Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.
TypeScript agentic-aiagentsaiai-agentsaiagentsdeveloper-toolsfunction-callinggpt-4javascriptjsllmllmopsmcppythonremote-mcp-serverssetypescript
Fix google genai provider
haxzief07f5d1c1ff8
diff --git a/examples/google/.env.example b/examples/google/.env.exampleindex f2e6cc751..5b3b776b1 100644--- a/examples/google/.env.example+++ b/examples/google/.env.example@@ -1,6 +1,4 @@# Composio API Key - Get it from https://app.composio.devCOMPOSIO_API_KEY=-GEMINI_API_KEY=your_composio_api_key_here-# Google GenAI (Gemini) API Key - Get it from https://ai.google.dev/-GEMINI_API_KEY=your_gemini_api_key_here+GEMINI_API_KEY=your_composio_api_key_here\ No newline at end of filediff --git a/examples/google/package.json b/examples/google/package.jsonindex 193ee7958..ad76d2506 100644--- a/examples/google/package.json+++ b/examples/google/package.json@@ -9,7 +9,13 @@"dev": "bun --watch src/index.ts","test": "echo \"Error: no test specified\" && exit 1"},- "keywords": ["composio", "example", "google", "genai", "gemini"],+ "keywords": [+ "composio",+ "example",+ "google",+ "genai",+ "gemini"+ ],"author": "","license": "ISC","packageManager": "[email protected]",diff --git a/examples/google/src/index.ts b/examples/google/src/index.tsindex 9d360a77b..26c2c6aba 100644--- a/examples/google/src/index.ts+++ b/examples/google/src/index.ts@@ -18,10 +18,9 @@ const ai = new GoogleGenAI({apiKey: process.env.GEMINI_API_KEY,});-const provider = new GoogleProvider();const composio = new Composio({apiKey: process.env.COMPOSIO_API_KEY,- provider,+ provider: new GoogleProvider(),});/**@@ -30,43 +29,37 @@ const composio = new Composio({async function main() {try {console.log('π Starting Google GenAI Example...');-+const tools = await composio.tools.get('default', 'HACKERNEWS_GET_USER');-+console.log(`β Found ${tools.length} tools`);-- const task = "Fetch the details of the user 'haxzie'";++ const task = "Fetch the details of the user 'pg'";console.log(`π Task: ${task}`);-- const wrappedTools = provider.wrapTools(tools as any);-+const response = await ai.models.generateContent({model: 'gemini-2.0-flash-001',contents: task,config: {- tools: [{ functionDeclarations: wrappedTools as any }],+ tools: [{ functionDeclarations: tools }],},});-+console.log('β Response received from Gemini');-+if (response.functionCalls) {- console.log(`β Calling tool ${response.functionCalls[0].name}`);+ console.log(`π Calling tool ${response.functionCalls[0].name}`);const functionCall = {name: response.functionCalls[0].name || '',- args: response.functionCalls[0].args || {}+ args: response.functionCalls[0].args || {},};- const result = await provider.executeToolCall(- 'default',- functionCall- );+ const result = await composio.provider.executeToolCall('default', functionCall);console.log('π Result:');console.log(JSON.parse(result).data);} else {console.log('π No function calls in the response');console.log(response.text);}-} catch (error) {console.error('β Error running example:', error);}diff --git a/packages/providers/google/package.json b/packages/providers/google/package.jsonindex 656d6f623..666322d29 100644--- a/packages/providers/google/package.json+++ b/packages/providers/google/package.json@@ -24,7 +24,13 @@"build": "tsup","test": "vitest run"},- "keywords": ["composio", "provider", "google", "genai", "gemini"],+ "keywords": [+ "composio",+ "provider",+ "google",+ "genai",+ "gemini"+ ],"author": "","license": "ISC","packageManager": "[email protected]",diff --git a/packages/providers/google/src/index.ts b/packages/providers/google/src/index.tsindex 74a9bbbf6..2571624e3 100644--- a/packages/providers/google/src/index.ts+++ b/packages/providers/google/src/index.ts@@ -7,28 +7,20 @@* @packageDocumentation* @module providers/google*/-import {- BaseNonAgenticProvider,- Tool,+import {+ BaseNonAgenticProvider,+ Tool,ToolExecuteParams,ExecuteToolModifiers,- ExecuteToolFnOptions+ ExecuteToolFnOptions,} from '@composio/core';+import { FunctionDeclaration, Schema } from '@google/genai';/*** Interface for Google GenAI function declaration* Based on the FunctionDeclaration type from @google/genai*/-export interface GoogleGenAIFunctionDeclaration {- name?: string;- description?: string;- parameters?: {- type: 'object';- description?: string;- properties: Record<string, unknown>;- required?: string[];- };-}+export type GoogleTool = FunctionDeclaration;/*** Interface for Google GenAI function call@@ -42,13 +34,13 @@ export interface GoogleGenAIFunctionCall {/*** Type for a collection of Google GenAI function declarations*/-export type GoogleGenAIToolCollection = GoogleGenAIFunctionDeclaration[];+export type GoogleGenAIToolCollection = GoogleTool[];/*** Google GenAI Provider for Composio SDK* Implements the BaseNonAgenticProvider to wrap Composio tools for use with Google's GenAI API*/-export class GoogleProvider extends BaseNonAgenticProvider<GoogleGenAIToolCollection, GoogleGenAIFunctionDeclaration> {+export class GoogleProvider extends BaseNonAgenticProvider<GoogleGenAIToolCollection, GoogleTool> {readonly name = 'google';/**@@ -56,16 +48,15 @@ export class GoogleProvider extends BaseNonAgenticProvider<GoogleGenAIToolCollec* @param tool - The Composio tool to wrap.* @returns The wrapped tool in Google GenAI format.*/- wrapTool(tool: Tool): GoogleGenAIFunctionDeclaration {+ wrapTool(tool: Tool): GoogleTool {return {name: tool.slug,description: tool.description || '',- parameters: {+ parameters: (tool.inputParameters ?? {type: 'object',- description: tool.description || '',- properties: (tool.inputParameters?.properties || {}) as Record<string, unknown>,- required: Array.isArray(tool.inputParameters?.required) ? tool.inputParameters.required : [],- },+ properties: {},+ required: [],+ }) as unknown as Schema,};}