agno 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

agno/team/team.py

@@ -1232,7 +1232,6 @@ class Team:
         dependencies: Optional[Dict[str, Any]] = None,
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
         yield_run_response: bool = False,
         debug_mode: Optional[bool] = None,
         **kwargs: Any,
@@ -1244,10 +1243,11 @@ class Team:
         2. Prepare run messages
         3. Reason about the task(s) if reasoning is enabled
         4. Get a response from the model
-        5. Add RunOutput to Team Session
-        6. Calculate session metrics
-        7. Update Team Memory
-        8. Save session to storage
+        5. Add the run to Team Session
+        6. Update Team Memory
+        7. Create the run completed event
+        8. Calculate session metrics
+        9. Save session to storage
         """
         # Register run for cancellation tracking
         register_run(run_response.run_id)  # type: ignore
@@ -1286,7 +1286,6 @@ class Team:
             videos=run_input.videos,
             audio=run_input.audios,
             files=run_input.files,
-            workflow_context=workflow_context,
             debug_mode=debug_mode,
             add_history_to_context=add_history_to_context,
             add_session_state_to_context=add_session_state_to_context,
@@ -1322,7 +1321,7 @@ class Team:
         try:
             # Start the Run by yielding a RunStarted event
             if stream_intermediate_steps:
-                yield self._handle_event(create_team_run_started_event(run_response), run_response, workflow_context)
+                yield self._handle_event(create_team_run_started_event(run_response), run_response)
 
             # 3. Reason about the task(s) if reasoning is enabled
             yield from self._handle_reasoning_stream(
@@ -1341,7 +1340,6 @@ class Team:
                     run_messages=run_messages,
                     response_format=response_format,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     yield event
@@ -1352,7 +1350,6 @@ class Team:
                     run_messages=run_messages,
                     response_format=response_format,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     from agno.run.team import IntermediateRunContentEvent, RunContentEvent
@@ -1371,7 +1368,6 @@ class Team:
                     run_response=run_response,
                     run_messages=run_messages,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     yield event
@@ -1395,26 +1391,26 @@ class Team:
             # 5. Add the run to Team Session
             session.upsert_run(run_response=run_response)
 
-            # 6. Calculate session metrics
-            self._update_session_metrics(session=session)
+            # 6. Update Team Memory
+            yield from self._make_memories_and_summaries(
+                run_response=run_response,
+                run_messages=run_messages,
+                session=session,
+                user_id=user_id,
+            )
 
+            # 7. Create the run completed event
             completed_event = self._handle_event(
                 create_team_run_completed_event(
                     from_run_response=run_response,
                 ),
                 run_response,
-                workflow_context,
             )
 
-            # 7. Update Team Memory
-            yield from self._make_memories_and_summaries(
-                run_response=run_response,
-                run_messages=run_messages,
-                session=session,
-                user_id=user_id,
-            )
+            # 8. Calculate session metrics
+            self._update_session_metrics(session=session)
 
-            # 8. Save session to storage
+            # 9. Save session to storage
             self.save_session(session=session)
 
             if stream_intermediate_steps:
@@ -1438,7 +1434,6 @@ class Team:
             yield self._handle_event(
                 create_team_run_cancelled_event(from_run_response=run_response, reason=str(e)),
                 run_response,
-                workflow_context,
             )
 
             # Add the RunOutput to Team Session even when cancelled
@@ -1584,9 +1579,6 @@ class Team:
         )
         add_history = add_history_to_context if add_history_to_context is not None else self.add_history_to_context
 
-        # Extract workflow context from kwargs if present
-        workflow_context = kwargs.pop("workflow_context", None)
-
         # Initialize Knowledge Filters
         effective_filters = knowledge_filters
 
@@ -1665,7 +1657,6 @@ class Team:
                         dependencies=run_dependencies,
                         response_format=response_format,
                         stream_intermediate_steps=stream_intermediate_steps,
-                        workflow_context=workflow_context,
                         yield_run_response=yield_run_response,
                         debug_mode=debug_mode,
                         **kwargs,
@@ -1756,7 +1747,6 @@ class Team:
         metadata: Optional[Dict[str, Any]] = None,
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
         dependencies: Optional[Dict[str, Any]] = None,
-        workflow_context: Optional[Dict] = None,
         debug_mode: Optional[bool] = None,
         **kwargs: Any,
     ) -> TeamRunOutput:
@@ -1812,7 +1802,6 @@ class Team:
             videos=run_input.videos,
             audio=run_input.audios,
             files=run_input.files,
-            workflow_context=workflow_context,
             debug_mode=debug_mode,
             add_history_to_context=add_history_to_context,
             add_dependencies_to_context=add_dependencies_to_context,
@@ -1943,7 +1932,6 @@ class Team:
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
         dependencies: Optional[Dict[str, Any]] = None,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
         yield_run_response: bool = False,
         debug_mode: Optional[bool] = None,
         **kwargs: Any,
@@ -1955,10 +1943,11 @@ class Team:
         2. Prepare run messages
         3. Reason about the task(s) if reasoning is enabled
         4. Get a response from the model
-        5. Update Team Memory
-        6. Add RunOutput to Team Session
-        7. Calculate session metrics
-        8. Save session to storage
+        5. Add the run to Team Session
+        6. Update Team Memory
+        7. Create the run completed event
+        8. Calculate session metrics
+        9. Save session to storage
         """
 
         # 1. Resolve callable dependencies if present
