rename config

apache · Jan 2, 2025 · 86b2522 · 86b2522
1 parent 4fcc13d
commit 86b2522
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 29 deletions.
diff --git a/...sistant/src/main/java/org/apache/bigtop/manager/ai/assistant/GeneralAssistantFactory.java b/...sistant/src/main/java/org/apache/bigtop/manager/ai/assistant/GeneralAssistantFactory.java
@@ -82,7 +82,7 @@ public AIAssistant createWithPrompt(
         AIAssistant.Builder builder = initializeBuilder(platformType);
         builder.id(id)
                 .memoryStore(chatMemoryStoreProvider.createPersistentChatMemoryStore())
-                .withConfigProvider(generalAssistantConfig)
+                .withConfig(generalAssistantConfig)
                 .withToolProvider(toolProvider);
 
         configureSystemPrompt(builder, systemPrompt, generalAssistantConfig.getLanguage());
@@ -98,7 +98,7 @@ public AIAssistant createForTest(AIAssistantConfig config, ToolProvider toolProv
 
         builder.id(null)
                 .memoryStore(chatMemoryStoreProvider.createInMemoryChatMemoryStore())
-                .withConfigProvider(generalAssistantConfig)
+                .withConfig(generalAssistantConfig)
                 .withToolProvider(toolProvider);
 
         return builder.build();

diff --git a/...rc/main/java/org/apache/bigtop/manager/ai/assistant/provider/LocSystemPromptProvider.java b/...rc/main/java/org/apache/bigtop/manager/ai/assistant/provider/LocSystemPromptProvider.java
@@ -72,6 +72,7 @@ private String loadPromptFromFile(String fileName) {
         return Objects.requireNonNullElse(text, "You are a helpful assistant.");
     }
 
+    @Override
     public String getLanguagePrompt(String locale) {
         final String filePath = SystemPrompt.LANGUAGE_PROMPT.getValue() + '-' + locale + ".st";
         String text = loadTextFromFile(filePath);

diff --git a/...ant/src/test/java/org/apache/bigtop/manager/ai/assistant/GeneralAssistantFactoryTest.java b/...ant/src/test/java/org/apache/bigtop/manager/ai/assistant/GeneralAssistantFactoryTest.java
@@ -57,7 +57,7 @@ void testCreateAIAssistant() {
         AIAssistant.Builder mockBuilder = mock(OpenAIAssistant.Builder.class);
         when(mockBuilder.id(any())).thenReturn(mockBuilder);
         when(mockBuilder.memoryStore(any())).thenReturn(mockBuilder);
-        when(mockBuilder.withConfigProvider(any())).thenReturn(mockBuilder);
+        when(mockBuilder.withConfig(any())).thenReturn(mockBuilder);
         when(mockBuilder.withToolProvider(any())).thenReturn(mockBuilder);
         when(mockBuilder.withSystemPrompt(any())).thenReturn(mockBuilder);
         when(mockBuilder.build()).thenReturn(mock(AIAssistant.class));

diff --git a/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/AbstractAIAssistant.java b/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/AbstractAIAssistant.java
@@ -61,7 +61,7 @@ public abstract static class Builder implements AIAssistant.Builder {
         protected Object id;
 
         protected ChatMemoryStore chatMemoryStore;
-        protected AIAssistantConfig configProvider;
+        protected AIAssistantConfig config;
 
         protected ToolProvider toolProvider;
         protected String systemPrompt;
@@ -78,8 +78,8 @@ public Builder withSystemPrompt(String systemPrompt) {
             return this;
         }
 
-        public Builder withConfigProvider(AIAssistantConfig configProvider) {
-            this.configProvider = configProvider;
+        public Builder withConfig(AIAssistantConfig config) {
+            this.config = config;
             return this;
         }
 

diff --git a/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/factory/AIAssistant.java b/...-manager-ai-core/src/main/java/org/apache/bigtop/manager/ai/core/factory/AIAssistant.java
@@ -74,7 +74,7 @@ interface Builder {
 
         Builder memoryStore(ChatMemoryStore memoryStore);
 
-        Builder withConfigProvider(AIAssistantConfig configProvider);
+        Builder withConfig(AIAssistantConfig configProvider);
 
         Builder withToolProvider(ToolProvider toolProvider);
 

diff --git a/...i-core/src/main/java/org/apache/bigtop/manager/ai/core/provider/SystemPromptProvider.java b/...i-core/src/main/java/org/apache/bigtop/manager/ai/core/provider/SystemPromptProvider.java
@@ -29,5 +29,7 @@ public interface SystemPromptProvider {
     // return default system prompt
     String getSystemMessage();
 
+    String getLanguagePrompt(String locale);
+
     String getSystemMessages(List<String> systemPrompts);
 }
diff --git a/...ai-dashscope/src/main/java/org/apache/bigtop/manager/ai/dashscope/DashScopeAssistant.java b/...ai-dashscope/src/main/java/org/apache/bigtop/manager/ai/dashscope/DashScopeAssistant.java
@@ -65,17 +65,17 @@ public AIAssistant build() {
 
         @Override
         public ChatLanguageModel getChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
             return QwenChatModel.builder().apiKey(apiKey).modelName(model).build();
         }
 
         @Override
         public StreamingChatLanguageModel getStreamingChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
             return QwenStreamingChatModel.builder()
                     .apiKey(apiKey)
                     .modelName(model)

diff --git a/...-manager-ai-openai/src/main/java/org/apache/bigtop/manager/ai/openai/OpenAIAssistant.java b/...-manager-ai-openai/src/main/java/org/apache/bigtop/manager/ai/openai/OpenAIAssistant.java
@@ -51,9 +51,9 @@ public static class Builder extends AbstractAIAssistant.Builder {
 
         @Override
         public ChatLanguageModel getChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
             return OpenAiChatModel.builder()
                     .apiKey(apiKey)
                     .baseUrl(BASE_URL)
@@ -63,9 +63,9 @@ public ChatLanguageModel getChatLanguageModel() {
 
         @Override
         public StreamingChatLanguageModel getStreamingChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
             return OpenAiStreamingChatModel.builder()
                     .apiKey(apiKey)
                     .baseUrl(BASE_URL)

diff --git a/...nager-ai-qianfan/src/main/java/org/apache/bigtop/manager/ai/qianfan/QianFanAssistant.java b/...nager-ai-qianfan/src/main/java/org/apache/bigtop/manager/ai/qianfan/QianFanAssistant.java
@@ -65,11 +65,11 @@ public AIAssistant build() {
 
         @Override
         public ChatLanguageModel getChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
-            String secretKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("secretKey"), "secretKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
+            String secretKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("secretKey"), "secretKey");
             return QianfanChatModel.builder()
                     .apiKey(apiKey)
                     .secretKey(secretKey)
@@ -79,11 +79,11 @@ public ChatLanguageModel getChatLanguageModel() {
 
         @Override
         public StreamingChatLanguageModel getStreamingChatLanguageModel() {
-            String model = ValidationUtils.ensureNotNull(configProvider.getModel(), "model");
-            String apiKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("apiKey"), "apiKey");
-            String secretKey = ValidationUtils.ensureNotNull(
-                    configProvider.getCredentials().get("secretKey"), "secretKey");
+            String model = ValidationUtils.ensureNotNull(config.getModel(), "model");
+            String apiKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("apiKey"), "apiKey");
+            String secretKey =
+                    ValidationUtils.ensureNotNull(config.getCredentials().get("secretKey"), "secretKey");
             return QianfanStreamingChatModel.builder()
                     .apiKey(apiKey)
                     .secretKey(secretKey)