agno 1.7.8__py3-none-any.whl → 1.7.10__py3-none-any.whl

agno/agent/agent.py

@@ -893,7 +893,7 @@ class Agent:
             ):
                 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 @@ class Agent:
             ):
                 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 @@ class Agent:
             ):
                 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 @@ class Agent:
             ):
                 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 @@ class Agent:
 
                 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 @@ class Agent:
                 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 @@ class Agent:
             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(
@@ -6866,7 +6872,7 @@ class Agent:
             document_name = query.replace(" ", "_").replace("?", "").replace("!", "").replace(".", "")
         document_content = json.dumps({"query": query, "result": result})
         log_info(f"Adding document to knowledge base: {document_name}: {document_content}")
-        self.knowledge.add_document_to_knowledge_base(
+        self.knowledge.load_document(
             document=Document(
                 name=document_name,
                 content=document_content,