@@ -1998,7 +1987,6 @@ class Team:
             videos=run_input.videos,
             audio=run_input.audios,
             files=run_input.files,
-            workflow_context=workflow_context,
             debug_mode=debug_mode,
             add_history_to_context=add_history_to_context,
             add_dependencies_to_context=add_dependencies_to_context,
@@ -2036,7 +2024,7 @@ class Team:
             # Start the Run by yielding a RunStarted event
             if stream_intermediate_steps:
                 yield self._handle_event(
-                    create_team_run_started_event(from_run_response=run_response), run_response, workflow_context
+                    create_team_run_started_event(from_run_response=run_response), run_response
                 )
 
             # 3. Reason about the task(s) if reasoning is enabled
@@ -2055,7 +2043,6 @@ class Team:
                     run_messages=run_messages,
                     response_format=response_format,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     yield event
@@ -2066,7 +2053,6 @@ class Team:
                     run_messages=run_messages,
                     response_format=response_format,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     from agno.run.team import IntermediateRunContentEvent, RunContentEvent
@@ -2085,7 +2071,6 @@ class Team:
                     run_response=run_response,
                     run_messages=run_messages,
                     stream_intermediate_steps=stream_intermediate_steps,
-                    workflow_context=workflow_context,
                 ):
                     raise_if_cancelled(run_response.run_id)  # type: ignore
                     yield event
@@ -2117,14 +2102,15 @@ class Team:
             ):
                 yield event
 
-            # 7. Calculate session metrics
-            self._update_session_metrics(session=session)
-
+            # 7. Create the run completed event
             completed_event = self._handle_event(
-                create_team_run_completed_event(from_run_response=run_response), run_response, workflow_context
+                create_team_run_completed_event(from_run_response=run_response), run_response
             )
 
-            # 8. Save session to storage
+            # 8. Calculate session metrics
+            self._update_session_metrics(session=session)
+
+            # 9. Save session to storage
             self.save_session(session=session)
 
             if stream_intermediate_steps:
@@ -2148,7 +2134,6 @@ class Team:
             yield self._handle_event(
                 create_team_run_cancelled_event(from_run_response=run_response, reason=str(e)),
                 run_response,
-                workflow_context,
             )
 
             # Add the RunOutput to Team Session even when cancelled
@@ -2289,9 +2274,6 @@ class Team:
         )
         add_history = add_history_to_context if add_history_to_context is not None else self.add_history_to_context
 
-        # Extract workflow context from kwargs if present
-        workflow_context = kwargs.pop("workflow_context", None)
-
         effective_filters = knowledge_filters
         # When filters are passed manually
         if self.knowledge_filters or knowledge_filters:
@@ -2367,7 +2349,6 @@ class Team:
                         response_format=response_format,
                         dependencies=run_dependencies,
                         stream_intermediate_steps=stream_intermediate_steps,
-                        workflow_context=workflow_context,
                         yield_run_response=yield_run_response,
                         debug_mode=debug_mode,
                         **kwargs,
@@ -2386,7 +2367,6 @@ class Team:
                         metadata=metadata,
                         response_format=response_format,
                         dependencies=run_dependencies,
-                        workflow_context=workflow_context,
                         debug_mode=debug_mode,
                         **kwargs,
                     )
