fix: limitedActions in getTools (ComposioHQ#1341)

skalingclouds · Feb 17, 2025 · c4d962f · c4d962f
1 parent aa94622
commit c4d962f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 19 deletions.
diff --git a/js/src/frameworks/langchain.ts b/js/src/frameworks/langchain.ts
@@ -77,7 +77,11 @@ export class LangchainToolSet extends BaseComposioToolSet {
       params: { filters, entityId },
     });
 
-    const tools = await this.getToolsSchema(filters, entityId);
+    const tools = await this.getToolsSchema(
+      filters,
+      entityId,
+      filters.integrationId
+    );
     return tools.map((tool) =>
       this._wrapTool(tool as RawActionData, entityId || this.entityId)
     );

diff --git a/js/src/frameworks/openai.ts b/js/src/frameworks/openai.ts
@@ -51,7 +51,11 @@ export class OpenAIToolSet extends BaseComposioToolSet {
       params: filters,
     });
 
-    const mainActions = await this.getToolsSchema(filters, entityId);
+    const mainActions = await this.getToolsSchema(
+      filters,
+      entityId,
+      filters.integrationId
+    );
     return (
       mainActions.map((action) => {
         const formattedSchema: OpenAI.FunctionDefinition = {

diff --git a/js/src/frameworks/vercel.ts b/js/src/frameworks/vercel.ts
@@ -57,14 +57,18 @@ export class VercelAIToolSet extends BaseComposioToolSet {
   }
 
   // change this implementation
-  async getTools(filters: {
-    actions?: Array<string>;
-    apps?: Array<string>;
-    tags?: Optional<Array<string>>;
-    useCase?: Optional<string>;
-    usecaseLimit?: Optional<number>;
-    filterByAvailableApps?: Optional<boolean>;
-  }): Promise<{ [key: string]: CoreTool }> {
+  async getTools(
+    filters: {
+      actions?: Array<string>;
+      apps?: Array<string>;
+      tags?: Optional<Array<string>>;
+      useCase?: Optional<string>;
+      usecaseLimit?: Optional<number>;
+      filterByAvailableApps?: Optional<boolean>;
+      integrationId?: Optional<string>;
+    },
+    entityId: Optional<string> = null
+  ): Promise<{ [key: string]: CoreTool }> {
     TELEMETRY_LOGGER.manualTelemetry(TELEMETRY_EVENTS.SDK_METHOD_INVOKED, {
       method: "getTools",
       file: this.fileName,
@@ -80,14 +84,18 @@ export class VercelAIToolSet extends BaseComposioToolSet {
       actions,
     } = ZExecuteToolCallParams.parse(filters);
 
-    const actionsList = await this.getToolsSchema({
-      apps,
-      actions,
-      tags,
-      useCase,
-      useCaseLimit: usecaseLimit,
-      filterByAvailableApps,
-    });
+    const actionsList = await this.getToolsSchema(
+      {
+        apps,
+        actions,
+        tags,
+        useCase,
+        useCaseLimit: usecaseLimit,
+        filterByAvailableApps,
+      },
+      entityId,
+      filters.integrationId
+    );
 
     const tools: { [key: string]: CoreTool } = {};
     actionsList.forEach((actionSchema) => {

diff --git a/js/src/sdk/base.toolset.ts b/js/src/sdk/base.toolset.ts
@@ -173,7 +173,7 @@ export class ComposioToolSet {
       apps: parsedFilters.apps?.join(","),
       tags: parsedFilters.tags?.join(","),
       useCase: parsedFilters.useCase,
-      actions: parsedFilters.actions?.join(","),
+      actions: actions?.join(","),
       usecaseLimit: parsedFilters.useCaseLimit,
       filterByAvailableApps: parsedFilters.filterByAvailableApps,
     });

diff --git a/js/src/types/base_toolset.ts b/js/src/types/base_toolset.ts
@@ -77,6 +77,7 @@ export const ZToolSchemaFilter = z.object({
   useCase: z.string().optional(),
   useCaseLimit: z.number().optional(),
   filterByAvailableApps: z.boolean().optional(),
+  integrationId: z.string().optional(),
 });
 
 export type TToolSchemaFilter = z.infer<typeof ZToolSchemaFilter>;