Merge pull request #578 from devoxx/issue-576

stephanj · web-flow · commit 80ca31b9bd9e · 2025-03-24T09:38:13.000+01:00
Swapped LocalAIChatModel to OpenAIChatModel. Rolledback to v1.0.0-bet…
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -50,16 +50,15 @@ tasks.named("buildPlugin") {
 }
 
 dependencies {
-    val lg4j_version = "1.0.0-beta2"
+    val lg4j_version = "1.0.0-beta1"
 
     // Add the dependencies for the core module
     implementation(project(":core"))
 
     // Langchain4J dependencies
     implementation("dev.langchain4j:langchain4j:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-ollama:$lg4j_version")
-    implementation("dev.langchain4j:langchain4j-local-ai:$lg4j_version")
-    implementation("dev.langchain4j:langchain4j-open-ai:1.0.0-alpha2-SNAPSHOT")
+    implementation("dev.langchain4j:langchain4j-open-ai:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-anthropic:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-bedrock:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-mistral-ai:$lg4j_version")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    val lg4j_version = "1.0.0-beta2"
+    val lg4j_version = "1.0.0-beta1"
     implementation("dev.langchain4j:langchain4j:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-ollama:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-local-ai:$lg4j_version")
diff --git a/src/main/java/com/devoxx/genie/chatmodel/ChatModelFactoryProvider.java b/src/main/java/com/devoxx/genie/chatmodel/ChatModelFactoryProvider.java
@@ -13,7 +13,7 @@
 import com.devoxx.genie.chatmodel.local.customopenai.CustomOpenAIChatModelFactory;
 import com.devoxx.genie.chatmodel.local.gpt4all.GPT4AllChatModelFactory;
 import com.devoxx.genie.chatmodel.local.jan.JanChatModelFactory;
-import com.devoxx.genie.chatmodel.local.llamaCPP.LlamaChatModelFactory;
+import com.devoxx.genie.chatmodel.local.llamacpp.LlamaChatModelFactory;
 import com.devoxx.genie.chatmodel.local.lmstudio.LMStudioChatModelFactory;
 import com.devoxx.genie.chatmodel.local.ollama.OllamaChatModelFactory;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactory.java
@@ -9,8 +9,8 @@
 import com.intellij.util.concurrency.AppExecutorUtil;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
-import dev.langchain4j.model.localai.LocalAiChatModel;
-import dev.langchain4j.model.localai.LocalAiStreamingChatModel;
+import dev.langchain4j.model.openai.OpenAiChatModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -40,9 +40,10 @@ protected LocalChatModelFactory(ModelProvider modelProvider) {
 
     protected abstract String getModelUrl();
 
-    protected ChatLanguageModel createLocalAiChatModel(@NotNull ChatModel chatModel) {
-        return LocalAiChatModel.builder()
+    protected ChatLanguageModel createOpenAiChatModel(@NotNull ChatModel chatModel) {
+        return OpenAiChatModel.builder()
                 .baseUrl(getModelUrl())
+                .apiKey("na")
                 .modelName(chatModel.getModelName())
                 .maxRetries(chatModel.getMaxRetries())
                 .temperature(chatModel.getTemperature())
@@ -52,9 +53,10 @@ protected ChatLanguageModel createLocalAiChatModel(@NotNull ChatModel chatModel)
                 .build();
     }
 
-    protected StreamingChatLanguageModel createLocalAiStreamingChatModel(@NotNull ChatModel chatModel) {
-        return LocalAiStreamingChatModel.builder()
+    protected StreamingChatLanguageModel createOpenAiStreamingChatModel(@NotNull ChatModel chatModel) {
+        return OpenAiStreamingChatModel.builder()
                 .baseUrl(getModelUrl())
+                .apiKey("na")
                 .modelName(chatModel.getModelName())
                 .temperature(chatModel.getTemperature())
                 .topP(chatModel.getTopP())
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/gpt4all/GPT4AllChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/gpt4all/GPT4AllChatModelFactory.java
@@ -20,12 +20,12 @@ public GPT4AllChatModelFactory() {
 
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiChatModel(chatModel);
+        return createOpenAiChatModel(chatModel);
     }
 
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiStreamingChatModel(chatModel);
+        return createOpenAiStreamingChatModel(chatModel);
     }
 
     @Override
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/jan/JanChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/jan/JanChatModelFactory.java
@@ -20,12 +20,12 @@ public JanChatModelFactory() {
 
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiChatModel(chatModel);
+        return createOpenAiChatModel(chatModel);
     }
 
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiStreamingChatModel(chatModel);
+        return createOpenAiStreamingChatModel(chatModel);
     }
 
     @Override
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/llamacpp/LlamaChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/llamacpp/LlamaChatModelFactory.java
@@ -1,12 +1,12 @@
-package com.devoxx.genie.chatmodel.local.llamaCPP;
+package com.devoxx.genie.chatmodel.local.llamacpp;
 
 import com.devoxx.genie.chatmodel.ChatModelFactory;
 import com.devoxx.genie.model.ChatModel;
 import com.devoxx.genie.model.LanguageModel;
 import com.devoxx.genie.model.enumarations.ModelProvider;
 import com.devoxx.genie.ui.settings.DevoxxGenieStateService;
 import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.localai.LocalAiChatModel;
+import dev.langchain4j.model.openai.OpenAiChatModel;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
@@ -17,8 +17,9 @@ public class LlamaChatModelFactory implements ChatModelFactory {
 
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-        return LocalAiChatModel.builder()
+        return OpenAiChatModel.builder()
             .baseUrl(DevoxxGenieStateService.getInstance().getLlamaCPPUrl())
+            .apiKey("na")
             .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
             .topP(chatModel.getTopP())
@@ -29,7 +30,7 @@ public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
 
     @Override
     public List<LanguageModel> getModels() {
-        LanguageModel lmStudio = LanguageModel.builder()
+        LanguageModel model = LanguageModel.builder()
             .provider(ModelProvider.LLaMA)
             .modelName(TEST_MODEL)
             .displayName(TEST_MODEL)
@@ -40,7 +41,7 @@ public List<LanguageModel> getModels() {
             .build();
 
         List<LanguageModel> modelNames = new ArrayList<>();
-        modelNames.add(lmStudio);
+        modelNames.add(model);
         return modelNames;
     }
 }
diff --git a/src/main/java/com/devoxx/genie/chatmodel/local/lmstudio/LMStudioChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/local/lmstudio/LMStudioChatModelFactory.java
@@ -22,12 +22,12 @@ public LMStudioChatModelFactory() {
 
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiChatModel(chatModel);
+        return createOpenAiChatModel(chatModel);
     }
 
     @Override
     public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
-        return createLocalAiStreamingChatModel(chatModel);
+        return createOpenAiStreamingChatModel(chatModel);
     }
 
     @Override
diff --git a/src/main/java/com/devoxx/genie/service/MessageCreationService.java b/src/main/java/com/devoxx/genie/service/MessageCreationService.java
@@ -129,11 +129,6 @@ private void constructUserMessageWithFullContext(@NotNull ChatMessageContext cha
             stringBuilder.append("</Context>\n");
         }
 
-        stringBuilder
-                .append("<ProjectPath>")
-                .append(chatMessageContext.getProject().getBasePath())
-                .append("</ProjectPath>\n");
-
         stringBuilder.append("<UserPrompt>");
         stringBuilder.append(chatMessageContext.getUserPrompt());
         stringBuilder.append("</UserPrompt>");
@@ -177,10 +172,13 @@ private void constructUserMessageWithCombinedContext(@NotNull ChatMessageContext
             }
         }
 
-        stringBuilder
-                .append("<ProjectPath>\n")
-                .append(chatMessageContext.getProject().getBasePath())
-                .append("</ProjectPath>");
+        if (MCPService.isMCPEnabled()) {
+            // We'll add more info about the project path so tools can use this info.
+            stringBuilder
+                    .append("<ProjectPath>\n")
+                    .append(chatMessageContext.getProject().getBasePath())
+                    .append("</ProjectPath>");
+        }
 
         // Add the user's prompt
         stringBuilder.append("<UserPrompt>\n").append(chatMessageContext.getUserPrompt()).append("\n</UserPrompt>\n\n");
diff --git a/src/main/java/com/devoxx/genie/service/prompt/memory/ChatMemoryManager.java b/src/main/java/com/devoxx/genie/service/prompt/memory/ChatMemoryManager.java
@@ -254,10 +254,10 @@ private boolean shouldIncludeSystemMessage(@NotNull ChatMessageContext context)
         }
 
         // Check for Bedrock Mistral AI model
-        if (context.getChatLanguageModel() instanceof BedrockChatModel bedrockChatModel) {
-            // TODO Test if this refactoring still works because BedrockMistralChatModel is deprecated
-            return bedrockChatModel.provider().name().startsWith("mistral.");
-        }
+        //        if (context.getChatLanguageModel() instanceof BedrockChatModel bedrockChatModel) {
+        //            // TODO Test if this refactoring still works because BedrockMistralChatModel is deprecated
+        //            return bedrockChatModel.provider().name().startsWith("mistral.");
+        //        }
 
         return true;
     }
