bump to LangChain4j 1.3.0

mariofusco · jmartisk · commit 439c972e1de9 · 2025-08-12T08:34:58.000+02:00
diff --git a/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ChatMessageSerializerTest.java b/core/deployment/src/test/java/io/quarkiverse/langchain4j/test/ChatMessageSerializerTest.java
@@ -111,7 +111,7 @@ void should_serialize_and_deserialize_list_with_all_types_of_messages() {
                 "{\"text\":\"Hello from system\",\"type\":\"SYSTEM\"}," +
                 "{\"contents\":[{\"text\":\"Hello from user\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +
                 "{\"name\":\"Klaus\",\"contents\":[{\"text\":\"Hello from Klaus\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +
-                "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"text\":\"Hello from AI\",\"type\":\"AI\"},"
+                "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"text\":\"Hello from AI\",\"attributes\":{},\"type\":\"AI\"},"
                 +
                 "{\"text\":\"4\",\"id\":\"12345\",\"toolName\":\"calculator\",\"type\":\"TOOL_EXECUTION_RESULT\"}" +
                 "]");
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,4 +1,5 @@
+<<<<<<< HEAD
 :project-version: 1.1.1
-:langchain4j-version: 1.1.0
-:langchain4j-embeddings-version: 1.1.0-beta7
+:langchain4j-version: 1.3.0
+:langchain4j-embeddings-version: 1.3.0-beta9
 :examples-dir: ./../examples/
diff --git a/embedding-stores/neo4j/deployment/pom.xml b/embedding-stores/neo4j/deployment/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-community-neo4j</artifactId>
-            <version>${langchain4j-beta.version}</version>
+            <version>${langchain4j-community.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkiverse.langchain4j</groupId>
diff --git a/embedding-stores/neo4j/runtime/pom.xml b/embedding-stores/neo4j/runtime/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-community-neo4j</artifactId>
-            <version>${langchain4j-beta.version}</version>
+            <version>${langchain4j-community.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkiverse.langchain4j</groupId>
diff --git a/mcp/deployment/src/test/java/io/quarkiverse/langchain4j/mcp/test/McpWithResourcesAsToolsTest.java b/mcp/deployment/src/test/java/io/quarkiverse/langchain4j/mcp/test/McpWithResourcesAsToolsTest.java
@@ -0,0 +1,56 @@
+package io.quarkiverse.langchain4j.mcp.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIterable;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import jakarta.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import dev.langchain4j.agent.tool.ToolSpecification;
+import dev.langchain4j.service.tool.ToolProvider;
+import dev.langchain4j.service.tool.ToolProviderResult;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class McpWithResourcesAsToolsTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest unitTest = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(AbstractMockHttpMcpServer.class, MockHttpMcpServer.class)
+                    .addAsResource(new StringAsset("""
+                            quarkus.langchain4j.mcp.expose-resources-as-tools=true
+                            quarkus.langchain4j.mcp.client1.transport-type=http
+                            quarkus.langchain4j.mcp.client1.url=http://localhost:8081/mock-mcp/sse
+                            quarkus.langchain4j.mcp.client1.log-requests=true
+                            quarkus.langchain4j.mcp.client1.log-responses=true
+                            quarkus.log.category."dev.langchain4j".level=DEBUG
+                            quarkus.log.category."io.quarkiverse".level=DEBUG
+                            quarkus.langchain4j.mcp.client1.tool-execution-timeout=1s
+                            """),
+                            "application.properties"));
+
+    @Inject
+    ToolProvider toolProvider;
+
+    @Test
+    public void providingTools() {
+        // obtain a list of tools from the MCP server
+        ToolProviderResult toolProviderResult = toolProvider.provideTools(null);
+
+        // verify the list of tools
+        assertThat(toolProviderResult.tools().size()).isEqualTo(5);
+        Set<String> toolNames = toolProviderResult.tools().keySet().stream()
+                .map(ToolSpecification::name)
+                .collect(Collectors.toSet());
+        assertThatIterable(toolNames)
+                .containsExactlyInAnyOrder("add", "longRunningOperation", "logging", "get_resource", "list_resources");
+    }
+}
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/McpRecorder.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/McpRecorder.java
@@ -112,7 +112,9 @@ public ToolProvider apply(SyntheticCreationalContext<ToolProvider> context) {
                     McpClientName.Literal qualifier = McpClientName.Literal.of(mcpClientName);
                     clients.add(context.getInjectedReference(McpClient.class, qualifier));
                 }
