feat: support reasoning

alexcheng1982 · alexcheng1982 · commit 422db0646090 · 2025-12-05T20:24:13.000+13:00
diff --git a/chat-agent-model/pom.xml b/chat-agent-model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.llmagentspec</groupId>
     <artifactId>llm-agent-spec</artifactId>
-    <version>0.2.3</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>chat-agent-model</artifactId>
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ChatAgentResponse.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ChatAgentResponse.java
@@ -4,9 +4,13 @@
 
 /**
  * Response of a chat agent
+ *
  * @param content content in the response
- * @see ThreadAssistantContentPart
+ * @see ThreadAssistantMessagePart
  */
-public record ChatAgentResponse(List<ThreadAssistantContentPart> content) {
+public record ChatAgentResponse(List<ThreadAssistantMessagePart> content) {
 
+  public boolean hasContent() {
+    return content != null && !content.isEmpty();
+  }
 }
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ReasoningMessagePart.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ReasoningMessagePart.java
@@ -0,0 +1,9 @@
+package com.javaaidev.chatagent.model;
+
+public record ReasoningMessagePart(String text) implements ThreadAssistantMessagePart {
+
+  @Override
+  public String getType() {
+    return "reasoning";
+  }
+}
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/TextMessagePart.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/TextMessagePart.java
@@ -2,9 +2,11 @@
 
 /**
  * Text content
+ *
  * @param text text
  */
-public record TextContentPart(String text) implements ThreadUserContentPart, ThreadAssistantContentPart {
+public record TextMessagePart(String text) implements ThreadUserMessagePart,
+    ThreadAssistantMessagePart {
 
   @Override
   public String getType() {
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadAssistantMessage.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadAssistantMessage.java
@@ -6,9 +6,9 @@
  * Assistant message in a thread
  * @param id Message id
  * @param content Message content
- * @see ThreadAssistantContentPart
+ * @see ThreadAssistantMessagePart
  */
-public record ThreadAssistantMessage(String id, List<ThreadAssistantContentPart> content) implements ThreadMessage {
+public record ThreadAssistantMessage(String id, List<ThreadAssistantMessagePart> content) implements ThreadMessage {
 
   @Override
   public MessageRole getRole() {
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadAssistantMessagePart.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadAssistantMessagePart.java
@@ -1,5 +1,6 @@
 package com.javaaidev.chatagent.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
@@ -8,8 +9,11 @@
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
-    @JsonSubTypes.Type(value = TextContentPart.class, name = "text")
+    @JsonSubTypes.Type(value = TextMessagePart.class, name = "text"),
+    @JsonSubTypes.Type(value = ReasoningMessagePart.class, name = "reasoning")
 })
-public interface ThreadAssistantContentPart {
+public interface ThreadAssistantMessagePart {
+
+  @JsonIgnore
   String getType();
 }
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadUserMessage.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadUserMessage.java
@@ -6,9 +6,9 @@
  * User message in a thread
  * @param id Message id
  * @param content Message content
- * @see ThreadUserContentPart
+ * @see ThreadUserMessagePart
  */
-public record ThreadUserMessage(String id, List<ThreadUserContentPart> content) implements ThreadMessage {
+public record ThreadUserMessage(String id, List<ThreadUserMessagePart> content) implements ThreadMessage {
 
   @Override
   public MessageRole getRole() {
diff --git a/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadUserMessagePart.java b/chat-agent-model/src/main/java/com/javaaidev/chatagent/model/ThreadUserMessagePart.java
@@ -1,5 +1,6 @@
 package com.javaaidev.chatagent.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
@@ -8,8 +9,10 @@
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
 @JsonSubTypes({
-    @JsonSubTypes.Type(value = TextContentPart.class, name = "text")
+    @JsonSubTypes.Type(value = TextMessagePart.class, name = "text")
 })
-public interface ThreadUserContentPart {
+public interface ThreadUserMessagePart {
+
+  @JsonIgnore
   String getType();
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.javaaidev.llmagentspec</groupId>
   <artifactId>llm-agent-spec</artifactId>
-  <version>0.2.3</version>
+  <version>0.3.0</version>
   <packaging>pom</packaging>
   <name>LLM Agent Spec</name>
   <description>Spec of LLM Agents</description>
diff --git a/spring-ai-adapter/pom.xml b/spring-ai-adapter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.llmagentspec</groupId>
     <artifactId>llm-agent-spec</artifactId>
-    <version>0.2.3</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>spring-ai-adapter</artifactId>
@@ -18,8 +18,8 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.0.3</spring-ai.version>
-    <spring.version>6.2.12</spring.version>
+    <spring-ai.version>1.1.0</spring-ai.version>
+    <spring.version>6.2.14</spring.version>
   </properties>
 
   <dependencyManagement>
diff --git a/spring-ai-adapter/src/main/java/com/javaaidev/chatagent/springai/ModelAdapter.java b/spring-ai-adapter/src/main/java/com/javaaidev/chatagent/springai/ModelAdapter.java
@@ -2,20 +2,23 @@
 
 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.ReasoningMessagePart;
+import com.javaaidev.chatagent.model.TextMessagePart;
 import com.javaaidev.chatagent.model.ThreadAssistantMessage;
+import com.javaaidev.chatagent.model.ThreadAssistantMessagePart;
 import com.javaaidev.chatagent.model.ThreadUserMessage;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 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;
 import org.springframework.http.codec.ServerSentEvent;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Flux;
 
 /**
@@ -36,14 +39,14 @@ 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) {
+          if (part instanceof TextMessagePart 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) {
+          if (part instanceof TextMessagePart textContentPart) {
             return new AssistantMessage(textContentPart.text());
           }
           return null;
@@ -60,13 +63,29 @@ public static List<Message> fromRequest(ChatAgentRequest request) {
    * @return {@linkplain ChatAgentResponse} of chat agent
    */
   public static ChatAgentResponse toResponse(ChatResponse chatResponse) {
-    var content = new ArrayList<ThreadAssistantContentPart>();
+    var content = new ArrayList<ThreadAssistantMessagePart>();
     for (Generation generation : chatResponse.getResults()) {
-      content.add(new TextContentPart(generation.getOutput().getText()));
+      var message = generation.getOutput();
+      if (StringUtils.hasText(message.getText())) {
+        content.add(new TextMessagePart(message.getText()));
+      }
+      extractReasoning(message).ifPresent(
+          reasoning -> content.add(new ReasoningMessagePart(reasoning))
+      );
     }
     return new ChatAgentResponse(content);
   }
 
+  private static Optional<String> extractReasoning(AssistantMessage assistantMessage) {
+    var metadata = assistantMessage.getMetadata();
+    return Stream.of("reasoningContent", "thinking")
+        .map(metadata::get)
+        .filter(Objects::nonNull)
+        .map(Object::toString)
+        .filter(StringUtils::hasText)
+        .findFirst();
+  }
+
   /**
    * Convert a stream of Spring AI {@linkplain ChatResponse} to a stream of
    * {@linkplain ChatAgentResponse} using Server-sent Events
@@ -76,13 +95,10 @@ public static ChatAgentResponse toResponse(ChatResponse chatResponse) {
    */
   public static Flux<ServerSentEvent<ChatAgentResponse>> toStreamingResponse(
       Flux<ChatResponse> chatResponse) {
-    return chatResponse.concatMap(
-            response -> Flux.fromIterable(response.getResults()))
-        .filter(generation -> Objects.nonNull(generation.getOutput()) && Objects.nonNull(generation.getOutput().getText()))
-        .map(generation -> generation.getOutput().getText())
-        .map(text -> ServerSentEvent.<ChatAgentResponse>builder()
-            .data(new ChatAgentResponse(
-                List.of(new TextContentPart(text))))
+    return chatResponse.map(ModelAdapter::toResponse)
+        .filter(ChatAgentResponse::hasContent)
+        .map(response -> ServerSentEvent.<ChatAgentResponse>builder()
+            .data(response)
             .build());
   }
 }
