agno 2.0.10__py3-none-any.whl → 2.0.11__py3-none-any.whl

agno/agent/agent.py

@@ -1178,6 +1178,7 @@ class Agent:
             run_id=run_id,
             session_id=session_id,
             agent_id=self.id,
+            user_id=user_id,
             agent_name=self.name,
             metadata=metadata,
             input=run_input,
@@ -1811,6 +1812,7 @@ class Agent:
             run_id=run_id,
             session_id=session_id,
             agent_id=self.id,
+            user_id=user_id,
             agent_name=self.name,
             metadata=metadata,
             input=run_input,

agno/models/litellm/chat.py

@@ -38,6 +38,10 @@ class LiteLLM(Model):
     max_tokens: Optional[int] = None
     temperature: float = 0.7
     top_p: float = 1.0
+    metadata: Optional[Dict[str, Any]] = None
+    extra_headers: Optional[Dict[str, Any]] = None
+    extra_query: Optional[Dict[str, Any]] = None
+    extra_body: Optional[Dict[str, Any]] = None
     request_params: Optional[Dict[str, Any]] = None
 
     client: Optional[Any] = None
@@ -148,10 +152,23 @@ class LiteLLM(Model):
             base_params["api_key"] = self.api_key
         if self.api_base:
             base_params["api_base"] = self.api_base
+        if self.extra_headers:
+            base_params["extra_headers"] = self.extra_headers
+        if self.extra_query:
+            base_params["extra_query"] = self.extra_query
         if tools:
             base_params["tools"] = tools
             base_params["tool_choice"] = "auto"
 
+        # Handle metadata via extra_body as per LiteLLM docs
+        if self.metadata:
+            if self.extra_body:
+                base_params["extra_body"] = {**self.extra_body, "metadata": self.metadata}
+            else:
+                base_params["extra_body"] = {"metadata": self.metadata}
+        elif self.extra_body:
+            base_params["extra_body"] = self.extra_body
+
         # Add additional request params if provided
         request_params: Dict[str, Any] = {k: v for k, v in base_params.items() if v is not None}
         if self.request_params:

agno/os/app.py

@@ -12,6 +12,7 @@ from rich.panel import Panel
 from starlette.requests import Request
 
 from agno.agent.agent import Agent