@@ -2526,7 +2506,6 @@ class Team:
         run_messages: RunMessages,
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
     ) -> Iterator[Union[TeamRunOutputEvent, RunOutputEvent]]:
         self.model = cast(Model, self.model)
 
@@ -2559,7 +2538,6 @@ class Team:
                 reasoning_state=reasoning_state,
                 stream_intermediate_steps=stream_intermediate_steps,
                 parse_structured_output=self.should_parse_structured_output,
-                workflow_context=workflow_context,
             )
 
         # 3. Update TeamRunOutput
@@ -2608,7 +2586,6 @@ class Team:
         run_messages: RunMessages,
         response_format: Optional[Union[Dict, Type[BaseModel]]] = None,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
     ) -> AsyncIterator[Union[TeamRunOutputEvent, RunOutputEvent]]:
         self.model = cast(Model, self.model)
 
@@ -2642,7 +2619,6 @@ class Team:
                 reasoning_state=reasoning_state,
                 stream_intermediate_steps=stream_intermediate_steps,
                 parse_structured_output=self.should_parse_structured_output,
-                workflow_context=workflow_context,
             ):
                 yield event
 
@@ -2695,7 +2671,6 @@ class Team:
         reasoning_state: Optional[Dict[str, Any]] = None,
         stream_intermediate_steps: bool = False,
         parse_structured_output: bool = False,
-        workflow_context: Optional[Dict] = None,
     ) -> Iterator[Union[TeamRunOutputEvent, RunOutputEvent]]:
         if isinstance(model_response_event, tuple(get_args(RunOutputEvent))) or isinstance(
             model_response_event, tuple(get_args(TeamRunOutputEvent))
@@ -2829,7 +2804,6 @@ class Team:
                                 image=model_response_event.images[-1] if model_response_event.images else None,
                             ),
                             run_response,
-                            workflow_context=workflow_context,
                         )
                     else:
                         yield self._handle_event(
@@ -2839,7 +2813,6 @@ class Team:
                                 content_type=content_type,
                             ),
                             run_response,
-                            workflow_context=workflow_context,
                         )
 
             # If the model response is a tool_call_started, add the tool call to the run_response
@@ -3285,7 +3258,6 @@ class Team:
         run_response: TeamRunOutput,
         run_messages: RunMessages,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
     ):
         """Parse the model response using the output model stream."""
         from agno.utils.events import (
@@ -3308,7 +3280,6 @@ class Team:
                 run_response=run_response,
                 full_model_response=model_response,
                 model_response_event=model_response_event,
-                workflow_context=workflow_context,
             )
 
         # Update the TeamRunResponse content
@@ -3341,7 +3312,6 @@ class Team:
         run_response: TeamRunOutput,
         run_messages: RunMessages,
         stream_intermediate_steps: bool = False,
-        workflow_context: Optional[Dict] = None,
     ):
         """Parse the model response using the output model stream."""
         from agno.utils.events import (
@@ -3364,7 +3334,6 @@ class Team:
                 run_response=run_response,
                 full_model_response=model_response,
                 model_response_event=model_response_event,
-                workflow_context=workflow_context,
             ):
                 yield event
 
@@ -3385,15 +3354,7 @@ class Team:
         self,
         event: Union[RunOutputEvent, TeamRunOutputEvent],
         run_response: TeamRunOutput,
-        workflow_context: Optional[Dict] = None,
     ):
-        if workflow_context:
-            event.workflow_id = workflow_context.get("workflow_id")
-            event.workflow_run_id = workflow_context.get("workflow_run_id")
-            event.step_id = workflow_context.get("step_id")
-            event.step_name = workflow_context.get("step_name")
-            event.step_index = workflow_context.get("step_index")
-
         # We only store events that are not run_response_content events
         events_to_skip = [event.value for event in self.events_to_skip] if self.events_to_skip else []
         if self.store_events and event.event not in events_to_skip:
@@ -4529,7 +4490,6 @@ class Team:
         videos: Optional[Sequence[Video]] = None,
         audio: Optional[Sequence[Audio]] = None,
         files: Optional[Sequence[File]] = None,
-        workflow_context: Optional[Dict] = None,
         debug_mode: Optional[bool] = None,
         add_history_to_context: Optional[bool] = None,
         dependencies: Optional[Dict[str, Any]] = None,
