Merge pull request #495 from quarkiverse/issue-493_1-7-x

mkouba · web-flow · commit 5f50bc280b62 · 2025-11-15T10:14:51.000+01:00
core: fix resource template completion
diff --git a/core/deployment/src/main/java/io/quarkiverse/mcp/server/deployment/McpServerProcessor.java b/core/deployment/src/main/java/io/quarkiverse/mcp/server/deployment/McpServerProcessor.java
@@ -434,6 +434,25 @@ void collectFeatureMethods(BeanDiscoveryFinishedBuildItem beanDiscovery, Invoker
             }
         }
 
+        // Check duplicate uris for resource templates
+        List<FeatureMethodBuildItem> resourceTemplates = found.get(RESOURCE_TEMPLATE);
+        if (resourceTemplates != null) {
+            Map<String, List<FeatureMethodBuildItem>> byUri = resourceTemplates.stream()
+                    .collect(Collectors.toMap(FeatureMethodBuildItem::getUri, List::of, (v1, v2) -> {
+                        List<FeatureMethodBuildItem> list = new ArrayList<>();
+                        list.addAll(v1);
+                        list.addAll(v2);
+                        return list;
+                    }));
+            for (List<FeatureMethodBuildItem> list : byUri.values()) {
+                if (list.size() > 1) {
+                    String message = "Duplicate resource template uri found:\n\t%s"
+                            .formatted(list.stream().map(Object::toString).collect(Collectors.joining("\n\t")));
+                    errors.produce(new ValidationErrorBuildItem(new IllegalStateException(message)));
+                }
+            }
+        }
+
         // Check existing prompts for completions
         List<FeatureMethodBuildItem> prompts = found.get(PROMPT);
         List<FeatureMethodBuildItem> promptCompletions = found.get(PROMPT_COMPLETE);
@@ -448,7 +467,6 @@ void collectFeatureMethods(BeanDiscoveryFinishedBuildItem beanDiscovery, Invoker
         }
 
         // Check existing resource templates for completions
