fix: tests

python/composio/cli/apps.py

@@ -178,7 +178,6 @@ def _update_actions(apps: t.List[AppModel], actions: t.List[ActionModel]) -> Non
                 ).upper()
             else:
                 action_names.append(get_enum_key(name=action.name))
-
             enums.base.ActionData(
                 name=action.name,
                 app=app.key,

python/composio/client/enums/_action.py

@@ -975,14 +975,14 @@ class Action(_AnnotatedEnum[ActionData], path=ACTIONS_CACHE):
     CLICKUP_UPDATE_VIEW: "Action"
     CLICKUP_UPDATE_WEBHOOK: "Action"
     CLICKUP_VIEWS_GET_EVERYTHING_LEVEL: "Action"
+    CODEINTERPRETER_EXECUTE_CODE: "Action"
+    CODEINTERPRETER_GET_FILE_CMD: "Action"
+    CODEINTERPRETER_RUN_TERMINAL_CMD: "Action"
     CODE_FORMAT_TOOL_FORMAT_AND_LINT_CODEBASE: "Action"
     CODE_GREP_TOOL_SEARCH_CODEBASE: "Action"
     CODE_INDEX_TOOL_CREATE_INDEX: "Action"
     CODE_INDEX_TOOL_INDEX_STATUS: "Action"
     CODE_INDEX_TOOL_SEARCH_CODEBASE: "Action"
-    CODE_INTERPRETER_EXECUTE_CODE: "Action"
-    CODE_INTERPRETER_GET_FILE_CMD: "Action"
-    CODE_INTERPRETER_RUN_TERMINAL_CMD: "Action"
     CODE_MAP_TOOL_DELETE_REPO_MAP: "Action"
     CODE_MAP_TOOL_GENERATE_RANKED_TAGS: "Action"
     CODE_MAP_TOOL_GET_REPO_MAP: "Action"

python/composio/client/enums/_app.py

@@ -25,10 +25,10 @@ class App(_AnnotatedEnum[AppData], path=APPS_CACHE):
     BROWSERBASE_TOOL: "App"
     BROWSER_TOOL: "App"
     CLICKUP: "App"
+    CODEINTERPRETER: "App"
     CODE_FORMAT_TOOL: "App"
     CODE_GREP_TOOL: "App"
     CODE_INDEX_TOOL: "App"
-    CODE_INTERPRETER: "App"
     CODE_MAP_TOOL: "App"
     COMPOSIO: "App"
     DISCORD: "App"

python/composio/client/enums/base.py

@@ -154,7 +154,9 @@ def __init__(
             if self._slug in tools:
                 return
 
-        raise ValueError(f"Invalid value `{value}` for `{self.__class__.__name__}`")
+        raise ValueError(
+            f"Invalid value `{self._slug}` for `{self.__class__.__name__}`"
+        )
 
     @property
     def slug(self) -> str:

python/composio/tools/base/abs.py

@@ -36,7 +36,8 @@ def remove_json_ref(data: t.Dict) -> t.Dict:
             jsonref.replace_refs(
                 obj=data,
                 lazy_load=False,
-            )
+            ),
+            indent=2,
         )
     )
 

python/composio/tools/base/runtime.py

