waldiez 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

waldiez/running/protocol.py

@@ -1,16 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
-
+# pyright: reportReturnType=false
 """Waldiez Runner protocol."""
 
 from pathlib import Path
-from typing import TYPE_CHECKING, Protocol, Union, runtime_checkable
-
-if TYPE_CHECKING:
-    from autogen.io.run_response import (  # type: ignore[import-untyped]
-        AsyncRunResponseProtocol,
-        RunResponseProtocol,
-    )
+from typing import Any, Protocol, runtime_checkable
 
 
 @runtime_checkable
@@ -63,6 +57,9 @@ class WaldiezRunnerProtocol(Protocol):
         uploads_root: str | Path | None,
         structured_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
+        dot_env: str | Path | None = None,
+        **kwargs: Any,
     ) -> None:
         """Start running the Waldiez flow in a non-blocking way.
 
@@ -78,6 +75,12 @@ class WaldiezRunnerProtocol(Protocol):
             Whether to use structured IO instead of the default 'input/print'.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
+        dot_env : str | Path | None
+            The path to the .env file, if any.
+        **kwargs : Any
+            Additional keyword arguments for the start method.
 
         Raises
         ------
@@ -91,6 +94,9 @@ class WaldiezRunnerProtocol(Protocol):
         uploads_root: str | Path | None,
         structured_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
+        dot_env: str | Path | None = None,
+        **kwargs: Any,
     ) -> None:
         """Asynchronously start running the Waldiez flow in a non-blocking way.
 
@@ -106,6 +112,12 @@ class WaldiezRunnerProtocol(Protocol):
             Whether to use structured IO instead of the default 'input/print'.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
+        dot_env : str | Path | None
+            The path to the .env file, if any.
+        **kwargs : Any
+            Additional keyword arguments for the start method.
 
         Raises
         ------
@@ -119,10 +131,10 @@ class WaldiezRunnerProtocol(Protocol):
         uploads_root: str | Path | None,
         structured_io: bool | None = None,
         skip_mmd: bool = False,
-    ) -> Union[
-        list["RunResponseProtocol"],
-        list["AsyncRunResponseProtocol"],
-    ]:  # pyright: ignore
+        skip_timeline: bool = False,
+        dot_env: str | Path | None = None,
+        **kwargs: Any,
+    ) -> list[dict[str, Any]]:
         """Run the Waldiez flow in a blocking way.
 
         Parameters
@@ -135,15 +147,17 @@ class WaldiezRunnerProtocol(Protocol):
             Whether to use structured IO instead of the default 'input/print'.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
+        dot_env : str | Path | None
+            The path to the .env file, if any.
+        **kwargs : Any
+            Additional keyword arguments for the run method.
 
         Returns
         -------
-        Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"],
-        ]
-            The result of the run, which can be a list of RunResponseProtocol
-            or a list of AsyncRunResponseProtocol.
+        list[dict[str, Any]]
+            The result of the run.
         """
 
     async def a_run(
@@ -152,10 +166,10 @@ class WaldiezRunnerProtocol(Protocol):
         uploads_root: str | Path | None,
         structured_io: bool | None = None,
         skip_mmd: bool = False,
-    ) -> Union[
-        list["RunResponseProtocol"],
-        list["AsyncRunResponseProtocol"],
-    ]:  # pyright: ignore
+        skip_timeline: bool = False,
+        dot_env: str | Path | None = None,
+        **kwargs: Any,
+    ) -> list[dict[str, Any]]:
         """Run the Waldiez flow.
 
         Parameters
@@ -168,23 +182,22 @@ class WaldiezRunnerProtocol(Protocol):
             Whether to use structured IO instead of the default 'input/print'.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
+        dot_env : str | Path | None
+            The path to the .env file, if any.
+        **kwargs : Any
+            Additional keyword arguments for the a_run method.
 
         Returns
         -------
-        Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"],
-        ]
-            The result of the run, which can be a list of RunResponseProtocol
-            or a list of AsyncRunResponseProtocol.
+        list[dict[str, Any]]
+            The result of the run.
         """
 
     def after_run(
         self,
-        results: Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"],
-        ],
+        results: list[dict[str, Any]],
         output_file: Path,
         uploads_root: Path | None,
         temp_dir: Path,
@@ -195,12 +208,8 @@ class WaldiezRunnerProtocol(Protocol):
 
         Parameters
         ----------
