From 3a10fedddb66851242e0d7e018fbe0e1d0b8ae43 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Mon, 20 May 2024 13:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90todo=E3=80=91=E7=99=BE=E5=BA=A6?=
 =?UTF-8?q?=E6=96=87=E8=A8=80=E4=B8=80=E5=BF=83=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=20todo=EF=BC=8C=E5=88=A0=E9=99=A4=20doOnComplete=E3=80=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20retryTemplate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/core/model/yiyan/YiYanChatClient.java  | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/yiyan/YiYanChatClient.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/yiyan/YiYanChatClient.java
index a613af6db2..c7b0bf372b 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/yiyan/YiYanChatClient.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/yiyan/YiYanChatClient.java
@@ -85,22 +85,20 @@ public class YiYanChatClient implements ChatClient, StreamingChatClient {
     @Override
     public Flux<ChatResponse> stream(Prompt prompt) {
         YiYanChatCompletionRequest request = this.createRequest(prompt, true);
-        // TODO @fan：return this.retryTemplate.execute(ctx -> {
-        // 调用 callWithFunctionSupport 发送请求
-        Flux<YiYanChatCompletionResponse> response = this.yiYanApi.chatCompletionStream(request);
-        // TODO @fan：下面的 doOnComplete 是不是可以删除哈？
-        response.doOnComplete(new Runnable() {
-            @Override
-            public void run() {
-                String a = ";";
-            }
-        });
-        return response.map(chunk -> {
-            // TODO @fan：ChatResponseMetadata chatResponseMetadata
-            return new ChatResponse(List.of(new Generation(chunk.getResult())));
+        // TODO done @fan：return this.retryTemplate.execute(ctx -> {
+        return retryTemplate.execute(ctx -> {
+            // 调用 callWithFunctionSupport 发送请求
+            Flux<YiYanChatCompletionResponse> response = this.yiYanApi.chatCompletionStream(request);
+            return response.map(chunk -> {
+//                System.err.println("---".concat(chunk.getResult()));
+                // TODO @fan：ChatResponseMetadata chatResponseMetadata
+                return new ChatResponse(List.of(new Generation(chunk.getResult())));
+            });
         });
     }
 
+
+
     private YiYanChatCompletionRequest createRequest(Prompt prompt, boolean stream) {
         // 参考 https://cloud.baidu.com/doc/WENXINWORKSHOP/s/clntwmv7t 文档，system 是独立字段
         // 1.1 获取 user 和 assistant