From 2ef64a0a506c02c490f2a625859a09909196d211 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Fri, 26 Apr 2024 18:24:57 +0800
Subject: [PATCH] 【优化】自动配置，适配新的千问

---
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatqianwen/QianWenOptions.java      |  5 -----
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java |  9 ++++++---
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java        | 23 +++++++----------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatqianwen/QianWenOptions.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatqianwen/QianWenOptions.java
index eb598d3..bc7564d 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatqianwen/QianWenOptions.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/chatqianwen/QianWenOptions.java
@@ -18,11 +18,6 @@ import java.util.List;
 @Accessors
 public class QianWenOptions implements ChatOptions {
 
-    private String appId;
-    /**
-     * 是否流式输出, 默认为否。
-     */
-    private Boolean stream;
     /**
      * 用户与模型的对话历史
      */
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java
index 483e884..2eadf15 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiAutoConfiguration.java
@@ -44,13 +44,16 @@ public class YudaoAiAutoConfiguration {
     @ConditionalOnProperty(value = "yudao.ai.qianwen.enable", havingValue = "true")
     public QianWenChatClient qianWenChatClient(YudaoAiProperties yudaoAiProperties) {
         YudaoAiProperties.QianWenProperties qianWenProperties = yudaoAiProperties.getQianwen();
+        QianWenOptions qianWenOptions = new QianWenOptions();
+        qianWenOptions.setTopK(qianWenProperties.getTopK());
+        qianWenOptions.setTopP(qianWenProperties.getTopP());
+        qianWenOptions.setTemperature(qianWenProperties.getTemperature());
         return new QianWenChatClient(
                 new QianWenApi(
-                        qianWenProperties.getAgentKey(),
+                        qianWenProperties.getApiKey(),
                         QianWenChatModal.QWEN_72B_CHAT
                 ),
-                new QianWenOptions()
-                        .setAppId(qianWenProperties.getAppId())
+                qianWenOptions
         );
     }
 
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java
index 40f310f..4ccfb2a 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/config/YudaoAiProperties.java
@@ -42,26 +42,15 @@ public class YudaoAiProperties {
     @Data
     @Accessors(chain = true)
     public static class QianWenProperties extends ChatProperties {
+
         /**
-         * 阿里云：服务器接入点
-         */
-        private String endpoint = "bailian.cn-beijing.aliyuncs.com";
-        /**
-         * 阿里云：权限 accessKeyId
-         */
-        private String accessKeyId;
-        /**
-         * 阿里云：权限 accessKeySecret
-         */
-        private String accessKeySecret;
-        /**
-         * 阿里云：agentKey
+         * api key
          */
-        private String agentKey;
+        private String apiKey;
         /**
-         * 阿里云：agentKey(相当于应用id)
+         * model
          */
-        private String appId;
+        private YiYanChatModel model;
 
     }
 
@@ -93,5 +82,7 @@ public class YudaoAiProperties {
          * token 刷新时间(默认 86400 = 24小时)
          */
         private int refreshTokenSecondTime = 86400;
+
+        private YiYanChatModel model;
     }
 }
--
libgit2 0.21.4