-        results : Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"],
-        ]
-            The results of the run, which can be a list of RunResponseProtocol
-            or a list of AsyncRunResponseProtocol.
+        results : list[dict[str, Any]]
+            The results of the run.
         output_file : Path
             The path to the output file.
         uploads_root : Path | None
@@ -215,10 +224,7 @@ class WaldiezRunnerProtocol(Protocol):
 
     async def a_after_run(
         self,
-        results: Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"],
-        ],
+        results: list[dict[str, Any]],
         output_file: Path,
         uploads_root: Path | None,
         temp_dir: Path,
@@ -229,12 +235,8 @@ class WaldiezRunnerProtocol(Protocol):
 
         Parameters
         ----------
-        results : Union[
-            list["RunResponseProtocol"],
-            list["AsyncRunResponseProtocol"]
-        ]
-            The results of the run, which can be a list of RunResponseProtocol
-            or a list of AsyncRunResponseProtocol.
+        results : list[dict[str, Any]]
+            The results of the run.
         output_file : Path
             The path to the output file.
         uploads_root : Path | None

waldiez/running/run_results.py

@@ -3,20 +3,12 @@
 
 """Waldiez run results module."""
 
-from typing import TYPE_CHECKING, TypedDict, Union
-
-if TYPE_CHECKING:
-    from autogen.io.run_response import (  # type: ignore[import-untyped]
-        AsyncRunResponseProtocol,
-        RunResponseProtocol,
-    )
+from typing import Any, TypedDict
 
 
 class WaldiezRunResults(TypedDict):
     """Results of the Waldiez run."""
 
-    results: Union[
-        list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]
-    ]
+    results: list[dict[str, Any]]
     exception: Exception | None
     completed: bool

waldiez/running/standard_runner.py

@@ -15,6 +15,7 @@ variables specified in the waldiez file are set.
 """
 
 import asyncio
+import getpass
 import importlib.util
 import sys
 import threading
@@ -31,10 +32,7 @@ from .utils import chdir
 
 if TYPE_CHECKING:
     from autogen.events import BaseEvent  # type: ignore
-    from autogen.io.run_response import (  # type: ignore
-        AsyncRunResponseProtocol,
-        RunResponseProtocol,
-    )
+    from autogen.messages import BaseMessage  # type: ignore
 
 
 class WaldiezStandardRunner(WaldiezBaseRunner):
@@ -46,6 +44,8 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         output_path: str | Path | None = None,
         uploads_root: str | Path | None = None,
         structured_io: bool = False,
+        dot_env: str | Path | None = None,
+        **kwargs: Any,
     ) -> None:
         """Initialize the Waldiez manager."""
         super().__init__(
@@ -53,6 +53,8 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
             output_path=output_path,
             uploads_root=uploads_root,
             structured_io=structured_io,
+            dot_env=dot_env,
+            **kwargs,
         )
         self._execution_thread: threading.Thread | None = None
         self._loaded_module: ModuleType | None = None
@@ -77,6 +79,26 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         self._loaded_module = module
         return module
 
+    @staticmethod
+    def standard_input(prompt: str, *, password: bool = False) -> str:
+        """Fallback / common input function for the workflow.
+
+        Parameters
+        ----------
+        prompt : str
+            The prompt to display to the user.
+        password : bool, optional
+            If True, use getpass to hide input (default is False).
+
+        Returns
+        -------
+        str
+            The user input as a string.
+        """
+        if password:
+            return getpass.getpass(prompt)
+        return input(prompt)
+
     def _run(
         self,
         temp_dir: Path,
@@ -84,7 +106,8 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         skip_mmd: bool,
         skip_timeline: bool,
-    ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
+        **kwargs: Any,
+    ) -> list[dict[str, Any]]:
         """Run the Waldiez workflow."""
         from autogen.io import IOStream  # type: ignore
 
@@ -93,7 +116,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         self._print: Callable[..., None] = print
         self._input: (
             Callable[..., str] | Callable[..., Coroutine[Any, Any, str]]
-        ) = input
+        ) = WaldiezStandardRunner.standard_input
         results_container: WaldiezRunResults = {
             "results": [],
             "exception": None,
@@ -134,7 +157,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
 
     def _on_event(
         self,
-        event: "BaseEvent",
+        event: Union["BaseEvent", "BaseMessage"],
     ) -> bool:
         """Process an event from the workflow."""
         self._event_count += 1
@@ -162,7 +185,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
                     )
                     event.content.respond(user_input)
                 else:
-                    self._send(event)
+                    self._send(event)  # pyright: ignore
             self._processed_events += 1
         except Exception as e:
             raise RuntimeError(
@@ -248,7 +271,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
 
     async def _a_on_event(
         self,
-        event: "BaseEvent",
+        event: Union["BaseEvent", "BaseMessage"],
     ) -> bool:
         """Process an event from the workflow asynchronously."""
         self._event_count += 1
@@ -278,7 +301,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
                         user_input = await user_input
                     await event.content.respond(user_input)
                 else:
-                    self._send(event)
+                    self._send(event)  # pyright: ignore
             self._processed_events += 1
         except Exception as e:
             raise RuntimeError(
@@ -293,18 +316,19 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         skip_mmd: bool = False,
         skip_timeline: bool = False,
-    ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
+        **kwargs: Any,
+    ) -> list[dict[str, Any]]:
         """Run the Waldiez workflow asynchronously."""
 
         # fmt: off
-        async def _execute_workflow() -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
+        async def _execute_workflow() -> list[dict[str, Any]]:
             # fmt: on
             """Execute the workflow in an async context."""
             from autogen.io import IOStream  # pyright: ignore
 
             from waldiez.io import StructuredIOStream
 
-            results: Union[list["AsyncRunResponseProtocol"], list["RunResponseProtocol"]] = []
+            results: list[dict[str, Any]] = []
             try:
                 self._loaded_module = self._load_module(output_file, temp_dir)
                 if self._stop_requested.is_set():

waldiez/running/timeline_processor.py

@@ -64,6 +64,7 @@ DEFAULT_AGENT_COLOR = "#E5E7EB"
 LOG = WaldiezLogger()
 
 
+# noinspection PyMethodMayBeStatic
 class TimelineProcessor:
     """Class to process timeline data from CSV files."""
 
@@ -147,6 +148,7 @@ class TimelineProcessor:
                         default_name,
                     )
             else:
+                # noinspection PyTypeChecker
                 last_valid_name = current_name
 
         return data
@@ -215,6 +217,7 @@ class TimelineProcessor:
         pd.Timestamp
             The parsed datetime.
         """
