mirror of
https://gitee.com/270580156/weiyu.git
synced 2025-12-30 10:52:26 +00:00
update
This commit is contained in:
@@ -325,7 +325,7 @@ services:
|
||||
# SPRING_AI_ZHIPUAI_BASE_URL: https://open.bigmodel.cn/api/paas
|
||||
SPRING_AI_ZHIPUAI_API_KEY: 'sk-xxx'
|
||||
SPRING_AI_ZHIPUAI_CHAT_ENABLED: "false"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4.5-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TOP_P: 0.9
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MAX_TOKENS: 4096
|
||||
|
||||
@@ -339,7 +339,7 @@ services:
|
||||
# SPRING_AI_ZHIPUAI_BASE_URL: https://open.bigmodel.cn/api/paas
|
||||
SPRING_AI_ZHIPUAI_API_KEY: 'sk-xxx'
|
||||
SPRING_AI_ZHIPUAI_CHAT_ENABLED: "false"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4.5-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TOP_P: 0.9
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MAX_TOKENS: 4096
|
||||
|
||||
@@ -319,7 +319,7 @@ services:
|
||||
# SPRING_AI_ZHIPUAI_BASE_URL: https://open.bigmodel.cn/api/paas
|
||||
SPRING_AI_ZHIPUAI_API_KEY: 'sk-xxx'
|
||||
SPRING_AI_ZHIPUAI_CHAT_ENABLED: "true"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4.5-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TOP_P: 0.9
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MAX_TOKENS: 4096
|
||||
|
||||
@@ -207,7 +207,7 @@ data:
|
||||
|
||||
# ZhipuAI 配置
|
||||
SPRING_AI_ZHIPUAI_CHAT_ENABLED: "true"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: "glm-4-flash"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: "glm-4.5-flash"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: "0.7"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TOP_P: "0.9"
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MAX_TOKENS: "4096"
|
||||
|
||||
@@ -45,7 +45,7 @@ public class SpringAIZhipuaiChatConfig {
|
||||
@Value("${spring.ai.zhipuai.base-url:https://open.bigmodel.cn/api/paas}")
|
||||
String zhipuaiBaseUrl;
|
||||
|
||||
@Value("${spring.ai.zhipuai.chat.options.model:glm-4-flash}")
|
||||
@Value("${spring.ai.zhipuai.chat.options.model:glm-4.5-flash}")
|
||||
String zhipuaiApiModel;
|
||||
|
||||
@Value("${spring.ai.zhipuai.chat.options.temperature:0.7}")
|
||||
|
||||
@@ -42,7 +42,7 @@ public class ZhipuaiChatConfig {
|
||||
@Value("${spring.ai.zhipuai.api-key:}")
|
||||
private String apiKey;
|
||||
|
||||
@Value("${spring.ai.zhipuai.chat.options.model:glm-4-flash}")
|
||||
@Value("${spring.ai.zhipuai.chat.options.model:glm-4.5-flash}")
|
||||
private String model;
|
||||
|
||||
@Value("${spring.ai.zhipuai.chat.options.temperature:0.7}")
|
||||
|
||||
@@ -52,13 +52,13 @@
|
||||
"type": "TEXT"
|
||||
},
|
||||
{
|
||||
"name": "glm-4-flash",
|
||||
"name": "glm-4.5-flash",
|
||||
"nickname": "GLM-4-Flash(免费)",
|
||||
"description": "免费使用的快速响应GLM-4变体",
|
||||
"type": "TEXT"
|
||||
},
|
||||
{
|
||||
"name": "glm-4-flashx",
|
||||
"name": "glm-4.5-flashx",
|
||||
"nickname": "GLM-4-FlashX",
|
||||
"description": "GLM-4-Flash的增强版本,保持快速响应的同时提供更好的输出质量",
|
||||
"type": "TEXT"
|
||||
@@ -130,7 +130,7 @@
|
||||
"type": "TEXT"
|
||||
},
|
||||
{
|
||||
"name": "glm-4-flashx-250414",
|
||||
"name": "glm-4.5-flashx-250414",
|
||||
"nickname": "GLM-4-FlashX-250414",
|
||||
"description": "GLM-4-FlashX 2025-04-14 版本,进一步优化速度与质量",
|
||||
"type": "TEXT"
|
||||
|
||||
@@ -137,7 +137,7 @@ services:
|
||||
# zhipuai
|
||||
SPRING_AI_ZHIPUAI_CHAT_ENABLED: false
|
||||
SPRING_AI_ZHIPUAI_API_KEY: ''
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_MODEL: glm-4.5-flash
|
||||
SPRING_AI_ZHIPUAI_CHAT_OPTIONS_TEMPERATURE: 0.7
|
||||
# ollama
|
||||
SPRING_AI_OLLAMA_CHAT_ENABLED: true
|
||||
|
||||
@@ -60,7 +60,7 @@ public class LlmConfigUtils {
|
||||
private String getChatModel(Environment environment, String provider) {
|
||||
switch (provider) {
|
||||
case LlmProviderConstants.ZHIPUAI:
|
||||
return environment.getProperty("spring.ai.zhipuai.chat.options.model", "glm-4-flash");
|
||||
return environment.getProperty("spring.ai.zhipuai.chat.options.model", "glm-4.5-flash");
|
||||
case LlmProviderConstants.OLLAMA:
|
||||
return environment.getProperty("spring.ai.ollama.chat.options.model", "qwen3:0.6b");
|
||||
case LlmProviderConstants.DEEPSEEK:
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* @Author: jackning 270580156@qq.com
|
||||
* @Date: 2024-11-11 16:35:02
|
||||
* @LastEditors: jackning 270580156@qq.com
|
||||
* @LastEditTime: 2025-09-23 13:18:36
|
||||
* @LastEditTime: 2025-09-25 13:21:35
|
||||
* @Description: bytedesk.com https://github.com/Bytedesk/bytedesk
|
||||
* Please be aware of the BSL license restrictions before installing Bytedesk IM –
|
||||
* selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license.
|
||||
@@ -30,7 +30,7 @@ public class LlmDefaults {
|
||||
// 默认文字对话模型提供商
|
||||
public static final String DEFAULT_TEXT_PROVIDER = LlmProviderConstants.ZHIPUAI;
|
||||
// 默认文字对话模型
|
||||
public static final String DEFAULT_TEXT_MODEL = "glm-4-flash";
|
||||
public static final String DEFAULT_TEXT_MODEL = "glm-4.5-flash";
|
||||
|
||||
// 默认视觉对话模型提供商
|
||||
public static final String DEFAULT_VISION_PROVIDER = LlmProviderConstants.ZHIPUAI;
|
||||
@@ -55,5 +55,5 @@ public class LlmDefaults {
|
||||
// 默认rewrite提供商
|
||||
public static final String DEFAULT_REWRITE_PROVIDER = LlmProviderConstants.ZHIPUAI;
|
||||
// 默认rewrite模型
|
||||
public static final String DEFAULT_REWRITE_MODEL = "glm-4-flash";
|
||||
public static final String DEFAULT_REWRITE_MODEL = "glm-4.5-flash";
|
||||
}
|
||||
@@ -33,7 +33,7 @@ class LlmConfigUtilsTest {
|
||||
environment.setProperty("spring.ai.model.vision", "zhipuai");
|
||||
environment.setProperty("spring.ai.model.audio", "zhipuai");
|
||||
environment.setProperty("spring.ai.model.rerank", "zhipuai");
|
||||
environment.setProperty("spring.ai.zhipuai.chat.options.model", "glm-4-flash");
|
||||
environment.setProperty("spring.ai.zhipuai.chat.options.model", "glm-4.5-flash");
|
||||
environment.setProperty("spring.ai.zhipuai.embedding.options.model", "embedding-2");
|
||||
|
||||
// When
|
||||
@@ -42,7 +42,7 @@ class LlmConfigUtilsTest {
|
||||
// Then
|
||||
assertNotNull(config);
|
||||
assertEquals("zhipuai", config.getDefaultChatProvider());
|
||||
assertEquals("glm-4-flash", config.getDefaultChatModel());
|
||||
assertEquals("glm-4.5-flash", config.getDefaultChatModel());
|
||||
assertEquals("zhipuai", config.getDefaultEmbeddingProvider());
|
||||
assertEquals("embedding-2", config.getDefaultEmbeddingModel());
|
||||
assertEquals("zhipuai", config.getDefaultVisionProvider());
|
||||
|
||||
@@ -804,7 +804,7 @@ spring.ai.ollama.embedding.options.model.rerank=linux6200/bge-reranker-v2-m3:lat
|
||||
spring.ai.zhipuai.api-key='sk-xxx'
|
||||
spring.ai.zhipuai.chat.enabled=false
|
||||
# 免费模型:https://open.bigmodel.cn/dev/api#glm-4
|
||||
spring.ai.zhipuai.chat.options.model=glm-4-flash
|
||||
spring.ai.zhipuai.chat.options.model=glm-4.5-flash
|
||||
spring.ai.zhipuai.chat.options.temperature=0.7
|
||||
# https://docs.spring.io/spring-ai/reference/api/embeddings/zhipuai-embeddings.html
|
||||
spring.ai.zhipuai.embedding.enabled=false
|
||||
|
||||
@@ -804,7 +804,7 @@ spring.ai.ollama.embedding.options.model.rerank=linux6200/bge-reranker-v2-m3:lat
|
||||
spring.ai.zhipuai.api-key='sk-xxx'
|
||||
spring.ai.zhipuai.chat.enabled=true
|
||||
# 免费模型:https://open.bigmodel.cn/dev/api#glm-4
|
||||
spring.ai.zhipuai.chat.options.model=glm-4-flash
|
||||
spring.ai.zhipuai.chat.options.model=glm-4.5-flash
|
||||
spring.ai.zhipuai.chat.options.temperature=0.7
|
||||
# https://docs.spring.io/spring-ai/reference/api/embeddings/zhipuai-embeddings.html
|
||||
spring.ai.zhipuai.embedding.enabled=true
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user