+from agno.db.base import BaseDb
 from agno.os.config import (
     AgentOSConfig,
     DatabaseConfig,
@@ -36,7 +37,11 @@ from agno.os.routers.memory import get_memory_router
 from agno.os.routers.metrics import get_metrics_router
 from agno.os.routers.session import get_session_router
 from agno.os.settings import AgnoAPISettings
-from agno.os.utils import update_cors_middleware
+from agno.os.utils import (
+    collect_mcp_tools_from_team,
+    collect_mcp_tools_from_workflow,
+    update_cors_middleware,
+)
 from agno.team.team import Team
 from agno.utils.log import logger
 from agno.utils.string import generate_id, generate_id_from_name
@@ -130,7 +135,7 @@ class AgentOS:
         self.lifespan = lifespan
 
         # List of all MCP tools used inside the AgentOS
-        self.mcp_tools = []
+        self.mcp_tools: List[Any] = []
 
         if self.agents:
             for agent in self.agents:
@@ -140,7 +145,8 @@ class AgentOS:
                         # Checking if the tool is a MCPTools or MultiMCPTools instance
                         type_name = type(tool).__name__
                         if type_name in ("MCPTools", "MultiMCPTools"):
-                            self.mcp_tools.append(tool)
+                            if tool not in self.mcp_tools:
+                                self.mcp_tools.append(tool)
 
                 agent.initialize_agent()
 
@@ -149,13 +155,8 @@ class AgentOS:
 
         if self.teams:
             for team in self.teams:
-                # Track all MCP tools to later handle their connection
-                if team.tools:
-                    for tool in team.tools:
-                        # Checking if the tool is a MCPTools or MultiMCPTools instance
-                        type_name = type(tool).__name__
-                        if type_name in ("MCPTools", "MultiMCPTools"):
-                            self.mcp_tools.append(tool)
+                # Track all MCP tools recursively
+                collect_mcp_tools_from_team(team, self.mcp_tools)
 
                 team.initialize_team()
 
@@ -171,7 +172,8 @@ class AgentOS:
 
         if self.workflows:
             for workflow in self.workflows:
-                # TODO: track MCP tools in workflow members
+                # Track MCP tools recursively in workflow members
+                collect_mcp_tools_from_workflow(workflow, self.mcp_tools)
                 if not workflow.id:
                     workflow.id = generate_id_from_name(workflow.name)
 
@@ -415,40 +417,85 @@ class AgentOS:
 
     def _auto_discover_databases(self) -> None:
         """Auto-discover the databases used by all contextual agents, teams and workflows."""
-        dbs = {}
-        knowledge_dbs = {}  # Track databases specifically used for knowledge
+        from agno.db.base import BaseDb
+
+        dbs: Dict[str, BaseDb] = {}
+        knowledge_dbs: Dict[str, BaseDb] = {}  # Track databases specifically used for knowledge
 
         for agent in self.agents or []:
             if agent.db:
-                dbs[agent.db.id] = agent.db
+                self._register_db_with_validation(dbs, agent.db)
             if agent.knowledge and agent.knowledge.contents_db:
-                knowledge_dbs[agent.knowledge.contents_db.id] = agent.knowledge.contents_db
+                self._register_db_with_validation(knowledge_dbs, agent.knowledge.contents_db)
                 # Also add to general dbs if it's used for both purposes
                 if agent.knowledge.contents_db.id not in dbs:
-                    dbs[agent.knowledge.contents_db.id] = agent.knowledge.contents_db
+                    self._register_db_with_validation(dbs, agent.knowledge.contents_db)
 
         for team in self.teams or []:
             if team.db:
-                dbs[team.db.id] = team.db
+                self._register_db_with_validation(dbs, team.db)
             if team.knowledge and team.knowledge.contents_db:
-                knowledge_dbs[team.knowledge.contents_db.id] = team.knowledge.contents_db
+                self._register_db_with_validation(knowledge_dbs, team.knowledge.contents_db)
                 # Also add to general dbs if it's used for both purposes
                 if team.knowledge.contents_db.id not in dbs:
-                    dbs[team.knowledge.contents_db.id] = team.knowledge.contents_db
+                    self._register_db_with_validation(dbs, team.knowledge.contents_db)
 
         for workflow in self.workflows or []:
             if workflow.db:
-                dbs[workflow.db.id] = workflow.db
+                self._register_db_with_validation(dbs, workflow.db)
 
         for interface in self.interfaces or []:
             if interface.agent and interface.agent.db:
-                dbs[interface.agent.db.id] = interface.agent.db
+                self._register_db_with_validation(dbs, interface.agent.db)
             elif interface.team and interface.team.db:
-                dbs[interface.team.db.id] = interface.team.db
+                self._register_db_with_validation(dbs, interface.team.db)
 
         self.dbs = dbs
         self.knowledge_dbs = knowledge_dbs
 
+    def _register_db_with_validation(self, registered_dbs: Dict[str, Any], db: BaseDb) -> None:
+        """Register a database in the contextual OS after validating it is not conflicting with registered databases"""
+        if db.id in registered_dbs:
+            existing_db = registered_dbs[db.id]
+            if not self._are_db_instances_compatible(existing_db, db):
+                raise ValueError(
+                    f"Database ID conflict detected: Two different database instances have the same ID '{db.id}'. "
+                    f"Database instances with the same ID must point to the same database with identical configuration."
+                )
+        registered_dbs[db.id] = db
+
+    def _are_db_instances_compatible(self, db1: BaseDb, db2: BaseDb) -> bool:
+        """
+        Return True if the two given database objects are compatible
+        Two database objects are compatible if they point to the same database with identical configuration.
+        """
+        # If they're the same object reference, they're compatible
+        if db1 is db2:
+            return True
+
+        if type(db1) is not type(db2):
+            return False
+
+        if hasattr(db1, "db_url") and hasattr(db2, "db_url"):
+            if db1.db_url != db2.db_url:  # type: ignore
+                return False
+
+        if hasattr(db1, "db_file") and hasattr(db2, "db_file"):
+            if db1.db_file != db2.db_file:  # type: ignore
+                return False
+
+        # If table names are different, they're not compatible
+        if (
+            db1.session_table_name != db2.session_table_name
+            or db1.memory_table_name != db2.memory_table_name
+            or db1.metrics_table_name != db2.metrics_table_name
+            or db1.eval_table_name != db2.eval_table_name
+            or db1.knowledge_table_name != db2.knowledge_table_name
+        ):
+            return False
+
+        return True
+
     def _auto_discover_knowledge_instances(self) -> None:
         """Auto-discover the knowledge instances used by all contextual agents, teams and workflows."""
         knowledge_instances = []

agno/os/utils.py

@@ -303,3 +303,101 @@ def update_cors_middleware(app: FastAPI, new_origins: list):
         allow_headers=["*"],
         expose_headers=["*"],
     )