+        # noinspection PyBroadException
         try:
             return pd.to_datetime(date_str)
         except Exception:
@@ -223,6 +226,7 @@ class TimelineProcessor:
                 return coerced
             return pd.Timestamp("1970-01-01")
 
+    # noinspection PyMethodMayBeStatic
     def generate_agent_colors(self, agent_names: list[str]) -> dict[str, str]:
         """Generate color mapping for agents.
 
@@ -502,7 +506,11 @@ class TimelineProcessor:
             if matches:
                 # Return the first match, but prefer longer matches
                 best_match = max(matches, key=len)
-                return best_match
+                return (
+                    best_match
+                    if isinstance(best_match, str)
+                    else str(best_match)
+                )
 
         # Last resort: look for any word that might be a model name
         # This catches custom or unknown models
@@ -520,6 +528,7 @@ class TimelineProcessor:
 
         return "Unknown"
 
+    # noinspection PyTypeChecker
     def is_human_input_waiting_period(
         self,
         prev_session: Series,
@@ -631,6 +640,7 @@ class TimelineProcessor:
 
         return False
 
+    # noinspection PyTypeChecker
     def categorize_gap_activity(
         self,
         prev_session: Series,
@@ -727,6 +737,7 @@ class TimelineProcessor:
             "detail": f"Processing ({gap_duration:.1f}s)",
         }
 
+    # noinspection PyUnusedLocal
     def compress_timeline(
         self,
     ) -> tuple[list[dict[str, Any]], list[dict[str, Any]], float, float]:

waldiez/running/utils.py

@@ -7,6 +7,8 @@ import os
 import re
 import subprocess
 import sys
+
+# noinspection PyProtectedMember
 from asyncio.subprocess import Process
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass

waldiez/utils/conflict_checker.py

@@ -40,6 +40,6 @@ def check_conflicts() -> None:  # pragma: no cover
     """Check for conflicts."""
     # pylint: disable=global-statement
     global __waldiez_checked_conflicts
-    if __waldiez_checked_conflicts is False:
+    if not __waldiez_checked_conflicts:
         __waldiez_checked_conflicts = True
         _check_conflicts()

waldiez/utils/version.py

@@ -10,6 +10,7 @@ from pathlib import Path
 
 def _get_waldiez_version_from_importlib() -> str | None:
     """Get the Waldiez version from the version package."""
+    # noinspection PyBroadException
     try:
         return version("waldiez")
     except Exception:  # pylint: disable=broad-exception-caught