Do cascade arguments and configurations to the downstream services

Author: orpiske

core/core-exchange/src/main/proto/resourcerequest.proto

@@ -18,6 +18,8 @@ message ResourceRequest {
   string type = 2;
   string name = 3;
   map<string, string> params = 4;
+  map<string, string> serviceConfigurations = 5;
+  map<string, string> credentialsConfigurations = 6;
 }
 
 // The invocation response message

core/core-util/src/main/java/ai/wanaku/core/util/CollectionsHelper.java

@@ -0,0 +1,20 @@
+package ai.wanaku.core.util;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class CollectionsHelper {
+    private CollectionsHelper() {}
+
+    /**
+     * Convert a map of String keys and unspecified type to String (value must be
+     * convertible to String using toString())
+     * @param map the map of String keys and unspecified type
+     * @return A Map of String keys and String values
+     */
+    public static Map<String, String> toStringStringMap(Map<String, ?> map) {
+        return map.entrySet().stream()
+                .filter(e -> e.getValue() != null)
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString()));
+    }
+}

routers/wanaku-router/src/main/java/ai/wanaku/routers/proxies/resources/ResourceAcquirerProxy.java

@@ -17,10 +17,9 @@
 
 package ai.wanaku.routers.proxies.resources;
 
-import java.util.List;
-import java.util.Map;
-
 import ai.wanaku.api.types.ResourceReference;
+import ai.wanaku.api.types.management.Configuration;
+import ai.wanaku.api.types.management.Configurations;
 import ai.wanaku.api.types.management.Service;
 import ai.wanaku.core.exchange.InquireReply;
 import ai.wanaku.core.exchange.InquireRequest;
@@ -35,6 +34,8 @@
 import io.quarkiverse.mcp.server.ResourceContents;
 import io.quarkiverse.mcp.server.ResourceManager;
 import io.quarkiverse.mcp.server.TextResourceContents;
+import java.util.List;
+import java.util.Map;
 import org.jboss.logging.Logger;
 
 /**
@@ -56,7 +57,7 @@ public List<ResourceContents> eval(ResourceManager.ResourceArguments arguments,
         }
 
         LOG.infof("Requesting %s from %s", mcpResource.getName(), service.getTarget());
-        final ResourceReply reply = acquireRemotely(mcpResource, service.getTarget());
+        final ResourceReply reply = acquireRemotely(mcpResource, arguments, service);
         if (reply.getIsError()) {
             TextResourceContents textResourceContents =
                     new TextResourceContents(arguments.requestUri().value(), reply.getContent(), "text/plain");
@@ -75,16 +76,20 @@ public String name() {
         return "resource-acquirer";
     }
 
-    private ResourceReply acquireRemotely(ResourceReference mcpResource, String target) {
-        ManagedChannel channel = ManagedChannelBuilder.forTarget(target)
+    private ResourceReply acquireRemotely(ResourceReference mcpResource, ResourceManager.ResourceArguments arguments, Service service) {
+        ManagedChannel channel = ManagedChannelBuilder.forTarget(service.getTarget())
                 .usePlaintext()
                 .build();
 
+        Map<String, Configuration> configurations = service.getConfigurations().getConfigurations();
+        Map<String, String> serviceConfigurations = Configurations.toStringMap(configurations);
+
         ResourceRequest request = ResourceRequest
                 .newBuilder()
                 .setLocation(mcpResource.getLocation())
                 .setType(mcpResource.getType())
                 .setName(mcpResource.getName())
+                .putAllServiceConfigurations(serviceConfigurations)
                 .build();
 
         ResourceAcquirerGrpc.ResourceAcquirerBlockingStub blockingStub = ResourceAcquirerGrpc.newBlockingStub(channel);

routers/wanaku-router/src/main/java/ai/wanaku/routers/proxies/tools/InvokerProxy.java

@@ -17,8 +17,6 @@
 
 package ai.wanaku.routers.proxies.tools;
 
-import java.util.Map;
-
 import ai.wanaku.api.types.ToolReference;
 import ai.wanaku.api.types.management.Configuration;
 import ai.wanaku.api.types.management.Configurations;
@@ -30,11 +28,13 @@
 import ai.wanaku.core.exchange.ToolInvokeRequest;
 import ai.wanaku.core.exchange.ToolInvokerGrpc;
 import ai.wanaku.core.mcp.providers.ServiceRegistry;
+import ai.wanaku.core.util.CollectionsHelper;
 import ai.wanaku.routers.proxies.ToolsProxy;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.quarkiverse.mcp.server.ToolManager;
 import io.quarkiverse.mcp.server.ToolResponse;
+import java.util.Map;
 import org.jboss.logging.Logger;
 
 /**
@@ -70,15 +70,15 @@ private static ToolInvokeReply invokeRemotely(
         ManagedChannel channel = ManagedChannelBuilder.forTarget(service.getTarget()).usePlaintext().build();
 
         Map<String, Configuration> configurations = service.getConfigurations().getConfigurations();
-        Map<String, String> collect = Configurations.toStringMap(configurations);
+        Map<String, String> serviceConfigurations = Configurations.toStringMap(configurations);
+        Map<String, String> argumentsMap = CollectionsHelper.toStringStringMap(toolArguments.args());
 
         Request result = Request.newRequest(toolReference, toolArguments);
         ToolInvokeRequest toolInvokeRequest = ToolInvokeRequest.newBuilder()
                 .setBody(result.body())
                 .setUri(result.uri())
-                .putAllServiceConfigurations(collect)
-//                TODO
-//                .getArgumentsMap().putAll(toolArguments.args())
+                .putAllServiceConfigurations(serviceConfigurations)
+                .putAllArguments(argumentsMap)
                 .build();
 
         ToolInvokerGrpc.ToolInvokerBlockingStub blockingStub = ToolInvokerGrpc.newBlockingStub(channel);