agno 1.8.2__py3-none-any.whl → 1.8.4__py3-none-any.whl

agno/models/anthropic/claude.py

@@ -380,26 +380,6 @@ class Claude(Model):
             log_error(f"Unexpected error calling Claude API: {str(e)}")
             raise ModelProviderError(message=str(e), model_name=self.name, model_id=self.id) from e
 
-    def format_function_call_results(self, messages: List[Message], function_call_results: List[Message]) -> None:
-        """
-        Handle the results of function calls.
-
-        Args:
-            messages (List[Message]): The list of conversation messages.
-            function_call_results (List[Message]): The results of the function calls.
-        """
-        if len(function_call_results) > 0:
-            fc_responses: List = []
-            for _fc_message in function_call_results:
-                fc_responses.append(
-                    {
-                        "type": "tool_result",
-                        "tool_use_id": _fc_message.tool_call_id,
-                        "content": str(_fc_message.content),
-                    }
-                )
-            messages.append(Message(role="user", content=fc_responses))
-
     def get_system_message_for_model(self, tools: Optional[List[Any]] = None) -> Optional[str]:
         if tools is not None and len(tools) > 0:
             tool_call_prompt = "Do not reflect on the quality of the returned search results in your response\n\n"

agno/models/aws/claude.py

@@ -8,7 +8,7 @@ from agno.exceptions import ModelProviderError, ModelRateLimitError
 from agno.models.anthropic import Claude as AnthropicClaude
 from agno.models.message import Message
 from agno.utils.log import log_debug, log_error, log_warning
-from agno.utils.models.aws_claude import format_messages
+from agno.utils.models.claude import format_messages
 
 try:
     from anthropic import AnthropicBedrock, APIConnectionError, APIStatusError, AsyncAnthropicBedrock, RateLimitError

agno/utils/models/claude.py

@@ -69,11 +69,11 @@ def _format_image_for_message(image: Image) -> Optional[Dict[str, Any]]:
     try:
         # Case 0: Image is an Anthropic uploaded file
         if image.content is not None and hasattr(image.content, "id"):
-            return {"type": "image", "source": {"type": "file", "file_id": image.content.id}}
+            content_bytes = image.content
 
         # Case 1: Image is a URL
         if image.url is not None:
-            return {"type": "image", "source": {"type": "url", "url": image.url}}
+            content_bytes = image.image_url_content
 
         # Case 2: Image is a local file path
         elif image.filepath is not None:
@@ -277,6 +277,16 @@ def format_messages(messages: List[Message]) -> Tuple[List[Dict[str, str]], str]
                             type="tool_use",
                         )
                     )
+                    
+        elif message.role == "tool":
+            content = []
+            content.append(
+                {
+                    "type": "tool_result",
+                    "tool_use_id": message.tool_call_id,
+                    "content": str(message.content),
+                }
+            )
 
         # Skip empty assistant responses
         if message.role == "assistant" and not content:

