Merge branch 'main' into tools/browserbase

Author: Mustafa-Esoofally

cookbook/agent_concepts/knowledge/vector_dbs/lance_db/remote_lance_db.py

@@ -0,0 +1,31 @@
+"""
+This example shows how to use a remote LanceDB database.
+
+- Set URI obtained from https://cloud.lancedb.com/
+- Export `LANCEDB_API_KEY` OR set `api_key` in the `LanceDb` constructor
+"""
+
+# install lancedb - `pip install lancedb`
+
+from agno.agent import Agent
+from agno.knowledge.pdf_url import PDFUrlKnowledgeBase
+from agno.vectordb.lancedb import LanceDb
+
+# Initialize Remote LanceDB
+vector_db = LanceDb(
+    table_name="recipes",
+    uri="<URI>",
+    # api_key="<API_KEY>",
+)
+
+# Create knowledge base
+knowledge_base = PDFUrlKnowledgeBase(
+    urls=["https://agno-public.s3.amazonaws.com/recipes/ThaiRecipes.pdf"],
+    vector_db=vector_db,
+)
+
+knowledge_base.load(recreate=False)  # Comment out after first run
+
+# Create and use the agent
+agent = Agent(knowledge=knowledge_base, show_tool_calls=True)
+agent.print_response("How to make Tom Kha Gai", markdown=True)

cookbook/agent_concepts/memory/19_share_memory_and_history_between_agents.py

@@ -0,0 +1,58 @@
+from uuid import uuid4
+
+from agno.agent.agent import Agent
+from agno.memory.v2.db.sqlite import SqliteMemoryDb
+from agno.memory.v2.memory import Memory
+from agno.models.openai.chat import OpenAIChat
+from agno.storage.sqlite import SqliteStorage
+
+agent_storage = SqliteStorage(
+    table_name="agent_sessions", db_file="tmp/agent_sessions.db"
+)
+memory_db = SqliteMemoryDb(table_name="memory", db_file="tmp/memory.db")
+memory = Memory(db=memory_db)
+
+# Reset the memory for this example
+memory.clear()
+
+
+session_id = str(uuid4())
+user_id = "john_doe@example.com"
+
+agent_1 = Agent(
+    model=OpenAIChat(id="gpt-4o-mini"),
+    instructions="You are really friendly and helpful.",
+    storage=agent_storage,
+    memory=memory,
+    add_history_to_messages=True,
+    enable_user_memories=True,
+)
+
+agent_2 = Agent(
+    model=OpenAIChat(id="gpt-4o-mini"),
+    instructions="You are really grumpy and mean.",
+    storage=agent_storage,
+    memory=memory,
+    add_history_to_messages=True,
+    enable_user_memories=True,
+)
+
+agent_1.print_response(
+    "Hi! My name is John Doe.", session_id=session_id, user_id=user_id
+)
+
+agent_2.print_response("What is my name?", session_id=session_id, user_id=user_id)
+
+agent_2.print_response(
+    "I like to hike in the mountains on weekends.",
+    session_id=session_id,
+    user_id=user_id,
+)
+
+agent_1.print_response("What are my hobbies?", session_id=session_id, user_id=user_id)
+
+agent_1.print_response(
+    "What have we been discussing? Give me bullet points.",
+    session_id=session_id,
+    user_id=user_id,
+)

cookbook/agent_concepts/rag/agentic_rag_with_reranking.py

@@ -28,6 +28,10 @@
     ),
 )
 