-        List<FeatureMethodBuildItem> resourceTemplates = found.get(RESOURCE_TEMPLATE);
         List<FeatureMethodBuildItem> resourceTemplateCompletions = found.get(RESOURCE_TEMPLATE_COMPLETE);
         if (resourceTemplateCompletions != null) {
             for (FeatureMethodBuildItem completion : resourceTemplateCompletions) {
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/CompletionManagerBase.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/CompletionManagerBase.java
@@ -67,6 +67,8 @@ && matches(completion, mcpRequest)) {
 
     protected abstract void validateReference(String refName, String argumentName);
 
+    protected abstract String refName(String refName);
+
     IllegalArgumentException completionAlreadyExists(String refName, String argName) {
         return new IllegalArgumentException("A completion for [" + refName + "] with agument [" + argName + "] already exits");
     }
@@ -131,7 +133,7 @@ public CompletionDefinition setArgumentName(String argumentName) {
         public CompletionInfo register() {
             validate();
             validateReference(name, argumentName);
-            CompletionDefinitionInfo ret = new CompletionDefinitionInfo(name, description, serverName, fun, asyncFun,
+            CompletionDefinitionInfo ret = new CompletionDefinitionInfo(refName(name), description, serverName, fun, asyncFun,
                     runOnVirtualThread, argumentName);
             String key = ret.name() + "_" + ret.argumentName();
             CompletionInfo existing = completions.putIfAbsent(key, ret);
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/CompletionMessageHandler.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/CompletionMessageHandler.java
@@ -22,9 +22,13 @@ protected CompletionMessageHandler(ResponseHandlers responseHandlers) {
     protected abstract Future<CompletionResponse> execute(String key, ArgumentProviders argProviders,
             McpRequest mcpRequest) throws McpException;
 
+    protected String referenceName(JsonObject ref) {
+        return ref.getString("name");
+    }
+
     Future<Void> complete(JsonObject message, Object id, JsonObject ref, JsonObject argument, Sender sender,
             McpRequest mcpRequest) {
-        String referenceName = ref.getString("name");
+        String referenceName = referenceName(ref);
         String argumentName = argument.getString("name");
 
         LOG.debugf("Complete %s for argument %s [id: %s]", referenceName, argumentName, id);
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/McpMessageHandler.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/McpMessageHandler.java
@@ -497,9 +497,9 @@ private Future<Void> complete(JsonObject message, McpRequest mcpRequest) {
                 if (argument == null) {
                     return mcpRequest.sender().sendError(id, JsonRpcErrorCodes.INVALID_REQUEST, "Argument not found");
                 } else {
-                    if ("ref/prompt".equals(referenceType)) {
+                    if (Messages.isPromptRef(referenceType)) {
                         return promptCompleteHandler.complete(message, id, ref, argument, mcpRequest.sender(), mcpRequest);
-                    } else if ("ref/resource".equals(referenceType)) {
+                    } else if (Messages.isResourceRef(referenceType)) {
                         return resourceTemplateCompleteHandler.complete(message, id, ref, argument, mcpRequest.sender(),
                                 mcpRequest);
                     } else {
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/Messages.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/Messages.java
@@ -113,11 +113,11 @@ public static JsonObject newLog(LogLevel level, String loggerName, Object data)
     public static final String PROMPT_REF = "ref/prompt";
     public static final String RESOURCE_REF = "ref/resource";
 
-    public boolean isPromptRef(String referenceType) {
+    public static boolean isPromptRef(String referenceType) {
         return PROMPT_REF.equals(referenceType);
     }
 
-    public boolean isResourceRef(String referenceType) {
+    public static boolean isResourceRef(String referenceType) {
         return RESOURCE_REF.equals(referenceType);
     }
 
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/PromptCompletionManagerImpl.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/PromptCompletionManagerImpl.java
@@ -40,6 +40,11 @@ protected Feature feature() {
         return Feature.PROMPT_COMPLETE;
     }
 
+    @Override
+    protected String refName(String refName) {
+        return refName;
+    }
+
     @Override
     protected void validateReference(String refName, String argumentName) {
         PromptManager.PromptInfo prompt = promptManager.getPrompt(refName);
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/ResourceTemplateCompleteMessageHandler.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/ResourceTemplateCompleteMessageHandler.java
@@ -6,6 +6,7 @@
 import io.quarkiverse.mcp.server.McpException;
 import io.quarkiverse.mcp.server.runtime.FeatureManagerBase.FeatureExecutionContext;
 import io.vertx.core.Future;
+import io.vertx.core.json.JsonObject;
 
 class ResourceTemplateCompleteMessageHandler extends CompletionMessageHandler {
 
@@ -16,6 +17,11 @@ class ResourceTemplateCompleteMessageHandler extends CompletionMessageHandler {
         this.manager = Objects.requireNonNull(manager);
     }
 
+    @Override
+    protected String referenceName(JsonObject ref) {
+        return ref.getString("uri");
+    }
+
     @Override
     protected Future<CompletionResponse> execute(String key, ArgumentProviders argProviders, McpRequest mcpRequest)
             throws McpException {
diff --git a/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/ResourceTemplateCompletionManagerImpl.java b/core/runtime/src/main/java/io/quarkiverse/mcp/server/runtime/ResourceTemplateCompletionManagerImpl.java
@@ -1,5 +1,8 @@
 package io.quarkiverse.mcp.server.runtime;
 
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Singleton;
 
@@ -18,13 +21,21 @@ public class ResourceTemplateCompletionManagerImpl extends CompletionManagerBase
 
     private final ResourceTemplateManagerImpl resourceTemplateManager;
 
+    private final Map<String, String> nameToUriTemplate;
+
     ResourceTemplateCompletionManagerImpl(McpMetadata metadata, Vertx vertx, ObjectMapper mapper,
             ConnectionManager connectionManager, ResourceTemplateManagerImpl resourceTemplateManager,
             Instance<CurrentIdentityAssociation> currentIdentityAssociation, ResponseHandlers responseHandlers) {
         super(vertx, mapper, connectionManager, currentIdentityAssociation, responseHandlers);
+        this.nameToUriTemplate = metadata.resourceTemplates()
+                .stream().map(FeatureMetadata::info).collect(Collectors.toMap(FeatureMethodInfo::name, FeatureMethodInfo::uri));
         for (FeatureMetadata<CompletionResponse> c : metadata.resourceTemplateCompletions()) {
-            String key = c.info().name() + "_"
-                    + c.info().arguments().stream().filter(FeatureArgument::isParam).findFirst().orElseThrow()
+            // Find the corresponding resource template
+            String key = nameToUriTemplate.get(c.info().name()) + "_"
+                    + c.info().arguments().stream()
+                            .filter(FeatureArgument::isParam)
+                            .findFirst()
+                            .orElseThrow()
                             .name();
             this.completions.put(key, new CompletionMethod(c));
         }
@@ -52,4 +63,9 @@ protected void validateReference(String refName, String argumentName) {
         }
     }
 
+    @Override
+    protected String refName(String refName) {
+        return nameToUriTemplate.get(refName);
+    }
+
 }
diff --git a/test/src/main/java/io/quarkiverse/mcp/server/test/McpAssured.java b/test/src/main/java/io/quarkiverse/mcp/server/test/McpAssured.java
@@ -656,25 +656,25 @@ default ASSERT resourcesTemplatesList(Consumer<ResourcesTemplatesPage> assertFun
         /**
          * Build a {@value McpAssured#COMPLETION_COMPLETE} message.
          *
-         * @param promptName
+         * @param uriTemplate
          * @return a new builder
          */
-        ResourceTemplateCompleteMessage<ASSERT> resourceTemplateComplete(String resourceTemplateName);
+        ResourceTemplateCompleteMessage<ASSERT> resourceTemplateComplete(String uriTemplate);
 
         /**
          * Send a {@value McpAssured#COMPLETION_COMPLETE} message to the server.
          * <p>
          * The assert function is not used until the {@link #thenAssertResults()} method is called.
          *
-         * @param promptName
+         * @param uriTemplate
          * @param argumentName
          * @param argumentValue
          * @param assertFunction
          * @return self
          */
-        default ASSERT resourceTemplateComplete(String resourceTemplateName, String argumentName, String argumentValue,
+        default ASSERT resourceTemplateComplete(String uriTemplate, String argumentName, String argumentValue,
                 Consumer<CompletionResponse> assertFunction) {
-            return resourceTemplateComplete(resourceTemplateName)
+            return resourceTemplateComplete(uriTemplate)
                     .withArgument(argumentName, argumentValue)
                     .withAssert(assertFunction)
                     .send();
diff --git a/test/src/main/java/io/quarkiverse/mcp/server/test/McpTestClientBase.java b/test/src/main/java/io/quarkiverse/mcp/server/test/McpTestClientBase.java
@@ -193,9 +193,13 @@ protected JsonObject newPromptsGetMessage(String promptName, Map<String, String>
     protected JsonObject newCompleteMessage(String refType, String refName, String argumentName, String argumentValue,
             Map<String, String> contextArgs) {
         return newRequest(McpAssured.COMPLETION_COMPLETE, p -> {
-            p.put("ref", new JsonObject()
-                    .put("type", refType)
-                    .put("name", refName));
+            JsonObject ref = new JsonObject().put("type", refType);
+            if (Messages.isPromptRef(refType)) {
+                ref.put("name", refName);
+            } else if (Messages.isResourceRef(refType)) {
+                ref.put("uri", refName);
+            }
+            p.put("ref", ref);
             p.put("argument", new JsonObject()
                     .put("name", argumentName)
                     .put("value", argumentValue));
@@ -356,8 +360,8 @@ public ResourcesTemplatesListMessage<ASSERT> resourcesTemplatesList() {
         }
 
         @Override
-        public ResourceTemplateCompleteMessage<ASSERT> resourceTemplateComplete(String resourceTemplateName) {
-            return new ResourceTemplateCompleteMessageImpl(resourceTemplateName);
+        public ResourceTemplateCompleteMessage<ASSERT> resourceTemplateComplete(String uriTemplate) {
+            return new ResourceTemplateCompleteMessageImpl(uriTemplate);
         }
 
         @Override
@@ -639,8 +643,8 @@ abstract class CompleteMessageImpl {
         class ResourceTemplateCompleteMessageImpl extends CompleteMessageImpl
                 implements ResourceTemplateCompleteMessage<ASSERT> {
 
-            ResourceTemplateCompleteMessageImpl(String resourceTemplateName) {
-                super(resourceTemplateName);
+            ResourceTemplateCompleteMessageImpl(String uriTemplate) {
+                super(uriTemplate);
             }
 
             @Override
diff --git a/transports/sse/deployment/src/test/java/io/quarkiverse/mcp/server/test/complete/ResourceTemplateCompleteTest.java b/transports/sse/deployment/src/test/java/io/quarkiverse/mcp/server/test/complete/ResourceTemplateCompleteTest.java
@@ -22,11 +22,11 @@ public void testCompletion() {
         McpSseTestClient client = McpAssured.newConnectedSseClient();
         client
                 .when()
-                .resourceTemplateComplete("foo_template", "foo", "Ja", completionResponse -> {
+                .resourceTemplateComplete("file:///{foo}/{bar}", "foo", "Ja", completionResponse -> {
                     assertEquals(1, completionResponse.values().size());
                     assertEquals("Jachym", completionResponse.values().get(0));
                 })
-                .resourceTemplateComplete("foo_template", "bar", "Ja", completionResponse -> {
+                .resourceTemplateComplete("file:///{foo}/{bar}", "bar", "Ja", completionResponse -> {
                     assertEquals(1, completionResponse.values().size());
                     assertEquals("_bar", completionResponse.values().get(0));
                 })
diff --git a/transports/sse/deployment/src/test/java/io/quarkiverse/mcp/server/test/complete/ResourceTemplateProgrammaticCompleteTest.java b/transports/sse/deployment/src/test/java/io/quarkiverse/mcp/server/test/complete/ResourceTemplateProgrammaticCompleteTest.java
@@ -54,11 +54,11 @@ public void testCompletion() {
 
         client
                 .when()
-                .resourceTemplateComplete("foo_template", "foo", "Ja", completionResponse -> {
+                .resourceTemplateComplete("file:///{foo}/{bar}", "foo", "Ja", completionResponse -> {
                     assertEquals(1, completionResponse.values().size());
                     assertEquals("Jachym", completionResponse.values().get(0));
                 })
-                .resourceTemplateComplete("foo_template", "bar", "Ja", completionResponse -> {
+                .resourceTemplateComplete("file:///{foo}/{bar}", "bar", "Ja", completionResponse -> {
                     assertEquals(1, completionResponse.values().size());
                     assertEquals("_bar", completionResponse.values().get(0));
                 })

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,11 @@ public static JsonObject newLog(LogLevel level, String loggerName, Object data)`
`113`	`113`	`public static final String PROMPT_REF = "ref/prompt";`
`114`	`114`	`public static final String RESOURCE_REF = "ref/resource";`
`115`	`115`
`116`		`- public boolean isPromptRef(String referenceType) {`
	`116`	`+ public static boolean isPromptRef(String referenceType) {`
`117`	`117`	`return PROMPT_REF.equals(referenceType);`
`118`	`118`	`}`
`119`	`119`
`120`		`- public boolean isResourceRef(String referenceType) {`
	`120`	`+ public static boolean isResourceRef(String referenceType) {`
`121`	`121`	`return RESOURCE_REF.equals(referenceType);`
`122`	`122`	`}`
`123`	`123`