Tests pass.

Author: tcdent

agentstack/_tools/__init__.py

@@ -185,7 +185,8 @@ def filter_tools(cls, data: dict) -> dict:
         try:
             user_config = UserToolConfig(tool_name)
         except FileNotFoundError:
-            return data  # if the user has no config, allow all tools.
+            log.debug(f"User has no tools.yaml file; allowing all tools.")
+            return data
 
         log.debug(
             f"Excluding tools from {tool_name} based on project permissions: "
@@ -195,6 +196,7 @@ def filter_tools(cls, data: dict) -> dict:
 
         filtered_perms = {}
         for func_name in user_config.tools:
+            # TODO what about orphaned tools in the user config
             base_perms: dict = tool_data.get(func_name, {})
             assert base_perms, f"Tool config.json for '{tool_name}' does not include '{func_name}'."
 
@@ -205,12 +207,8 @@ def filter_tools(cls, data: dict) -> dict:
                 user_perms = _user_perms.model_dump()
             assert user_perms is not None, f"User tool permission got unexpected type {type(_user_perms)}."
 
-            filtered_perms[func_name] = ToolPermission(
-                **{
-                    **base_perms,
-                    **user_perms,
-                }
-            )
+            all_perms = {**base_perms, **user_perms}
+            filtered_perms[func_name] = ToolPermission(**all_perms)
 
         data['tools'] = filtered_perms
         return data
@@ -393,6 +391,7 @@ def _initialize_user_tool_config() -> None:
     all of the tools available to the user. This is used to bring an existing
     project up to date with a UserToolConfig.
     """
+    # TODO actually use this
     # TODO there is documentation in the example project file for this, which we
     # should include in old projects, too.
 

agentstack/_tools/composio/__init__.py

@@ -36,7 +36,7 @@ def execute_action(
     """
     permissions = tools.get_permissions(execute_action)
     if not permissions.EXECUTE:
-        return "User has not granted execute permission."
+        return {'error': "User has not granted execute permission."}
 
     toolset = ComposioToolSet()
     action = Action(action_name)
@@ -55,7 +55,7 @@ def get_action_schema(action_name: str) -> Dict[str, Any]:
     """Get the schema for a composio action."""
     permissions = tools.get_permissions(get_action_schema)
     if not permissions.READ:
-        return "User has not granted read permission."
+        return {'error': "User has not granted read permission."}
 
     toolset = ComposioToolSet()
     action = Action(action_name)
@@ -70,7 +70,7 @@ def find_actions_by_use_case(
     """Find actions by use case."""
     permissions = tools.get_permissions(find_actions_by_use_case)
     if not permissions.READ:
-        return "User has not granted read permission."
+        return [{'error': "User has not granted read permission."}]
 
     toolset = ComposioToolSet()
     actions = toolset.find_actions_by_use_case(*apps, use_case=use_case)
@@ -84,7 +84,7 @@ def find_actions_by_tags(
     """Find actions by tags."""
     permissions = tools.get_permissions(find_actions_by_tags)
     if not permissions.READ:
-        return "User has not granted read permission."
+        return [{'error': "User has not granted read permission."}]
 
     toolset = ComposioToolSet()
     actions = toolset.find_actions_by_tags(*apps, tags=tags)

tests/fixtures/tool_config_max.json

@@ -1,7 +1,6 @@
 {
     "name": "tool_name",
     "category": "category",
-    "tools": ["tool1", "tool2"],
     "url": "https://example.com",
     "cta": "Click me!",
     "env": {
@@ -13,5 +12,14 @@
         "dependency2>=2.0.0"
     ],
     "post_install": "install.sh",
-    "post_remove": "remove.sh"
+    "post_remove": "remove.sh",
+    "tools": {
+        "tool1": {
+            "actions": ["read", "write"],
+            "additional_property": "value"
+        },
+        "tool2": {
+            "actions": ["read"]
+        }
+    }
 }

tests/fixtures/tool_config_min.json

@@ -1,5 +1,12 @@
 {
     "name": "tool_name",
     "category": "category",
-    "tools": ["tool1", "tool2"]
+    "tools": {
+        "tool1": {
+            "actions": ["read", "write"]
+        },
+        "tool2": {
+            "actions": ["read"]
+        }
+    }
 }

tests/test_frameworks.py

@@ -8,7 +8,7 @@
 from agentstack.conf import ConfigFile, set_path
 from agentstack.exceptions import ValidationError
 from agentstack import frameworks
-from agentstack._tools import ToolConfig, get_all_tools
+from agentstack._tools import ToolConfig, ToolPermission, get_all_tools
 from agentstack.agents import AGENTS_FILENAME, AgentConfig
 from agentstack.tasks import TASKS_FILENAME, TaskConfig
 from agentstack import graph
@@ -61,10 +61,10 @@ def _get_test_task_alternate(self) -> TaskConfig:
         return TaskConfig('task_name_two')
 
     def _get_test_tool(self) -> ToolConfig:
-        return ToolConfig(name='test_tool', category='test', tools=['test_tool'])
+        return ToolConfig(name='test_tool', category='test', tools={'test_tool': {'actions': ['read']}})
 
     def _get_test_tool_alternate(self) -> ToolConfig:
-        return ToolConfig(name='test_tool_alt', category='test', tools=['test_tool_alt'])
+        return ToolConfig(name='test_tool_alt', category='test', tools={'test_tool_alt': {'actions': ['write']}})
 
     def test_get_framework_module(self):
         module = frameworks.get_framework_module(self.framework)

tests/test_tool_config.py

@@ -11,7 +11,8 @@ def test_minimal_json(self):
         config = ToolConfig.from_json(BASE_PATH / "fixtures/tool_config_min.json")
         assert config.name == "tool_name"
         assert config.category == "category"
-        assert config.tools == ["tool1", "tool2"]
+        assert config.tool_names == ["tool1", "tool2"]
+        # TODO test config.tools
         assert config.url is None
         assert config.cta is None
         assert config.env is None
@@ -22,7 +23,8 @@ def test_maximal_json(self):
         config = ToolConfig.from_json(BASE_PATH / "fixtures/tool_config_max.json")
         assert config.name == "tool_name"
         assert config.category == "category"
-        assert config.tools == ["tool1", "tool2"]
+        assert config.tool_names == ["tool1", "tool2"]
+        # TODO test config.tools
         assert config.url == "https://example.com"
         assert config.cta == "Click me!"
         assert config.env == {"ENV_VAR1": "value1", "ENV_VAR2": "value2"}