+# Comment this out after first run
+knowledge_base.load(recreate=False)
+
+
 agent = Agent(
     model=OpenAIChat(id="gpt-4o"),
     # Agentic RAG is enabled by default when `knowledge` is provided to the Agent.

libs/agno/agno/agent/agent.py

@@ -893,7 +893,7 @@ def _run_stream(
             ):
                 yield event
         else:
-            from agno.utils.events import RunResponseContentEvent
+            from agno.run.response import IntermediateRunResponseContentEvent, RunResponseContentEvent
 
             for event in self._handle_model_response_stream(
                 run_response=run_response,
@@ -903,7 +903,10 @@ def _run_stream(
             ):
                 if isinstance(event, RunResponseContentEvent):
                     if stream_intermediate_steps:
-                        yield event
+                        yield IntermediateRunResponseContentEvent(
+                            content=event.content,
+                            content_type=event.content_type,
+                        )
                 else:
                     yield event
 
@@ -1331,7 +1334,7 @@ async def _arun_stream(
             ):
                 yield event
         else:
-            from agno.utils.events import RunResponseContentEvent
+            from agno.run.response import IntermediateRunResponseContentEvent, RunResponseContentEvent
 
             async for event in self._ahandle_model_response_stream(
                 run_response=run_response,
@@ -1341,7 +1344,10 @@ async def _arun_stream(
             ):
                 if isinstance(event, RunResponseContentEvent):
                     if stream_intermediate_steps:
-                        yield event
+                        yield IntermediateRunResponseContentEvent(
+                            content=event.content,
+                            content_type=event.content_type,
+                        )
                 else:
                     yield event
 
@@ -4973,9 +4979,26 @@ def get_run_messages(
 
                 run_messages.messages += history_copy
 
-        # 4.Add user message to run_messages
+        # 4. Add messages to run_messages if provided
+        if messages is not None and len(messages) > 0:
+            for _m in messages:
+                if isinstance(_m, Message):
+                    run_messages.messages.append(_m)
+                    if run_messages.extra_messages is None:
+                        run_messages.extra_messages = []
+                    run_messages.extra_messages.append(_m)
+                elif isinstance(_m, dict):
+                    try:
+                        run_messages.messages.append(Message.model_validate(_m))
+                        if run_messages.extra_messages is None:
+                            run_messages.extra_messages = []
+                        run_messages.extra_messages.append(Message.model_validate(_m))
+                    except Exception as e:
+                        log_warning(f"Failed to validate message: {e}")
+
+        # 5. Add user message to run_messages
         user_message: Optional[Message] = None
-        # 4.1 Build user message if message is None, str or list
+        # 5.1 Build user message if message is None, str or list
         if message is None or isinstance(message, str) or isinstance(message, list):
             user_message = self.get_user_message(
                 message=message,
@@ -4986,16 +5009,16 @@ def get_run_messages(
                 knowledge_filters=knowledge_filters,
                 **kwargs,
             )
-        # 4.2 If message is provided as a Message, use it directly
+        # 5.2 If message is provided as a Message, use it directly
         elif isinstance(message, Message):
             user_message = message
-        # 4.3 If message is provided as a dict, try to validate it as a Message
+        # 5.3 If message is provided as a dict, try to validate it as a Message
         elif isinstance(message, dict):
             try:
                 user_message = Message.model_validate(message)
             except Exception as e:
                 log_warning(f"Failed to validate message: {e}")
-        # 4.4 If message is provided as a BaseModel, convert it to a Message
+        # 5.4 If message is provided as a BaseModel, convert it to a Message
         elif isinstance(message, BaseModel):
             try:
                 # Create a user message with the BaseModel content
@@ -5008,23 +5031,6 @@ def get_run_messages(
             run_messages.user_message = user_message
             run_messages.messages.append(user_message)
 
-        # 5. Add messages to run_messages if provided
-        if messages is not None and len(messages) > 0:
-            for _m in messages:
-                if isinstance(_m, Message):
-                    run_messages.messages.append(_m)
-                    if run_messages.extra_messages is None:
-                        run_messages.extra_messages = []
-                    run_messages.extra_messages.append(_m)
-                elif isinstance(_m, dict):
-                    try:
-                        run_messages.messages.append(Message.model_validate(_m))
-                        if run_messages.extra_messages is None:
-                            run_messages.extra_messages = []
-                        run_messages.extra_messages.append(Message.model_validate(_m))
-                    except Exception as e:
-                        log_warning(f"Failed to validate message: {e}")
-
         return run_messages
 
     def get_continue_run_messages(

libs/agno/agno/run/response.py

@@ -17,6 +17,7 @@ class RunEvent(str, Enum):
 
     run_started = "RunStarted"
     run_response_content = "RunResponseContent"
+    run_intermediate_response_content = "RunIntermediateResponseContent"
     run_completed = "RunCompleted"
     run_error = "RunError"
     run_cancelled = "RunCancelled"
@@ -92,6 +93,13 @@ class RunResponseContentEvent(BaseAgentRunResponseEvent):
     extra_data: Optional[RunResponseExtraData] = None
 
 
+@dataclass
+class IntermediateRunResponseContentEvent(BaseAgentRunResponseEvent):
+    event: str = RunEvent.run_intermediate_response_content.value
+    content: Optional[Any] = None
+    content_type: str = "str"
+
+
 @dataclass
 class RunResponseCompletedEvent(BaseAgentRunResponseEvent):
     event: str = RunEvent.run_completed.value
@@ -207,6 +215,7 @@ class OutputModelResponseCompletedEvent(BaseAgentRunResponseEvent):
 RunResponseEvent = Union[
     RunResponseStartedEvent,
     RunResponseContentEvent,
+    IntermediateRunResponseContentEvent,
     RunResponseCompletedEvent,
     RunResponseErrorEvent,
     RunResponseCancelledEvent,
@@ -230,6 +239,7 @@ class OutputModelResponseCompletedEvent(BaseAgentRunResponseEvent):
 RUN_EVENT_TYPE_REGISTRY = {
     RunEvent.run_started.value: RunResponseStartedEvent,
     RunEvent.run_response_content.value: RunResponseContentEvent,
+    RunEvent.run_intermediate_response_content.value: IntermediateRunResponseContentEvent,
     RunEvent.run_completed.value: RunResponseCompletedEvent,
     RunEvent.run_error.value: RunResponseErrorEvent,
     RunEvent.run_cancelled.value: RunResponseCancelledEvent,

libs/agno/agno/run/team.py

@@ -17,6 +17,7 @@ class TeamRunEvent(str, Enum):
 
     run_started = "TeamRunStarted"
     run_response_content = "TeamRunResponseContent"
+    run_intermediate_response_content = "TeamRunIntermediateResponseContent"
     run_completed = "TeamRunCompleted"
     run_error = "TeamRunError"
     run_cancelled = "TeamRunCancelled"
@@ -94,6 +95,13 @@ class RunResponseContentEvent(BaseTeamRunResponseEvent):
     extra_data: Optional[RunResponseExtraData] = None
 
 
+@dataclass
+class IntermediateRunResponseContentEvent(BaseTeamRunResponseEvent):
+    event: str = TeamRunEvent.run_intermediate_response_content.value
+    content: Optional[Any] = None
+    content_type: str = "str"
+
+
 @dataclass
 class RunResponseCompletedEvent(BaseTeamRunResponseEvent):
     event: str = TeamRunEvent.run_completed.value
@@ -191,6 +199,7 @@ class OutputModelResponseCompletedEvent(BaseTeamRunResponseEvent):
 TeamRunResponseEvent = Union[
     RunResponseStartedEvent,
     RunResponseContentEvent,
+    IntermediateRunResponseContentEvent,
     RunResponseCompletedEvent,
     RunResponseErrorEvent,
     RunResponseCancelledEvent,
@@ -211,6 +220,7 @@ class OutputModelResponseCompletedEvent(BaseTeamRunResponseEvent):
 TEAM_RUN_EVENT_TYPE_REGISTRY = {
     TeamRunEvent.run_started.value: RunResponseStartedEvent,
     TeamRunEvent.run_response_content.value: RunResponseContentEvent,
+    TeamRunEvent.run_intermediate_response_content.value: IntermediateRunResponseContentEvent,
     TeamRunEvent.run_completed.value: RunResponseCompletedEvent,
     TeamRunEvent.run_error.value: RunResponseErrorEvent,
     TeamRunEvent.run_cancelled.value: RunResponseCancelledEvent,

libs/agno/agno/team/team.py

@@ -1110,16 +1110,21 @@ def _run_stream(
                 response_format=response_format,
                 stream_intermediate_steps=stream_intermediate_steps,
             ):
-                from agno.run.team import RunResponseContentEvent
+                from agno.run.team import IntermediateRunResponseContentEvent, RunResponseContentEvent
 
                 if isinstance(event, RunResponseContentEvent):
                     if stream_intermediate_steps:
-                        yield event
+                        yield IntermediateRunResponseContentEvent(
+                            content=event.content,
+                            content_type=event.content_type,
+                        )
                 else:
                     yield event
 
             yield from self._generate_response_with_output_model_stream(
-                run_response=run_response, run_messages=run_messages
+                run_response=run_response,
+                run_messages=run_messages,
+                stream_intermediate_steps=stream_intermediate_steps,
             )
 
         # If a parser model is provided, structure the response separately
@@ -1519,19 +1524,28 @@ async def _arun_stream(
             ):
                 yield event
         else:
-            from agno.run.team import RunResponseContentEvent
-
-            async for event in self._agenerate_response_with_output_model_stream(
+            async for event in self._ahandle_model_response_stream(
                 run_response=run_response,
                 run_messages=run_messages,
+                response_format=response_format,
                 stream_intermediate_steps=stream_intermediate_steps,
             ):
+                from agno.run.team import IntermediateRunResponseContentEvent, RunResponseContentEvent
+
                 if isinstance(event, RunResponseContentEvent):
                     if stream_intermediate_steps:
-                        yield event
+                        yield IntermediateRunResponseContentEvent(
+                            content=event.content,
+                            content_type=event.content_type,
+                        )
                 else:
                     yield event
 
+            async for event in self._agenerate_response_with_output_model_stream(
+                run_response=run_response,
+                run_messages=run_messages,
+                stream_intermediate_steps=stream_intermediate_steps,
+            ):
                 yield event
 
         # If a parser model is provided, structure the response separately
@@ -2446,10 +2460,9 @@ def _parse_response_with_output_model(self, model_response: ModelResponse, run_m
         model_response.content = output_model_response.content
 
     def _generate_response_with_output_model_stream(
-        self, run_response: TeamRunResponse, run_messages: RunMessages, stream_intermediate_steps: bool = True
+        self, run_response: TeamRunResponse, run_messages: RunMessages, stream_intermediate_steps: bool = False
     ):
         """Parse the model response using the output model stream."""
-
         from agno.utils.events import (
             create_team_output_model_response_completed_event,
             create_team_output_model_response_started_event,
@@ -2497,7 +2510,7 @@ async def _agenerate_response_with_output_model(
         model_response.content = output_model_response.content
 
     async def _agenerate_response_with_output_model_stream(
-        self, run_response: TeamRunResponse, run_messages: RunMessages, stream_intermediate_steps: bool = True
+        self, run_response: TeamRunResponse, run_messages: RunMessages, stream_intermediate_steps: bool = False
     ):
         """Parse the model response using the output model stream."""
         from agno.utils.events import (
@@ -2514,9 +2527,7 @@ async def _agenerate_response_with_output_model_stream(
         messages_for_output_model = self.get_messages_for_output_model(run_messages.messages)
         model_response = ModelResponse(content="")
 
-        model_response_stream = self.output_model.aresponse_stream(messages=messages_for_output_model)
-
-        async for model_response_event in model_response_stream:
+        async for model_response_event in self.output_model.aresponse_stream(messages=messages_for_output_model):
             for event in self._handle_model_response_chunk(
                 run_response=run_response,
                 full_model_response=model_response,