Commit 2208396ee4164c9de67ae039b0719e886b831912
1 parent
7dface2d
fixup! 支持 GROK
Showing
4 changed files
with
4 additions
and
5 deletions
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java
| @@ -309,6 +309,5 @@ public class AiAutoConfiguration { | @@ -309,6 +309,5 @@ public class AiAutoConfiguration { | ||
| 309 | .toolCallingManager(getToolCallingManager()) | 309 | .toolCallingManager(getToolCallingManager()) |
| 310 | .build(); | 310 | .build(); |
| 311 | return new DouBaoChatModel(openAiChatModel); | 311 | return new DouBaoChatModel(openAiChatModel); |
| 312 | - | ||
| 313 | } | 312 | } |
| 314 | } | 313 | } |
| 315 | \ No newline at end of file | 314 | \ No newline at end of file |
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/grok/GrokChatModel.java
| @@ -19,8 +19,7 @@ public class GrokChatModel implements ChatModel { | @@ -19,8 +19,7 @@ public class GrokChatModel implements ChatModel { | ||
| 19 | 19 | ||
| 20 | public static final String BASE_URL = "https://api.x.ai"; | 20 | public static final String BASE_URL = "https://api.x.ai"; |
| 21 | public static final String COMPLETE_PATH = "/v1/chat/completions"; | 21 | public static final String COMPLETE_PATH = "/v1/chat/completions"; |
| 22 | - | ||
| 23 | - public static final String MODEL_DEFAULT = "grok-4-fast-reasoning\n"; | 22 | + public static final String MODEL_DEFAULT = "grok-4-fast-reasoning"; |
| 24 | 23 | ||
| 25 | /** | 24 | /** |
| 26 | * 兼容 OpenAI 接口，进行复用 | 25 | * 兼容 OpenAI 接口，进行复用 |
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java
| @@ -65,7 +65,6 @@ public class AiUtils { | @@ -65,7 +65,6 @@ public class AiUtils { | ||
| 65 | case MOONSHOT: | 65 | case MOONSHOT: |
| 66 | return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) | 66 | return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) |
| 67 | .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); | 67 | .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); |
| 68 | - case GROK: | ||
| 69 | case OPENAI: | 68 | case OPENAI: |
| 70 | case GEMINI: // 复用 OpenAI 客户端 | 69 | case GEMINI: // 复用 OpenAI 客户端 |
| 71 | case BAI_CHUAN: // 复用 OpenAI 客户端 | 70 | case BAI_CHUAN: // 复用 OpenAI 客户端 |
| @@ -80,6 +79,9 @@ public class AiUtils { | @@ -80,6 +79,9 @@ public class AiUtils { | ||
| 80 | case OLLAMA: | 79 | case OLLAMA: |
| 81 | return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens) | 80 | return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens) |
| 82 | .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); | 81 | .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); |
| 82 | + case GROK: | ||
| 83 | + return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens) | ||
| 84 | + .toolCallbacks(toolCallbacks).toolContext(toolContext).build(); | ||
| 83 | default: | 85 | default: |
| 84 | throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform)); | 86 | throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform)); |
| 85 | } | 87 | } |