{agno-1.8.2.dist-info → agno-1.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agno
-Version: 1.8.2
+Version: 1.8.4
 Summary: Agno: a lightweight library for building Multi-Agent Systems
 Author-email: Ashpreet Bedi <ashpreet@agno.com>
 License: Copyright (c) Agno, Inc.

{agno-1.8.2.dist-info → agno-1.8.4.dist-info}/RECORD

@@ -202,10 +202,10 @@ agno/models/response.py,sha256=iXUlBCM9FWZVRLygSQH8G-vhgKttQazLBa7L_NxgEjg,3771
 agno/models/aimlapi/__init__.py,sha256=ulPl-IAEcXvr83AXoCuZmOnoSZ0v47ZGTgEHSzUD2KM,78
 agno/models/aimlapi/aimlapi.py,sha256=o5pu9ypreAK-IkPAosHbLpAvbxu9u3jxBsgYPtS9bzo,1455
 agno/models/anthropic/__init__.py,sha256=nbReX3p17JCwfrMDR9hR7-OaEFZm80I7dng93dl-Fhw,77
-agno/models/anthropic/claude.py,sha256=QLrmI1dyjMah3y0MJMAvZ2MRmnOsboSHihoXxA6v1AM,24669
+agno/models/anthropic/claude.py,sha256=-R9MzNC9zZEgtXk75huDD0PbUiSlpA3b1uF6tG3WucI,23832
 agno/models/aws/__init__.py,sha256=TbcwQwv9A7KjqBM5RQBR8x46GvyyCxbBCjwkpjfVGKE,352
 agno/models/aws/bedrock.py,sha256=Yx09syx1Kv8awfHuy7jj_EK_gs-n6D2an3RUVRO2K2s,35123
-agno/models/aws/claude.py,sha256=3B-ghgJT-yhM8xJSspSFoSna7dpr10STA4Br4A7lzvc,13111
+agno/models/aws/claude.py,sha256=0E4PMfpiDcz9gmMTnmbieh14stzKo54axPTpYiqKVsk,13107
 agno/models/azure/__init__.py,sha256=EoFdJHjayvmv_VOmaW9cJguwA1K5OFS_nFeazyn0B2w,605
 agno/models/azure/ai_foundry.py,sha256=Fkn-BBPPUbw3vauiqqhSq4XQGMSq0TXBzshWCQIEuqg,16854
 agno/models/azure/openai_chat.py,sha256=RYHmcHA7cn79_U6GTjNP5vYiYET6IfPgUp6XZ2WEiyQ,4423
@@ -495,8 +495,7 @@ agno/utils/whatsapp.py,sha256=242VwGOdbgkxVeIj4D899mpT3GnG_IpcaKnd5qebhTA,9936
 agno/utils/yaml_io.py,sha256=cwTqCE-eBGoi87KLDcwB6iyWe0NcvEmadQjWL1cQ7jE,860
 agno/utils/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agno/utils/models/ai_foundry.py,sha256=PmhETWhdqZCq8NbDe-MdZVuRXx6DbVOePCyPFiPLceo,1511
-agno/utils/models/aws_claude.py,sha256=UayU7E4PK-GCm1zEdD31iM8pSbPGtIGlPkrbaFRA34Q,5662
-agno/utils/models/claude.py,sha256=CQ36iQda9UOjAeou8q7U4FtVY6UFj13pvRyO0sIHlh8,11285
+agno/utils/models/claude.py,sha256=AYdFvQ8HjuYs7Pbs6CWqJWkfnRKEo0mu8Wu5InLom30,11517
 agno/utils/models/cohere.py,sha256=SuZyupN1clBNMaSkHDQXWcTpY96rcF5EhMK5gpQAi94,3248
 agno/utils/models/llama.py,sha256=Z5fdOFUFnov1JgUDcP6ICK3M7o64UB1fkcwAs2XaZkM,2515
 agno/utils/models/mistral.py,sha256=v-ERNweHjmobUv5LOpB7XDxGZotXgGTC_hIFBJD1k3E,4013
@@ -558,9 +557,9 @@ agno/workspace/enums.py,sha256=MxF1CUMXBaZMTKLEfiR-7kEhTki2Gfz6W7u49RdYYaE,123
 agno/workspace/helpers.py,sha256=Mp-VlRsPVhW10CfDWYVhc9ANLk9RjNurDfCgXmycZCg,2066
 agno/workspace/operator.py,sha256=CNLwVR45eE5dSRjto2o0c9NgCi2xD-JZR5uLt9kfIt8,30758
 agno/workspace/settings.py,sha256=bcyHHN7lH1LPSMt4i_20XpTjZLoNXdzwyW-G9nHYV40,5703
-agno-1.8.2.dist-info/licenses/LICENSE,sha256=m2rfTWFUfIwCaQqgT2WeBjuKzMKEJRwnaiofg9n8MsQ,16751
-agno-1.8.2.dist-info/METADATA,sha256=vlStPRB06iknugb3p8fape5PRLcWQRybNm2L4Upa92E,44612
-agno-1.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agno-1.8.2.dist-info/entry_points.txt,sha256=Be-iPnPVabMohESsuUdV5w6IAYEIlpc2emJZbyNnfGI,88
-agno-1.8.2.dist-info/top_level.txt,sha256=MKyeuVesTyOKIXUhc-d_tPa2Hrh0oTA4LM0izowpx70,5
-agno-1.8.2.dist-info/RECORD,,
+agno-1.8.4.dist-info/licenses/LICENSE,sha256=m2rfTWFUfIwCaQqgT2WeBjuKzMKEJRwnaiofg9n8MsQ,16751
+agno-1.8.4.dist-info/METADATA,sha256=lGfIekKYNNmsPDU6iDcqe8ZGPp10TUNbui8LCxT_Y8o,44612
+agno-1.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agno-1.8.4.dist-info/entry_points.txt,sha256=Be-iPnPVabMohESsuUdV5w6IAYEIlpc2emJZbyNnfGI,88
+agno-1.8.4.dist-info/top_level.txt,sha256=MKyeuVesTyOKIXUhc-d_tPa2Hrh0oTA4LM0izowpx70,5
+agno-1.8.4.dist-info/RECORD,,

agno/utils/models/aws_claude.py

@@ -1,170 +0,0 @@
-import json
-from typing import Any, Dict, List, Optional, Tuple
-
-from agno.media import Image
-from agno.models.message import Message
-from agno.utils.log import log_error, log_warning
-
-try:
-    from anthropic.types import (
-        TextBlock,
-        ToolUseBlock,
-    )
-except ImportError:
-    log_error("`anthropic[bedrock]` not installed. Please install it via `pip install anthropic[bedrock]`.")
-    raise
-
-ROLE_MAP = {
-    "system": "system",
-    "user": "user",
-    "assistant": "assistant",
-    "tool": "user",
-}
-
-
-def _format_image_for_message(image: Image) -> Optional[Dict[str, Any]]:
-    """
-    Add an image to a message by converting it to base64 encoded format.
-    """
-    using_filetype = False
-
-    import base64
-
-    # 'imghdr' was deprecated in Python 3.11: https://docs.python.org/3/library/imghdr.html
-    # 'filetype' used as a fallback
-    try:
-        import imghdr
-    except (ModuleNotFoundError, ImportError):
-        try:
-            import filetype
-
-            using_filetype = True
-        except (ModuleNotFoundError, ImportError):
-            raise ImportError("`filetype` not installed. Please install using `pip install filetype`")
-
-    type_mapping = {
-        "jpeg": "image/jpeg",
-        "jpg": "image/jpeg",
-        "png": "image/png",
-        "gif": "image/gif",
-        "webp": "image/webp",
-    }
-
-    try:
-        # Case 1: Image is a URL
-        if image.url is not None:
-            content_bytes = image.image_url_content
-
-        # Case 2: Image is a local file path
-        elif image.filepath is not None:
-            from pathlib import Path
-
-            path = Path(image.filepath) if isinstance(image.filepath, str) else image.filepath
-            if path.exists() and path.is_file():
-                with open(image.filepath, "rb") as f:
-                    content_bytes = f.read()
-            else:
-                log_error(f"Image file not found: {image}")
-                return None
-
-        # Case 3: Image is a bytes object
-        elif image.content is not None:
-            content_bytes = image.content
-
-        else:
-            log_error(f"Unsupported image type: {type(image)}")
-            return None
-
-        if using_filetype:
-            kind = filetype.guess(content_bytes)
-            if not kind:
-                log_error("Unable to determine image type")
-                return None
-
-            img_type = kind.extension
-        else:
-            img_type = imghdr.what(None, h=content_bytes)  # type: ignore
-
-        if not img_type:
-            log_error("Unable to determine image type")
-            return None
-
-        media_type = type_mapping.get(img_type)
-        if not media_type:
-            log_error(f"Unsupported image type: {img_type}")
-            return None
-
-        return {
-            "type": "image",
-            "source": {
-                "type": "base64",
-                "media_type": media_type,
-                "data": base64.b64encode(content_bytes).decode("utf-8"),  # type: ignore
-            },
-        }
-
-    except Exception as e:
-        log_error(f"Error processing image: {e}")
-        return None
-
-
-def format_messages(messages: List[Message]) -> Tuple[List[Dict[str, str]], str]:
-    """
-    Process the list of messages and separate them into API messages and system messages.
-
-    Args:
-        messages (List[Message]): The list of messages to process.
-
-    Returns:
-        Tuple[List[Dict[str, str]], str]: A tuple containing the list of API messages and the concatenated system messages.
-    """
-
-    chat_messages: List[Dict[str, str]] = []
-    system_messages: List[str] = []
-
-    for message in messages:
-        content = message.content or ""
-        if message.role == "system":
-            if content is not None:
-                system_messages.append(content)  # type: ignore
-            continue
-        elif message.role == "user":
-            if isinstance(content, str):
-                content = [{"type": "text", "text": content}]
-
-            if message.images is not None:
-                for image in message.images:
-                    image_content = _format_image_for_message(image)
-                    if image_content:
-                        content.append(image_content)
-
-            if message.files is not None and len(message.files) > 0:
-                log_warning("Files are not supported for AWS Bedrock Claude")
-
-            if message.audio is not None and len(message.audio) > 0:
-                log_warning("Audio is not supported for AWS Bedrock Claude")
-
-            if message.videos is not None and len(message.videos) > 0:
-                log_warning("Video is not supported for AWS Bedrock Claude")
-
-        # Handle tool calls from history
-        elif message.role == "assistant":
-            content = []
-
-            if isinstance(message.content, str) and message.content and len(message.content.strip()) > 0:
-                content.append(TextBlock(text=message.content, type="text"))
-
-            if message.tool_calls:
-                for tool_call in message.tool_calls:
-                    content.append(
-                        ToolUseBlock(
-                            id=tool_call["id"],
-                            input=json.loads(tool_call["function"]["arguments"])
-                            if "arguments" in tool_call["function"]
-                            else {},
-                            name=tool_call["function"]["name"],
-                            type="tool_use",
-                        )
-                    )
-        chat_messages.append({"role": ROLE_MAP[message.role], "content": content})  # type: ignore
-    return chat_messages, " ".join(system_messages)