@composio/google 0.9.3 → 0.10.1

package/README.md

@@ -1,124 +1,72 @@
 # @composio/google
 
-Google GenAI Provider for Composio SDK.
-
-## Features
-
-- **Google GenAI Integration**: Seamless integration with Google's Generative AI models (Gemini)
-- **Function Calling Support**: Convert Composio tools to Google GenAI function declarations
-- **Type Safety**: Full TypeScript support with proper type definitions
-- **Execution Modifiers**: Support for transforming tool inputs and outputs
-- **Flexible Authentication**: Support for custom authentication parameters
-- **Streaming Support**: First-class support for streaming responses
+Adapts Composio tools to Gemini function declarations for the Google GenAI SDK (`@google/genai`) and executes the function calls the model returns.
 
 ## Installation
 
 ```bash
 npm install @composio/core @composio/google @google/genai
-# or
-yarn add @composio/core @composio/google @google/genai
-# or
-pnpm add @composio/core @composio/google @google/genai
 ```
 
-## Environment Variables
-
-Required environment variables:
-
-- `COMPOSIO_API_KEY`: Your Composio API key
-- `GEMINI_API_KEY`: Your Google AI API key
-
-Optional environment variables:
+Set `COMPOSIO_API_KEY` (create one at https://dashboard.composio.dev/settings) and `GOOGLE_API_KEY` (from https://aistudio.google.com/apikey) in your environment.
 
-- `GOOGLE_PROJECT_ID`: Your Google Cloud project ID (for custom deployments)
-- `GOOGLE_LOCATION`: Your Google Cloud location (for custom deployments)
+## Quickstart
 
-## Quick Start
+Create a session for your user, pass its tools to Gemini as function declarations, and run the loop: execute each function call with `composio.provider.executeToolCall`, feed the result back, and repeat until the model replies with text.
 
 ```typescript
 import { Composio } from '@composio/core';
 import { GoogleProvider } from '@composio/google';
-import { GoogleGenerativeAI } from '@google/genai';
+import { GoogleGenAI, type Part } from '@google/genai';
 
-// Initialize Google GenAI
-const genAI = new GoogleGenerativeAI(process.env.GEMINI_API_KEY);
-
-// Initialize Composio with Google provider
 const composio = new Composio({
-  apiKey: process.env.COMPOSIO_API_KEY,
   provider: new GoogleProvider(),
 });
+const ai = new GoogleGenAI({ apiKey: process.env.GOOGLE_API_KEY! });
 
-// Get available tools
-const tools = await composio.tools.get('user123', {
-  toolkits: ['gmail', 'calendar'],
-  limit: 10,
-});
-```
-
-## Examples
+// Create a session for your user
+const session = await composio.create('user_123');
+const tools = await session.tools();
 
-Check out our complete example implementations:
-
-- [Basic Google Integration](../../examples/google/src/index.ts)
-
-## API Reference
-
-### GoogleProvider Class
-
-The `GoogleProvider` class extends `BaseNonAgenticProvider` and provides Google GenAI-specific functionality.
-
-#### Methods
-
-##### `wrapTool(tool: Tool): GoogleTool`
-
-Wraps a Composio tool in the Google GenAI function declaration format.
-
-```typescript
-const wrappedTool = provider.wrapTool(composioTool);
-```
-
-##### `wrapTools(tools: Tool[]): GoogleGenAIToolCollection`
-
-Wraps multiple Composio tools in the Google GenAI function declaration format.
-
-```typescript
-const wrappedTools = provider.wrapTools(composioTools);
-```
-
-##### `executeToolCall(userId: string, tool: GoogleGenAIFunctionCall, options?: ExecuteToolFnOptions, modifiers?: ExecuteToolModifiers): Promise<string>`
-
-Executes a tool call from Google GenAI and returns the result as a JSON string.
-
-```typescript
-const result = await provider.executeToolCall('user123', functionCall, options, modifiers);
-```
+const chat = ai.chats.create({
+  model: 'gemini-3-pro-preview',
+  config: {
+    tools: [{ functionDeclarations: tools }],
+  },
+});
 
-#### Types
+let response = await chat.sendMessage({
+  message:
+    "Send an email to john@example.com with the subject 'Hello' and body 'Hello from Composio!'",
+});
 
-```typescript
-interface GoogleGenAIFunctionCall {
-  name: string;
-  args: Record<string, unknown>;
+// Agentic loop: keep executing tool calls until the model responds with text
+while (response.functionCalls && response.functionCalls.length > 0) {
+  const parts: Part[] = [];
+  for (const fc of response.functionCalls) {
+    const result = await composio.provider.executeToolCall('user_123', {
+      name: fc.name || '',
+      args: (fc.args || {}) as Record<string, unknown>,
+    });
+    parts.push({
+      functionResponse: {
+        id: fc.id,
+        name: fc.name,
+        response: JSON.parse(result),
+      },
+    });
+  }
+  response = await chat.sendMessage({ message: parts });
 }
 
-type GoogleTool = {
-  name: string;
-  description: string;
-  parameters: Schema;
-};
-
-type GoogleGenAIToolCollection = GoogleTool[];
+console.log(response.text);
 ```
 
-## Contributing
-
-We welcome contributions! Please see our [Contributing Guide](../../CONTRIBUTING.md) for more details.
-
-## License
+## Tool execution
 
-ISC License
+Gemini function calling is non-agentic; the model returns function calls and you execute them. `GoogleProvider` exposes `executeToolCall(userId, functionCall, options?, modifiers?)`, which takes a `{ name, args }` pair and returns the tool result as a JSON string. The constructor takes no options.
 
-## Support
+## Links
 
-For support, please visit our [Documentation](https://docs.composio.dev) or join our [Discord Community](https://discord.gg/composio).
+- [Google provider docs](https://docs.composio.dev/docs/providers/google)
+- [Composio documentation](https://docs.composio.dev)

package/dist/index.d.mts

@@ -2,7 +2,6 @@ import { BaseNonAgenticProvider, ExecuteToolFnOptions, ExecuteToolModifiers, Mcp
 import { FunctionDeclaration } from "@google/genai";
 
 //#region src/index.d.ts
-
 /**
  * Interface for Google GenAI function declaration
  * Based on the FunctionDeclaration type from @google/genai

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { BaseNonAgenticProvider, normalizeToolArguments } from "@composio/core";
+import { BaseNonAgenticProvider, deduplicateJsonSchemaRequiredArrays, normalizeToolArguments } from "@composio/core";
 
 //#region src/index.ts
 /**
@@ -90,14 +90,15 @@ var GoogleProvider = class extends BaseNonAgenticProvider {
 	* ```
 	*/
 	wrapTool(tool) {
+		const inputParameters = deduplicateJsonSchemaRequiredArrays(tool.inputParameters);
 		return {
 			name: tool.slug,
 			description: tool.description || "",
 			parameters: {
 				type: "object",
 				description: tool.description || "",
-				properties: tool.inputParameters?.properties || {},
-				required: tool.inputParameters?.required || []
+				properties: inputParameters?.properties || {},
+				required: inputParameters?.required || []
 			}
 		};
 	}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@composio/google",
-  "version": "0.9.3",
+  "version": "0.10.1",
   "description": "Google GenAI Provider for Composio SDK",
   "main": "dist/index.mjs",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/ComposioHQ/composio.git",
@@ -11,24 +12,14 @@
   "bugs": {
     "url": "https://github.com/ComposioHQ/composio/issues"
   },
-  "homepage": "https://github.com/ComposioHQ/composio/tree/main/ts/packages/providers/google#readme",
+  "homepage": "https://github.com/ComposioHQ/composio/tree/next/ts/packages/providers/google#readme",
   "publishConfig": {
     "access": "public"
   },
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      },
-      "default": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
     }
   },
   "files": [
@@ -49,13 +40,13 @@
     "@google/genai": "^1.1.0"
   },
   "devDependencies": {
-    "tsdown": "^0.18.4",
-    "typescript": "^5.9.2",
-    "@composio/core": "0.11.0"
+    "tsdown": "^0.22.3",
+    "typescript": "^6.0.3",
+    "@composio/core": "0.14.0"
   },
   "scripts": {
     "clean": "git clean -xdf node_modules",
-    "build": "pnpm exec tsdown",
+    "build": "tsdown",
     "test": "vitest run"
   },
   "types": "dist/index.d.mts"

package/dist/index.cjs

@@ -1,214 +0,0 @@
-let _composio_core = require("@composio/core");
-
-//#region src/index.ts
-/**
-* Google GenAI Provider
-*
-* This provider provides a set of tools for interacting with Google's GenAI API.
-* It supports both the Gemini Developer API and Vertex AI implementations.
-*
-* @packageDocumentation
-* @module providers/google
-*/
-/**
-* Google GenAI Provider for Composio SDK
-* Implements the BaseNonAgenticProvider to wrap Composio tools for use with Google's GenAI API
-*/
-var GoogleProvider = class extends _composio_core.BaseNonAgenticProvider {
-	name = "google";
-	/**
-	* Creates a new instance of the GoogleProvider.
-	*
-	* This provider enables integration with Google's GenAI API,
-	* supporting both the Gemini Developer API and Vertex AI implementations.
-	*
-	* @example
-	* ```typescript
-	* // Initialize the Google provider
-	* const provider = new GoogleProvider();
-	*
-	* // Use with Composio
-	* const composio = new Composio({
-	*   apiKey: 'your-api-key',
-	*   provider: new GoogleProvider()
-	* });
-	*
-	* // Use the provider to wrap tools for Google GenAI
-	* const googleTools = provider.wrapTools(composioTools);
-	* ```
-	*/
-	constructor() {
-		super();
-	}
-	/**
-	* Transform MCP URL response into Anthropic-specific format.
-	* By default, Anthropic uses the standard format (same as default),
-	* but this method is here to show providers can customize if needed.
-	*
-	* @param data - The MCP URL response data
-	* @returns Standard MCP server response format
-	*/
-	wrapMcpServerResponse(data) {
-		return data.map((item) => ({
-			url: new URL(item.url),
-			name: item.name
-		}));
-	}
-	/**
-	* Wraps a Composio tool in the Google GenAI function declaration format.
-	*
-	* This method transforms a Composio tool definition into the format
-	* expected by Google's GenAI API for function calling.
-	*
-	* @param tool - The Composio tool to wrap
-	* @returns The wrapped tool in Google GenAI format
-	*
-	* @example
-	* ```typescript
-	* // Wrap a single tool for use with Google GenAI
-	* const composioTool = {
-	*   slug: 'SEARCH_TOOL',
-	*   description: 'Search for information',
-	*   inputParameters: {
-	*     type: 'object',
-	*     properties: {
-	*       query: { type: 'string' }
-	*     },
-	*     required: ['query']
-	*   }
-	* };
-	*
-	* const googleTool = provider.wrapTool(composioTool);
-	* // Use with Google GenAI SDK
-	* const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-	* const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-	*
-	* const result = await model.generateContent({
-	*   contents: [{ role: 'user', parts: [{ text: 'Search for Composio' }] }],
-	*   tools: [googleTool]
-	* });
-	* ```
-	*/
-	wrapTool(tool) {
-		return {
-			name: tool.slug,
-			description: tool.description || "",
-			parameters: {
-				type: "object",
-				description: tool.description || "",
-				properties: tool.inputParameters?.properties || {},
-				required: tool.inputParameters?.required || []
-			}
-		};
-	}
-	/**
-	* Wraps a list of Composio tools in the Google GenAI function declaration format.
-	*
-	* This method transforms multiple Composio tool definitions into the format
-	* expected by Google's GenAI API for function calling.
-	*
-	* @param tools - Array of Composio tools to wrap
-	* @returns Array of wrapped tools in Google GenAI format
-	*
-	* @example
-	* ```typescript
-	* // Wrap multiple tools for use with Google GenAI
-	* const composioTools = [
-	*   {
-	*     slug: 'SEARCH_TOOL',
-	*     description: 'Search for information',
-	*     inputParameters: {
-	*       type: 'object',
-	*       properties: {
-	*         query: { type: 'string' }
-	*       },
-	*       required: ['query']
-	*     }
-	*   },
-	*   {
-	*     slug: 'WEATHER_TOOL',
-	*     description: 'Get weather information',
-	*     inputParameters: {
-	*       type: 'object',
-	*       properties: {
-	*         location: { type: 'string' }
-	*       },
-	*       required: ['location']
-	*     }
-	*   }
-	* ];
-	*
-	* const googleTools = provider.wrapTools(composioTools);
-	*
-	* // Use with Google GenAI SDK
-	* const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-	* const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-	*
-	* const result = await model.generateContent({
-	*   contents: [{ role: 'user', parts: [{ text: 'How is the weather in New York?' }] }],
-	*   tools: googleTools
-	* });
-	* ```
-	*/
-	wrapTools(tools) {
-		return tools.map((tool) => this.wrapTool(tool));
-	}
-	/**
-	* Executes a tool call from Google GenAI.
-	*
-	* This method processes a function call from Google's GenAI API,
-	* executes the corresponding Composio tool, and returns the result.
-	*
-	* @param userId - The user ID for authentication and tracking
-	* @param tool - The Google GenAI function call to execute
-	* @param options - Optional execution options like connected account ID
-	* @param modifiers - Optional execution modifiers for tool behavior
-	* @returns The result of the tool execution as a JSON string
-	*
-	* @example
-	* ```typescript
-	* // Execute a tool call from Google GenAI
-	* const functionCall = {
-	*   name: 'SEARCH_TOOL',
-	*   args: {
-	*     query: 'composio documentation'
-	*   }
-	* };
-	*
-	* const result = await provider.executeToolCall(
-	*   'user123',
-	*   functionCall,
-	*   { connectedAccountId: 'conn_xyz456' }
-	* );
-	*
-	* // Parse the result and use it in your application
-	* const searchResults = JSON.parse(result);
-	* console.log(searchResults);
-	*
-	* // You can also use the result to continue the conversation
-	* const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-	* const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-	*
-	* await model.generateContent({
-	*   contents: [
-	*     { role: 'user', parts: [{ text: 'Search for Composio' }] },
-	*     { role: 'model', parts: [{ functionResponse: { name: 'SEARCH_TOOL', response: result } }] }
-	*   ]
-	* });
-	* ```
-	*/
-	async executeToolCall(userId, tool, options, modifiers) {
-		const payload = {
-			arguments: (0, _composio_core.normalizeToolArguments)(tool.args, tool.name),
-			connectedAccountId: options?.connectedAccountId,
-			customAuthParams: options?.customAuthParams,
-			customConnectionData: options?.customConnectionData,
-			userId
-		};
-		const result = await this.executeTool(tool.name, payload, modifiers);
-		return JSON.stringify(result);
-	}
-};
-
-//#endregion
-exports.GoogleProvider = GoogleProvider;

package/dist/index.d.cts

@@ -1,193 +0,0 @@
-import { BaseNonAgenticProvider, ExecuteToolFnOptions, ExecuteToolModifiers, McpServerGetResponse, McpUrlResponse, Tool } from "@composio/core";
-import { FunctionDeclaration } from "@google/genai";
-
-//#region src/index.d.ts
-
-/**
- * Interface for Google GenAI function declaration
- * Based on the FunctionDeclaration type from @google/genai
- */
-type GoogleTool = FunctionDeclaration;
-/**
- * Interface for Google GenAI function call
- * Based on the FunctionCall type from @google/genai
- */
-interface GoogleGenAIFunctionCall {
-  name: string;
-  args: Record<string, unknown>;
-}
-/**
- * Type for a collection of Google GenAI function declarations
- */
-type GoogleGenAIToolCollection = GoogleTool[];
-/**
- * Google GenAI Provider for Composio SDK
- * Implements the BaseNonAgenticProvider to wrap Composio tools for use with Google's GenAI API
- */
-declare class GoogleProvider extends BaseNonAgenticProvider<GoogleGenAIToolCollection, GoogleTool, McpServerGetResponse> {
-  readonly name = "google";
-  /**
-   * Creates a new instance of the GoogleProvider.
-   *
-   * This provider enables integration with Google's GenAI API,
-   * supporting both the Gemini Developer API and Vertex AI implementations.
-   *
-   * @example
-   * ```typescript
-   * // Initialize the Google provider
-   * const provider = new GoogleProvider();
-   *
-   * // Use with Composio
-   * const composio = new Composio({
-   *   apiKey: 'your-api-key',
-   *   provider: new GoogleProvider()
-   * });
-   *
-   * // Use the provider to wrap tools for Google GenAI
-   * const googleTools = provider.wrapTools(composioTools);
-   * ```
-   */
-  constructor();
-  /**
-   * Transform MCP URL response into Anthropic-specific format.
-   * By default, Anthropic uses the standard format (same as default),
-   * but this method is here to show providers can customize if needed.
-   *
-   * @param data - The MCP URL response data
-   * @returns Standard MCP server response format
-   */
-  wrapMcpServerResponse(data: McpUrlResponse): McpServerGetResponse;
-  /**
-   * Wraps a Composio tool in the Google GenAI function declaration format.
-   *
-   * This method transforms a Composio tool definition into the format
-   * expected by Google's GenAI API for function calling.
-   *
-   * @param tool - The Composio tool to wrap
-   * @returns The wrapped tool in Google GenAI format
-   *
-   * @example
-   * ```typescript
-   * // Wrap a single tool for use with Google GenAI
-   * const composioTool = {
-   *   slug: 'SEARCH_TOOL',
-   *   description: 'Search for information',
-   *   inputParameters: {
-   *     type: 'object',
-   *     properties: {
-   *       query: { type: 'string' }
-   *     },
-   *     required: ['query']
-   *   }
-   * };
-   *
-   * const googleTool = provider.wrapTool(composioTool);
-   * // Use with Google GenAI SDK
-   * const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-   * const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-   *
-   * const result = await model.generateContent({
-   *   contents: [{ role: 'user', parts: [{ text: 'Search for Composio' }] }],
-   *   tools: [googleTool]
-   * });
-   * ```
-   */
-  wrapTool(tool: Tool): GoogleTool;
-  /**
-   * Wraps a list of Composio tools in the Google GenAI function declaration format.
-   *
-   * This method transforms multiple Composio tool definitions into the format
-   * expected by Google's GenAI API for function calling.
-   *
-   * @param tools - Array of Composio tools to wrap
-   * @returns Array of wrapped tools in Google GenAI format
-   *
-   * @example
-   * ```typescript
-   * // Wrap multiple tools for use with Google GenAI
-   * const composioTools = [
-   *   {
-   *     slug: 'SEARCH_TOOL',
-   *     description: 'Search for information',
-   *     inputParameters: {
-   *       type: 'object',
-   *       properties: {
-   *         query: { type: 'string' }
-   *       },
-   *       required: ['query']
-   *     }
-   *   },
-   *   {
-   *     slug: 'WEATHER_TOOL',
-   *     description: 'Get weather information',
-   *     inputParameters: {
-   *       type: 'object',
-   *       properties: {
-   *         location: { type: 'string' }
-   *       },
-   *       required: ['location']
-   *     }
-   *   }
-   * ];
-   *
-   * const googleTools = provider.wrapTools(composioTools);
-   *
-   * // Use with Google GenAI SDK
-   * const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-   * const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-   *
-   * const result = await model.generateContent({
-   *   contents: [{ role: 'user', parts: [{ text: 'How is the weather in New York?' }] }],
-   *   tools: googleTools
-   * });
-   * ```
-   */
-  wrapTools(tools: Tool[]): GoogleGenAIToolCollection;
-  /**
-   * Executes a tool call from Google GenAI.
-   *
-   * This method processes a function call from Google's GenAI API,
-   * executes the corresponding Composio tool, and returns the result.
-   *
-   * @param userId - The user ID for authentication and tracking
-   * @param tool - The Google GenAI function call to execute
-   * @param options - Optional execution options like connected account ID
-   * @param modifiers - Optional execution modifiers for tool behavior
-   * @returns The result of the tool execution as a JSON string
-   *
-   * @example
-   * ```typescript
-   * // Execute a tool call from Google GenAI
-   * const functionCall = {
-   *   name: 'SEARCH_TOOL',
-   *   args: {
-   *     query: 'composio documentation'
-   *   }
-   * };
-   *
-   * const result = await provider.executeToolCall(
-   *   'user123',
-   *   functionCall,
-   *   { connectedAccountId: 'conn_xyz456' }
-   * );
-   *
-   * // Parse the result and use it in your application
-   * const searchResults = JSON.parse(result);
-   * console.log(searchResults);
-   *
-   * // You can also use the result to continue the conversation
-   * const genAI = new GoogleGenerativeAI('YOUR_API_KEY');
-   * const model = genAI.getGenerativeModel({ model: 'gemini-pro' });
-   *
-   * await model.generateContent({
-   *   contents: [
-   *     { role: 'user', parts: [{ text: 'Search for Composio' }] },
-   *     { role: 'model', parts: [{ functionResponse: { name: 'SEARCH_TOOL', response: result } }] }
-   *   ]
-   * });
-   * ```
-   */
-  executeToolCall(userId: string, tool: GoogleGenAIFunctionCall, options?: ExecuteToolFnOptions, modifiers?: ExecuteToolModifiers): Promise<string>;
-}
-//#endregion
-export { GoogleGenAIFunctionCall, GoogleGenAIToolCollection, GoogleProvider, GoogleTool };