Merge branch 'main' into release-2.5.7

Author: ysolanky

libs/agno/agno/agent/_tools.py

@@ -376,6 +376,8 @@ def parse_tools(
                 _function_names.append(name)
                 _func = _func.model_copy(deep=True)
                 _func._agent = agent
+                if agent._team is not None:
+                    _func._team = agent._team
                 # Respect the function's explicit strict setting if set
                 effective_strict = strict if _func.strict is None else _func.strict
                 _func.process_entrypoint(strict=effective_strict)
@@ -401,6 +403,8 @@ def parse_tools(
             tool.process_entrypoint(strict=effective_strict)
 
             tool._agent = agent
+            if agent._team is not None:
+                tool._team = agent._team
             if strict and tool.strict is None:
                 tool.strict = True
             if agent.tool_hooks is not None:
@@ -439,6 +443,8 @@ def parse_tools(
                         )
                 _func = _func.model_copy(deep=True)
                 _func._agent = agent
+                if agent._team is not None:
+                    _func._team = agent._team
                 if strict:
                     _func.strict = True
                 if agent.tool_hooks is not None:

libs/agno/agno/agent/agent.py

@@ -648,6 +648,7 @@ def __init__(
         self._cached_session: Optional[AgentSession] = None
 
         self._tool_instructions: Optional[List[str]] = None
+        self._team: Optional[Any] = None
 
         self._formatter: Optional[SafeFormatter] = None
 

libs/agno/agno/team/_init.py

@@ -465,6 +465,7 @@ def _initialize_member(team: "Team", member: Union["Team", Agent], debug_mode: O
 
     if isinstance(member, Agent):
         member.team_id = team.id
+        member._team = team
         member.set_id()
 
         # Inherit team primary model if agent has no explicit model

libs/agno/tests/unit/agent/test_team_tool_propagation.py

@@ -0,0 +1,86 @@
+from typing import Any
+from unittest.mock import MagicMock
+
+from agno.agent.agent import Agent
+from agno.agent._tools import parse_tools
+from agno.tools.function import Function
+from agno.tools.toolkit import Toolkit
+
+
+def _mock_model():
+    model = MagicMock()
+    model.supports_native_structured_outputs = False
+    return model
+
+
+def _mock_team():
+    team = MagicMock()
+    team.__class__.__name__ = "Team"
+    return team
+
+
+# -- Callable tools ----------------------------------------------------------
+
+
+def test_callable_tool_receives_team_from_member_agent():
+    def my_tool(query: str, team: Any) -> str:
+        return "ok"
+
+    agent = Agent(tools=[my_tool])
+    agent._team = _mock_team()
+
+    functions = parse_tools(agent=agent, tools=agent.tools, model=_mock_model())
+
+    assert len(functions) == 1
+    assert functions[0]._team is agent._team
+
+
+def test_callable_tool_team_is_none_when_agent_has_no_team():
+    def my_tool(query: str) -> str:
+        return "ok"
+
+    agent = Agent(tools=[my_tool])
+
+    functions = parse_tools(agent=agent, tools=agent.tools, model=_mock_model())
+
+    assert len(functions) == 1
+    assert functions[0]._team is None
+
+
+# -- Function objects ---------------------------------------------------------
+
+
+def test_function_tool_receives_team_from_member_agent():
+    def my_tool(query: str, team: Any) -> str:
+        return "ok"
+
+    func = Function.from_callable(my_tool)
+    agent = Agent(tools=[func])
+    agent._team = _mock_team()
+
+    functions = parse_tools(agent=agent, tools=agent.tools, model=_mock_model())
+
+    assert len(functions) == 1
+    assert functions[0]._team is agent._team
+
+
+# -- Toolkit functions --------------------------------------------------------
+
+
+def test_toolkit_tool_receives_team_from_member_agent():
+    class MyToolkit(Toolkit):
+        def __init__(self):
+            super().__init__(name="my_toolkit")
+            self.register(self.my_tool)
+
+        def my_tool(self, query: str) -> str:
+            return "ok"
+
+    agent = Agent(tools=[MyToolkit()])
+    agent._team = _mock_team()
+
+    functions = parse_tools(agent=agent, tools=agent.tools, model=_mock_model())
+
+    toolkit_funcs = [f for f in functions if isinstance(f, Function)]
+    assert len(toolkit_funcs) == 1
+    assert toolkit_funcs[0]._team is agent._team