User propagation

Author: johnsonr

src/main/java/com/embabel/guide/GuideAgent.java

@@ -6,6 +6,8 @@
 import com.embabel.agent.api.annotation.Export;
 import com.embabel.agent.api.common.Ai;
 
+import java.util.Map;
+
 record GuideRequest(
         String question
 ) {
@@ -32,7 +34,7 @@ GuideResponse answerQuestion(GuideRequest guideRequest, Ai ai) {
                 .withReferences(guideData.references)
                 .withRag(guideData.ragOptions())
                 .withTemplate("guide_system")
-                .createObject(GuideResponse.class, guideData.templateModel());
+                .createObject(GuideResponse.class, guideData.templateModel(Map.of()));
     }
 
 }

src/main/java/com/embabel/guide/GuideChatSession.java

@@ -1,8 +1,13 @@
 package com.embabel.guide;
 
 import com.embabel.agent.api.common.AiBuilder;
+import com.embabel.agent.identity.User;
+import com.embabel.agent.rag.pipeline.event.RagPipelineEvent;
 import com.embabel.chat.*;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.lang.Nullable;
+
+import java.util.Map;
 
 /**
  * GuideLoader will have loaded content
@@ -13,14 +18,24 @@ public class GuideChatSession implements ChatSession {
 
     private final AiBuilder aiBuilder;
     private final GuideData guideData;
+    @Nullable
+    private final User user;
 
     private final Conversation conversation = new InMemoryConversation();
 
     public GuideChatSession(AiBuilder aiBuilder,
-                            GuideData guideData
+                            GuideData guideData,
+                            @Nullable User user
     ) {
         this.guideData = guideData;
         this.aiBuilder = aiBuilder;
+        this.user = user;
+    }
+
+    @Nullable
+    @Override
+    public User getUser() {
+        return user;
     }
 
     @NotNull
@@ -38,11 +53,14 @@ public void respond(@NotNull UserMessage userMessage, @NotNull MessageListener m
                 .withLlm(guideData.guideConfig.llm())
                 .withReferences(guideData.references)
                 .withRag(guideData.ragOptions().withListener(e -> {
-                    var am = new AssistantMessage(e.toString());
-                    messageListener.onMessage(am, conversation);
+                    if (e instanceof RagPipelineEvent rpe) {
+                        var am = new AssistantMessage(rpe.getDescription());
+                        messageListener.onMessage(am, conversation);
+                    }
                 }))
                 .withTemplate("guide_system")
-                .respondWithSystemPrompt(conversation, guideData.templateModel());
+                .respondWithSystemPrompt(conversation,
+                        guideData.templateModel(Map.of("user", user)));
 
         conversation.addMessage(assistantMessage);
         messageListener.onMessage(assistantMessage, conversation);

src/main/java/com/embabel/guide/GuideChatbot.java

@@ -2,6 +2,7 @@
 
 import com.embabel.agent.api.common.AiBuilder;
 import com.embabel.agent.api.common.LlmReference;
+import com.embabel.agent.identity.User;
 import com.embabel.chat.ChatSession;
 import com.embabel.chat.InMemoryChatbot;
 import org.jetbrains.annotations.NotNull;
@@ -31,8 +32,8 @@ public GuideChatbot(
 
     @NotNull
     @Override
-    protected ChatSession doCreateSession(@Nullable String systemMessage) {
-        return new GuideChatSession(aiBuilder, guideData);
+    protected ChatSession doCreateSession(@Nullable User user, @Nullable String systemMessage) {
+        return new GuideChatSession(aiBuilder, guideData, user);
     }
 
 }

src/main/java/com/embabel/guide/GuideData.java

@@ -15,10 +15,7 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Exposes the guide configuration and the loaded references
@@ -85,7 +82,9 @@ public RagOptions ragOptions() {
                 .withTopK(guideConfig.topK());
     }
 
-    public Map<String, Object> templateModel() {
-        return Map.of("persona", guideConfig.persona());
+    public Map<String, Object> templateModel(Map<String, Object> extras) {
+        var n = new HashMap<>(extras);
+        n.put("persona", guideConfig.persona());
+        return n;
     }
 }

src/main/resources/prompts/coding_style.jinja

@@ -1,5 +1,8 @@
 ## Coding Style
 
+Refer to this if you generate any code.
+TRY NOT TO GENERATE CODE BUT PULL FROM EXAMPLES.
+
 - Use modern Java features like var, records, and switch expressions.
 - Use multiline strings rather than concatenation.
 - Use Mockito for tests.

src/main/resources/prompts/guide_system.jinja

@@ -1,6 +1,10 @@
 {% set persona_template = "persona/" + persona %}
 {% include persona_template %}
 
+{% if user.displayName is defined and user.displayName %}
+    The user's name is {{ user.displayName }}. Address them by name.
+{% endif %}
+
 References:
 
 - embabel-agent-examples: Excellent source of API examples