-                return new QuarkusMcpToolProvider(clients, context.getInjectedReference(TRACER_TYPE_LITERAL));
+                boolean exposeResourcesAsTools = mcpRuntimeConfiguration.getValue().exposeResourcesAsTools().orElse(false);
+                return new QuarkusMcpToolProvider(clients, context.getInjectedReference(TRACER_TYPE_LITERAL),
+                        exposeResourcesAsTools);
             }
         };
     }
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/QuarkusMcpToolProvider.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/QuarkusMcpToolProvider.java
@@ -10,6 +10,7 @@
 import dev.langchain4j.agent.tool.ToolSpecification;
 import dev.langchain4j.mcp.McpToolProvider;
 import dev.langchain4j.mcp.client.McpClient;
+import dev.langchain4j.mcp.resourcesastools.DefaultMcpResourcesAsToolsPresenter;
 import dev.langchain4j.service.tool.ToolExecutor;
 import dev.langchain4j.service.tool.ToolProviderRequest;
 import dev.langchain4j.service.tool.ToolProviderResult;
@@ -20,9 +21,11 @@
 
 public class QuarkusMcpToolProvider extends McpToolProvider {
 
-    QuarkusMcpToolProvider(List<McpClient> mcpClients, Instance<Tracer> tracerInstance) {
-        super(mcpClients, false, AlwaysTrueMcpClientToolSpecificationBiPredicate.INSTANCE,
-                determineToolWrapper(tracerInstance));
+    QuarkusMcpToolProvider(List<McpClient> mcpClients, Instance<Tracer> tracerInstance, boolean exposeResourcesAsTools) {
+        super(mcpClients, false,
+                AlwaysTrueMcpClientToolSpecificationBiPredicate.INSTANCE,
+                determineToolWrapper(tracerInstance),
+                exposeResourcesAsTools ? DefaultMcpResourcesAsToolsPresenter.builder().build() : null);
     }
 
     private static Function<ToolExecutor, ToolExecutor> determineToolWrapper(Instance<Tracer> tracerInstance) {
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/config/McpClientRuntimeConfig.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/config/McpClientRuntimeConfig.java
@@ -66,5 +66,4 @@ public interface McpClientRuntimeConfig {
      */
     @WithDefault("10s")
     Duration pingTimeout();
-
 }
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/config/McpRuntimeConfiguration.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/config/McpRuntimeConfiguration.java
@@ -1,12 +1,14 @@
 package io.quarkiverse.langchain4j.mcp.runtime.config;
 
 import java.util.Map;
+import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 import io.smallrye.config.WithParentName;
 
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
@@ -21,4 +23,9 @@ public interface McpRuntimeConfiguration {
     @WithParentName
     Map<String, McpClientRuntimeConfig> clients();
 
+    /**
+     * Whether resources should be exposed as MCP tools.
+     */
+    @WithDefault("false")
+    Optional<Boolean> exposeResourcesAsTools();
 }
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/http/QuarkusHttpMcpTransport.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/http/QuarkusHttpMcpTransport.java
@@ -15,8 +15,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-import dev.langchain4j.mcp.client.protocol.InitializationNotification;
 import dev.langchain4j.mcp.client.protocol.McpClientMessage;
+import dev.langchain4j.mcp.client.protocol.McpInitializationNotification;
 import dev.langchain4j.mcp.client.protocol.McpInitializeRequest;
 import dev.langchain4j.mcp.client.transport.McpOperationHandler;
 import dev.langchain4j.mcp.client.transport.McpTransport;
@@ -93,7 +93,7 @@ public void start(McpOperationHandler messageHandler) {
     public CompletableFuture<JsonNode> initialize(McpInitializeRequest request) {
         return execute(request, request.getId()).onItem()
                 .transformToUni(
-                        response -> execute(new InitializationNotification(), null).onItem().transform(ignored -> response))
+                        response -> execute(new McpInitializationNotification(), null).onItem().transform(ignored -> response))
                 .subscribeAsCompletionStage();
     }
 
diff --git a/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/http/QuarkusStreamableHttpMcpTransport.java b/mcp/runtime/src/main/java/io/quarkiverse/langchain4j/mcp/runtime/http/QuarkusStreamableHttpMcpTransport.java
@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import dev.langchain4j.mcp.client.protocol.InitializationNotification;
 import dev.langchain4j.mcp.client.protocol.McpClientMessage;
+import dev.langchain4j.mcp.client.protocol.McpInitializationNotification;
 import dev.langchain4j.mcp.client.protocol.McpInitializeRequest;
 import dev.langchain4j.mcp.client.transport.McpOperationHandler;
 import dev.langchain4j.mcp.client.transport.McpTransport;
@@ -72,7 +72,7 @@ public void start(McpOperationHandler messageHandler) {
     public CompletableFuture<JsonNode> initialize(McpInitializeRequest request) {
         return execute(request, request.getId()).onItem()
                 .transformToUni(
-                        response -> execute(new InitializationNotification(), null).onItem().transform(ignored -> response))
+                        response -> execute(new McpInitializationNotification(), null).onItem().transform(ignored -> response))
                 .subscribeAsCompletionStage();
     }
 
diff --git a/model-providers/anthropic/runtime/pom.xml b/model-providers/anthropic/runtime/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-anthropic</artifactId>
-            <version>${langchain4j-rc.version}</version>
+            <version>${langchain4j.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.squareup.retrofit2</groupId>
diff --git a/model-providers/bedrock/runtime/pom.xml b/model-providers/bedrock/runtime/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-bedrock</artifactId>
-            <version>${langchain4j-rc.version}</version>
+            <version>${langchain4j.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.squareup.retrofit2</groupId>
diff --git a/model-providers/mistral/runtime/pom.xml b/model-providers/mistral/runtime/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-mistral-ai</artifactId>
-            <version>${langchain4j-rc.version}</version>
+            <version>${langchain4j.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.squareup.retrofit2</groupId>
diff --git a/pom.xml b/pom.xml
@@ -36,10 +36,10 @@
   <properties>
     <quarkus.version>3.20.0</quarkus.version>
     <quarkus.extension-processor.version>${quarkus.version}</quarkus.extension-processor.version>
-    <langchain4j.version>1.1.0</langchain4j.version>
-    <langchain4j-rc.version>1.1.0-rc1</langchain4j-rc.version>
-    <langchain4j-beta.version>1.1.0-beta7</langchain4j-beta.version>
-    <langchain4j-embeddings.version>1.1.0-beta7</langchain4j-embeddings.version>
+    <langchain4j.version>1.3.0</langchain4j.version>
+    <langchain4j-beta.version>1.3.0-beta9</langchain4j-beta.version>
+    <langchain4j-community.version>1.2.0-beta8</langchain4j-community.version>
+    <langchain4j-embeddings.version>1.3.0-beta9</langchain4j-embeddings.version>
     <quarkus-antora.version>2.2.0</quarkus-antora.version>
     <quarkus-poi.version>2.0.4</quarkus-poi.version> <!-- we need to use this version because langchain4j uses POI 5.2.3 instead of 5.2.5 and the substitution needed is different in the two versions -->
     <assertj.version>3.27.3</assertj.version>

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ void should_serialize_and_deserialize_list_with_all_types_of_messages() {`
`111`	`111`	`"{\"text\":\"Hello from system\",\"type\":\"SYSTEM\"}," +`
`112`	`112`	`"{\"contents\":[{\"text\":\"Hello from user\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +`
`113`	`113`	`"{\"name\":\"Klaus\",\"contents\":[{\"text\":\"Hello from Klaus\",\"type\":\"TEXT\"}],\"type\":\"USER\"}," +`
`114`		`- "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"text\":\"Hello from AI\",\"type\":\"AI\"},"`
	`114`	`+ "{\"toolExecutionRequests\":[{\"name\":\"calculator\",\"arguments\":\"{}\"}],\"text\":\"Hello from AI\",\"attributes\":{},\"type\":\"AI\"},"`
`115`	`115`	`+`
`116`	`116`	`"{\"text\":\"4\",\"id\":\"12345\",\"toolName\":\"calculator\",\"type\":\"TOOL_EXECUTION_RESULT\"}" +`
`117`	`117`	`"]");`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ public ToolProvider apply(SyntheticCreationalContext<ToolProvider> context) {`
`112`	`112`	`McpClientName.Literal qualifier = McpClientName.Literal.of(mcpClientName);`
`113`	`113`	`clients.add(context.getInjectedReference(McpClient.class, qualifier));`
`114`	`114`	`}`
`115`		`- return new QuarkusMcpToolProvider(clients, context.getInjectedReference(TRACER_TYPE_LITERAL));`
	`115`	`+ boolean exposeResourcesAsTools = mcpRuntimeConfiguration.getValue().exposeResourcesAsTools().orElse(false);`
	`116`	`+ return new QuarkusMcpToolProvider(clients, context.getInjectedReference(TRACER_TYPE_LITERAL),`
	`117`	`+ exposeResourcesAsTools);`
`116`	`118`	`}`
`117`	`119`	`};`
`118`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,4 @@ public interface McpClientRuntimeConfig {`
`66`	`66`	`*/`
`67`	`67`	`@WithDefault("10s")`
`68`	`68`	`Duration pingTimeout();`
`69`		`-`
`70`	`69`	`}`