fix: update tests to pass agent in to direct tool call

Author: dbschmigelski

src/strands/tools/decorator.py

@@ -143,22 +143,6 @@ def _create_input_model(self) -> Type[BaseModel]:
             # Handle case with no parameters
             return create_model(model_name)
 
-    def _is_special_parameter(self, param_name: str) -> bool:
-        """Check if a parameter should be automatically injected by the framework.
-
-        Special parameters include:
-        - Standard Python parameters: self, cls
-        - Framework-provided context parameters: agent, strands_context
-
-        Args:
-            param_name: The name of the parameter to check.
-
-        Returns:
-            True if the parameter should be excluded from input validation and
-            automatically injected during tool execution.
-        """
-        return param_name in {"self", "cls", "agent", "strands_context"}
-
     def extract_metadata(self) -> ToolSpec:
         """Extract metadata from the function to create a tool specification.
 
@@ -293,6 +277,22 @@ def inject_special_parameters(
         if "agent" in self.signature.parameters and "agent" in invocation_state:
             validated_input["agent"] = invocation_state["agent"]
 
+    def _is_special_parameter(self, param_name: str) -> bool:
+        """Check if a parameter should be automatically injected by the framework.
+
+        Special parameters include:
+        - Standard Python parameters: self, cls
+        - Framework-provided context parameters: agent, strands_context
+
+        Args:
+            param_name: The name of the parameter to check.
+
+        Returns:
+            True if the parameter should be excluded from input validation and
+            automatically injected during tool execution.
+        """
+        return param_name in {"self", "cls", "agent", "strands_context"}
+
 
 P = ParamSpec("P")  # Captures all parameters
 R = TypeVar("R")  # Return type

tests_integ/test_strands_context_integration.py

@@ -15,7 +15,10 @@
 def tool_with_context(message: str, strands_context: StrandsContext) -> dict:
     """Tool that uses StrandsContext to access tool_use_id."""
     tool_use_id = strands_context["tool_use"]["toolUseId"]
-    return {"status": "success", "content": [{"text": f"Context tool processed '{message}' with ID: {tool_use_id}"}]}
+    return {
+        "status": "success",
+        "content": [{"text": f"Context tool processed '{message}' with ID: {tool_use_id}"}],
+    }
 
 
 @tool
@@ -36,9 +39,14 @@ def test_strands_context_integration():
     agent = Agent(tools=[tool_with_context, tool_with_agent_and_context])
 
     # Test tool with StrandsContext
-    result1 = agent.tool.tool_with_context(message="hello world")
-    assert result1.get("status") == "success"
-
-    # Test tool with both agent and StrandsContext
-    result = agent.tool.tool_with_agent_and_context(message="hello agent")
-    assert result.get("status") == "success"
+    result_with_context = agent.tool.tool_with_context(message="hello world")
+    assert (
+        "Context tool processed 'hello world' with ID: tooluse_tool_with_context_"
+        in result_with_context["content"][0]["text"]
+    )
+
+    result_with_agent_and_context = agent.tool.tool_with_agent_and_context(message="hello agent", agent=agent)
+    assert (
+        "Agent 'Strands Agents' processed 'hello agent' with ID: tooluse_tool_with_agent_and_context_"
+        in result_with_agent_and_context["content"][0]["text"]
+    )