agno 2.3.8__py3-none-any.whl → 2.3.10__py3-none-any.whl

agno/tools/spotify.py

@@ -13,14 +13,11 @@ Required scopes:
 import json
 from typing import Any, List, Optional
 
+import httpx
+
 from agno.tools import Toolkit
 from agno.utils.log import log_debug
 
-try:
-    import httpx
-except ImportError:
-    raise ImportError("`httpx` not installed. Please install using `pip install httpx`")
-
 
 class SpotifyTools(Toolkit):
     """

agno/utils/hooks.py

@@ -1,5 +1,8 @@
 from copy import deepcopy
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union
+
+if TYPE_CHECKING:
+    from agno.eval.base import BaseEval
 
 from agno.guardrails.base import BaseGuardrail
 from agno.hooks.decorator import HOOK_RUN_IN_BACKGROUND_ATTR
@@ -53,16 +56,17 @@ def should_run_hook_in_background(hook: Callable[..., Any]) -> bool:
     return getattr(hook, HOOK_RUN_IN_BACKGROUND_ATTR, False)
 
 
-def normalize_hooks(
-    hooks: Optional[List[Union[Callable[..., Any], BaseGuardrail]]],
+def normalize_pre_hooks(
+    hooks: Optional[List[Union[Callable[..., Any], BaseGuardrail, "BaseEval"]]],
     async_mode: bool = False,
 ) -> Optional[List[Callable[..., Any]]]:
-    """Normalize hooks to a list format
+    """Normalize pre-hooks to a list format.
 
     Args:
-        hooks: List of hook functions or hook instances
+        hooks: List of hook functions, guardrails, or eval instances
         async_mode: Whether to use async versions of methods
     """
+    from agno.eval.base import BaseEval
 
     result_hooks: List[Callable[..., Any]] = []
 
