agno 2.0.0rc1__py3-none-any.whl → 2.0.0rc2__py3-none-any.whl

agno/run/team.py

@@ -1,11 +1,11 @@
 from dataclasses import asdict, dataclass, field
 from enum import Enum
 from time import time
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Sequence, Union
 
 from pydantic import BaseModel
 
-from agno.media import AudioArtifact, AudioResponse, ImageArtifact, VideoArtifact
+from agno.media import AudioArtifact, AudioResponse, File, ImageArtifact, VideoArtifact
 from agno.models.message import Citations, Message
 from agno.models.metrics import Metrics
 from agno.models.response import ToolExecution
@@ -40,6 +40,8 @@ class TeamRunEvent(str, Enum):
     output_model_response_started = "TeamOutputModelResponseStarted"
     output_model_response_completed = "TeamOutputModelResponseCompleted"
 
+    custom_event = "CustomEvent"
+
 
 @dataclass
 class BaseTeamRunEvent(BaseRunOutputEvent):
@@ -213,6 +215,11 @@ class OutputModelResponseCompletedEvent(BaseTeamRunEvent):
     event: str = TeamRunEvent.output_model_response_completed.value
 
 
+@dataclass
+class CustomEvent(BaseTeamRunEvent):
+    event: str = TeamRunEvent.custom_event.value
+
+
 TeamRunOutputEvent = Union[
     RunStartedEvent,
     RunContentEvent,
@@ -231,6 +238,7 @@ TeamRunOutputEvent = Union[
     ParserModelResponseCompletedEvent,
     OutputModelResponseStartedEvent,
     OutputModelResponseCompletedEvent,
+    CustomEvent,
 ]
 
 # Map event string to dataclass for team events
@@ -252,6 +260,7 @@ TEAM_RUN_EVENT_TYPE_REGISTRY = {
     TeamRunEvent.parser_model_response_completed.value: ParserModelResponseCompletedEvent,
     TeamRunEvent.output_model_response_started.value: OutputModelResponseStartedEvent,
     TeamRunEvent.output_model_response_completed.value: OutputModelResponseCompletedEvent,
+    TeamRunEvent.custom_event.value: CustomEvent,
 }
 
 
@@ -266,6 +275,76 @@ def team_run_output_event_from_dict(data: dict) -> BaseTeamRunEvent:
     return event_class.from_dict(data)  # type: ignore
 
 
+@dataclass
+class TeamRunInput:
+    """Container for the raw input data passed to Agent.run().
+    This captures the original input exactly as provided by the user,
+    separate from the processed messages that go to the model.
+    Attributes:
+        input_content: The literal input message/content passed to run()
+        images: Images directly passed to run()
+        videos: Videos directly passed to run()
+        audios: Audio files directly passed to run()
+        files: Files directly passed to run()
+    """
+
+    input_content: Optional[Union[str, List, Dict, Message, BaseModel, List[Message]]] = None
+    images: Optional[Sequence[ImageArtifact]] = None
+    videos: Optional[Sequence[VideoArtifact]] = None
+    audios: Optional[Sequence[AudioArtifact]] = None
+    files: Optional[Sequence[File]] = None
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary representation"""
+        result: Dict[str, Any] = {}
+
+        if self.input_content is not None:
+            if isinstance(self.input_content, (str)):
+                result["input_content"] = self.input_content
+            elif isinstance(self.input_content, BaseModel):
+                result["input_content"] = self.input_content.model_dump(exclude_none=True)
+            elif isinstance(self.input_content, Message):
+                result["input_content"] = self.input_content.to_dict()
+            elif (
+                isinstance(self.input_content, list)
+                and self.input_content
+                and isinstance(self.input_content[0], Message)
+            ):
+                result["input_content"] = [m.to_dict() for m in self.input_content]
+            else:
+                result["input_content"] = self.input_content
+
+        if self.images:
+            result["images"] = [img.to_dict() for img in self.images]
+        if self.videos:
+            result["videos"] = [vid.to_dict() for vid in self.videos]
+        if self.audios:
+            result["audios"] = [aud.to_dict() for aud in self.audios]
+
+        return result
+
+    @classmethod
+    def from_dict(cls, data: Dict[str, Any]) -> "TeamRunInput":
+        """Create TeamRunInput from dictionary"""
+        images = None
+        if data.get("images"):
+            images = [ImageArtifact.model_validate(img_data) for img_data in data["images"]]
+
+        videos = None
+        if data.get("videos"):
+            videos = [VideoArtifact.model_validate(vid_data) for vid_data in data["videos"]]
+
+        audios = None
+        if data.get("audios"):
+            audios = [AudioArtifact.model_validate(aud_data) for aud_data in data["audios"]]
+
+        files = None
+        if data.get("files"):
+            files = [File.model_validate(file_data) for file_data in data["files"]]
+
+        return cls(input_content=data.get("input_content"), images=images, videos=videos, audios=audios, files=files)
+
+
 @dataclass
 class TeamRunOutput:
     """Response returned by Team.run() functions"""
@@ -293,6 +372,9 @@ class TeamRunOutput:
 
     response_audio: Optional[AudioResponse] = None  # Model audio response
 
+    # Input media and messages from user
+    input: Optional[TeamRunInput] = None
+
     reasoning_content: Optional[str] = None
 
     citations: Optional[Citations] = None
@@ -401,6 +483,9 @@ class TeamRunOutput:
                 else:
                     _dict["tools"].append(tool)
 
+        if self.input is not None:
+            _dict["input"] = self.input.to_dict()
+
         return _dict
 
     def to_json(self) -> str:
@@ -468,6 +553,11 @@ class TeamRunOutput:
         response_audio = data.pop("response_audio", None)
         response_audio = AudioResponse.model_validate(response_audio) if response_audio else None
 
+        input_data = data.pop("input", None)
+        input_obj = None
+        if input_data:
+            input_obj = TeamRunInput.from_dict(input_data)
+
         metrics = data.pop("metrics", None)
         if metrics:
             metrics = Metrics(**metrics)
@@ -487,6 +577,7 @@ class TeamRunOutput:
             videos=videos,
             audio=audio,
             response_audio=response_audio,
+            input=input_obj,
             citations=citations,
             tools=tools,
             events=events,

agno/run/workflow.py

@@ -13,6 +13,9 @@ from agno.utils.log import log_error
 
 if TYPE_CHECKING:
     from agno.workflow.types import StepOutput, WorkflowMetrics
+else:
+    StepOutput = Any
+    WorkflowMetrics = Any
 
 
 class WorkflowRunEvent(str, Enum):
@@ -46,6 +49,8 @@ class WorkflowRunEvent(str, Enum):
 
     step_output = "StepOutput"
 
+    custom_event = "CustomEvent"
+
 
 @dataclass
 class BaseWorkflowRunOutputEvent:
@@ -132,7 +137,7 @@ class WorkflowCompletedEvent(BaseWorkflowRunOutputEvent):
     content_type: str = "str"
 
     # Store actual step execution results as StepOutput objects
-    step_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    step_results: List[StepOutput] = field(default_factory=list)
     metadata: Optional[Dict[str, Any]] = None
 
 
@@ -183,7 +188,7 @@ class StepCompletedEvent(BaseWorkflowRunOutputEvent):
     response_audio: Optional[AudioResponse] = None
 
     # Store actual step execution results as StepOutput objects
-    step_response: Optional["StepOutput"] = None  # noqa: F821
+    step_response: Optional[StepOutput] = None
 
 
 @dataclass
@@ -226,7 +231,7 @@ class LoopIterationCompletedEvent(BaseWorkflowRunOutputEvent):
     step_index: Optional[Union[int, tuple]] = None
     iteration: int = 0
     max_iterations: Optional[int] = None
-    iteration_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    iteration_results: List[StepOutput] = field(default_factory=list)
     should_continue: bool = True
 
 
@@ -239,7 +244,7 @@ class LoopExecutionCompletedEvent(BaseWorkflowRunOutputEvent):
     step_index: Optional[Union[int, tuple]] = None
     total_iterations: int = 0
     max_iterations: Optional[int] = None
-    all_results: List[List["StepOutput"]] = field(default_factory=list)  # noqa: F821
+    all_results: List[List[StepOutput]] = field(default_factory=list)
 
 
 @dataclass
@@ -262,7 +267,7 @@ class ParallelExecutionCompletedEvent(BaseWorkflowRunOutputEvent):
     parallel_step_count: Optional[int] = None
 
     # Results from all parallel steps
-    step_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    step_results: List[StepOutput] = field(default_factory=list)
 
 
 @dataclass
@@ -286,7 +291,7 @@ class ConditionExecutionCompletedEvent(BaseWorkflowRunOutputEvent):
     executed_steps: Optional[int] = None
 
     # Results from executed steps
-    step_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    step_results: List[StepOutput] = field(default_factory=list)
 
 
 @dataclass
@@ -312,7 +317,7 @@ class RouterExecutionCompletedEvent(BaseWorkflowRunOutputEvent):
     executed_steps: Optional[int] = None
 
     # Results from executed steps
-    step_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    step_results: List[StepOutput] = field(default_factory=list)
 
 
 @dataclass
@@ -336,7 +341,7 @@ class StepsExecutionCompletedEvent(BaseWorkflowRunOutputEvent):
     executed_steps: Optional[int] = None
 
     # Results from executed steps
-    step_results: List["StepOutput"] = field(default_factory=list)  # noqa: F821
+    step_results: List[StepOutput] = field(default_factory=list)
 
 
 @dataclass
@@ -348,7 +353,7 @@ class StepOutputEvent(BaseWorkflowRunOutputEvent):
     step_index: Optional[Union[int, tuple]] = None
 
     # Store actual step execution result as StepOutput object
-    step_output: Optional["StepOutput"] = None  # noqa: F821
+    step_output: Optional[StepOutput] = None
 
     # Properties for backward compatibility
     @property
@@ -380,6 +385,13 @@ class StepOutputEvent(BaseWorkflowRunOutputEvent):
         return self.step_output.stop if self.step_output else False
 
 
+@dataclass
+class CustomEvent(BaseWorkflowRunOutputEvent):
+    """Event sent when a custom event is produced"""
+
+    event: str = WorkflowRunEvent.custom_event.value
+
+
 # Union type for all workflow run response events
 WorkflowRunOutputEvent = Union[
     WorkflowStartedEvent,
@@ -402,6 +414,7 @@ WorkflowRunOutputEvent = Union[
     StepsExecutionStartedEvent,
     StepsExecutionCompletedEvent,
     StepOutputEvent,
+    CustomEvent,
 ]
 
 
@@ -426,7 +439,7 @@ class WorkflowRunOutput:
     response_audio: Optional[AudioResponse] = None
 
     # Store actual step execution results as StepOutput objects
-    step_results: List[Union["StepOutput", List["StepOutput"]]] = field(default_factory=list)  # noqa: F821
+    step_results: List[Union[StepOutput, List[StepOutput]]] = field(default_factory=list)
 
     # Store agent/team responses separately with parent_run_id references
     step_executor_runs: Optional[List[Union[RunOutput, TeamRunOutput]]] = None
@@ -435,7 +448,7 @@ class WorkflowRunOutput:
     events: Optional[List[WorkflowRunOutputEvent]] = None
 
     # Workflow metrics aggregated from all steps
-    metrics: Optional["WorkflowMetrics"] = None
+    metrics: Optional[WorkflowMetrics] = None
 
     metadata: Optional[Dict[str, Any]] = None
     created_at: int = field(default_factory=lambda: int(time()))
@@ -521,7 +534,7 @@ class WorkflowRunOutput:
             workflow_metrics = WorkflowMetrics.from_dict(workflow_metrics_dict)
 
         step_results = data.pop("step_results", [])
-        parsed_step_results: List[Union["StepOutput", List["StepOutput"]]] = []
+        parsed_step_results: List[Union[StepOutput, List[StepOutput]]] = []
         if step_results:
             for step_output_dict in step_results:
                 # Reconstruct StepOutput from dict