Simplification

Author: johnsonr

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

@@ -1,6 +1,7 @@
 package com.embabel.guide;
 
 import com.embabel.agent.api.common.LlmReference;
+import com.embabel.agent.identity.User;
 import com.embabel.agent.rag.WritableContentElementRepository;
 import com.embabel.agent.rag.ingestion.DirectoryParsingResult;
 import com.embabel.agent.rag.ingestion.HierarchicalContentReader;
@@ -12,6 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,12 +60,12 @@ public GuideData(
     }
 
     @NonNull
-    public GuideConfig guideConfig() {
+    public GuideConfig config() {
         return guideConfig;
     }
 
     @NonNull
-    public List<LlmReference> references() {
+    public List<LlmReference> referencesForUser(@Nullable User user) {
         return Collections.unmodifiableList(references);
     }
 

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

@@ -13,27 +13,27 @@
 import com.embabel.agent.rag.EntitySearch;
 import com.embabel.agent.rag.HyDE;
 import com.embabel.agent.rag.pipeline.event.RagPipelineEvent;
+import com.embabel.agent.rag.tools.DualShotConfig;
 import com.embabel.chat.AssistantMessage;
 import com.embabel.chat.Chatbot;
 import com.embabel.chat.Conversation;
 import com.embabel.chat.UserMessage;
 import com.embabel.chat.agent.AgentProcessChatbot;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
-import javax.validation.constraints.Null;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.Set;
 
-record ConversationOver(String why) {
+record ConversationOver(@NonNull String why) {
 }
 
-// TODO should go into common
 record ChatbotReturn(
         @Nullable AssistantMessage assistantMessage,
-        @Null ConversationOver termination
+        @Nullable ConversationOver termination
 ) implements SomeOf {
 }
 
@@ -61,22 +61,24 @@ ChatbotReturn respond(
             ActionContext context) {
         var assistantMessage = context
                 .ai()
-                .withLlm(guideData.guideConfig().llm())
-                .withReferences(guideData.references())
+                .withLlm(guideData.config().llm())
+                .withReferences(guideData.referencesForUser(context.user()))
                 .withTools(CoreToolGroups.WEB)
-                .withRag(guideData.ragOptions()
-                        .withHyDE(new HyDE(40))
-                        .withContentElementSearch(ContentElementSearch.CHUNKS_ONLY)
-                        .withEntitySearch(new EntitySearch(Set.of(
-                                "Concept", "Example"
-                        ), false))
-                        .withDesiredMaxLatency(Duration.ofMinutes(10))
-//                        .withDualShot(new DualShotConfig(100))
-                        .withListener(e -> {
-                            if (e instanceof RagPipelineEvent rpe) {
-                                context.updateProgress(rpe.getDescription());
-                            }
-                        }))
+                .withRag(
+                        guideData
+                                .ragOptions()
+                                .withHyDE(new HyDE(40))
+                                .withContentElementSearch(ContentElementSearch.CHUNKS_ONLY)
+                                .withEntitySearch(new EntitySearch(Set.of(
+                                        "Concept", "Example"
+                                ), false))
+                                .withDesiredMaxLatency(Duration.ofMinutes(10))
+                                .withDualShot(new DualShotConfig(100))
+                                .withListener(e -> {
+                                    if (e instanceof RagPipelineEvent rpe) {
+                                        context.updateProgress(rpe.getDescription());
+                                    }
+                                }))
                 .withTemplate("guide_system")
                 .respondWithSystemPrompt(conversation,
                         guideData.templateModel(Collections.singletonMap("user",
@@ -89,7 +91,7 @@ ChatbotReturn respond(
 
     @AchievesGoal(description = "Conversation completed")
     @Action
-    ConversationOver respondAndMaybeTerminate(
+    ConversationOver respondAndTerminate(
             ConversationOver conversationOver,
             Conversation conversation,
             ActionContext context) {

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

@@ -35,8 +35,8 @@ public record GuideAgent(
     @Action
     GuideResponse answerQuestion(GuideRequest guideRequest, OperationContext operationContext) {
         return operationContext.ai()
-                .withLlm(guideData.guideConfig().llm())
-                .withReferences(guideData.references())
+                .withLlm(guideData.config().llm())
+                .withReferences(guideData.referencesForUser(null))
                 .withRag(guideData.ragOptions())
                 .withTemplate("guide_system")
                 .createObject(GuideResponse.class, guideData.templateModel(Collections.singletonMap(

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

@@ -16,7 +16,7 @@
 import java.util.Collections;
 
 /**
- * GuideLoader will have loaded content
+ * Shows how to write a ChatSession without an agent backing it
  */
 public class GuideChatSession implements ChatSession {
 
@@ -66,8 +66,8 @@ public void onUserMessage(@NotNull UserMessage userMessage) {
         final var assistantMessage = aiBuilder
                 .withShowPrompts(false)
                 .ai()
-                .withLlm(guideData.guideConfig().llm())
-                .withReferences(guideData.references())
+                .withLlm(guideData.config().llm())
+                .withReferences(guideData.referencesForUser(getUser()))
                 .withRag(guideData.ragOptions().withListener(e -> {
                     if (e instanceof RagPipelineEvent rpe) {
                         var am = new AssistantMessage(rpe.getDescription());