chore: typing

Author: phil65

src/agentpool/resource_providers/base.py

@@ -212,7 +212,7 @@ def create_tool(
             category=category,
             source=self.name,
             requires_confirmation=requires_confirmation,
-            metadata=metadata,
+            meta=metadata,
             name_override=name_override,
             description_override=description_override,
             schema_override=schema_override,

src/agentpool/resource_providers/static.py

@@ -152,7 +152,7 @@ def register_tool(
                     name_override=name_override,
                     description_override=description_override,
                     requires_confirmation=requires_confirmation,
-                    metadata=metadata or {},
+                    meta=metadata or {},
                 )
             case _ as unreachable:
                 assert_never(unreachable)  # ty:ignore[type-assertion-failure]
@@ -209,7 +209,6 @@ def tool(
         enabled: bool = True,
         requires_confirmation: bool = False,
         metadata: dict[str, str] | None = None,
-        **kwargs: Any,
     ) -> Callable[[Callable[..., Any]], Callable[..., Any]]: ...
 
     def tool(
@@ -221,7 +220,6 @@ def tool(
         enabled: bool = True,
         requires_confirmation: bool = False,
         metadata: dict[str, str] | None = None,
-        **kwargs: Any,
     ) -> Callable[..., Any] | Callable[[Callable[..., Any]], Callable[..., Any]]:
         """Decorator to register a function as a tool.
 
@@ -246,7 +244,6 @@ def another_function(y: str) -> str:
             enabled: Whether tool is initially enabled
             requires_confirmation: Whether execution needs confirmation
             metadata: Additional tool metadata
-            **kwargs: Additional arguments passed to Tool.from_callable
         """
         from agentpool.tools.base import FunctionTool
 
@@ -257,8 +254,7 @@ def decorator(f: Callable[..., Any]) -> Callable[..., Any]:
                 description_override=description,
                 enabled=enabled,
                 requires_confirmation=requires_confirmation,
-                metadata=metadata or {},
-                **kwargs,
+                meta=metadata or {},
             )
             self.add_tool(tool)
             return f

src/agentpool/tools/base.py

@@ -274,7 +274,8 @@ def from_callable(
         category: ToolKind | None = None,
         enabled: bool = True,
         source: ToolSource | str | None = None,
-        **kwargs: Any,
+        requires_confirmation: bool = False,
+        meta: dict[str, Any] | None = None,
     ) -> FunctionTool[TOutputType]:
         """Create a FunctionTool from a callable or import path string."""
         from agentpool.utils import importing
@@ -301,7 +302,8 @@ def from_callable(
             hints=hints or ToolHints(),
             enabled=enabled,
             source=source or "dynamic",
-            **kwargs,
+            requires_confirmation=requires_confirmation,
+            meta=meta or {},
         )
 
 

src/agentpool_config/tools.py

@@ -82,9 +82,6 @@ class BaseToolConfig(Schema):
     metadata: dict[str, str] = Field(default_factory=dict, title="Tool metadata")
     """Additional tool metadata."""
 
-    instructions: str | None = Field(default=None, title="Tool instructions")
-    """Instructions for how to use this tool effectively."""
-
     model_config = ConfigDict(frozen=True)
 
     def get_tool(self) -> Tool:
@@ -123,6 +120,5 @@ def get_tool(self) -> Tool:
             description_override=self.description,
             enabled=self.enabled,
             requires_confirmation=self.requires_confirmation,
-            metadata=self.metadata,
-            instructions=self.instructions,
+            meta=self.metadata,
         )

tests/servers/acp_server/test_mcp_integration.py

@@ -153,7 +153,7 @@ def dummy_mcp_tool(query: str) -> str:
             return f"MCP result for: {query}"
 
         meta = {"mcp_tool": "dummy_search"}
-        tool = FunctionTool.from_callable(dummy_mcp_tool, source="mcp", metadata=meta)
+        tool = FunctionTool.from_callable(dummy_mcp_tool, source="mcp", meta=meta)
 
         agent.tools.register_tool(tool)