Merge branch 'main' into blog-to-podcast

.gitignore

@@ -15,6 +15,7 @@
 # Machine specific
 .idea
 .vscode
+*.code-workspace
 
 # Ignore .env files
 .env

cookbook/agent_concepts/async/basic.py

@@ -10,4 +10,4 @@
     markdown=True,
 )
 # -*- Print a response to the cli
-asyncio.run(agent.aprint_response("Share a breakfast recipe.", stream=True))
+asyncio.run(agent.aprint_response("Share a breakfast recipe."))

cookbook/agent_concepts/async/basic_stream.py

@@ -0,0 +1,13 @@
+import asyncio
+
+from agno.agent import Agent
+from agno.models.openai import OpenAIChat
+
+agent = Agent(
+    model=OpenAIChat(id="gpt-4o"),
+    description="You help people with their health and fitness goals.",
+    instructions=["Recipes should be under 5 ingredients"],
+    markdown=True,
+)
+# -*- Print a response to the cli
+asyncio.run(agent.aprint_response("Share a breakfast recipe.", stream=True))

cookbook/agent_concepts/async/data_analyst.py

@@ -25,6 +25,4 @@
     - movies: contains information about movies from IMDB.
     """),
 )
-asyncio.run(
-    agent.aprint_response("What is the average rating of movies?", stream=False)
-)
+asyncio.run(agent.aprint_response("What is the average rating of movies?"))

cookbook/agent_concepts/other/agent_metrics.py

@@ -33,3 +33,6 @@
 # Print the metrics
 print("---" * 5, "Aggregated Metrics", "---" * 5)
 pprint(agent.run_response.metrics)
+# Print the session metrics
+print("---" * 5, "Session Metrics", "---" * 5)
+pprint(agent.session_metrics)

cookbook/examples/apps/agentic_rag/utils.py

@@ -2,7 +2,7 @@
 
 import streamlit as st
 from agentic_rag import get_agentic_rag_agent
-from agno.agent.agent import Agent
+from agno.agent import Agent
 from agno.utils.log import logger
 
 

cookbook/models/anthropic/async/basic.py → cookbook/models/anthropic/async_basic.py

@@ -4,7 +4,7 @@
 
 import asyncio
 
-from agno.agent.agent import Agent
+from agno.agent import Agent
 from agno.models.anthropic import Claude
 
 agent = Agent(

cookbook/models/anthropic/async/basic_stream.py → cookbook/models/anthropic/async_basic_stream.py

@@ -4,7 +4,7 @@
 
 import asyncio
 
-from agno.agent.agent import Agent
+from agno.agent import Agent
 from agno.models.anthropic import Claude
 
 agent = Agent(

cookbook/models/anthropic/async/tool_use.py → cookbook/models/anthropic/async_tool_use.py

@@ -4,7 +4,7 @@
 
 import asyncio
 
-from agno.agent.agent import Agent
+from agno.agent import Agent
 from agno.models.anthropic import Claude
 from agno.tools.duckduckgo import DuckDuckGoTools
 

cookbook/models/anthropic/tool_use.py

@@ -10,4 +10,4 @@
     show_tool_calls=True,
     markdown=True,
 )
-agent.print_response("Whats happening in France?", stream=True)
+agent.print_response("Whats happening in France?")

cookbook/models/anthropic/tool_use_stream.py

@@ -0,0 +1,13 @@
+"""Run `pip install duckduckgo-search` to install dependencies."""
+
+from agno.agent import Agent
+from agno.models.anthropic import Claude
+from agno.tools.duckduckgo import DuckDuckGoTools
+
+agent = Agent(
+    model=Claude(id="claude-3-5-sonnet-20240620"),
+    tools=[DuckDuckGoTools()],
+    show_tool_calls=True,
+    markdown=True,
+)
+agent.print_response("Whats happening in France?", stream=True)

cookbook/models/aws/.gitignore

@@ -0,0 +1,6 @@
+*.jpg
+*.png
+*.mp3
+*.wav
+*.mp4
+*.mp3

cookbook/models/aws/bedrock_claude/README.md → cookbook/models/aws/bedrock/README.md

@@ -16,51 +16,51 @@ source ~/.venvs/aienv/bin/activate
 ```shell
 export AWS_ACCESS_KEY_ID=***
 export AWS_SECRET_ACCESS_KEY=***
-export AWS_DEFAULT_REGION=***
+export AWS_REGION=***
 ```
 
 ### 3. Install libraries
 
 ```shell
-pip install -U boto3 duckduckgo-search duckdb yfinance agno
+pip install -U boto3 duckduckgo-search agno
 ```
 
 ### 4. Run basic agent
 
 - Streaming on
 
 ```shell
-python cookbook/models/aws/bedrock_claude/basic_stream.py
+python cookbook/models/aws/bedrock/basic_stream.py
 ```
 
 - Streaming off
 
 ```shell
-python cookbook/models/aws/bedrock_claude/basic.py
+python cookbook/models/aws/bedrock/basic.py
 ```
 
 ### 5. Run Agent with Tools
 
 - DuckDuckGo Search
 
 ```shell
-python cookbook/models/aws/bedrock_claude/tool_use.py
+python cookbook/models/aws/bedrock/tool_use.py
 ```
 
 ### 6. Run Agent that returns structured output
 
 ```shell
-python cookbook/models/aws/bedrock_claude/structured_output.py
+python cookbook/models/aws/bedrock/structured_output.py
 ```
 
 ### 7. Run Agent that uses storage
 
 ```shell
-python cookbook/models/aws/bedrock_claude/storage.py
+python cookbook/models/aws/bedrock/storage.py
 ```
 
 ### 8. Run Agent that uses knowledge
 
 ```shell
-python cookbook/models/aws/bedrock_claude/knowledge.py
+python cookbook/models/aws/bedrock/knowledge.py
 ```

cookbook/models/google/gemini_openai/basic.py → cookbook/models/aws/bedrock/basic.py

@@ -1,7 +1,7 @@
 from agno.agent import Agent, RunResponse  # noqa
-from agno.models.google import GeminiOpenAI
+from agno.models.aws import AwsBedrock
 
-agent = Agent(model=GeminiOpenAI(id="gemini-2.0-flash-exp"), markdown=True)
+agent = Agent(model=AwsBedrock(id="mistral.mistral-small-2402-v1:0"), markdown=True)
 
 # Get the response in a variable
 # run: RunResponse = agent.run("Share a 2 sentence horror story")

cookbook/models/ollama_hermes/basic_stream.py → cookbook/models/aws/bedrock/basic_stream.py

@@ -1,8 +1,8 @@
 from typing import Iterator  # noqa
 from agno.agent import Agent, RunResponse  # noqa
-from agno.models.ollama import OllamaHermes
+from agno.models.aws import AwsBedrock
 
-agent = Agent(model=OllamaHermes(id="hermes3"), markdown=True)
+agent = Agent(model=AwsBedrock(id="mistral.mistral-small-2402-v1:0"), markdown=True)
 
 # Get the response in a variable
 # run_response: Iterator[RunResponse] = agent.run("Share a 2 sentence horror story", stream=True)

cookbook/models/aws/bedrock/image_agent_bytes.py

@@ -0,0 +1,25 @@
+from pathlib import Path
+
+from agno.agent import Agent
+from agno.media import Image
+from agno.models.aws import AwsBedrock
+from agno.tools.duckduckgo import DuckDuckGoTools
+
+agent = Agent(
+    model=AwsBedrock(id="amazon.nova-pro-v1:0"),
+    tools=[DuckDuckGoTools()],
+    markdown=True,
+)
+
+image_path = Path(__file__).parent.joinpath("sample.jpg")
+
+# Read the image file content as bytes
+with open(image_path, "rb") as img_file:
+    image_bytes = img_file.read()
+
+agent.print_response(
+    "Tell me about this image and give me the latest news about it.",
+    images=[
+        Image(content=image_bytes, format="jpeg"),
+    ],
+)

cookbook/models/vertexai/structured_output.py → cookbook/models/aws/bedrock/structured_output.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from agno.agent import Agent, RunResponse  # noqa
-from agno.models.vertexai import Gemini
+from agno.models.aws import AwsBedrock
 from pydantic import BaseModel, Field
 from rich.pretty import pprint  # noqa
 
@@ -26,13 +26,13 @@ class MovieScript(BaseModel):
 
 
 movie_agent = Agent(
-    model=Gemini(id="gemini-2.0-flash-exp"),
+    model=AwsBedrock(id="mistral.mistral-large-2402-v1:0"),
     description="You help people write movie scripts.",
     response_model=MovieScript,
 )
 
 # Get the response in a variable
-# run: RunResponse = movie_agent.run("New York")
-# pprint(run.content)
+# movie_agent: RunResponse = movie_agent.run("New York")
+# pprint(movie_agent.content)
 
 movie_agent.print_response("New York")

cookbook/models/aws/bedrock/tool_use.py

@@ -0,0 +1,14 @@
+"""Run `pip install duckduckgo-search` to install dependencies."""
+
+from agno.agent import Agent
+from agno.models.aws import AwsBedrock
+from agno.tools.duckduckgo import DuckDuckGoTools
+
+agent = Agent(
+    model=AwsBedrock(id="mistral.mistral-large-2402-v1:0"),
+    tools=[DuckDuckGoTools()],
+    instructions="You are a helpful assistant that can use the following tools to answer questions.",
+    show_tool_calls=True,
+    markdown=True,
+)
+agent.print_response("Whats happening in France?")

cookbook/models/aws/bedrock/tool_use_stream.py

@@ -0,0 +1,14 @@
+"""Run `pip install duckduckgo-search` to install dependencies."""
+
+from agno.agent import Agent
+from agno.models.aws import AwsBedrock
+from agno.tools.duckduckgo import DuckDuckGoTools
+
+agent = Agent(
+    model=AwsBedrock(id="amazon.nova-lite-v1:0"),
+    tools=[DuckDuckGoTools()],
+    instructions="You are a helpful assistant that can use the following tools to answer questions.",
+    show_tool_calls=True,
+    markdown=True,
+)
+agent.print_response("Whats happening in France?", stream=True)

cookbook/models/aws/claude/README.md

@@ -0,0 +1,66 @@
+# AWS Bedrock Anthropic Claude
+
+[Models overview](https://docs.anthropic.com/claude/docs/models-overview)
+
+> Note: Fork and clone this repository if needed
+
+### 1. Create and activate a virtual environment
+
+```shell
+python3 -m venv ~/.venvs/aienv
+source ~/.venvs/aienv/bin/activate
+```
+
+### 2. Export your AWS Credentials
+
+```shell
+export AWS_ACCESS_KEY_ID=***
+export AWS_SECRET_ACCESS_KEY=***
+export AWS_REGION=***
+```
+
+### 3. Install libraries
+
+```shell
+pip install -U boto3 duckduckgo-search agno
+```
+
+### 4. Run basic agent
+
+- Streaming on
+
+```shell
+python cookbook/models/aws/claude/basic_stream.py
+```
+
+- Streaming off
+
+```shell
+python cookbook/models/aws/claude/basic.py
+```
+
+### 5. Run Agent with Tools
+
+- DuckDuckGo Search
+
+```shell
+python cookbook/models/aws/claude/tool_use.py
+```
+
+### 6. Run Agent that returns structured output
+
+```shell
+python cookbook/models/aws/claude/structured_output.py
+```
+
+### 7. Run Agent that uses storage
+
+```shell
+python cookbook/models/aws/claude/storage.py
+```
+
+### 8. Run Agent that uses knowledge
+
+```shell
+python cookbook/models/aws/claude/knowledge.py
+```

cookbook/models/aws/claude/async_basic.py

@@ -0,0 +1,15 @@
+import asyncio
+
+from agno.agent import Agent, RunResponse  # noqa
+from agno.models.aws import Claude
+
+agent = Agent(
+    model=Claude(id="anthropic.claude-3-5-sonnet-20240620-v1:0"), markdown=True
+)
+
+# Get the response in a variable
+# run: RunResponse = agent.run("Share a 2 sentence horror story")
+# print(run.content)
+
+# Print the response in the terminal
+asyncio.run(agent.aprint_response("Share a 2 sentence horror story"))

cookbook/models/aws/claude/async_basic_stream.py

@@ -0,0 +1,17 @@
+import asyncio
+from typing import Iterator  # noqa
+
+from agno.agent import Agent, RunResponse  # noqa
+from agno.models.aws import Claude
+
+agent = Agent(
+    model=Claude(id="anthropic.claude-3-5-sonnet-20240620-v1:0"), markdown=True
+)
+
+# Get the response in a variable
+# run_response: Iterator[RunResponse] = agent.run("Share a 2 sentence horror story", stream=True)
+# for chunk in run_response:
+#     print(chunk.content)
+
+# Print the response in the terminal
+asyncio.run(agent.aprint_response("Share a 2 sentence horror story", stream=True))