Browse Source

fixup! 支持 GROK

A 8 months ago
parent
commit
2208396ee4

+ 0 - 1
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java

@@ -309,6 +309,5 @@ public class AiAutoConfiguration {
                 .toolCallingManager(getToolCallingManager())
                 .build();
         return new DouBaoChatModel(openAiChatModel);
-
     }
 }

+ 0 - 1
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java

@@ -174,7 +174,6 @@ public class YudaoAiProperties {
 
     }
 
-
     @Data
     public static class WebSearch {
 

+ 1 - 2
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 {
 
     public static final String BASE_URL = "https://api.x.ai";
     public static final String COMPLETE_PATH = "/v1/chat/completions";
-
-    public static final String MODEL_DEFAULT = "grok-4-fast-reasoning\n";
+    public static final String MODEL_DEFAULT = "grok-4-fast-reasoning";
 
     /**
      * 兼容 OpenAI 接口,进行复用

+ 3 - 1
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java

@@ -65,7 +65,6 @@ public class AiUtils {
             case MOONSHOT:
                 return MoonshotChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
                         .toolCallbacks(toolCallbacks).toolContext(toolContext).build();
-            case GROK:
             case OPENAI:
             case GEMINI: // 复用 OpenAI 客户端
             case BAI_CHUAN: // 复用 OpenAI 客户端
@@ -80,6 +79,9 @@ public class AiUtils {
             case OLLAMA:
                 return OllamaOptions.builder().model(model).temperature(temperature).numPredict(maxTokens)
                         .toolCallbacks(toolCallbacks).toolContext(toolContext).build();
+            case GROK:
+                return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
+                        .toolCallbacks(toolCallbacks).toolContext(toolContext).build();
             default:
                 throw new IllegalArgumentException(StrUtil.format("未知平台({})", platform));
         }