refactoring

Author: Yuriy Bezsonov

…agent/ai-agent/samples/expense_policy.md …agent/ai-agent/samples/policy-expense.mdsamples/spring-ai-te-agent/ai-agent/samples/expense_policy.md renamed to samples/spring-ai-te-agent/ai-agent/samples/policy-expense.md samples/spring-ai-te-agent/ai-agent/samples/expense_policy.md renamed to samples/spring-ai-te-agent/ai-agent/samples/policy-expense.md

@@ -20,18 +20,18 @@ public class ChatController {
     private static final Logger logger = LoggerFactory.getLogger(ChatController.class);
 
     private final ChatService chatService;
-    private final DocumentChatService documentChatService;
-    private final ConversationSummaryService summaryService;
     private final ChatMemoryService chatMemoryService;
+    private final ConversationSummaryService summaryService;
+    private final DocumentChatService documentChatService;
 
-    public ChatController(ChatService chatService,
-                         DocumentChatService documentChatService,
+    public ChatController(ChatMemoryService chatMemoryService,
                          ConversationSummaryService summaryService,
-                         ChatMemoryService chatMemoryService) {
+                         DocumentChatService documentChatService,
+                         ChatService chatService) {
         this.chatService = chatService;
-        this.documentChatService = documentChatService;
-        this.summaryService = summaryService;
         this.chatMemoryService = chatMemoryService;
+        this.summaryService = summaryService;
+        this.documentChatService = documentChatService;
     }
 
     @PostMapping(value = "message", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)

…-agent/ai-agent/samples/travel_policy.md …-agent/ai-agent/samples/policy-travel.mdsamples/spring-ai-te-agent/ai-agent/samples/travel_policy.md renamed to samples/spring-ai-te-agent/ai-agent/samples/policy-travel.md samples/spring-ai-te-agent/ai-agent/samples/travel_policy.md renamed to samples/spring-ai-te-agent/ai-agent/samples/policy-travel.md

@@ -1,9 +1,9 @@
 package com.example.ai.agent.controller;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Value;
 
 @Controller
 public class WebViewController {

samples/spring-ai-te-agent/ai-agent/samples/travel_and_expenses_policy.md

@@ -28,13 +28,11 @@ public class ChatMemoryService {
     private final MessageWindowChatMemory sessionMemory;
     private final MessageWindowChatMemory contextMemory;
     private final MessageWindowChatMemory preferencesMemory;
-    private final ChatResponseExtractor responseExtractor;
 
     // Thread-local to store current userId per request
     private final ThreadLocal<String> currentUserId = ThreadLocal.withInitial(() -> "user1");
 
-    public ChatMemoryService(DataSource dataSource, ChatResponseExtractor responseExtractor) {
-        this.responseExtractor = responseExtractor;
+    public ChatMemoryService(DataSource dataSource) {
 
         var jdbcRepository = JdbcChatMemoryRepository.builder()
             .dataSource(dataSource)
@@ -145,7 +143,9 @@ private void loadPreviousContext(String conversationId, ChatClient chatClient) {
             .call()
             .chatResponse();
 
-        String contextSummary = responseExtractor.extractText(chatResponse);
+        String contextSummary = (chatResponse != null && chatResponse.getResult() != null && chatResponse.getResult().getOutput() != null)
+            ? chatResponse.getResult().getOutput().getText()
+            : null;
 
         if (contextSummary == null || contextSummary.isEmpty()) {
             logger.warn("Failed to generate context summary");

samples/spring-ai-te-agent/ai-agent/src/main/java/com/example/ai/agent/controller/ChatController.java

@@ -18,7 +18,6 @@ public class ChatService {
 
     private final ChatClient chatClient;
     private final ChatMemoryService chatMemoryService;
-    private final ChatResponseExtractor responseExtractor;
 
     public static final String SYSTEM_PROMPT = """
         You are a helpful AI Agent for travel and expenses.
@@ -30,14 +29,13 @@ public class ChatService {
         4. Use tools for dynamic data (flights, weather, bookings, currency)
         """;
 
-    public ChatService(ChatResponseExtractor responseExtractor,
-                      ChatMemoryService chatMemoryService,
+    public ChatService(ChatMemoryService chatMemoryService,
                       VectorStore vectorStore,
                       DateTimeService dateTimeService,
                       WeatherService weatherService,
                       ToolCallbackProvider tools,
                       ChatClient.Builder chatClientBuilder) {
-        this.responseExtractor = responseExtractor;
+
         this.chatClient = chatClientBuilder
                 .defaultSystem(SYSTEM_PROMPT)
                 .defaultAdvisors(
@@ -64,8 +62,4 @@ public Flux<String> processChat(String prompt) {
             return Flux.just("I don't know - there was an error processing your request.");
         }
     }
-
-    public String extractTextFromResponse(org.springframework.ai.chat.model.ChatResponse chatResponse) {
-        return responseExtractor.extractText(chatResponse);
-    }
 }

samples/spring-ai-te-agent/ai-agent/src/main/java/com/example/ai/agent/controller/WebViewController.java

@@ -14,14 +14,11 @@ public class ConversationSummaryService {
     private static final Logger logger = LoggerFactory.getLogger(ConversationSummaryService.class);
 
     private final ChatMemoryService chatMemoryService;
-    private final ChatResponseExtractor responseExtractor;
     private final ChatClient chatClient;
 
     public ConversationSummaryService(ChatMemoryService chatMemoryService,
-                                     ChatResponseExtractor responseExtractor,
                                      ChatClient.Builder chatClientBuilder) {
         this.chatMemoryService = chatMemoryService;
-        this.responseExtractor = responseExtractor;
         this.chatClient = chatClientBuilder.build();
     }
 
@@ -56,7 +53,7 @@ public String summarizeAndSave(String conversationId) {
 
         String preferencesPrompt = existingPrefsText.isEmpty()
             ? "Extract static user information (name, email, preferences). If none, return empty."
-            : "Merge preferences. Keep existing:\n" + existingPrefsText + 
+            : "Merge preferences. Keep existing:\n" + existingPrefsText +
               "\nAdd new from conversation. Update only if explicitly changed. Never remove existing.";
 
         var chatResponse = chatClient.prompt()
@@ -79,7 +76,9 @@ public String summarizeAndSave(String conversationId) {
             .call()
             .chatResponse();
 
-        String response = responseExtractor.extractText(chatResponse);
+        String response = (chatResponse != null && chatResponse.getResult() != null && chatResponse.getResult().getOutput() != null)
+            ? chatResponse.getResult().getOutput().getText()
+            : null;
 
         if (response == null || response.trim().isEmpty()) {
             logger.error("Generated summary is null or empty");
@@ -131,9 +130,9 @@ public String summarizeAndSave(String conversationId) {
 
         String timestamp = java.time.LocalDateTime.now()
             .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd HHmmss"));
-        
+
         return "**Summary:** [" + timestamp + "]\n\n" +
-               "**Preferences:**\n" + (preferences.isEmpty() ? "None" : preferences) + 
+               "**Preferences:**\n" + (preferences.isEmpty() ? "None" : preferences) +
                "\n\n**Context:**\n" + context;
     }
 }