Update

agno-agi · Feb 7, 2025 · c2f0ac9 · c2f0ac9
1 parent e13f472
commit c2f0ac9
Show file tree

Hide file tree

Showing 15 changed files with 499 additions and 591 deletions.
diff --git a/cookbook/models/azure/openai/async/__init__.py b/cookbook/models/azure/openai/async/__init__.py
diff --git a/cookbook/models/azure/openai/async/basic.py → cookbook/models/azure/openai/async_basic.py b/cookbook/models/azure/openai/async/basic.py → cookbook/models/azure/openai/async_basic.py
diff --git a/...models/azure/openai/async/basic_stream.py → ...models/azure/openai/async_basic_stream.py b/...models/azure/openai/async/basic_stream.py → ...models/azure/openai/async_basic_stream.py
diff --git a/cookbook/models/openai/async_tool_use.py b/cookbook/models/openai/async_tool_use.py
@@ -0,0 +1,14 @@
+"""Run `pip install duckduckgo-search` to install dependencies."""
+
+import asyncio
+from agno.agent import Agent
+from agno.models.openai import OpenAIChat
+from agno.tools.duckduckgo import DuckDuckGoTools
+
+agent = Agent(
+    model=OpenAIChat(id="gpt-4o"),
+    tools=[DuckDuckGoTools()],
+    show_tool_calls=True,
+    markdown=True,
+)
+asyncio.run(agent.aprint_response("Whats happening in France?", stream=True))
diff --git a/libs/agno/agno/agent/agent.py b/libs/agno/agno/agent/agent.py
@@ -24,7 +24,7 @@
 from pydantic import BaseModel
 
 from agno.agent.metrics import SessionMetrics
-from agno.exceptions import AgentRunException, StopAgentRun
+from agno.exceptions import AgentRunException, ModelProviderError, StopAgentRun
 from agno.knowledge.agent import AgentKnowledge
 from agno.media import Audio, AudioArtifact, Image, ImageArtifact, Video, VideoArtifact
 from agno.memory.agent import AgentMemory, AgentRun
@@ -867,7 +867,7 @@ def run(
                             **kwargs,
                         )
                         return next(resp)
-            except Exception as e:
+            except ModelProviderError as e:
                 logger.warning(f"Attempt {attempt + 1}/{num_attempts} failed: {str(e)}")
                 if isinstance(e, StopAgentRun):
                     raise e
@@ -1267,7 +1267,7 @@ async def arun(
                             **kwargs,
                         )
                         return await resp.__anext__()
-            except Exception as e:
+            except ModelProviderError as e:
                 logger.warning(f"Attempt {attempt + 1}/{num_attempts} failed: {str(e)}")
                 if isinstance(e, StopAgentRun):
                     raise e

diff --git a/libs/agno/agno/exceptions.py b/libs/agno/agno/exceptions.py
@@ -36,3 +36,11 @@ def __init__(
         super().__init__(
             exc, user_message=user_message, agent_message=agent_message, messages=messages, stop_execution=True
         )
+
+class ModelProviderError(Exception):
+    """Exception raised when a model provider returns an error."""
+
+    def __init__(self, exc, model_name: str, model_id: str):
+        super().__init__(exc)
+        self.model_name = model_name
+        self.model_id = model_id
diff --git a/libs/agno/agno/models/anthropic/claude.py b/libs/agno/agno/models/anthropic/claude.py
@@ -3,6 +3,7 @@
 from os import getenv
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
+from agno.exceptions import ModelProviderError
 from agno.media import Image
 from agno.models.base import Model
 from agno.models.message import Message
@@ -309,16 +310,16 @@ def invoke(self, messages: List[Message]) -> AnthropicMessage:
             )
         except APIConnectionError as e:
             logger.error(f"Connection error while calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except RateLimitError as e:
             logger.warning(f"Rate limit exceeded: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except APIStatusError as e:
             logger.error(f"Claude API error (status {e.status_code}): {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except Exception as e:
             logger.error(f"Unexpected error calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
 
     def invoke_stream(self, messages: List[Message]) -> Any:
         """
@@ -341,16 +342,16 @@ def invoke_stream(self, messages: List[Message]) -> Any:
             ).__enter__()
         except APIConnectionError as e:
             logger.error(f"Connection error while calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except RateLimitError as e:
             logger.warning(f"Rate limit exceeded: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except APIStatusError as e:
             logger.error(f"Claude API error (status {e.status_code}): {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except Exception as e:
             logger.error(f"Unexpected error calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
 
     async def ainvoke(self, messages: List[Message]) -> AnthropicMessage:
         """
@@ -378,16 +379,16 @@ async def ainvoke(self, messages: List[Message]) -> AnthropicMessage:
             )
         except APIConnectionError as e:
             logger.error(f"Connection error while calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except RateLimitError as e:
             logger.warning(f"Rate limit exceeded: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except APIStatusError as e:
             logger.error(f"Claude API error (status {e.status_code}): {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except Exception as e:
             logger.error(f"Unexpected error calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
 
     async def ainvoke_stream(self, messages: List[Message]) -> Any:
         """
@@ -410,16 +411,16 @@ async def ainvoke_stream(self, messages: List[Message]) -> Any:
             ).__aenter__()
         except APIConnectionError as e:
             logger.error(f"Connection error while calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except RateLimitError as e:
             logger.warning(f"Rate limit exceeded: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except APIStatusError as e:
             logger.error(f"Claude API error (status {e.status_code}): {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
         except Exception as e:
             logger.error(f"Unexpected error calling Claude API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
 
     # Overwrite the default from the base model
     def format_function_call_results(

diff --git a/libs/agno/agno/models/aws/bedrock.py b/libs/agno/agno/models/aws/bedrock.py
@@ -3,6 +3,7 @@
 from typing import Any, Dict, Iterator, List, Optional
 
 from agno.aws.api_client import AwsApiClient  # type: ignore
+from agno.exceptions import ModelProviderError
 from agno.models.base import Model
 from agno.models.message import Message
 from agno.models.response import ProviderResponse
@@ -92,7 +93,7 @@ def invoke(self, messages: List[Message]) -> Dict[str, Any]:
             return self.get_client().converse(**body)
         except Exception as e:
             logger.error(f"Unexpected error calling Bedrock API: {str(e)}")
-            raise
+            raise ModelProviderError(e, self.name, self.id) from e
 
     def invoke_stream(self, messages: List[Message]) -> Iterator[Dict[str, Any]]:
         """
@@ -105,11 +106,15 @@ def invoke_stream(self, messages: List[Message]) -> Iterator[Dict[str, Any]]:
             Iterator[Dict[str, Any]]: The streamed response.
         """
         body = self.format_messages(messages)
-        response = self.get_client().converse_stream(**body)
-        stream = response.get("stream")
-        if stream:
-            for event in stream:
-                yield event
+        try:
+            response = self.get_client().converse_stream(**body)
+            stream = response.get("stream")
+            if stream:
+                for event in stream:
+                    yield event
+        except Exception as e:
+            logger.error(f"Unexpected error calling Bedrock API: {str(e)}")
+            raise ModelProviderError(e, self.name, self.id) from e
 
     @abstractmethod
     def format_messages(self, messages: List[Message]) -> Dict[str, Any]: