Upgrade LangChain4J to v0.34.0 and Use LC4J Gemini API

devoxx · Sep 8, 2024 · ab1253a · ab1253a
1 parent 8ce04da
commit ab1253a
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 431 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,7 +37,7 @@ tasks.named("buildPlugin") {
 }
 
 dependencies {
-    val lg4j_version = "0.33.0"
+    val lg4j_version = "0.34.0"
 
     // Add the dependencies for the core module
     implementation(project(":core"))
@@ -48,6 +48,7 @@ dependencies {
     implementation("dev.langchain4j:langchain4j-open-ai:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-anthropic:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-mistral-ai:$lg4j_version")
+    implementation("dev.langchain4j:langchain4j-google-ai-gemini:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-web-search-engine-google-custom:$lg4j_version")
     implementation("dev.langchain4j:langchain4j-web-search-engine-tavily:$lg4j_version")
 

diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/Candidate.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/Candidate.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/CitationMetadata.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/CitationMetadata.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/CitationSources.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/CitationSources.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/Content.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/Content.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/GenerationConfig.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/GenerationConfig.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/Part.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/Part.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/SafetyRatings.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/SafetyRatings.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/SystemInstruction.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/SystemInstruction.java
diff --git a/core/src/main/java/com/devoxx/genie/model/gemini/model/UsageMetadata.java b/core/src/main/java/com/devoxx/genie/model/gemini/model/UsageMetadata.java
diff --git a/src/main/java/com/devoxx/genie/chatmodel/google/GoogleChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/google/GoogleChatModelFactory.java
@@ -4,24 +4,22 @@
 import com.devoxx.genie.model.ChatModel;
 import com.devoxx.genie.model.LanguageModel;
 import com.devoxx.genie.model.enumarations.ModelProvider;
-import com.devoxx.genie.model.gemini.GeminiChatModel;
 import com.devoxx.genie.service.DevoxxGenieSettingsServiceProvider;
 import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.googleai.GoogleAiGeminiChatModel;
 import org.jetbrains.annotations.NotNull;
 
-import java.time.Duration;
 import java.util.List;
 
 public class GoogleChatModelFactory implements ChatModelFactory {
 
     @Override
     public ChatLanguageModel createChatModel(@NotNull ChatModel chatModel) {
-        return GeminiChatModel.builder()
-            .modelName(chatModel.getModelName())
+        return GoogleAiGeminiChatModel.builder()
             .apiKey(getApiKey())
+            .modelName(chatModel.getModelName())
             .temperature(chatModel.getTemperature())
-            .maxTokens(chatModel.getMaxTokens())
-            .timeout(Duration.ofSeconds(chatModel.getTimeout()))
+            .maxOutputTokens(chatModel.getMaxTokens())
             .build();
     }
 

diff --git a/src/main/java/com/devoxx/genie/chatmodel/openrouter/OpenRouterChatModelFactory.java b/src/main/java/com/devoxx/genie/chatmodel/openrouter/OpenRouterChatModelFactory.java
@@ -57,7 +57,7 @@ public StreamingChatLanguageModel createStreamingChatModel(@NotNull ChatModel ch
 
     @Override
     public String getApiKey() {
-        return DevoxxGenieSettingsServiceProvider.getInstance().getOpenRouterKey().trim();
+        return DevoxxGenieSettingsServiceProvider.getInstance().getOpenRouterKey();
     }
 
     /**

diff --git a/src/main/java/com/devoxx/genie/model/gemini/GeminiApi.java b/src/main/java/com/devoxx/genie/model/gemini/GeminiApi.java
diff --git a/src/main/java/com/devoxx/genie/model/gemini/GeminiChatModel.java b/src/main/java/com/devoxx/genie/model/gemini/GeminiChatModel.java