agno 2.1.3__py3-none-any.whl → 2.1.5__py3-none-any.whl

agno/os/mcp.py

@@ -1,7 +1,7 @@
 """Router for MCP interface providing Model Context Protocol endpoints."""
 
 import logging
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional, cast
 from uuid import uuid4
 
 from fastmcp import FastMCP
@@ -9,7 +9,7 @@ from fastmcp.server.http import (
     StarletteWithLifespan,
 )
 
-from agno.db.base import SessionType
+from agno.db.base import AsyncBaseDb, SessionType
 from agno.db.schemas import UserMemory
 from agno.os.routers.memory.schemas import (
     UserMemorySchema,
@@ -104,14 +104,25 @@ def get_mcp_server(
         sort_order: str = "desc",
     ):
         db = get_db(os.dbs, db_id)
-        sessions, _ = db.get_sessions(
-            session_type=SessionType.AGENT,
-            component_id=agent_id,
-            user_id=user_id,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            deserialize=False,
-        )
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            sessions = await db.get_sessions(
+                session_type=SessionType.AGENT,
+                component_id=agent_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
+        else:
+            sessions = db.get_sessions(
+                session_type=SessionType.AGENT,
+                component_id=agent_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
 
         return {
             "data": [SessionSchema.from_dict(session) for session in sessions],  # type: ignore
@@ -126,14 +137,25 @@ def get_mcp_server(
         sort_order: str = "desc",
     ):
         db = get_db(os.dbs, db_id)
-        sessions, _ = db.get_sessions(
-            session_type=SessionType.TEAM,
-            component_id=team_id,
-            user_id=user_id,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            deserialize=False,
-        )
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            sessions = await db.get_sessions(
+                session_type=SessionType.TEAM,
+                component_id=team_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
+        else:
+            sessions = db.get_sessions(
+                session_type=SessionType.TEAM,
+                component_id=team_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
 
         return {
             "data": [SessionSchema.from_dict(session) for session in sessions],  # type: ignore
@@ -148,14 +170,25 @@ def get_mcp_server(
         sort_order: str = "desc",
     ):
         db = get_db(os.dbs, db_id)
-        sessions, _ = db.get_sessions(
-            session_type=SessionType.WORKFLOW,
-            component_id=workflow_id,
-            user_id=user_id,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            deserialize=False,
-        )
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            sessions = await db.get_sessions(
+                session_type=SessionType.WORKFLOW,
+                component_id=workflow_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
+        else:
+            sessions = db.get_sessions(
+                session_type=SessionType.WORKFLOW,
+                component_id=workflow_id,
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
 
         return {
             "data": [SessionSchema.from_dict(session) for session in sessions],  # type: ignore
@@ -192,12 +225,21 @@ def get_mcp_server(
         db_id: Optional[str] = None,
     ):
         db = get_db(os.dbs, db_id)
-        user_memories, _ = db.get_user_memories(
-            user_id=user_id,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            deserialize=False,
-        )
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            user_memories = await db.get_user_memories(
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
+        else:
+            user_memories = db.get_user_memories(
+                user_id=user_id,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                deserialize=False,
+            )
         return {
             "data": [UserMemorySchema.from_dict(user_memory) for user_memory in user_memories],  # type: ignore
         }
@@ -210,14 +252,25 @@ def get_mcp_server(
         user_id: str,
     ) -> UserMemorySchema:
         db = get_db(os.dbs, db_id)
-        user_memory = db.upsert_user_memory(
-            memory=UserMemory(
-                memory_id=memory_id,
-                memory=memory,
-                user_id=user_id,
-            ),
-            deserialize=False,
-        )
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            user_memory = await db.upsert_user_memory(
+                memory=UserMemory(
+                    memory_id=memory_id,
+                    memory=memory,
+                    user_id=user_id,
+                ),
+                deserialize=False,
+            )
+        else:
+            user_memory = db.upsert_user_memory(
+                memory=UserMemory(
+                    memory_id=memory_id,
+                    memory=memory,
+                    user_id=user_id,
+                ),
+                deserialize=False,
+            )
         if not user_memory:
             raise Exception("Failed to update memory")
 
@@ -229,7 +282,11 @@ def get_mcp_server(
         memory_id: str,
     ) -> None:
         db = get_db(os.dbs, db_id)
-        db.delete_user_memory(memory_id=memory_id)
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            await db.delete_user_memory(memory_id=memory_id)
+        else:
+            db.delete_user_memory(memory_id=memory_id)
 
     mcp_app = mcp.http_app(path="/mcp")
     return mcp_app

agno/os/router.py

@@ -92,6 +92,14 @@ async def _get_request_kwargs(request: Request, endpoint_func: Callable) -> Dict
             kwargs.pop("dependencies")
             log_warning(f"Invalid dependencies parameter couldn't be loaded: {dependencies}")
 
+    if metadata := kwargs.get("metadata"):
+        try:
+            metadata_dict = json.loads(metadata)  # type: ignore
+            kwargs["metadata"] = metadata_dict
+        except json.JSONDecodeError:
+            kwargs.pop("metadata")
+            log_warning(f"Invalid metadata parameter couldn't be loaded: {metadata}")
+
     return kwargs
 
 
@@ -769,6 +777,11 @@ def get_base_router(
             if "dependencies" in kwargs:
                 log_warning("Dependencies parameter passed in both request state and kwargs, using request state")
             kwargs["dependencies"] = dependencies
+        if hasattr(request.state, "metadata"):
+            metadata = request.state.metadata
+            if "metadata" in kwargs:
+                log_warning("Metadata parameter passed in both request state and kwargs, using request state")
+            kwargs["metadata"] = metadata
 
         agent = get_agent_by_id(agent_id, os.agents)
         if agent is None:
@@ -1180,6 +1193,11 @@ def get_base_router(
             if "dependencies" in kwargs:
                 log_warning("Dependencies parameter passed in both request state and kwargs, using request state")
             kwargs["dependencies"] = dependencies
+        if hasattr(request.state, "metadata"):
+            metadata = request.state.metadata
+            if "metadata" in kwargs:
+                log_warning("Metadata parameter passed in both request state and kwargs, using request state")
+            kwargs["metadata"] = metadata
 
         logger.debug(f"Creating team run: {message=} {session_id=} {monitor=} {user_id=} {team_id=} {files=} {kwargs=}")
 
@@ -1626,6 +1644,11 @@ def get_base_router(
             if "dependencies" in kwargs:
                 log_warning("Dependencies parameter passed in both request state and kwargs, using request state")
             kwargs["dependencies"] = dependencies
+        if hasattr(request.state, "metadata"):
+            metadata = request.state.metadata
+            if "metadata" in kwargs:
+                log_warning("Metadata parameter passed in both request state and kwargs, using request state")
+            kwargs["metadata"] = metadata
 
         # Retrieve the workflow by ID
         workflow = get_workflow_by_id(workflow_id, os.workflows)

agno/os/routers/evals/evals.py

@@ -1,11 +1,11 @@
 import logging
 from copy import deepcopy
-from typing import List, Optional
+from typing import List, Optional, Union, cast
 
 from fastapi import APIRouter, Depends, HTTPException, Query
 
 from agno.agent.agent import Agent
-from agno.db.base import BaseDb
+from agno.db.base import AsyncBaseDb, BaseDb
 from agno.db.schemas.evals import EvalFilterType, EvalType
 from agno.models.utils import get_model
 from agno.os.auth import get_authentication_dependency
@@ -34,7 +34,7 @@ logger = logging.getLogger(__name__)
 
 
 def get_eval_router(
-    dbs: dict[str, BaseDb],
+    dbs: dict[str, Union[BaseDb, AsyncBaseDb]],
     agents: Optional[List[Agent]] = None,
     teams: Optional[List[Team]] = None,
     settings: AgnoAPISettings = AgnoAPISettings(),
@@ -55,7 +55,10 @@ def get_eval_router(
 
 
 def attach_routes(
-    router: APIRouter, dbs: dict[str, BaseDb], agents: Optional[List[Agent]] = None, teams: Optional[List[Team]] = None
+    router: APIRouter,
+    dbs: dict[str, Union[BaseDb, AsyncBaseDb]],
+    agents: Optional[List[Agent]] = None,
+    teams: Optional[List[Team]] = None,
 ) -> APIRouter:
     @router.get(
         "/eval-runs",
@@ -114,19 +117,36 @@ def attach_routes(
         db_id: Optional[str] = Query(default=None, description="The ID of the database to use"),
     ) -> PaginatedResponse[EvalSchema]:
         db = get_db(dbs, db_id)
-        eval_runs, total_count = db.get_eval_runs(
-            limit=limit,
-            page=page,
-            sort_by=sort_by,
-            sort_order=sort_order,
-            agent_id=agent_id,
-            team_id=team_id,
-            workflow_id=workflow_id,
-            model_id=model_id,
-            eval_type=eval_types,
-            filter_type=filter_type,
-            deserialize=False,
-        )
+
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            eval_runs, total_count = await db.get_eval_runs(
+                limit=limit,
+                page=page,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                agent_id=agent_id,
+                team_id=team_id,
+                workflow_id=workflow_id,
+                model_id=model_id,
+                eval_type=eval_types,
+                filter_type=filter_type,
+                deserialize=False,
+            )
+        else:
+            eval_runs, total_count = db.get_eval_runs(  # type: ignore
+                limit=limit,
+                page=page,
+                sort_by=sort_by,
+                sort_order=sort_order,
+                agent_id=agent_id,
+                team_id=team_id,
+                workflow_id=workflow_id,
+                model_id=model_id,
+                eval_type=eval_types,
+                filter_type=filter_type,
+                deserialize=False,
+            )
 
         return PaginatedResponse(
             data=[EvalSchema.from_dict(eval_run) for eval_run in eval_runs],  # type: ignore
@@ -180,7 +200,11 @@ def attach_routes(
         db_id: Optional[str] = Query(default=None, description="The ID of the database to use"),
     ) -> EvalSchema:
         db = get_db(dbs, db_id)
-        eval_run = db.get_eval_run(eval_run_id=eval_run_id, deserialize=False)
+        if isinstance(db, AsyncBaseDb):
+            db = cast(AsyncBaseDb, db)
+            eval_run = await db.get_eval_run(eval_run_id=eval_run_id, deserialize=False)
+        else:
+            eval_run = db.get_eval_run(eval_run_id=eval_run_id, deserialize=False)
         if not eval_run:
             raise HTTPException(status_code=404, detail=f"Eval run with id '{eval_run_id}' not found")
 
@@ -203,7 +227,11 @@ def attach_routes(
     ) -> None:
         try:
             db = get_db(dbs, db_id)
-            db.delete_eval_runs(eval_run_ids=request.eval_run_ids)
+            if isinstance(db, AsyncBaseDb):
+                db = cast(AsyncBaseDb, db)
+                await db.delete_eval_runs(eval_run_ids=request.eval_run_ids)
+            else:
+                db.delete_eval_runs(eval_run_ids=request.eval_run_ids)
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Failed to delete eval runs: {e}")
 
@@ -252,7 +280,11 @@ def attach_routes(
     ) -> EvalSchema:
         try:
             db = get_db(dbs, db_id)
-            eval_run = db.rename_eval_run(eval_run_id=eval_run_id, name=request.name, deserialize=False)
+            if isinstance(db, AsyncBaseDb):
+                db = cast(AsyncBaseDb, db)
+                eval_run = await db.rename_eval_run(eval_run_id=eval_run_id, name=request.name, deserialize=False)
+            else:
+                eval_run = db.rename_eval_run(eval_run_id=eval_run_id, name=request.name, deserialize=False)
         except Exception as e:
             raise HTTPException(status_code=500, detail=f"Failed to rename eval run: {e}")
 

agno/os/routers/evals/utils.py

@@ -1,9 +1,9 @@
-from typing import Optional
+from typing import Optional, Union
 
 from fastapi import HTTPException
 
 from agno.agent.agent import Agent
-from agno.db.base import BaseDb
+from agno.db.base import AsyncBaseDb, BaseDb
 from agno.eval.accuracy import AccuracyEval
 from agno.eval.performance import PerformanceEval
 from agno.eval.reliability import ReliabilityEval
@@ -14,7 +14,7 @@ from agno.team.team import Team
 
 async def run_accuracy_eval(
     eval_run_input: EvalRunInput,
-    db: BaseDb,
+    db: Union[BaseDb, AsyncBaseDb],
     agent: Optional[Agent] = None,
     team: Optional[Team] = None,
     default_model: Optional[Model] = None,
@@ -35,7 +35,7 @@ async def run_accuracy_eval(
         name=eval_run_input.name,
     )
 
-    result = await accuracy_eval.arun(print_results=False, print_summary=False)
+    result = accuracy_eval.run(print_results=False, print_summary=False)
     if not result:
         raise HTTPException(status_code=500, detail="Failed to run accuracy evaluation")
 
@@ -52,7 +52,7 @@ async def run_accuracy_eval(
 
 async def run_performance_eval(
     eval_run_input: EvalRunInput,
-    db: BaseDb,
+    db: Union[BaseDb, AsyncBaseDb],
     agent: Optional[Agent] = None,
     team: Optional[Team] = None,
     default_model: Optional[Model] = None,
@@ -60,16 +60,16 @@ async def run_performance_eval(
     """Run a performance evaluation for the given agent or team"""
     if agent:
 
-        async def run_component():  # type: ignore
-            return await agent.arun(eval_run_input.input)
+        def run_component():  # type: ignore
+            return agent.run(eval_run_input.input)
 
         model_id = agent.model.id if agent and agent.model else None
         model_provider = agent.model.provider if agent and agent.model else None
 
     elif team:
 
-        async def run_component():
-            return await team.arun(eval_run_input.input)
+        def run_component():
+            return team.run(eval_run_input.input)
 
         model_id = team.model.id if team and team.model else None
         model_provider = team.model.provider if team and team.model else None
@@ -85,7 +85,7 @@ async def run_performance_eval(
         model_id=model_id,
         model_provider=model_provider,
     )
-    result = await performance_eval.arun(print_results=False, print_summary=False)
+    result = performance_eval.run(print_results=False, print_summary=False)
     if not result:
         raise HTTPException(status_code=500, detail="Failed to run performance evaluation")
 
@@ -109,7 +109,7 @@ async def run_performance_eval(
 
 async def run_reliability_eval(
     eval_run_input: EvalRunInput,
-    db: BaseDb,
+    db: Union[BaseDb, AsyncBaseDb],
     agent: Optional[Agent] = None,
     team: Optional[Team] = None,
     default_model: Optional[Model] = None,
@@ -119,7 +119,7 @@ async def run_reliability_eval(
         raise HTTPException(status_code=400, detail="expected_tool_calls is required for reliability evaluations")
 
     if agent:
-        agent_response = await agent.arun(eval_run_input.input)
+        agent_response = agent.run(eval_run_input.input)
         reliability_eval = ReliabilityEval(
             db=db,
             name=eval_run_input.name,
@@ -130,7 +130,7 @@ async def run_reliability_eval(
         model_provider = agent.model.provider if agent and agent.model else None
 
     elif team:
-        team_response = await team.arun(eval_run_input.input)
+        team_response = team.run(eval_run_input.input)
         reliability_eval = ReliabilityEval(
             db=db,
             name=eval_run_input.name,
@@ -140,7 +140,7 @@ async def run_reliability_eval(
         model_id = team.model.id if team and team.model else None
         model_provider = team.model.provider if team and team.model else None
 
-    result = await reliability_eval.arun(print_results=False)
+    result = reliability_eval.run(print_results=False)
     if not result:
         raise HTTPException(status_code=500, detail="Failed to run reliability evaluation")