From 7eb74b2aa8cf80d24dbbf4f218b3c4e89edf070c Mon Sep 17 00:00:00 2001 From: jack ning Date: Mon, 24 Feb 2025 23:22:58 +0800 Subject: [PATCH] update modules/ai: mod 4 files --- .../java/com/bytedesk/ai/springai/SpringAIDeepseekConfig.java | 4 +++- .../java/com/bytedesk/ai/springai/SpringAIOllamaConfig.java | 3 ++- .../java/com/bytedesk/ai/springai/SpringAIZhipuaiConfig.java | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIDeepseekConfig.java b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIDeepseekConfig.java index 54f189e74d..83677f46d8 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIDeepseekConfig.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIDeepseekConfig.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-02-17 11:17:28 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-20 12:26:42 + * @LastEditTime: 2025-02-24 23:21:30 * @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. @@ -18,6 +18,7 @@ import org.springframework.ai.chat.prompt.ChatOptions; import org.springframework.ai.openai.OpenAiChatModel; import org.springframework.ai.openai.api.OpenAiApi; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,6 +27,7 @@ import org.springframework.context.annotation.Configuration; * 复用 openai 的配置 */ @Configuration +@ConditionalOnProperty(name = "spring.ai.deepseek.chat.enabled", havingValue = "true") public class SpringAIDeepseekConfig { @Value("${spring.ai.openai.base-url}") diff --git a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIOllamaConfig.java b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIOllamaConfig.java index 05ad759458..efc395cf23 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIOllamaConfig.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIOllamaConfig.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-31 10:24:39 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-24 09:26:21 + * @LastEditTime: 2025-02-24 23:21:58 * @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. @@ -42,6 +42,7 @@ import redis.clients.jedis.JedisPooled; */ @Data @Configuration +@ConditionalOnProperty(name = "spring.ai.ollama.chat.enabled", havingValue = "true") public class SpringAIOllamaConfig { @Value("${spring.ai.ollama.base-url:http://host.docker.internal:11434}") diff --git a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIZhipuaiConfig.java b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIZhipuaiConfig.java index ce54ff5206..f24e610f78 100644 --- a/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIZhipuaiConfig.java +++ b/modules/ai/src/main/java/com/bytedesk/ai/springai/SpringAIZhipuaiConfig.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-31 10:53:11 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-02-24 09:26:41 + * @LastEditTime: 2025-02-24 23:20:40 * @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. @@ -47,6 +47,7 @@ import redis.clients.jedis.JedisPooled; */ @Data @Configuration +@ConditionalOnProperty(name = "spring.ai.zhipuai.chat.enabled", havingValue = "true") public class SpringAIZhipuaiConfig { @Value("${spring.ai.zhipuai.api-key:}")