+
+
+def collect_mcp_tools_from_team(team: Team, mcp_tools: List[Any]) -> None:
+    """Recursively collect MCP tools from a team and its members."""
+    # Check the team tools
+    if team.tools:
+        for tool in team.tools:
+            type_name = type(tool).__name__
+            if type_name in ("MCPTools", "MultiMCPTools"):
+                if tool not in mcp_tools:
+                    mcp_tools.append(tool)
+
+    # Recursively check team members
+    if team.members:
+        for member in team.members:
+            if isinstance(member, Agent):
+                if member.tools:
+                    for tool in member.tools:
+                        type_name = type(tool).__name__
+                        if type_name in ("MCPTools", "MultiMCPTools"):
+                            if tool not in mcp_tools:
+                                mcp_tools.append(tool)
+
+            elif isinstance(member, Team):
+                # Recursively check nested team
+                collect_mcp_tools_from_team(member, mcp_tools)
+
+
+def collect_mcp_tools_from_workflow(workflow: Workflow, mcp_tools: List[Any]) -> None:
+    """Recursively collect MCP tools from a workflow and its steps."""
+    from agno.workflow.steps import Steps
+
+    # Recursively check workflow steps
+    if workflow.steps:
+        if isinstance(workflow.steps, list):
+            # Handle list of steps
+            for step in workflow.steps:
+                collect_mcp_tools_from_workflow_step(step, mcp_tools)
+
+        elif isinstance(workflow.steps, Steps):
+            # Handle Steps container
+            if steps := workflow.steps.steps:
+                for step in steps:
+                    collect_mcp_tools_from_workflow_step(step, mcp_tools)
+
+        elif callable(workflow.steps):
+            pass
+
+
+def collect_mcp_tools_from_workflow_step(step: Any, mcp_tools: List[Any]) -> None:
+    """Collect MCP tools from a single workflow step."""
+    from agno.workflow.condition import Condition
+    from agno.workflow.loop import Loop
+    from agno.workflow.parallel import Parallel
+    from agno.workflow.router import Router
+    from agno.workflow.step import Step
+    from agno.workflow.steps import Steps
+
+    if isinstance(step, Step):
+        # Check step's agent
+        if step.agent:
+            if step.agent.tools:
+                for tool in step.agent.tools:
+                    type_name = type(tool).__name__
+                    if type_name in ("MCPTools", "MultiMCPTools"):
+                        if tool not in mcp_tools:
+                            mcp_tools.append(tool)
+        # Check step's team
+        if step.team:
+            collect_mcp_tools_from_team(step.team, mcp_tools)
+
+    elif isinstance(step, Steps):
+        if steps := step.steps:
+            for step in steps:
+                collect_mcp_tools_from_workflow_step(step, mcp_tools)
+
+    elif isinstance(step, (Parallel, Loop, Condition, Router)):
+        # These contain other steps - recursively check them
+        if hasattr(step, "steps") and step.steps:
+            for sub_step in step.steps:
+                collect_mcp_tools_from_workflow_step(sub_step, mcp_tools)
+
+    elif isinstance(step, Agent):
+        # Direct agent in workflow steps
+        if step.tools:
+            for tool in step.tools:
+                type_name = type(tool).__name__
+                if type_name in ("MCPTools", "MultiMCPTools"):
+                    if tool not in mcp_tools:
+                        mcp_tools.append(tool)
+
+    elif isinstance(step, Team):
+        # Direct team in workflow steps
+        collect_mcp_tools_from_team(step, mcp_tools)
+
+    elif isinstance(step, Workflow):
+        # Nested workflow
+        collect_mcp_tools_from_workflow(step, mcp_tools)

agno/vectordb/llamaindex/__init__.py