@@ -152,7 +152,7 @@ class WrappedAction(RuntimeAction[request_schema, response_schema]):  # type: ig
 
         data = ActionData(
             name=f.__name__,
-            app=toolname,
+            app=toolname.upper(),
             tags=tags,
             no_auth=True,
             is_local=True,
@@ -170,6 +170,7 @@ def execute(self, request: t.Any, metadata: dict) -> t.Any:
     cls.__doc__ = f.__doc__
 
     existing_actions = []
+    toolname = toolname.upper()
     if toolname in tool_registry["runtime"]:
         existing_actions = tool_registry["runtime"][toolname].actions()
     tool = _create_tool_class(name=toolname, actions=[cls, *existing_actions])  # type: ignore

python/composio/tools/env/host/workspace.py

@@ -152,9 +152,9 @@ def execute_action(
 
         registry = load_local_tools()
         tool = (
-            registry["runtime"][action.app]
+            registry["runtime"][action.app.upper()]
             if action.is_runtime
-            else registry["local"][action.app]
+            else registry["local"][action.app.upper()]
         )
         return tool.execute(
             action=action.slug,

python/composio/tools/local/handler.py

@@ -39,7 +39,7 @@ def get_action_schemas(
         action_schemas: t.List[t.Dict] = []
 
         for app in apps:
-            action_schemas += [action.schema() for action in tools[app.name].actions()]
+            action_schemas += [action.schema() for action in tools[app.slug].actions()]
 
         for action in actions:
             action_schemas.append(
@@ -55,6 +55,10 @@ def get_action_schemas(
                 for action_schema in action_schemas
                 if bool(set(tags) & set(action_schema["tags"]))
             ]
+
+        for schema in action_schemas:
+            schema["name"] = schema["enum"]
+
         return action_schemas
 
 

python/composio/tools/toolset.py

@@ -36,13 +36,13 @@
 )
 from composio.exceptions import ApiKeyNotProvidedError, ComposioSDKError
 from composio.storage.user import UserData
+from composio.tools.base.local import LocalAction
 from composio.tools.env.base import (
     ENV_GITHUB_ACCESS_TOKEN,
     Workspace,
     WorkspaceConfigType,
 )
 from composio.tools.env.factory import HostWorkspaceConfig, WorkspaceFactory
-from composio.tools.local.base import Action as LocalAction
 from composio.tools.local.handler import LocalClient
 from composio.utils.enums import get_enum_key
 from composio.utils.logging import WithLogger
@@ -271,7 +271,7 @@ def check_connected_account(self, action: ActionType) -> None:
         ]:
             raise ComposioSDKError(
                 f"No connected account found for app `{action.app}`; "
-                f"Run `composio add {action.app}` to fix this"
+                f"Run `composio add {action.app.lower()}` to fix this"
             )
 
     def _execute_local(
@@ -568,13 +568,13 @@ def get_action_schemas(
                 self.check_connected_account(action=item.name)
             items = items + remote_items
 
-        items += [ActionModel(**act().get_action_schema()) for act in runtime_actions]
-        for item in items:
-            item = self.action_preprocessing(item)
+        for act in runtime_actions:
+            schema = act.schema()
+            schema["name"] = act.enum
+            items.append(ActionModel(**schema))
 
-        # Temporary
         for item in items:
-            item.name = f"{item.appName}_{item.name}".lower()
+            item = self.action_preprocessing(item)
 
         return items
 

python/examples/runtime_tools/langchain_math.py

@@ -7,15 +7,16 @@
 from langchain_openai import ChatOpenAI
 
 @action(toolname="math", requires=["smtplib"])
-def multiply(a: int, b: int, c: int):
+def multiply(a: int, b: int, c: int) -> int:
     """
     Multiply three numbers
-    a: int
-    b: int
-    c: int
+
+    :param a: Number a
+    :param b: Number b
+    :param c: Number c
+    :return result: Result of the multiplication
     """
-    print("Multiplying the numbers: ", a, b, c)
-    return {"execution_details": {"executed": True, "result": a * b * c}}
+    return a * b * c
 
 
 llm = ChatOpenAI(model="gpt-4-turbo")
@@ -24,9 +25,6 @@ def multiply(a: int, b: int, c: int):
 
 # Get All the tools
 tools = ComposioToolSet().get_actions(actions=[multiply])
-print(tools)
-
-
 task = "Calculate the forumula 445*669*8886"
 
 agent = create_openai_functions_agent(llm, tools, prompt)

python/tests/test_client/test_enum.py

@@ -8,7 +8,7 @@
 def test_tag_enum() -> None:
     """Test `Tag` enum."""
     tag = Tag("ASANA_ALLOCATIONS")
-    assert tag.app == "asana"
+    assert tag.app.upper() == "ASANA"
     assert tag.value == "Allocations"
 
 
@@ -30,7 +30,7 @@ def test_action_enum() -> None:
 def test_trigger_enum() -> None:
     """Test `Trigger` enum."""
     trigger = Trigger("slack_receive_message")
-    assert trigger.app == "slack"
+    assert trigger.app.upper() == "SLACK"
     assert trigger.name == "SLACK_RECEIVE_MESSAGE"
 
 

python/tests/test_example.py

@@ -27,9 +27,7 @@
         "file": PLUGINS / "autogen" / "autogen_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                '{"execution_details": {"executed": true}, "response_data": ""}'
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {
             "OPENAI_API_KEY": OPENAI_API_KEY,
@@ -41,9 +39,7 @@
         "file": PLUGINS / "llamaindex" / "llamaindex_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                "{'execution_details': {'executed': True}, 'response_data': ''}",
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {
             "OPENAI_API_KEY": OPENAI_API_KEY,
@@ -55,9 +51,7 @@
         "file": EXAMPLES_PATH / "local_tools" / "autogen_math.py",
         "match": {
             "type": "stdout",
-            "values": [
-                '{"execution_details": {"executed": true}, "response_data": 11962.560439560439}'
-            ],
+            "values": ["11962"],
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY},
     },
@@ -66,7 +60,7 @@
         "file": EXAMPLES_PATH / "runtime_tools" / "langchain_math.py",
         "match": {
             "type": "stdout",
-            "values": ["Multiplying the numbers:  445 669 8886"],
+            "values": ["2645406630"],
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY},
     },
@@ -75,9 +69,7 @@
         "file": PLUGINS / "crew_ai" / "crewai_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                "{'execution_details': {'executed': True}, 'response_data': ''}"
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {
             "OPENAI_API_KEY": OPENAI_API_KEY,
@@ -104,12 +96,11 @@
         "file": PLUGINS / "langchain" / "langchain_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                "{'execution_details': {'executed': True}, 'response_data': ''}"
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
     },
+<<<<<<< Updated upstream
     "langgraph": {
         "plugin": "langgraph",
         "file": PLUGINS / "langgraph" / "langgraph_demo.py",
@@ -121,14 +112,24 @@
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
     },
+=======
+    # "langgraph": {
+    #     "file": PLUGINS / "langgraph" / "langgraph_demo.py",
+    #     "match": {
+    #         "type": "stdout",
+    #         "values": [
+    #             "Action executed successfully"
+    #         ],
+    #     },
+    #     "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
+    # },
+>>>>>>> Stashed changes
     "openai": {
         "plugin": "openai",
         "file": PLUGINS / "openai" / "openai_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                "{'execution_details': {'executed': True}, 'response_data': ''}"
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
     },
@@ -137,9 +138,7 @@
         "file": PLUGINS / "lyzr" / "lyzr_demo.py",
         "match": {
             "type": "stdout",
-            "values": [
-                "{'execution_details': {'executed': True}, 'response_data': ''}"
-            ],
+            "values": ["Action executed successfully"],
         },
         "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
     },
@@ -149,7 +148,7 @@
     #     "match": {
     #         "type": "stdout",
     #         "values": [
-    #             "{'execution_details': {'executed': True}, 'response_data': ''}"
+    #             "Action executed successfully"
     #         ],
     #     },
     #     "env": {"OPENAI_API_KEY": OPENAI_API_KEY, "COMPOSIO_API_KEY": COMPOSIO_API_KEY},
@@ -167,9 +166,14 @@ def test_example(
     example_name: str, example: dict  # pylint: disable=unused-argument
 ) -> None:
     """Test an example with given environment."""
+<<<<<<< Updated upstream
     plugin_to_test = os.getenv("PLUGIN_TO_TEST")
     if plugin_to_test is not None and plugin_to_test != example["plugin"]:
         pytest.skip(f"Skipping {example['plugin']}")
+=======
+    if "_tools" not in example_name:
+        return
+>>>>>>> Stashed changes
 
     for key, val in example["env"].items():
         assert (