diff --git a/src/main/java/com/devoxx/genie/service/prompt/nonstreaming/NonStreamingPromptExecutionService.java b/src/main/java/com/devoxx/genie/service/prompt/nonstreaming/NonStreamingPromptExecutionService.java
@@ -20,7 +20,7 @@
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.response.ChatResponse;
 import dev.langchain4j.service.AiServices;
-import dev.langchain4j.service.UserMessage;
+
 import dev.langchain4j.service.tool.ToolProvider;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -169,11 +169,14 @@ public void cancelExecutingQuery() {
             // Add extra user message context
             MessageCreationService.getInstance().addUserMessageToContext(chatMessageContext);
 
-            String queryResponse = assistant.chat(chatMessageContext.getUserMessage());
-
-            return ChatResponse.builder()
-                    .aiMessage(AiMessage.aiMessage(queryResponse))
-                    .build();
+            if (chatMessageContext.getUserMessage().hasSingleText()) {
+                String queryResponse = assistant.chat(chatMessageContext.getUserMessage().singleText());
+                return ChatResponse.builder()
+                        .aiMessage(AiMessage.aiMessage(queryResponse))
+                        .build();
+            } else {
+                return chatLanguageModel.chat(chatMessageContext.getUserMessage());
+            }
 
         } catch (Exception e) {
             // Thread interruption is likely from cancellation, so we handle it specially
@@ -189,7 +192,7 @@ public void cancelExecutingQuery() {
             }
 
             // Let the ChatMemoryManager handle removing the last message on error
-            // chatMemoryManager.removeLastMessage(chatMessageContext.getProject());
+            chatMemoryManager.removeLastMessage(chatMessageContext.getProject());
 
             // Use our own ModelException instead of the generic ProviderUnavailableException
             throw new ModelException("Provider unavailable: " + e.getMessage(), e);
@@ -200,6 +203,6 @@ public void cancelExecutingQuery() {
      * The Code Assistant chat method
      */
     interface Assistant {
-        String chat(dev.langchain4j.data.message.UserMessage userMessage);
+        String chat(String userMessage);
     }
 }
diff --git a/src/main/java/com/devoxx/genie/ui/settings/llm/LLMProvidersComponent.java b/src/main/java/com/devoxx/genie/ui/settings/llm/LLMProvidersComponent.java
@@ -119,7 +119,7 @@ public JPanel createPanel() {
 
         addSection(panel, gbc, "Local Large Language Response");
         addSettingRow(panel, gbc, "Enable Stream Mode", streamModeCheckBox);
-        addSettingRow(panel, gbc, "⚠️Currently MCP is not enabled in streaming mode.");
+        addSettingRow(panel, gbc, "⚠️MCP is currently not enabled in streaming mode.");
 
         // Local LLM Providers section
         addSection(panel, gbc, "Local LLM Providers");
diff --git a/src/test/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactoryTest.java b/src/test/java/com/devoxx/genie/chatmodel/local/LocalChatModelFactoryTest.java
@@ -9,8 +9,8 @@
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
-import dev.langchain4j.model.localai.LocalAiChatModel;
-import dev.langchain4j.model.localai.LocalAiStreamingChatModel;
+import dev.langchain4j.model.openai.OpenAiChatModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,12 +46,12 @@ public TestLocalChatModelFactory(boolean throwOnFetch) {
 
         @Override
         public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-            return createLocalAiChatModel(chatModel);
+            return createOpenAiChatModel(chatModel);
         }
 
         @Override
         public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {
-            return createLocalAiStreamingChatModel(chatModel);
+            return createOpenAiStreamingChatModel(chatModel);
         }
 
         @Override
@@ -87,7 +87,7 @@ protected LanguageModel buildLanguageModel(Object model) throws IOException {
 
         // Overridden to avoid notification calls in tests
         @Override
-        protected void handleModelFetchError(IOException e) {
+        protected void handleModelFetchError(@NotNull IOException e) {
             // Do nothing in test
         }
 
@@ -140,15 +140,15 @@ public void testCreateChatModel() {
         ChatLanguageModel model = factory.createChatModel(chatModel);
 
         assertNotNull(model);
-        assertTrue(model instanceof LocalAiChatModel);
+        assertTrue(model instanceof OpenAiChatModel);
     }
 
     @Test
     public void testCreateStreamingChatModel() {
         StreamingChatLanguageModel model = factory.createStreamingChatModel(chatModel);
 
         assertNotNull(model);
-        assertTrue(model instanceof LocalAiStreamingChatModel);
+        assertTrue(model instanceof OpenAiStreamingChatModel);
     }
 
     @Test
diff --git a/src/test/java/com/devoxx/genie/chatmodel/local/gpt4all/GPT4AllChatModelFactoryTest.java b/src/test/java/com/devoxx/genie/chatmodel/local/gpt4all/GPT4AllChatModelFactoryTest.java
@@ -8,8 +8,9 @@
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.chat.StreamingChatLanguageModel;
-import dev.langchain4j.model.localai.LocalAiChatModel;
-import dev.langchain4j.model.localai.LocalAiStreamingChatModel;
+import dev.langchain4j.model.openai.OpenAiChatModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
+import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
@@ -20,7 +21,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 class GPT4AllChatModelFactoryTest extends BasePlatformTestCase {
@@ -69,15 +69,15 @@ public void testCreateChatModel() {
         ChatLanguageModel model = factory.createChatModel(chatModel);
 
         assertNotNull(model);
-        assertTrue(model instanceof LocalAiChatModel);
+        assertTrue(model instanceof OpenAiChatModel);
     }
 
     @Test
     public void testCreateStreamingChatModel() {
         StreamingChatLanguageModel model = factory.createStreamingChatModel(chatModel);
 
         assertNotNull(model);
-        assertTrue(model instanceof LocalAiStreamingChatModel);
+        assertTrue(model instanceof OpenAiStreamingChatModel);
     }
 
     @Test
@@ -132,7 +132,7 @@ public void testGetModels() throws IOException {
             // Override notification handling method to avoid platform issues in tests
             GPT4AllChatModelFactory testFactory = new GPT4AllChatModelFactory() {
                 @Override
-                protected void handleModelFetchError(IOException e) {
+                protected void handleModelFetchError(@NotNull IOException e) {
                     // No-op for testing
                 }
 
@@ -184,7 +184,7 @@ public void testGetModelsHandlesException() throws IOException {
             // Override notification handling method to avoid platform issues in tests
             GPT4AllChatModelFactory testFactory = new GPT4AllChatModelFactory() {
                 @Override
-                protected void handleModelFetchError(IOException e) {
+                protected void handleModelFetchError(@NotNull IOException e) {
                     // No-op for testing
                 }
 
diff --git a/src/test/java/com/devoxx/genie/service/MessageCreationServiceTest.java b/src/test/java/com/devoxx/genie/service/MessageCreationServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- val lg4j_version = "1.0.0-beta2"`
	`10`	`+ val lg4j_version = "1.0.0-beta1"`
`11`	`11`	`implementation("dev.langchain4j:langchain4j:$lg4j_version")`
`12`	`12`	`implementation("dev.langchain4j:langchain4j-ollama:$lg4j_version")`
`13`	`13`	`implementation("dev.langchain4j:langchain4j-local-ai:$lg4j_version")`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public GPT4AllChatModelFactory() {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`23`		`- return createLocalAiChatModel(chatModel);`
	`23`	`+ return createOpenAiChatModel(chatModel);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {`
`28`		`- return createLocalAiStreamingChatModel(chatModel);`
	`28`	`+ return createOpenAiStreamingChatModel(chatModel);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public JanChatModelFactory() {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`23`		`- return createLocalAiChatModel(chatModel);`
	`23`	`+ return createOpenAiChatModel(chatModel);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {`
`28`		`- return createLocalAiStreamingChatModel(chatModel);`
	`28`	`+ return createOpenAiStreamingChatModel(chatModel);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public LMStudioChatModelFactory() {`
`22`	`22`
`23`	`23`	`@Override`
`24`	`24`	`public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {`
`25`		`- return createLocalAiChatModel(chatModel);`
	`25`	`+ return createOpenAiChatModel(chatModel);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel chatModel) {`
`30`		`- return createLocalAiStreamingChatModel(chatModel);`
	`30`	`+ return createOpenAiStreamingChatModel(chatModel);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,10 @@ private boolean shouldIncludeSystemMessage(@NotNull ChatMessageContext context)`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`// Check for Bedrock Mistral AI model`
`257`		`- if (context.getChatLanguageModel() instanceof BedrockChatModel bedrockChatModel) {`
`258`		`- // TODO Test if this refactoring still works because BedrockMistralChatModel is deprecated`
`259`		`- return bedrockChatModel.provider().name().startsWith("mistral.");`
`260`		`- }`
	`257`	`+ // if (context.getChatLanguageModel() instanceof BedrockChatModel bedrockChatModel) {`
	`258`	`+ // // TODO Test if this refactoring still works because BedrockMistralChatModel is deprecated`
	`259`	`+ // return bedrockChatModel.provider().name().startsWith("mistral.");`
	`260`	`+ // }`
`261`	`261`
`262`	`262`	`return true;`
`263`	`263`	`}`