@iqai/adk 0.0.9 → 0.0.11

package/dist/index.mjs

@@ -2186,6 +2186,7 @@ __export(tools_exports, {
   LoadMemoryTool: () => LoadMemoryTool,
   McpError: () => McpError,
   McpErrorType: () => McpErrorType,
+  McpSamplingHandler: () => McpSamplingHandler,
   McpToolset: () => McpToolset,
   ToolContext: () => ToolContext,
   TransferToAgentTool: () => TransferToAgentTool,
@@ -2193,6 +2194,7 @@ __export(tools_exports, {
   adkToMcpToolType: () => adkToMcpToolType,
   buildFunctionDeclaration: () => buildFunctionDeclaration,
   createFunctionTool: () => createFunctionTool,
+  createSamplingHandler: () => createSamplingHandler,
   getMcpTools: () => getMcpTools,
   jsonSchemaToDeclaration: () => jsonSchemaToDeclaration,
   mcpSchemaToParameters: () => mcpSchemaToParameters,
@@ -2979,15 +2981,24 @@ var McpError = class extends Error {
 // src/tools/mcp/sampling-handler.ts
 var McpSamplingHandler = class {
   logger = new Logger({ name: "McpSamplingHandler" });
-  adkHandler;
-  constructor(adkHandler) {
-    this.adkHandler = adkHandler;
+  samplingHandler;
+  constructor(samplingHandler) {
+    this.samplingHandler = samplingHandler;
   }
   /**
    * Handle MCP sampling request and convert between formats
    */
   async handleSamplingRequest(request) {
     try {
+      if (request.method !== "sampling/createMessage") {
+        this.logger.error(
+          `Invalid method for sampling handler: ${request.method}. Expected: sampling/createMessage`
+        );
+        throw new McpError(
+          `Invalid method: ${request.method}. This handler only processes sampling/createMessage requests.`,
+          "INVALID_REQUEST_ERROR" /* INVALID_REQUEST_ERROR */
+        );
+      }
       const validationResult = CreateMessageRequestSchema.safeParse(request);
       if (!validationResult.success) {
         this.logger.error(
@@ -3013,19 +3024,19 @@ var McpSamplingHandler = class {
         );
       }
       this.logger.debug("Converting MCP request to ADK format");
-      const adkMessages = this.convertMcpMessagesToADK(mcpParams.messages);
+      const adkMessages = this.convertMcpMessagesToADK(
+        mcpParams.messages,
+        mcpParams.systemPrompt
+      );
       const adkRequest = {
         messages: adkMessages,
-        systemPrompt: mcpParams.systemPrompt,
-        modelPreferences: mcpParams.modelPreferences,
-        includeContext: mcpParams.includeContext,
-        temperature: mcpParams.temperature,
-        maxTokens: mcpParams.maxTokens,
-        stopSequences: mcpParams.stopSequences,
-        metadata: mcpParams.metadata
+        config: {
+          temperature: mcpParams.temperature,
+          max_tokens: mcpParams.maxTokens
+        }
       };
       this.logger.debug("Calling ADK sampling handler");
-      const adkResponse = await this.adkHandler(adkRequest);
+      const adkResponse = await this.samplingHandler(adkRequest);
       this.logger.debug("Converting ADK response to MCP format");
       const mcpResponse = this.convertADKResponseToMcp(adkResponse);
       const responseValidation = CreateMessageResultSchema.safeParse(mcpResponse);
@@ -3055,54 +3066,66 @@ var McpSamplingHandler = class {
   /**
    * Convert MCP messages to ADK message format
    */
-  convertMcpMessagesToADK(mcpMessages) {
-    return mcpMessages.map((mcpMessage) => {
-      const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
-      let adkContent;
-      if (mcpMessage.content.type === "text") {
-        adkContent = mcpMessage.content.text || "";
-      } else if (mcpMessage.content.type === "image") {
-        const contentParts = [];
-        if (mcpMessage.content.text) {
-          contentParts.push({
-            type: "text",
-            text: mcpMessage.content.text
-          });
-        }
-        if (mcpMessage.content.data) {
-          const mimeType = mcpMessage.content.mimeType || "image/jpeg";
-          const dataUrl = `data:${mimeType};base64,${mcpMessage.content.data}`;
-          contentParts.push({
-            type: "image",
-            image_url: {
-              url: dataUrl
-            }
-          });
-        }
-        adkContent = contentParts.length > 0 ? contentParts : "";
-      } else {
-        this.logger.warn(
-          `Unknown MCP content type: ${mcpMessage.content.type}`
-        );
-        adkContent = mcpMessage.content.data || "";
-      }
-      const adkMessage = {
-        role: adkRole,
-        content: adkContent
-      };
-      this.logger.debug(
-        `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
-      );
-      return adkMessage;
+  convertMcpMessagesToADK(mcpMessages, systemPrompt) {
+    const transformedMessages = mcpMessages.map(
+      (mcpMessage) => this.convertSingleMcpMessageToADK(mcpMessage)
+    );
+    transformedMessages.unshift({
+      role: "system",
+      content: systemPrompt
     });
+    return transformedMessages;
+  }
+  /**
+   * Convert a single MCP message to ADK message format
+   */
+  convertSingleMcpMessageToADK(mcpMessage) {
+    const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
+    const adkContent = this.convertMcpContentToADK(mcpMessage.content);
+    const adkMessage = {
+      role: adkRole,
+      content: adkContent
+    };
+    this.logger.debug(
+      `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
+    );
+    return adkMessage;
+  }
+  /**
+   * Convert MCP message content to ADK content format
+   */
+  convertMcpContentToADK(mcpContent) {
+    if (mcpContent.type === "text") {
+      return mcpContent.text || "";
+    }
+    if (mcpContent.type === "image") {
+      const contentParts = [];
+      if (mcpContent.text) {
+        contentParts.push({
+          type: "text",
+          text: mcpContent.text
+        });
+      }
+      if (mcpContent.data) {
+        const mimeType = mcpContent.mimeType || "image/jpeg";
+        const dataUrl = `data:${mimeType};base64,${mcpContent.data}`;
+        contentParts.push({
+          type: "image",
+          image_url: {
+            url: dataUrl
+          }
+        });
+      }
+      return contentParts.length > 0 ? contentParts : "";
+    }
+    this.logger.warn(`Unknown MCP content type: ${mcpContent.type}`);
+    return mcpContent.data || "";
   }
   /**
    * Convert ADK response to MCP response format
    */
   convertADKResponseToMcp(adkResponse) {
     const mcpResponse = {
-      model: adkResponse.model,
-      stopReason: adkResponse.stopReason,
       role: "assistant",
       // ADK responses are always from assistant
       content: {
@@ -3110,19 +3133,20 @@ var McpSamplingHandler = class {
         text: adkResponse.content || ""
       }
     };
-    this.logger.debug(
-      `Converted ADK response - model: ${adkResponse.model}, content length: ${adkResponse.content?.length || 0}`
-    );
+    this.logger.debug(`Received content: ${adkResponse.content}`);
     return mcpResponse;
   }
   /**
    * Update the ADK handler
    */
   updateHandler(handler) {
-    this.adkHandler = handler;
+    this.samplingHandler = handler;
     this.logger.debug("ADK sampling handler updated");
   }
 };
+function createSamplingHandler(handler) {
+  return handler;
+}
 
 // src/tools/mcp/utils.ts
 function withRetry(fn, instance, reinitMethod, maxRetries = 1) {
@@ -3162,6 +3186,9 @@ var McpClientService = class {
   logger = new Logger({ name: "McpClientService" });
   constructor(config) {
     this.config = config;
+    if (config.samplingHandler) {
+      this.mcpSamplingHandler = new McpSamplingHandler(config.samplingHandler);
+    }
   }
   /**
    * Initializes and returns an MCP client based on configuration.
@@ -3190,7 +3217,9 @@ var McpClientService = class {
           capabilities: {
             prompts: {},
             resources: {},
-            tools: {}
+            tools: {},
+            sampling: {}
+            // Enable sampling capability
           }
         }
       );
@@ -3396,13 +3425,13 @@ var McpClientService = class {
     }
   }
   /**
-   * Set an ADK sampling handler
+   * Set a new ADK sampling handler
    */
   setSamplingHandler(handler) {
     this.mcpSamplingHandler = new McpSamplingHandler(handler);
     if (this.client) {
       this.setupSamplingHandler(this.client).catch((error) => {
-        console.error("Failed to update sampling handler:", error);
+        console.error("Failed to update ADK sampling handler:", error);
       });
     }
   }
@@ -3753,6 +3782,32 @@ var McpToolset = class {
     await this.clientService.initialize();
     return this.clientService;
   }
+  /**
+   * Set a sampling handler for this MCP toolset.
+   * This allows MCP servers to request LLM completions through your ADK agent.
+   *
+   * @param handler - ADK sampling handler that receives ADK-formatted messages
+   */
+  setSamplingHandler(handler) {
+    if (!this.clientService) {
+      this.clientService = new McpClientService(this.config);
+    }
+    this.clientService.setSamplingHandler(handler);
+    if (this.config.debug) {
+      console.log("\u{1F3AF} Sampling handler set for MCP toolset");
+    }
+  }
+  /**
+   * Remove the sampling handler
+   */
+  removeSamplingHandler() {
+    if (this.clientService) {
+      this.clientService.removeSamplingHandler();
+      if (this.config.debug) {
+        console.log("\u{1F6AB} Sampling handler removed from MCP toolset");
+      }
+    }
+  }
   /**
    * Retrieves tools from the MCP server and converts them to BaseTool instances.
    * Similar to Python's get_tools method.
@@ -7167,6 +7222,7 @@ export {
   LoopAgent,
   McpError,
   McpErrorType,
+  McpSamplingHandler,
   McpToolset,
   memory_exports as Memory,
   models_exports as Models,
@@ -7195,6 +7251,7 @@ export {
   buildFunctionDeclaration,
   cloneSession,
   createFunctionTool,
+  createSamplingHandler,
   generateSessionId,
   getMcpTools,
   jsonSchemaToDeclaration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iqai/adk",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Agent Development Kit for TypeScript with multi-provider LLM support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",