Merge branch 'master' into fix-constraints

ComposioHQ · Jan 3, 2025 · c9813ef · c9813ef
2 parents 4cc8629 + 4012478
commit c9813ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/js/src/frameworks/langchain.spec.ts b/js/src/frameworks/langchain.spec.ts
@@ -60,10 +60,11 @@ describe("Apps class tests", () => {
       },
     });
 
-    langchainToolSet.getTools({
+    const tools = await langchainToolSet.getTools({
       actions: ["starRepositoryCustomAction"],
     });
 
+    await expect(tools.length).toBe(1);
     const actionOuput = await langchainToolSet.executeAction({
       action: "starRepositoryCustomAction",
       params: {

diff --git a/js/src/sdk/base.toolset.ts b/js/src/sdk/base.toolset.ts
@@ -138,19 +138,14 @@ export class ComposioToolSet {
       filterByAvailableApps: parsedFilters.filterByAvailableApps,
     });
 
-    const toolsWithCustomActions = (
-      await this.userActionRegistry.getAllActions()
-    ).filter((action) => {
-      const { name: actionName, toolName } = action.metadata || {};
+    const customActions = await this.userActionRegistry.getAllActions();
+    const toolsWithCustomActions = customActions.filter((action) => {
+      const { name: actionName } = action || {};
       return (
         (!filters.actions ||
           filters.actions.some(
             (name) => name.toLowerCase() === actionName?.toLowerCase()
           )) &&
-        (!filters.apps ||
-          filters.apps.some(
-            (name) => name.toLowerCase() === toolName?.toLowerCase()
-          )) &&
         (!filters.tags ||
           filters.tags.some((tag) => tag.toLowerCase() === "custom"))
       );