code refactoring

Author: alexcheng1982

chat-agent-ui/src/main/java/com/javaaidev/chatagent/model/ChatRequest.java renamed to chat-agent-ui/src/main/java/com/javaaidev/chatagent/model/ChatAgentRequest.java

@@ -2,6 +2,6 @@
 
 import java.util.List;
 
-public record ChatRequest(List<ThreadMessage> messages) {
+public record ChatAgentRequest(List<ThreadMessage> messages) {
 
 }

chat-agent-ui/src/main/java/com/javaaidev/chatagent/model/ChatAgentResponse.java

@@ -0,0 +1,7 @@
+package com.javaaidev.chatagent.model;
+
+import java.util.List;
+
+public record ChatAgentResponse(List<ThreadAssistantContentPart> content) {
+
+}

chat-agent-ui/src/main/java/com/javaaidev/chatagent/model/ChatResponse.java

@@ -1,50 +1,67 @@
 package com.javaaidev.chatagent.springai;
 
-import com.javaaidev.chatagent.model.ChatRequest;
+import com.javaaidev.chatagent.model.ChatAgentRequest;
+import com.javaaidev.chatagent.model.ChatAgentResponse;
 import com.javaaidev.chatagent.model.TextContentPart;
 import com.javaaidev.chatagent.model.ThreadAssistantContentPart;
 import com.javaaidev.chatagent.model.ThreadAssistantMessage;
 import com.javaaidev.chatagent.model.ThreadUserMessage;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
 
+/**
+ * Convert models between chat agent and Spring AI
+ */
 public class ModelAdapter {
 
   private ModelAdapter() {
   }
 
-  public static List<Message> fromRequest(ChatRequest request) {
+  /**
+   * Convert a {@linkplain ChatAgentRequest} to a list of Spring AI {@linkplain Message}
+   *
+   * @param request {@linkplain ChatAgentRequest} of chat agent
+   * @return A list of Spring AI {@linkplain Message}
+   */
+  public static List<Message> fromRequest(ChatAgentRequest request) {
     return request.messages().stream().flatMap(message -> {
       if (message instanceof ThreadUserMessage userMessage) {
         return userMessage.content().stream().map(part -> {
           if (part instanceof TextContentPart textContentPart) {
             return new UserMessage(textContentPart.text());
           }
           return null;
-        });
+        }).filter(Objects::nonNull);
       } else if (message instanceof ThreadAssistantMessage assistantMessage) {
         return assistantMessage.content().stream().map(part -> {
           if (part instanceof TextContentPart textContentPart) {
             return new AssistantMessage(textContentPart.text());
           }
           return null;
-        });
+        }).filter(Objects::nonNull);
       }
       return Stream.<Message>of();
     }).toList();
   }
 
-  public com.javaaidev.chatagent.model.ChatResponse toResponse(ChatResponse chatResponse) {
+  /**
+   * Convert a Spring AI {@linkplain ChatResponse} to {@linkplain ChatAgentResponse}
+   *
+   * @param chatResponse Spring AI {@linkplain ChatResponse}
+   * @return {@linkplain ChatAgentResponse} of chat agent
+   */
+  public static ChatAgentResponse toResponse(ChatResponse chatResponse) {
     var content = new ArrayList<ThreadAssistantContentPart>();
     for (Generation generation : chatResponse.getResults()) {
       content.add(new TextContentPart(generation.getOutput().getText()));
     }
-    return new com.javaaidev.chatagent.model.ChatResponse(content);
+    return new ChatAgentResponse(content);
   }
 }