Merge pull request #79 from devoxx/issue-71

Fix #71: Support for AST/PSI window context reflection
devoxx · May 27, 2024 · 4febe75 · 4febe75
2 parents 9010a2b + 91036d6
commit 4febe75
Show file tree

Hide file tree

Showing 37 changed files with 342 additions and 137 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.devoxx.genie"
-version = "0.1.12"
+version = "0.1.13"
 
 repositories {
     mavenCentral()

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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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();
-        SettingsState settingsState = SettingsState.getInstance();
+        SettingsStateService settingsState = SettingsStateService.getInstance();
         setMaxOutputTokens(settingsState, chatModel);
 
         chatModel.setTemperature(settingsState.getTemperature());
@@ -101,7 +101,7 @@ public StreamingChatLanguageModel getStreamingChatLanguageModel(@NotNull ChatMes
      * @param settingsState the settings state
      * @param chatModel     the chat model
      */
-    private static void setMaxOutputTokens(@NotNull SettingsState settingsState, ChatModel chatModel) {
+    private static void setMaxOutputTokens(@NotNull SettingsStateService settingsState, ChatModel chatModel) {
         String maxOutputTokens = settingsState.getMaxOutputTokens();
         if (maxOutputTokens.isBlank()) {
             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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
@@ -32,7 +32,7 @@ private LLMProviderConstant() {
     };
 
     public static @NotNull List<String> getLLMProviders() {
-        SettingsState settingState = SettingsState.getInstance();
+        SettingsStateService settingState = SettingsStateService.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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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 SettingsState.getInstance().getAnthropicKey();
+        return SettingsStateService.getInstance().getAnthropicKey();
     }
 
     @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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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 SettingsState.getInstance().getDeepInfraKey();
+        return SettingsStateService.getInstance().getDeepInfraKey();
     }
 
     @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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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 SettingsState.getInstance().getGeminiKey();
+        return SettingsStateService.getInstance().getGeminiKey();
     }
 
     @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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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(SettingsState.getInstance().getGpt4allModelUrl())
+            .baseUrl(SettingsStateService.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(SettingsState.getInstance().getGpt4allModelUrl())
+            .baseUrl(SettingsStateService.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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
@@ -28,21 +28,21 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
             .build();
     }
 
-
-    @Override
-    public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
-        return OpenAiStreamingChatModel.builder()
-            .apiKey(getApiKey())
-            .modelName(chatModel.getModelName())
-            .temperature(chatModel.getTemperature())
-            .topP(chatModel.getTopP())
-            .timeout(Duration.ofSeconds(chatModel.getTimeout()))
-            .build();
-    }
+//    Streaming gives error for Groq model provider
+//    @Override
+//    public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
+//        return OpenAiStreamingChatModel.builder()
+//            .apiKey(getApiKey())
+//            .modelName(chatModel.getModelName())
+//            .temperature(chatModel.getTemperature())
+//            .topP(chatModel.getTopP())
+//            .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+//            .build();
+//    }
 
     @Override
     public String getApiKey() {
-        return SettingsState.getInstance().getGroqKey();
+        return SettingsStateService.getInstance().getGroqKey();
     }
 
     @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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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(SettingsState.getInstance().getJanModelUrl())
+            .baseUrl(SettingsStateService.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(SettingsState.getInstance().getJanModelUrl())
+            .baseUrl(SettingsStateService.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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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(SettingsState.getInstance().getLmstudioModelUrl())
+            .baseUrl(SettingsStateService.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(SettingsState.getInstance().getLmstudioModelUrl())
+            .baseUrl(SettingsStateService.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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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 SettingsState.getInstance().getMistralKey();
+        return SettingsStateService.getInstance().getMistralKey();
     }
 
     @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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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(SettingsState.getInstance().getOllamaModelUrl())
+            .baseUrl(SettingsStateService.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(SettingsState.getInstance().getOllamaModelUrl())
+            .baseUrl(SettingsStateService.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.ui.SettingsState;
+import com.devoxx.genie.service.SettingsStateService;
 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 SettingsState.getInstance().getOpenAIKey();
+        return SettingsStateService.getInstance().getOpenAIKey();
     }
 
     @Override

diff --git a/src/main/java/com/devoxx/genie/model/Constant.java b/src/main/java/com/devoxx/genie/model/Constant.java
@@ -25,4 +25,9 @@ private Constant() {
     public static final Integer MAX_MEMORY = 6;
 
     public static final Boolean STREAM_MODE = false;
+
+    public static final Boolean AST_MODE = false;
+    public static final Boolean AST_PARENT_CLASS = true;
+    public static final Boolean AST_CLASS_REFERENCE = true;
+    public static final Boolean AST_FIELD_REFERENCE = true;
 }
diff --git a/src/main/java/com/devoxx/genie/model/request/EditorInfo.java b/src/main/java/com/devoxx/genie/model/request/EditorInfo.java
@@ -4,6 +4,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Setter
@@ -20,4 +21,8 @@ public EditorInfo() {
     public EditorInfo(List<VirtualFile> selectedFiles) {
         this.selectedFiles = selectedFiles;
     }
+
+    public void setSelectedFiles(List<VirtualFile> selectedFiles) {
+        this.selectedFiles = new ArrayList<>(selectedFiles);
+    }
 }
diff --git a/src/main/java/com/devoxx/genie/service/ChatPromptExecutor.java b/src/main/java/com/devoxx/genie/service/ChatPromptExecutor.java
@@ -1,7 +1,6 @@
 package com.devoxx.genie.service;
 
 import com.devoxx.genie.model.request.ChatMessageContext;
-import com.devoxx.genie.ui.SettingsState;
 import com.devoxx.genie.ui.panel.PromptOutputPanel;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -17,7 +16,7 @@
 public class ChatPromptExecutor {
 
     private final PromptExecutionService promptExecutionService = PromptExecutionService.getInstance();
-    private final SettingsState settingsState = SettingsState.getInstance();
+    private final SettingsStateService settingsState = SettingsStateService.getInstance();
 
     public ChatPromptExecutor() {
     }
@@ -36,7 +35,7 @@ public void executePrompt(@NotNull ChatMessageContext chatMessageContext,
         new Task.Backgroundable(chatMessageContext.getProject(), "Working...", true) {
             @Override
             public void run(@NotNull ProgressIndicator progressIndicator) {
-                if (SettingsState.getInstance().getStreamMode()) {
+                if (SettingsStateService.getInstance().getStreamMode()) {
                     setupStreaming(chatMessageContext, promptOutputPanel, enableButtons);
                 } else {
                     runPrompt(chatMessageContext, promptOutputPanel, enableButtons);

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,6 @@
 
 import com.devoxx.genie.model.jan.Data;
 import com.devoxx.genie.model.jan.ResponseDTO;
-import com.devoxx.genie.ui.SettingsState;
 import com.google.gson.Gson;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -21,7 +20,7 @@ public JanService(OkHttpClient client) {
     }
 
     public List<Data> getModels() throws IOException {
-        String baseUrl = ensureEndsWithSlash(SettingsState.getInstance().getJanModelUrl());
+        String baseUrl = ensureEndsWithSlash(SettingsStateService.getInstance().getJanModelUrl());
 
         Request request = new Request.Builder()
             .url(baseUrl + "models")