@@ -4623,7 +4583,6 @@ class Team:
                 files=files,  # type: ignore
                 knowledge_filters=knowledge_filters,
                 add_history_to_context=add_history_to_context,
-                workflow_context=workflow_context,
                 dependencies=dependencies,
                 add_dependencies_to_context=add_dependencies_to_context,
                 add_session_state_to_context=add_session_state_to_context,
@@ -5834,7 +5793,6 @@ class Team:
         files: Optional[List[File]] = None,
         knowledge_filters: Optional[Dict[str, Any]] = None,
         add_history_to_context: Optional[bool] = None,
-        workflow_context: Optional[Dict] = None,
         dependencies: Optional[Dict[str, Any]] = None,
         add_dependencies_to_context: Optional[bool] = None,
         add_session_state_to_context: Optional[bool] = None,
@@ -5989,7 +5947,6 @@ class Team:
                     stream=True,
                     stream_intermediate_steps=stream_intermediate_steps,
                     debug_mode=debug_mode,
-                    workflow_context=workflow_context,
                     dependencies=dependencies,
                     add_dependencies_to_context=add_dependencies_to_context,
                     metadata=metadata,
@@ -6029,7 +5986,6 @@ class Team:
                     files=files,
                     stream=False,
                     debug_mode=debug_mode,
-                    workflow_context=workflow_context,
                     dependencies=dependencies,
                     add_dependencies_to_context=add_dependencies_to_context,
                     add_session_state_to_context=add_session_state_to_context,
@@ -6121,7 +6077,6 @@ class Team:
                     add_dependencies_to_context=add_dependencies_to_context,
                     add_session_state_to_context=add_session_state_to_context,
                     metadata=metadata,
-                    workflow_context=workflow_context,
                     knowledge_filters=knowledge_filters
                     if not member_agent.knowledge_filters and member_agent.knowledge
                     else None,
@@ -6157,7 +6112,6 @@ class Team:
                     files=files,
                     stream=False,
                     debug_mode=debug_mode,
-                    workflow_context=workflow_context,
                     dependencies=dependencies,
                     add_dependencies_to_context=add_dependencies_to_context,
                     add_session_state_to_context=add_session_state_to_context,
@@ -6234,7 +6188,6 @@ class Team:
                         files=files,
                         stream=True,
                         stream_intermediate_steps=stream_intermediate_steps,
-                        workflow_context=workflow_context,
                         knowledge_filters=knowledge_filters
                         if not member_agent.knowledge_filters and member_agent.knowledge
                         else None,
@@ -6275,7 +6228,6 @@ class Team:
                         audio=audio,
                         files=files,
                         stream=False,
-                        workflow_context=workflow_context,
                         knowledge_filters=knowledge_filters
                         if not member_agent.knowledge_filters and member_agent.knowledge
                         else None,
@@ -6352,7 +6304,6 @@ class Team:
                         files=files,
                         stream=True,
                         stream_intermediate_steps=stream_intermediate_steps,
-                        workflow_context=workflow_context,
                         debug_mode=debug_mode,
                         knowledge_filters=knowledge_filters
                         if not member_agent.knowledge_filters and member_agent.knowledge
@@ -6433,7 +6384,6 @@ class Team:
                             stream=False,
                             stream_intermediate_steps=stream_intermediate_steps,
                             debug_mode=debug_mode,
-                            workflow_context=workflow_context,
                             knowledge_filters=knowledge_filters
                             if not member_agent.knowledge_filters and member_agent.knowledge
                             else None,

agno/tools/file.py

