Skip to content

Commit 3995ef6

Browse files
committed
update chat agent ui
1 parent 9ec7fb1 commit 3995ef6

File tree

4 files changed

+16
-32
lines changed

4 files changed

+16
-32
lines changed

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<properties>
1818
<java.version>21</java.version>
1919
<spring-ai.version>1.0.0-M5</spring-ai.version>
20+
<chat-agent-ui.version>0.9.0</chat-agent-ui.version>
2021
</properties>
2122
<dependencies>
2223
<dependency>
@@ -29,9 +30,14 @@
2930
</dependency>
3031

3132
<dependency>
32-
<groupId>com.javaaidev</groupId>
33+
<groupId>com.javaaidev.chatagentui</groupId>
3334
<artifactId>chat-agent-ui</artifactId>
34-
<version>0.7.0</version>
35+
<version>${chat-agent-ui.version}</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>com.javaaidev.chatagentui</groupId>
39+
<artifactId>spring-ai-adapter</artifactId>
40+
<version>${chat-agent-ui.version}</version>
3541
</dependency>
3642

3743
<dependency>
Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package com.javaaidev.agent;
22

3-
import com.javaaidev.chatagent.model.ChatRequest;
4-
import com.javaaidev.chatagent.model.TextContentPart;
5-
import com.javaaidev.chatagent.model.ThreadAssistantMessage;
6-
import com.javaaidev.chatagent.model.ThreadUserMessage;
3+
import com.javaaidev.chatagent.model.ChatAgentRequest;
4+
import com.javaaidev.chatagent.springai.ModelAdapter;
75
import java.util.List;
8-
import java.util.stream.Stream;
9-
import org.springframework.ai.chat.messages.AssistantMessage;
106
import org.springframework.ai.chat.messages.Message;
11-
import org.springframework.ai.chat.messages.UserMessage;
127

138
public abstract class AbstractChatAgentController {
149

@@ -18,24 +13,7 @@ public abstract class AbstractChatAgentController {
1813
""";
1914

2015

21-
protected List<Message> chatRequestToMessages(ChatRequest request) {
22-
return request.messages().stream().flatMap(message -> {
23-
if (message instanceof ThreadUserMessage userMessage) {
24-
return userMessage.content().stream().map(part -> {
25-
if (part instanceof TextContentPart(String text)) {
26-
return new UserMessage(text);
27-
}
28-
return null;
29-
});
30-
} else if (message instanceof ThreadAssistantMessage assistantMessage) {
31-
return assistantMessage.content().stream().map(part -> {
32-
if (part instanceof TextContentPart(String text)) {
33-
return new AssistantMessage(text);
34-
}
35-
return null;
36-
});
37-
}
38-
return Stream.<Message>of();
39-
}).toList();
16+
protected List<Message> chatRequestToMessages(ChatAgentRequest request) {
17+
return ModelAdapter.fromRequest(request);
4018
}
4119
}

src/main/java/com/javaaidev/agent/ChatAgentController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.javaaidev.agent;
22

3-
import com.javaaidev.chatagent.model.ChatRequest;
3+
import com.javaaidev.chatagent.model.ChatAgentRequest;
44
import org.springframework.ai.chat.client.ChatClient;
55
import org.springframework.ai.chat.messages.Message;
66
import org.springframework.http.codec.ServerSentEvent;
@@ -21,7 +21,7 @@ public ChatAgentController(ChatClient.Builder builder) {
2121
}
2222

2323
@PostMapping
24-
public Flux<ServerSentEvent<String>> chat(@RequestBody ChatRequest request) {
24+
public Flux<ServerSentEvent<String>> chat(@RequestBody ChatAgentRequest request) {
2525
if (request == null) {
2626
return Flux.empty();
2727
}

src/main/java/com/javaaidev/agent/ChatAgentStreamingController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.javaaidev.agent;
22

3-
import com.javaaidev.chatagent.model.ChatRequest;
3+
import com.javaaidev.chatagent.model.ChatAgentRequest;
44
import org.springframework.ai.chat.client.ChatClient;
55
import org.springframework.ai.chat.messages.Message;
66
import org.springframework.http.MediaType;
@@ -22,7 +22,7 @@ public ChatAgentStreamingController(ChatClient.Builder builder) {
2222
}
2323

2424
@PostMapping(produces = MediaType.TEXT_EVENT_STREAM_VALUE)
25-
public Flux<ServerSentEvent<String>> chatStreaming(@RequestBody ChatRequest request) {
25+
public Flux<ServerSentEvent<String>> chatStreaming(@RequestBody ChatAgentRequest request) {
2626
var messages = chatRequestToMessages(request);
2727
return chatClient.prompt().system(SYSTEM_TEXT).messages(messages.toArray(new Message[0]))
2828
.stream().content()

0 commit comments

Comments
 (0)