Include numeric value Spinners

devoxx · Jun 3, 2024 · 342247b · 342247b
1 parent 3c43826
commit 342247b
Show file tree

Hide file tree

Showing 37 changed files with 232 additions and 995 deletions.
diff --git a/src/main/java/com/devoxx/genie/chatmodel/ChatModelProvider.java b/src/main/java/com/devoxx/genie/chatmodel/ChatModelProvider.java
@@ -13,7 +13,7 @@
 import com.devoxx.genie.model.Constant;
 import com.devoxx.genie.model.enumarations.ModelProvider;
 import com.devoxx.genie.model.request.ChatMessageContext;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llmconfig.LLMConfigStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import lombok.Setter;
@@ -83,7 +83,7 @@ public StreamingChatLanguageModel getStreamingChatLanguageModel(@NotNull ChatMes
      */
     public @NotNull ChatModel initChatModel(@NotNull ChatMessageContext chatMessageContext) {
         ChatModel chatModel = new ChatModel();
-        SettingsStateService settingsState = SettingsStateService.getInstance();
+        LLMConfigStateService settingsState = LLMConfigStateService.getInstance();
         setMaxOutputTokens(settingsState, chatModel);
 
         chatModel.setTemperature(settingsState.getTemperature());
@@ -101,15 +101,13 @@ public StreamingChatLanguageModel getStreamingChatLanguageModel(@NotNull ChatMes
      * @param settingsState the settings state
      * @param chatModel     the chat model
      */
-    private static void setMaxOutputTokens(@NotNull SettingsStateService settingsState, ChatModel chatModel) {
-        String maxOutputTokens = settingsState.getMaxOutputTokens();
-        if (maxOutputTokens.isBlank()) {
+    private static void setMaxOutputTokens(@NotNull LLMConfigStateService settingsState, ChatModel chatModel) {
+        Integer maxOutputTokens = settingsState.getMaxOutputTokens();
+        if (maxOutputTokens == null) {
             chatModel.setMaxTokens(Constant.MAX_OUTPUT_TOKENS);
         } else {
-            int value;
             try {
-                value = Integer.parseInt(maxOutputTokens);
-                chatModel.setMaxTokens(value);
+                chatModel.setMaxTokens(maxOutputTokens);
             } catch (NumberFormatException e) {
                 chatModel.setMaxTokens(Constant.MAX_OUTPUT_TOKENS);
             }

diff --git a/src/main/java/com/devoxx/genie/chatmodel/LLMProviderConstant.java b/src/main/java/com/devoxx/genie/chatmodel/LLMProviderConstant.java
@@ -1,6 +1,6 @@
 package com.devoxx.genie.chatmodel;
 
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -32,7 +32,7 @@ private LLMProviderConstant() {
     };
 
     public static @NotNull List<String> getLLMProviders() {
-        SettingsStateService settingState = SettingsStateService.getInstance();
+        LLMStateService settingState = LLMStateService.getInstance();
         Map<String, Supplier<String>> providerKeyMap = new HashMap<>();
         providerKeyMap.put(OpenAI.getName(), settingState::getOpenAIKey);
         providerKeyMap.put(Anthropic.getName(), settingState::getAnthropicKey);

diff --git a/src/main/java/com/devoxx/genie/chatmodel/anthropic/AnthropicChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/anthropic/AnthropicChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.anthropic.AnthropicChatModel;
 import dev.langchain4j.model.anthropic.AnthropicStreamingChatModel;
 import dev.langchain4j.model.chat.ChatLanguageModel;
@@ -40,7 +40,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getAnthropicKey().trim();
+        return LLMStateService.getInstance().getAnthropicKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/chatmodel/deepinfra/DeepInfraChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/deepinfra/DeepInfraChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
@@ -42,7 +42,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getDeepInfraKey().trim();
+        return LLMStateService.getInstance().getDeepInfraKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/chatmodel/gemini/GeminiChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/gemini/GeminiChatModelFactory.java
@@ -3,7 +3,7 @@
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
 import com.devoxx.genie.model.gemini.GeminiChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,7 +26,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getGeminiKey().trim();
+        return LLMStateService.getInstance().getGeminiKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/chatmodel/gpt4all/GPT4AllChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/gpt4all/GPT4AllChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.localai.LocalAiChatModel;
@@ -16,7 +16,7 @@ public class GPT4AllChatModelFactory implements ChatModelFactory {
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
         return LocalAiChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getGpt4allModelUrl())
+            .baseUrl(LLMStateService.getInstance().getGpt4allModelUrl())
             .modelName("test-model")
             .maxRetries(chatModel.getMaxRetries())
             .maxTokens(chatModel.getMaxTokens())
@@ -28,7 +28,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
 
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
         return LocalAiStreamingChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getGpt4allModelUrl())
+            .baseUrl(LLMStateService.getInstance().getGpt4allModelUrl())
             .modelName("test-model")
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())

diff --git a/src/main/java/com/devoxx/genie/chatmodel/groq/GroqChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/groq/GroqChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
 import org.jetbrains.annotations.NotNull;
@@ -40,7 +40,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getGroqKey().trim();
+        return LLMStateService.getInstance().getGroqKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/chatmodel/jan/JanChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/jan/JanChatModelFactory.java
@@ -4,7 +4,7 @@
 import com.devoxx.genie.model.ChatModel;
 import com.devoxx.genie.model.jan.Data;
 import com.devoxx.genie.service.JanService;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.project.ProjectManager;
 import dev.langchain4j.model.chat.ChatLanguageModel;
@@ -27,7 +27,7 @@ public class JanChatModelFactory implements ChatModelFactory {
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
         return LocalAiChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getJanModelUrl())
+            .baseUrl(LLMStateService.getInstance().getJanModelUrl())
             .modelName(chatModel.getModelName())
             .maxRetries(chatModel.getMaxRetries())
             .temperature(chatModel.getTemperature())
@@ -41,7 +41,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
         return LocalAiStreamingChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getJanModelUrl())
+            .baseUrl(LLMStateService.getInstance().getJanModelUrl())
             .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())

diff --git a/src/main/java/com/devoxx/genie/chatmodel/lmstudio/LMStudioChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/lmstudio/LMStudioChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.localai.LocalAiChatModel;
@@ -16,7 +16,7 @@ public class LMStudioChatModelFactory implements ChatModelFactory {
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
         return LocalAiChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getLmstudioModelUrl())
+            .baseUrl(LLMStateService.getInstance().getLmstudioModelUrl())
             .modelName("LMStudio")
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
@@ -29,7 +29,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
         return LocalAiStreamingChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getLmstudioModelUrl())
+            .baseUrl(LLMStateService.getInstance().getLmstudioModelUrl())
             .modelName("LMStudio")
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())

diff --git a/src/main/java/com/devoxx/genie/chatmodel/mistral/MistralChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/mistral/MistralChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.mistralai.MistralAiChatModel;
@@ -42,7 +42,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getMistralKey().trim();
+        return LLMStateService.getInstance().getMistralKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/chatmodel/ollama/OllamaChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/ollama/OllamaChatModelFactory.java
@@ -4,7 +4,7 @@
 import com.devoxx.genie.model.ChatModel;
 import com.devoxx.genie.model.ollama.OllamaModelEntryDTO;
 import com.devoxx.genie.service.OllamaService;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.project.ProjectManager;
 import dev.langchain4j.model.chat.ChatLanguageModel;
@@ -23,7 +23,7 @@ public class OllamaChatModelFactory implements ChatModelFactory {
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
         return OllamaChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getOllamaModelUrl())
+            .baseUrl(LLMStateService.getInstance().getOllamaModelUrl())
             .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
@@ -35,7 +35,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
         return OllamaStreamingChatModel.builder()
-            .baseUrl(SettingsStateService.getInstance().getOllamaModelUrl())
+            .baseUrl(LLMStateService.getInstance().getOllamaModelUrl())
             .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())

diff --git a/src/main/java/com/devoxx/genie/chatmodel/openai/OpenAIChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/openai/OpenAIChatModelFactory.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
@@ -41,7 +41,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
 
     @Override
     public String getApiKey() {
-        return SettingsStateService.getInstance().getOpenAIKey().trim();
+        return LLMStateService.getInstance().getOpenAIKey().trim();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/model/ChatModel.java b/src/main/java/com/devoxx/genie/model/ChatModel.java
@@ -9,8 +9,8 @@ public class ChatModel {
 
     private String baseUrl;
     private String modelName;
-    private Double temperature = Constant.TEMPERATURE;
-    private Double topP = Constant.TOP_P;
+    private double temperature = Constant.TEMPERATURE;
+    private double topP = Constant.TOP_P;
     private int maxTokens = Constant.MAX_OUTPUT_TOKENS;
     private int maxRetries = Constant.MAX_RETRIES;
     private int timeout = Constant.TIMEOUT;

diff --git a/src/main/java/com/devoxx/genie/service/ChatMemoryService.java b/src/main/java/com/devoxx/genie/service/ChatMemoryService.java
@@ -1,7 +1,7 @@
 package com.devoxx.genie.service;
 
-import com.devoxx.genie.service.settings.SettingsStateService;
 import com.devoxx.genie.ui.listener.ChatMemorySizeListener;
+import com.devoxx.genie.ui.settings.llmconfig.LLMConfigStateService;
 import com.devoxx.genie.ui.topic.AppTopics;
 import com.intellij.openapi.application.ApplicationManager;
 import dev.langchain4j.data.message.ChatMessage;
@@ -22,7 +22,7 @@ public class ChatMemoryService implements ChatMemorySizeListener {
      * @link PostStartupActivity
      */
     public void init() {
-        createChatMemory(SettingsStateService.getInstance().getChatMemorySize());
+        createChatMemory(LLMConfigStateService.getInstance().getChatMemorySize());
         createChangeListener();
     }
 

diff --git a/src/main/java/com/devoxx/genie/service/ChatPromptExecutor.java b/src/main/java/com/devoxx/genie/service/ChatPromptExecutor.java
@@ -1,8 +1,9 @@
 package com.devoxx.genie.service;
 
 import com.devoxx.genie.model.request.ChatMessageContext;
-import com.devoxx.genie.service.settings.SettingsStateService;
 import com.devoxx.genie.ui.panel.PromptOutputPanel;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
+import com.devoxx.genie.ui.settings.prompt.PromptSettingsStateService;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
@@ -18,7 +19,6 @@
 public class ChatPromptExecutor {
 
     private final PromptExecutionService promptExecutionService = PromptExecutionService.getInstance();
-    private final SettingsStateService settingsState = SettingsStateService.getInstance();
 
     public ChatPromptExecutor() {
     }
@@ -39,7 +39,7 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                 if (chatMessageContext.getContext() != null && chatMessageContext.getContext().toLowerCase().contains("search")) {
                     webSearchPrompt(chatMessageContext, promptOutputPanel, enableButtons);
                 } else {
-                    if (SettingsStateService.getInstance().getStreamMode()) {
+                    if (LLMStateService.getInstance().getStreamMode()) {
                         setupStreaming(chatMessageContext, promptOutputPanel, enableButtons);
                     } else {
                         runPrompt(chatMessageContext, promptOutputPanel, enableButtons);
@@ -99,7 +99,7 @@ private void setupStreaming(@NotNull ChatMessageContext chatMessageContext,
         MessageCreationService messageCreationService = MessageCreationService.getInstance();
 
         if (chatMemoryService.isEmpty()) {
-            chatMemoryService.add(new SystemMessage(SettingsStateService.getInstance().getSystemPrompt()));
+            chatMemoryService.add(new SystemMessage(PromptSettingsStateService.getInstance().getSystemPrompt()));
         }
 
         UserMessage userMessage = messageCreationService.createUserMessage(chatMessageContext);
@@ -124,13 +124,13 @@ private Optional<String> getCommandFromPrompt(@NotNull String prompt,
         if (prompt.startsWith("/")) {
 
             if (prompt.equalsIgnoreCase("/test")) {
-                prompt = settingsState.getTestPrompt();
+                prompt = PromptSettingsStateService.getInstance().getTestPrompt();
             } else if (prompt.equalsIgnoreCase("/review")) {
-                prompt = settingsState.getReviewPrompt();
+                prompt = PromptSettingsStateService.getInstance().getReviewPrompt();
             } else if (prompt.equalsIgnoreCase("/explain")) {
-                prompt = settingsState.getExplainPrompt();
+                prompt = PromptSettingsStateService.getInstance().getExplainPrompt();
             } else if (prompt.equalsIgnoreCase("/custom")) {
-                prompt = settingsState.getCustomPrompt();
+                prompt = PromptSettingsStateService.getInstance().getCustomPrompt();
             } else {
                 promptOutputPanel.showHelpText();
                 return Optional.empty();

diff --git a/src/main/java/com/devoxx/genie/service/JanService.java b/src/main/java/com/devoxx/genie/service/JanService.java
@@ -2,7 +2,7 @@
 
 import com.devoxx.genie.model.jan.Data;
 import com.devoxx.genie.model.jan.ResponseDTO;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
 import com.google.gson.Gson;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -21,7 +21,7 @@ public JanService(OkHttpClient client) {
     }
 
     public List<Data> getModels() throws IOException {
-        String baseUrl = ensureEndsWithSlash(SettingsStateService.getInstance().getJanModelUrl());
+        String baseUrl = ensureEndsWithSlash(LLMStateService.getInstance().getJanModelUrl());
 
         Request request = new Request.Builder()
             .url(baseUrl + "models")

diff --git a/src/main/java/com/devoxx/genie/service/MessageCreationService.java b/src/main/java/com/devoxx/genie/service/MessageCreationService.java
@@ -1,7 +1,8 @@
 package com.devoxx.genie.service;
 
 import com.devoxx.genie.model.request.ChatMessageContext;
-import com.devoxx.genie.service.settings.SettingsStateService;
+import com.devoxx.genie.ui.settings.llm.LLMStateService;
+import com.devoxx.genie.ui.settings.llmconfig.LLMConfigStateService;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
@@ -100,7 +101,7 @@ public static MessageCreationService getInstance() {
 
         appendIfNotEmpty(sb, chatMessageContext.getEditorInfo().getSelectedText());
 
-        if (SettingsStateService.getInstance().getAstMode()) {
+        if (LLMConfigStateService.getInstance().getAstMode()) {
             addASTContext(chatMessageContext, sb);
         }