@@ -75,7 +75,9 @@ class FileTools(Toolkit):
         """
         try:
             log_info(f"Reading files in : {self.base_dir}")
-            return json.dumps([str(file_path) for file_path in self.base_dir.iterdir()], indent=4)
+            return json.dumps(
+                [str(file_path.relative_to(self.base_dir)) for file_path in self.base_dir.iterdir()], indent=4
+            )
         except Exception as e:
             log_error(f"Error reading files: {e}")
             return f"Error reading files: {e}"
@@ -93,7 +95,7 @@ class FileTools(Toolkit):
             log_debug(f"Searching files in {self.base_dir} with pattern {pattern}")
             matching_files = list(self.base_dir.glob(pattern))
 
-            file_paths = [str(file_path) for file_path in matching_files]
+            file_paths = [str(file_path.relative_to(self.base_dir)) for file_path in matching_files]
 
             result = {
                 "pattern": pattern,

agno/tools/function.py

@@ -473,6 +473,7 @@ class Function(BaseModel):
 
     def _get_cache_key(self, entrypoint_args: Dict[str, Any], call_args: Optional[Dict[str, Any]] = None) -> str:
         """Generate a cache key based on function name and arguments."""
+        import json
         from hashlib import md5
 
         copy_entrypoint_args = entrypoint_args.copy()
@@ -493,7 +494,8 @@ class Function(BaseModel):
             del copy_entrypoint_args["files"]
         if "dependencies" in copy_entrypoint_args:
             del copy_entrypoint_args["dependencies"]
-        args_str = str(copy_entrypoint_args)
+        # Use json.dumps with sort_keys=True to ensure consistent ordering regardless of dict key order
+        args_str = json.dumps(copy_entrypoint_args, sort_keys=True, default=str)
 
         kwargs_str = str(sorted((call_args or {}).items()))
         key_str = f"{self.name}:{args_str}:{kwargs_str}"
@@ -799,6 +801,9 @@ class FunctionCall(BaseModel):
                 return FunctionExecutionResult(status="success", result=cached_result)
 
         # Execute function
+        execution_result = None
+        exception_to_raise = None
+
         try:
             # Build and execute the nested chain of hooks
             if self.function.tool_hooks is not None:
@@ -822,22 +827,27 @@ class FunctionCall(BaseModel):
                     cache_file = self.function._get_cache_file_path(cache_key)
                     self.function._save_to_cache(cache_file, self.result)
 
+            execution_result = FunctionExecutionResult(
+                status="success", result=self.result, updated_session_state=updated_session_state
+            )
+
         except AgentRunException as e:
             log_debug(f"{e.__class__.__name__}: {e}")
             self.error = str(e)
-            raise
+            exception_to_raise = e
         except Exception as e:
             log_warning(f"Could not run function {self.get_call_str()}")
             log_exception(e)
             self.error = str(e)
-            return FunctionExecutionResult(status="failure", error=str(e))
+            execution_result = FunctionExecutionResult(status="failure", error=str(e))
 
-        # Execute post-hook if it exists
-        self._handle_post_hook()
+        finally:
+            self._handle_post_hook()
 
-        return FunctionExecutionResult(
-            status="success", result=self.result, updated_session_state=updated_session_state
-        )
+            if exception_to_raise is not None:
+                raise exception_to_raise
+
+            return execution_result  # type: ignore[return-value]
 
     async def _handle_pre_hook_async(self):
         """Handles the async pre-hook for the function call."""
@@ -991,6 +1001,9 @@ class FunctionCall(BaseModel):
                 return FunctionExecutionResult(status="success", result=cached_result)
 
         # Execute function
+        execution_result = None
+        exception_to_raise = None
+
         try:
             # Build and execute the nested chain of hooks
             if self.function.tool_hooks is not None:
@@ -1017,25 +1030,30 @@ class FunctionCall(BaseModel):
             if entrypoint_args.get("session_state") is not None:
                 updated_session_state = entrypoint_args.get("session_state")
 
+            execution_result = FunctionExecutionResult(
+                status="success", result=self.result, updated_session_state=updated_session_state
+            )
+
         except AgentRunException as e:
             log_debug(f"{e.__class__.__name__}: {e}")
             self.error = str(e)
-            raise
+            exception_to_raise = e
         except Exception as e:
             log_warning(f"Could not run function {self.get_call_str()}")
             log_exception(e)
             self.error = str(e)
-            return FunctionExecutionResult(status="failure", error=str(e))
+            execution_result = FunctionExecutionResult(status="failure", error=str(e))
 
-        # Execute post-hook if it exists
-        if iscoroutinefunction(self.function.post_hook):
-            await self._handle_post_hook_async()
-        else:
-            self._handle_post_hook()
+        finally:
+            if iscoroutinefunction(self.function.post_hook):
+                await self._handle_post_hook_async()
+            else:
+                self._handle_post_hook()
 
-        return FunctionExecutionResult(
-            status="success", result=self.result, updated_session_state=updated_session_state
-        )
+            if exception_to_raise is not None:
+                raise exception_to_raise
+
+            return execution_result  # type: ignore[return-value]
 
 
 class ToolResult(BaseModel):