Bump-up lc4j 1.3.0 -> 1.5.0 (#10683)

danielkec · web-flow · commit 8e6851fbcff6 · 2025-09-22T22:02:53.000+02:00
Signed-off-by: Daniel Kec &lt;daniel.kec@oracle.com&gt;
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -108,8 +108,8 @@
         <version.lib.kafka>3.9.1</version.lib.kafka>
         <!-- Kotlin: dependency convergence requirement, we never use this directly -->
         <version.lib.kotlin>1.9.10</version.lib.kotlin>
-        <version.lib.langchain4j>1.3.0</version.lib.langchain4j>
-        <version.lib.langchain4j-community>1.3.0-beta9</version.lib.langchain4j-community>
+        <version.lib.langchain4j>1.5.0</version.lib.langchain4j>
+        <version.lib.langchain4j-community>1.5.0-beta11</version.lib.langchain4j-community>
         <version.lib.log4j>2.21.1</version.lib.log4j>
         <version.lib.mariadb-java-client>2.6.2</version.lib.mariadb-java-client>
         <version.lib.maven-wagon>2.10</version.lib.maven-wagon>
diff --git a/integrations/langchain4j/codegen/src/main/java/io/helidon/integrations/langchain4j/codegen/LangchainTypes.java b/integrations/langchain4j/codegen/src/main/java/io/helidon/integrations/langchain4j/codegen/LangchainTypes.java
@@ -36,6 +36,7 @@ final class LangchainTypes {
     static final Annotation TOOL_QUALIFIER_ANNOTATION = Annotation.create(AI_TOOL);
     static final TypeName MODEL_CONFIG_TYPE = TypeName.create("io.helidon.integrations.langchain4j.AiProvider.ModelConfig");
     static final TypeName MODEL_CONFIGS_TYPE = TypeName.create("io.helidon.integrations.langchain4j.AiProvider.ModelConfigs");
+    static final TypeName MODEL_CONFIG_KEY_TYPE = TypeName.create("io.helidon.integrations.langchain4j.AiProvider.ConfigKey");
     static final TypeName MODEL_DEFAULT_WEIGHT = TypeName.create("io.helidon.integrations.langchain4j.AiProvider.DefaultWeight");
     static final TypeName MODEL_NESTED_CONFIG = TypeName.create("io.helidon.integrations.langchain4j.AiProvider.NestedConfig");
     static final TypeName MODEL_CUSTOM_BUILDER_MAPPING =
diff --git a/integrations/langchain4j/codegen/src/main/java/io/helidon/integrations/langchain4j/codegen/ModelConfigCodegen.java b/integrations/langchain4j/codegen/src/main/java/io/helidon/integrations/langchain4j/codegen/ModelConfigCodegen.java
@@ -31,6 +31,7 @@
 import io.helidon.common.types.TypeNames;
 
 import static io.helidon.integrations.langchain4j.codegen.LangchainTypes.MODEL_CONFIGS_TYPE;
+import static io.helidon.integrations.langchain4j.codegen.LangchainTypes.MODEL_CONFIG_KEY_TYPE;
 import static io.helidon.integrations.langchain4j.codegen.LangchainTypes.MODEL_CONFIG_TYPE;
 import static java.util.function.Predicate.not;
 
@@ -66,6 +67,8 @@ private void process(RoundContext ctx,
                 .collect(Collectors.toSet());
 
         var providerKey = modelAnnotation.stringValue("providerKey")
+                .filter(s -> !s.isEmpty())
+                .or(() -> type.findAnnotation(MODEL_CONFIG_KEY_TYPE).flatMap(Annotation::stringValue))
                 .filter(s -> !s.isEmpty())
                 .or(() -> Optional.of(ModelCodegenHelper.providerConfigKeyFromClassName(type)))
                 .filter(s -> !s.isEmpty())
diff --git a/integrations/langchain4j/langchain4j/src/main/java/io/helidon/integrations/langchain4j/AiProvider.java b/integrations/langchain4j/langchain4j/src/main/java/io/helidon/integrations/langchain4j/AiProvider.java
@@ -32,6 +32,20 @@ public final class AiProvider {
     private AiProvider() {
     }
 
+    /**
+     * Default config key used under langchain4j context for all model configs in the same class.
+     * Override provider key otherwise derived from class name prefix.
+     */
+    @Target({ElementType.TYPE})
+    public @interface ConfigKey {
+
+        /**
+         * Default config key used under langchain4j context for all model configs in the same class.
+         * @return string key
+         */
+        String value() default "";
+    }
+
     /**
      * Annotation used to define a configuration for a specific LangChain4j model class.
      * This configuration is used during code generation for creating service bean providers
diff --git a/integrations/langchain4j/providers/cohere/pom.xml b/integrations/langchain4j/providers/cohere/pom.xml
@@ -67,6 +67,10 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-cohere</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common.features</groupId>
             <artifactId>helidon-common-features-api</artifactId>
diff --git a/integrations/langchain4j/providers/cohere/src/main/java/module-info.java b/integrations/langchain4j/providers/cohere/src/main/java/module-info.java
@@ -34,6 +34,7 @@
     requires transitive io.helidon.service.registry;
     requires transitive io.helidon.integrations.langchain4j;
     requires transitive io.helidon.config;
+    requires org.slf4j;
 
     exports io.helidon.integrations.langchain4j.providers.cohere;
 }
diff --git a/integrations/langchain4j/providers/ollama/pom.xml b/integrations/langchain4j/providers/ollama/pom.xml
@@ -71,6 +71,10 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-http-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common.features</groupId>
             <artifactId>helidon-common-features-api</artifactId>
diff --git a/integrations/langchain4j/providers/ollama/src/main/java/module-info.java b/integrations/langchain4j/providers/ollama/src/main/java/module-info.java
@@ -35,6 +35,7 @@
     requires transitive io.helidon.integrations.langchain4j;
     requires transitive io.helidon.config;
     requires langchain4j.http.client;
+    requires org.slf4j;
 
     exports io.helidon.integrations.langchain4j.providers.ollama;
 }
diff --git a/integrations/langchain4j/providers/open-ai/pom.xml b/integrations/langchain4j/providers/open-ai/pom.xml
@@ -71,6 +71,10 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-http-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.common.features</groupId>
             <artifactId>helidon-common-features-api</artifactId>
diff --git a/integrations/langchain4j/providers/open-ai/src/main/java/io/helidon/integrations/langchain4j/providers/openai/OpenAiEmbLc4jProvider.java b/integrations/langchain4j/providers/open-ai/src/main/java/io/helidon/integrations/langchain4j/providers/openai/OpenAiEmbLc4jProvider.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2025 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.helidon.integrations.langchain4j.providers.openai;
+
+import io.helidon.integrations.langchain4j.AiProvider;
+
+import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiLanguageModel;
+import dev.langchain4j.model.openai.OpenAiModerationModel;
+
+@AiProvider.ConfigKey("open-ai")
+@AiProvider.ModelConfig(value = OpenAiModerationModel.class)
+@AiProvider.ModelConfig(value = OpenAiEmbeddingModel.class)
+@AiProvider.ModelConfig(value = OpenAiLanguageModel.class)
+interface OpenAiEmbLc4jProvider {
+
+}
diff --git a/integrations/langchain4j/providers/open-ai/src/main/java/io/helidon/integrations/langchain4j/providers/openai/OpenAiLc4jProvider.java b/integrations/langchain4j/providers/open-ai/src/main/java/io/helidon/integrations/langchain4j/providers/openai/OpenAiLc4jProvider.java
@@ -16,20 +16,26 @@
 
 package io.helidon.integrations.langchain4j.providers.openai;
 
+import java.util.Optional;
+
+import io.helidon.builder.api.Option;
 import io.helidon.integrations.langchain4j.AiProvider;
 
 import dev.langchain4j.model.openai.OpenAiChatModel;
-import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiImageModel;
-import dev.langchain4j.model.openai.OpenAiLanguageModel;
-import dev.langchain4j.model.openai.OpenAiModerationModel;
 import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 
 @AiProvider.ModelConfig(value = OpenAiChatModel.class)
 @AiProvider.ModelConfig(value = OpenAiStreamingChatModel.class)
-@AiProvider.ModelConfig(value = OpenAiModerationModel.class)
 @AiProvider.ModelConfig(value = OpenAiImageModel.class)
-@AiProvider.ModelConfig(value = OpenAiEmbeddingModel.class)
-@AiProvider.ModelConfig(value = OpenAiLanguageModel.class)
 interface OpenAiLc4jProvider {
+
+    /**
+     * Enable a "JSON mode" in the model configuration. This way, the LLM will be forced to respond with a valid JSON.
+     * For newer models that support Structured Outputs use supported-capabilities.
+     *
+     * @return "json_object" to enable JSON mode on older models like gpt-3.5-turbo or gpt-4
+     */
+    @Option.Configured
+    Optional<String> responseFormat();
 }
diff --git a/integrations/langchain4j/providers/open-ai/src/main/java/module-info.java b/integrations/langchain4j/providers/open-ai/src/main/java/module-info.java
@@ -36,6 +36,7 @@
     requires transitive io.helidon.config;
     requires org.apache.opennlp.tools;
     requires langchain4j.http.client;
+    requires org.slf4j;
 
     exports io.helidon.integrations.langchain4j.providers.openai;
 }
diff --git a/integrations/langchain4j/providers/open-ai/src/test/java/io/helidon/integrations/langchain4j/openai/ChatModelConfigTest.java b/integrations/langchain4j/providers/open-ai/src/test/java/io/helidon/integrations/langchain4j/openai/ChatModelConfigTest.java
@@ -28,7 +28,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import static dev.langchain4j.model.chat.Capability.RESPONSE_FORMAT_JSON_SCHEMA;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -71,7 +73,8 @@ void testDefaultRoot() {
         assertThat(config.logitBias().get("key1"), is(1));
         assertThat(config.logitBias().get("key2"), is(2));
         assertThat(config.responseFormat().isPresent(), is(true));
-        assertThat(config.responseFormat().get(), is("response-format"));
+        assertThat(config.responseFormat().get(), is("json-object"));
+        assertThat(config.supportedCapabilities(), contains(RESPONSE_FORMAT_JSON_SCHEMA));
         assertThat(config.strictJsonSchema().isPresent(), is(true));
         assertThat(config.strictJsonSchema().get(), is(false));
         assertThat(config.seed().isPresent(), is(true));
diff --git a/integrations/langchain4j/providers/open-ai/src/test/resources/application.yaml b/integrations/langchain4j/providers/open-ai/src/test/resources/application.yaml
@@ -30,7 +30,8 @@ langchain4j.open-ai:
     frequency-penalty: 0.2
     logit-bias.key1: 1
     logit-bias.key2: 2
-    response-format: response-format
+    response-format: json-object
+    supported-capabilities: [RESPONSE_FORMAT_JSON_SCHEMA]
     strict-json-schema: false
     seed: 100
     user: user

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`requires transitive io.helidon.service.registry;`
`35`	`35`	`requires transitive io.helidon.integrations.langchain4j;`
`36`	`36`	`requires transitive io.helidon.config;`
	`37`	`+ requires org.slf4j;`
`37`	`38`
`38`	`39`	`exports io.helidon.integrations.langchain4j.providers.cohere;`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`requires transitive io.helidon.integrations.langchain4j;`
`36`	`36`	`requires transitive io.helidon.config;`
`37`	`37`	`requires langchain4j.http.client;`
	`38`	`+ requires org.slf4j;`
`38`	`39`
`39`	`40`	`exports io.helidon.integrations.langchain4j.providers.ollama;`
`40`	`41`	`}`