@@ -73,6 +77,61 @@ def normalize_hooks(
                     result_hooks.append(hook.async_check)
                 else:
                     result_hooks.append(hook.check)
+            elif isinstance(hook, BaseEval):
+                # Extract pre_check method
+                method = hook.async_pre_check if async_mode else hook.pre_check
+
+                from functools import partial
+
+                wrapped = partial(method)
+                wrapped.__name__ = method.__name__  # type: ignore
+                setattr(wrapped, HOOK_RUN_IN_BACKGROUND_ATTR, getattr(hook, "run_in_background", False))
+                result_hooks.append(wrapped)
+            else:
+                # Check if the hook is async and used within sync methods
+                if not async_mode:
+                    import asyncio
+
+                    if asyncio.iscoroutinefunction(hook):
+                        raise ValueError(
+                            f"Cannot use {hook.__name__} (an async hook) with `run()`. Use `arun()` instead."
+                        )
+
+                result_hooks.append(hook)
+    return result_hooks if result_hooks else None
+
+
+def normalize_post_hooks(
+    hooks: Optional[List[Union[Callable[..., Any], BaseGuardrail, "BaseEval"]]],
+    async_mode: bool = False,
+) -> Optional[List[Callable[..., Any]]]:
+    """Normalize post-hooks to a list format.
+
+    Args:
+        hooks: List of hook functions, guardrails, or eval instances
+        async_mode: Whether to use async versions of methods
+    """
+    from agno.eval.base import BaseEval
+
+    result_hooks: List[Callable[..., Any]] = []
+
+    if hooks is not None:
+        for hook in hooks:
+            if isinstance(hook, BaseGuardrail):
+                if async_mode:
+                    result_hooks.append(hook.async_check)
+                else:
+                    result_hooks.append(hook.check)
+            elif isinstance(hook, BaseEval):
+                # Extract post_check method
+                method = hook.async_post_check if async_mode else hook.post_check  # type: ignore[assignment]
+
+                from functools import partial
+
+                wrapped = partial(method)
+                wrapped.__name__ = method.__name__  # type: ignore
+                setattr(wrapped, HOOK_RUN_IN_BACKGROUND_ATTR, getattr(hook, "run_in_background", False))
+                result_hooks.append(wrapped)
             else:
                 # Check if the hook is async and used within sync methods
                 if not async_mode:

agno/utils/http.py

@@ -140,7 +140,7 @@ def fetch_with_retry(
                 logger.error(f"Failed to fetch {url} after {max_retries} attempts: {e}")
                 raise
             wait_time = backoff_factor**attempt
-            logger.warning(f"Request failed (attempt {attempt + 1}), retrying in {wait_time} seconds...")
+            logger.warning("Connection error.")
             sleep(wait_time)
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error for {url}: {e.response.status_code} - {e.response.text}")
@@ -176,7 +176,7 @@ async def async_fetch_with_retry(
                 logger.error(f"Failed to fetch {url} after {max_retries} attempts: {e}")
                 raise
             wait_time = backoff_factor**attempt
-            logger.warning(f"Request failed (attempt {attempt + 1}), retrying in {wait_time} seconds...")
+            logger.warning("Connection error.")
             await asyncio.sleep(wait_time)
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error for {url}: {e.response.status_code} - {e.response.text}")

agno/utils/media.py

@@ -291,7 +291,7 @@ def reconstruct_file_from_dict(file_data):
         if isinstance(file_data, dict):
             # If content is base64 string, decode it back to bytes
             if "content" in file_data and isinstance(file_data["content"], str):
-                return File.from_base64(
+                file_obj = File.from_base64(
                     file_data["content"],
                     id=file_data.get("id"),
                     mime_type=file_data.get("mime_type"),
@@ -299,6 +299,16 @@ def reconstruct_file_from_dict(file_data):
                     name=file_data.get("name"),
                     format=file_data.get("format"),
                 )
+                # Preserve additional fields that from_base64 doesn't handle
+                if file_data.get("size") is not None:
+                    file_obj.size = file_data.get("size")
+                if file_data.get("file_type") is not None:
+                    file_obj.file_type = file_data.get("file_type")
+                if file_data.get("filepath") is not None:
+                    file_obj.filepath = file_data.get("filepath")
+                if file_data.get("url") is not None:
+                    file_obj.url = file_data.get("url")
+                return file_obj
             else:
                 # Regular file (filepath/url)
                 return File(**file_data)

agno/utils/print_response/agent.py

@@ -31,6 +31,7 @@ def print_response_stream(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -86,6 +87,7 @@ def print_response_stream(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             audio=audio,
             images=images,
             videos=videos,
@@ -222,6 +224,7 @@ async def aprint_response_stream(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -275,6 +278,7 @@ async def aprint_response_stream(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             audio=audio,
             images=images,
             videos=videos,
@@ -512,6 +516,7 @@ def print_response(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -571,6 +576,7 @@ def print_response(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             audio=audio,
             images=images,
             videos=videos,
@@ -645,6 +651,7 @@ async def aprint_response(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -704,6 +711,7 @@ async def aprint_response(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             audio=audio,
             images=images,
             videos=videos,

agno/utils/print_response/team.py

@@ -30,6 +30,7 @@ def print_response(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -81,6 +82,7 @@ def print_response(
         # Run the agent
         run_response: TeamRunOutput = team.run(  # type: ignore
             input=input,
+            run_id=run_id,
             images=images,
             audio=audio,
             videos=videos,
@@ -339,6 +341,7 @@ def print_response_stream(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -417,6 +420,7 @@ def print_response_stream(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             knowledge_filters=knowledge_filters,
             add_history_to_context=add_history_to_context,
             dependencies=dependencies,
@@ -893,6 +897,7 @@ async def aprint_response(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -944,6 +949,7 @@ async def aprint_response(
         # Run the agent
         run_response: TeamRunOutput = await team.arun(  # type: ignore
             input=input,
+            run_id=run_id,
             images=images,
             audio=audio,
             videos=videos,
@@ -1200,6 +1206,7 @@ async def aprint_response_stream(
     session_id: Optional[str] = None,
     session_state: Optional[Dict[str, Any]] = None,
     user_id: Optional[str] = None,
+    run_id: Optional[str] = None,
     audio: Optional[Sequence[Audio]] = None,
     images: Optional[Sequence[Image]] = None,
     videos: Optional[Sequence[Video]] = None,
@@ -1288,6 +1295,7 @@ async def aprint_response_stream(
             session_id=session_id,
             session_state=session_state,
             user_id=user_id,
+            run_id=run_id,
             knowledge_filters=knowledge_filters,
             add_history_to_context=add_history_to_context,
             add_dependencies_to_context=add_dependencies_to_context,