【优化】讯飞星火兼容 system、assistant、user

cherishsince
1 parent 63c5f905
Showing 2 changed files with 22 additions and 6 deletions
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatxinghuo/XingHuoChatClient.java
yudao-module-ai/yudao-spring-boot-starter-ai/src/test/java/cn/iocoder/yudao/framework/ai/chat/XingHuoChatClientTests.java
@@ -117,12 +117,15 @@ public class XingHuoChatClient implements ChatClient, StreamingChatClient {
         chatParameter.setDomain(xingHuoOptions.getChatModel().getValue());
         XingHuoChatCompletionRequest.Parameter parameter = new XingHuoChatCompletionRequest.Parameter().setChat(chatParameter);
         // 创建 payload text 信息
-        XingHuoChatCompletionRequest.Payload.Message.Text text = new XingHuoChatCompletionRequest.Payload.Message.Text();
-        text.setRole(XingHuoChatCompletionRequest.Payload.Message.Text.Role.USER.getName());
-        text.setContent(prompt.getContents());
+        List<XingHuoChatCompletionRequest.Payload.Message.Text> texts = prompt.getInstructions().stream().map(message -> {
+            XingHuoChatCompletionRequest.Payload.Message.Text text = new XingHuoChatCompletionRequest.Payload.Message.Text();
+            text.setContent(message.getContent());
+            text.setRole(message.getMessageType().getValue());
+            return text;
+        }).collect(Collectors.toList());
         // 创建 payload
         XingHuoChatCompletionRequest.Payload payload = new XingHuoChatCompletionRequest.Payload()
-                .setMessage(new XingHuoChatCompletionRequest.Payload.Message().setText(List.of(text)));
+                .setMessage(new XingHuoChatCompletionRequest.Payload.Message().setText(texts));
         // 创建 request
         return new XingHuoChatCompletionRequest()
                 .setHeader(header)
 package cn.iocoder.yudao.framework.ai.chat;
+import cn.iocoder.yudao.framework.ai.chat.messages.Message;
+import cn.iocoder.yudao.framework.ai.chat.messages.SystemMessage;
+import cn.iocoder.yudao.framework.ai.chat.messages.UserMessage;
 import cn.iocoder.yudao.framework.ai.chat.prompt.Prompt;
 import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatClient;
 import cn.iocoder.yudao.framework.ai.chatxinghuo.XingHuoChatModel;
@@ -9,6 +12,8 @@ import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Scanner;
 import java.util.function.Consumer;
@@ -37,13 +42,21 @@ public class XingHuoChatClientTests {
     @Test
     public void callTest() {
-        ChatResponse call = xingHuoChatClient.call(new Prompt("java和go那个性能更好!"));
+        List<Message> messages = new ArrayList<>();
+        messages.add(new SystemMessage("你是一个优质的文言文作者，用文言文描述着各城市的人文风景。"));
+        messages.add(new UserMessage("长沙怎么样？"));
+
+        ChatResponse call = xingHuoChatClient.call(new Prompt(messages));
         System.err.println(call.getResult());
     }
     @Test
     public void streamTest() {
-        Flux<ChatResponse> stream = xingHuoChatClient.stream(new Prompt("java和go那个性能更好!"));
+        List<Message> messages = new ArrayList<>();
+        messages.add(new SystemMessage("你是一个优质的文言文作者，用文言文描述着各城市的人文风景。"));
+        messages.add(new UserMessage("长沙怎么样？"));
+
+        Flux<ChatResponse> stream = xingHuoChatClient.stream(new Prompt(messages));
         stream.subscribe(new Consumer<ChatResponse>() {
             @Override
             public void accept(ChatResponse chatResponse) {