@@ -0,0 +1,3 @@
+from agno.vectordb.llamaindex.llamaindexdb import LlamaIndexVectorDb
+
+__all__ = ["LlamaIndexVectorDb"]

{agno-2.0.10.dist-info → agno-2.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agno
-Version: 2.0.10
+Version: 2.0.11
 Summary: Agno: a lightweight library for building Multi-Agent Systems
 Author-email: Ashpreet Bedi <ashpreet@agno.com>
 Project-URL: homepage, https://agno.com

{agno-2.0.10.dist-info → agno-2.0.11.dist-info}/RECORD

@@ -4,7 +4,7 @@ agno/exceptions.py,sha256=HWuuNFS5J0l1RYJsdUrSx51M22aFEoh9ltoeonXBoBw,2891
 agno/media.py,sha256=eTfYb_pwhX_PCIVPSrW4VYRqmoxKABEF1aZClrVvQ30,16500
 agno/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agno/agent/__init__.py,sha256=s7S3FgsjZxuaabzi8L5n4aSH8IZAiZ7XaNNcySGR-EQ,1051
-agno/agent/agent.py,sha256=jeJp0Nx6z3jabzhWIgJuT9eU24WjKwAAmlrGLNmgBhA,330395
+agno/agent/agent.py,sha256=hkbbQr90Puq2Hj2RTkeuSd3iYggpHfOpFpA0SEpTM2s,330453
 agno/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agno/api/agent.py,sha256=fKlQ62E_C9Rjd7Zus3Gs3R1RG-IhzFV-ICpkb6SLqYc,932
 agno/api/api.py,sha256=Z7iWbrjheJcGLeeDYrtTCWiKTVqjH0uJI35UNWOtAXw,973
@@ -190,7 +190,7 @@ agno/models/internlm/internlm.py,sha256=9oX7gbvVS-2GJhGvfug7sVFWMLCg-m1icQyUeFZk
 agno/models/langdb/__init__.py,sha256=ubh5nDcxyH33_ONwsmY4tWQz5esRwRjHBe68u9hdAIM,45
 agno/models/langdb/langdb.py,sha256=tTorf22oSTA632LzFor6UtJLqAOP6gsEKtNimNeehZI,1631
 agno/models/litellm/__init__.py,sha256=5e4yHqepF9-fOE0DMDIKnH6psFV1OcRgfAD5BaoVRgI,353
-agno/models/litellm/chat.py,sha256=6JHfOIluv3X73lmF24V2Ej56wjtEMqII6PqiadXKius,18448
+agno/models/litellm/chat.py,sha256=4gaK3YhFeeVQl9-mzicFLFdxWwQ3FM7krZP_AmIPuIg,19209
 agno/models/litellm/litellm_openai.py,sha256=6TNf6nRbCibPWEyubDmSLnoKpAKcM31afiklAYbujyY,759
 agno/models/llama_cpp/__init__.py,sha256=oxOZfqEcOdcB74VLwOTO6bPmXHHA88uaeJO-IkXgr8A,84
 agno/models/llama_cpp/llama_cpp.py,sha256=tWIF0TQH-sK29xCrTe7oy0SjSC-FlOmwmPL1d5IVMPM,673
@@ -232,14 +232,14 @@ agno/models/vllm/vllm.py,sha256=anBt3gshctbmda-OZJ51tOgbHHemsrSbQLMDqB39HIA,2707
 agno/models/xai/__init__.py,sha256=ukcCxnCHxTtkJNA2bAMTX4MhCv1wJcbiq8ZIfYczIxs,55
 agno/models/xai/xai.py,sha256=OqqhPySt64hQ4MM_qYhdMPPjoLRNhExyC-01sN86hJw,4158
 agno/os/__init__.py,sha256=h8oQu7vhD5RZf09jkyM_Kt1Kdq_d5kFB9gJju8QPwcY,55
-agno/os/app.py,sha256=acPtlVPAlrdsg6L2QC73SpaaX68-hsWn9X0RH9WNx7Q,24457
+agno/os/app.py,sha256=FWHnivzKhJH1FayoobkQIrfZceQXU51DK8FUWQQz29A,26500
 agno/os/auth.py,sha256=FyBtAKWtg-qSunCas5m5pK1dVEmikOSZvcCp5r25tTA,1844
 agno/os/config.py,sha256=u4R9yazQXIcKjR3QzEIZw_XAe_OHp3xn0ff7SVkj2jA,2893
 agno/os/mcp.py,sha256=5L0TZwInuCWM7TQ7MI_DjMWfVIIB0jxVCqaVEdR62UU,8114
 agno/os/router.py,sha256=IFgQCyx16MHHA2UAqr1T8I2_dKJ_QqmOOYdnGjWABHE,62517
 agno/os/schema.py,sha256=bdmGLQoBJyetiAZeajJG_gEKLaQSSEwiDwKy0q4Pa-M,38278
 agno/os/settings.py,sha256=Cn5_8lZI8Vx1UaUYqs9h6Qp4IMDFn4f3c35uppiaMy4,1343
-agno/os/utils.py,sha256=tOszvSQPXbbYCLOWBPsCnHGbELKw0i6mVahxmEzddhI,10810
+agno/os/utils.py,sha256=VRxUQCBhjL62Qk2-KE-fl--RZEh1FDJ2Z0gjYpeIK3M,14528
 agno/os/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agno/os/interfaces/base.py,sha256=giU0y-egtXLqokN1HQyQIWl4NBawTk_ua7ytKGFmZRc,527
 agno/os/interfaces/agui/__init__.py,sha256=1zrGICk4roXUINwSFZfqH6sBsbHmD5KjGYVJMGg4fKQ,66
@@ -488,7 +488,7 @@ agno/vectordb/langchaindb/__init__.py,sha256=BxGs6tcEKTiydbVJL3P5djlnafS5Bbgql3u
 agno/vectordb/langchaindb/langchaindb.py,sha256=VieHU4W-lRmYN0bLo2vmb7rGkmlNkPtjXILD4_F8818,5505
 agno/vectordb/lightrag/__init__.py,sha256=fgQpA8pZW-jEHI91SZ_xgmROmv14oKdwCQZ8LpyipaE,84
 agno/vectordb/lightrag/lightrag.py,sha256=GBReSzGBxpv0u0WTTZYTezZWpJQNj1zwL70ori3_cD4,14390
-agno/vectordb/llamaindex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agno/vectordb/llamaindex/__init__.py,sha256=fgdWIntUOX3n5YEPcPfr-yPb2kvmSy5ngQ5_UqAIrgM,103
 agno/vectordb/llamaindex/llamaindexdb.py,sha256=co_GtDJuorGG0cN-taWiuNUXGwNlgE044PQjTT7lfcU,5432
 agno/vectordb/milvus/__init__.py,sha256=I9V-Rm-rIYxWdRVIs6bKI-6JSJsyOd1-vvasvVpYHuE,127
 agno/vectordb/milvus/milvus.py,sha256=fbpXXOV_ahxP5kX0KoPZ4_4M3kWC4gjGX0GEtuIVD8o,42394
@@ -520,8 +520,8 @@ agno/workflow/step.py,sha256=15vZFN5HlO3IkHqsxkM-2InUzCWC0Ee8BtoJ-OAhS5w,52485
 agno/workflow/steps.py,sha256=uRE4oGWs2cA-TrX881AEa69zu6rheXH81mNOZiRrNvg,23719
 agno/workflow/types.py,sha256=ZEFyaKH42261_3yx810ABfi70RUfjPGSwiIep7n53yg,17485
 agno/workflow/workflow.py,sha256=yjjVZ0MvkLjGgVaVt8jFWlm2urx7zZdAuJ0We9KRu2U,112738
-agno-2.0.10.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-agno-2.0.10.dist-info/METADATA,sha256=PKHm3CQY3sd9WdY5O1VGJyQyVeza95ICLnS3lhPuIA0,22018
-agno-2.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agno-2.0.10.dist-info/top_level.txt,sha256=MKyeuVesTyOKIXUhc-d_tPa2Hrh0oTA4LM0izowpx70,5
-agno-2.0.10.dist-info/RECORD,,
+agno-2.0.11.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+agno-2.0.11.dist-info/METADATA,sha256=rLaQ6VJDCNK1fLPp3sy3-TGYfF68OXGElkkmms5Qvho,22018
+agno-2.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agno-2.0.11.dist-info/top_level.txt,sha256=MKyeuVesTyOKIXUhc-d_tPa2Hrh0oTA4LM0izowpx70,5
+agno-2.0.11.dist-info/RECORD,,