waldiez 0.4.8__py3-none-any.whl → 0.4.11__py3-none-any.whl

waldiez/running/protocol.py

@@ -0,0 +1,281 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+"""Waldiez Runner protocol."""
+
+from pathlib import Path
+from typing import TYPE_CHECKING, Protocol, Union, runtime_checkable
+
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore[import-untyped]
+
+
+@runtime_checkable
+class WaldiezRunnerProtocol(Protocol):
+    """Waldiez Runner protocol."""
+
+    def before_run(
+        self,
+        output_file: Path,
+        uploads_root: Path | None,
+    ) -> Path:  # pyright: ignore
+        """Actions to perform before running the flow.
+
+        Parameters
+        ----------
+        output_file : Path
+            The output file.
+        uploads_root : Path | None
+            The runtime uploads root.
+
+        Returns
+        -------
+        Path
+            The path to the temporary directory created for the run.
+        """
+
+    async def a_before_run(
+        self,
+        output_file: Path,
+        uploads_root: Path | None,
+    ) -> Path:  # pyright: ignore
+        """Asynchronously perform actions before running the flow.
+
+        Parameters
+        ----------
+        output_file : Path
+            The output file.
+        uploads_root : Path | None
+            The runtime uploads root.
+
+        Returns
+        -------
+        Path
+            The path to the temporary directory created for the run.
+        """
+
+    def start(
+        self,
+        output_path: str | Path | None,
+        uploads_root: str | Path | None,
+        structured_io: bool | None = None,
+        skip_patch_io: bool | None = None,
+        skip_mmd: bool = False,
+    ) -> None:
+        """Start running the Waldiez flow in a non-blocking way.
+
+        To allow "stoping" it later.
+
+        Parameters
+        ----------
+        output_path : str | Path | None
+            The output path.
+        uploads_root : str | Path | None
+            The runtime uploads root.
+        structured_io : bool
+            Whether to use structured IO instead of the default 'input/print'.
+        skip_patch_io : bool | None
+            Whether to skip patching I/O, by default None.
+            If None, it will use the value from the context.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+
+        Raises
+        ------
+        RuntimeError
+            If the runner is already running.
+        """
+
+    async def a_start(
+        self,
+        output_path: str | Path | None,
+        uploads_root: str | Path | None,
+        structured_io: bool | None = None,
+        skip_patch_io: bool | None = None,
+        skip_mmd: bool = False,
+    ) -> None:
+        """Asynchronously start running the Waldiez flow in a non-blocking way.
+
+        To allow "stoping" it later.
+
+        Parameters
+        ----------
+        output_path :  str | Path | None
+            The output path.
+        uploads_root : str | Path | None
+            The runtime uploads root.
+        structured_io : bool
+            Whether to use structured IO instead of the default 'input/print'.
+        skip_patch_io : bool | None
+            Whether to skip patching I/O, by default None.
+            If None, it will use the value from the context.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+
+        Raises
+        ------
+        RuntimeError
+            If the runner is already running.
+        """
+
+    def run(
+        self,
+        output_path: str | Path | None,
+        uploads_root: str | Path | None,
+        structured_io: bool | None = None,
+        threaded: bool | None = None,
+        skip_patch_io: bool | None = None,
+        skip_mmd: bool = False,
+    ) -> Union[
+        "ChatResult",
+        list["ChatResult"],
+        dict[int, "ChatResult"],
+    ]:  # pyright: ignore
+        """Run the Waldiez flow in a blocking way.
+
+        Parameters
+        ----------
+        output_path : str | Path | None
+            The output path, by default None.
+        uploads_root : str | Path | None
+            The runtime uploads root.
+        structured_io : bool
+            Whether to use structured IO instead of the default 'input/print'.
+        threaded : bool | None
+            Whether to run the flow in a separate thread.
+        skip_patch_io : bool
+            Whether to skip patching I/O, by default None.
+            If None, it will use the value from the context.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+
+        Returns
+        -------
+        Union[ChatResult, list[ChatResult], dict[int, ChatResult]]
+            The result of the run, which can be a single ChatResult,
+            a list of ChatResults,
+            or a dictionary mapping indices to ChatResults.
+        """
+
+    async def a_run(
+        self,
+        output_path: str | Path | None,
+        uploads_root: str | Path | None,
+        structured_io: bool | None = None,
+        skip_patch_io: bool | None = None,
+        skip_mmd: bool = False,
+    ) -> Union[
+        "ChatResult",
+        list["ChatResult"],
+        dict[int, "ChatResult"],
+    ]:  # pyright: ignore
+        """Run the Waldiez flow.
+
+        Parameters
+        ----------
+        output_path : str | Path | None
+            The output path, by default None.
+        uploads_root : str | Path | None
+            The runtime uploads root.
+        structured_io : bool
+            Whether to use structured IO instead of the default 'input/print'.
+        skip_patch_io : bool
+            Whether to skip patching I/O, by default None.
+            If None, it will use the value from the context.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+
+        Returns
+        -------
+        Union[ChatResult, list[ChatResult], dict[int, ChatResult]]
+            The result of the run, which can be a single ChatResult,
+            a list of ChatResults,
+            or a dictionary mapping indices to ChatResults.
+        """
+
+    def after_run(
+        self,
+        results: Union[
+            "ChatResult",
+            list["ChatResult"],
+            dict[int, "ChatResult"],
+        ],
+        output_file: Path,
+        uploads_root: Path | None,
+        temp_dir: Path,
+        skip_mmd: bool,
+    ) -> None:
+        """Actions to perform after running the flow.
+
+        Parameters
+        ----------
+        results : Union[ChatResult, list[ChatResult], dict[int, ChatResult]]
+            The results of the run, which can be a single ChatResult,
+            a list of ChatResults,
+            or a dictionary mapping indices to ChatResults.
+        output_file : Path
+            The path to the output file.
+        uploads_root : Path | None
+            The runtime uploads root.
+        temp_dir : Path
+            The path to the temporary directory.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+        """
+
+    async def a_after_run(
+        self,
+        results: Union[
+            "ChatResult",
+            list["ChatResult"],
+            dict[int, "ChatResult"],
+        ],
+        output_file: Path,
+        uploads_root: Path | None,
+        temp_dir: Path,
+        skip_mmd: bool,
+    ) -> None:
+        """Asynchronously perform actions after running the flow.
+
+        Parameters
+        ----------
+        results : Union[ChatResult, list[ChatResult], dict[int, ChatResult]]
+            The results of the run, which can be a single ChatResult,
+            a list of ChatResults,
+            or a dictionary mapping indices to ChatResults.
+        output_file : Path
+            The path to the output file.
+        uploads_root : Path | None
+            The runtime uploads root.
+        temp_dir : Path
+            The path to the temporary directory.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram.
+        """
+
+    def is_running(self) -> bool:  # pyright: ignore
+        """Check if the runner is currently running.
+
+        Returns
+        -------
+        bool
+            True if the runner is running, False otherwise.
+        """
+
+    def stop(self) -> None:
+        """Stop the runner if it is running.
+
+        Raises
+        ------
+        RuntimeError
+            If the runner is not running.
+        """
+
+    async def a_stop(self) -> None:
+        """Asynchronously stop the runner if it is running.
+
+        Raises
+        ------
+        RuntimeError
+            If the runner is not running.
+        """

waldiez/running/run_results.py

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+"""Waldiez run results module."""
+
+from typing import TYPE_CHECKING, TypedDict, Union
+
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore[import-untyped]
+
+
+class WaldiezRunResults(TypedDict):
+    """Results of the Waldiez run."""
+
+    results: Union[
+        "ChatResult",
+        list["ChatResult"],
+        dict[int, "ChatResult"],
+        None,
+    ]
+    exception: Exception | None
+    completed: bool

waldiez/running/subprocess_runner.py

@@ -0,0 +1,100 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Run a waldiez flow.
+
+The flow is first converted to an autogen flow with agents, chats, and tools.
+We then chown to temporary directory, call the flow's `main()` and
+return the results. Before running the flow, any additional environment
+variables specified in the waldiez file are set.
+"""
+
+from pathlib import Path
+from typing import TYPE_CHECKING, Union
+
+from waldiez.models.waldiez import Waldiez
+
+from .base_runner import WaldiezBaseRunner
+
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore[import-untyped]
+
+
+class WaldiezSubprocessRunner(WaldiezBaseRunner):
+    """Waldiez runner class."""
+
+    def __init__(
+        self,
+        waldiez: Waldiez,
+        output_path: str | Path | None = None,
+        uploads_root: str | Path | None = None,
+        structured_io: bool = True,
+        isolated: bool = True,
+        threaded: bool = False,
+        skip_patch_io: bool = True,
+    ) -> None:
+        """Initialize the Waldiez manager."""
+        super().__init__(
+            waldiez,
+            output_path=output_path,
+            uploads_root=uploads_root,
+            structured_io=structured_io,
+            isolated=isolated,
+            threaded=threaded,
+            skip_patch_io=skip_patch_io,
+        )
+
+    def _run(
+        self,
+        temp_dir: Path,
+        output_file: Path,
+        uploads_root: Path | None,
+        skip_mmd: bool,
+    ) -> Union[
+        "ChatResult",
+        list["ChatResult"],
+        dict[int, "ChatResult"],
+    ]:
+        """Run the Waldiez workflow."""
+        return []
+
+    async def _a_run(
+        self,
+        temp_dir: Path,
+        output_file: Path,
+        uploads_root: Path | None,
+        skip_mmd: bool,
+    ) -> Union[
+        "ChatResult",
+        list["ChatResult"],
+        dict[int, "ChatResult"],
+    ]:
+        """Run the Waldiez workflow asynchronously."""
+        return []
+
+    def _start(
+        self,
+        temp_dir: Path,
+        output_file: Path,
+        uploads_root: Path | None,
+        skip_mmd: bool,
+    ) -> None:
+        """Start the Waldiez workflow."""
+        # This method should be implemented to start the workflow
+        # For now, it is a placeholder
+
+    async def _a_start(
+        self,
+        temp_dir: Path,
+        output_file: Path,
+        uploads_root: Path | None,
+        skip_mmd: bool,
+    ) -> None:
+        """Start the Waldiez workflow asynchronously."""
+        # This method should be implemented to start the workflow asynchronously
+        # For now, it is a placeholder
+
+    def _stop(self) -> None:
+        """Stop the Waldiez workflow."""
+
+    async def _a_stop(self) -> None:
+        """Stop the Waldiez workflow asynchronously."""

waldiez/running/utils.py

@@ -0,0 +1,134 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Common utilities for the waldiez runner."""
+
+import asyncio
+import os
+import re
+import subprocess
+import sys
+from asyncio.subprocess import Process
+from contextlib import asynccontextmanager, contextmanager
+from dataclasses import dataclass
+from pathlib import Path
+from typing import AsyncIterator, Iterator, Union
+
+
+@dataclass
+class ProcessSetup:
+    """Container for subprocess setup data."""
+
+    temp_dir: Path
+    file_path: Path
+    old_vars: dict[str, str]
+    skip_mmd: bool
+
+
+@contextmanager
+def chdir(to: Union[str, Path]) -> Iterator[None]:
+    """Change the current working directory in a context.
+
+    Parameters
+    ----------
+    to : Union[str, Path]
+        The directory to change to.
+
+    Yields
+    ------
+    Iterator[None]
+        The context manager.
+    """
+    old_cwd = str(os.getcwd())
+    os.chdir(to)
+    try:
+        yield
+    finally:
+        os.chdir(old_cwd)
+
+
+@asynccontextmanager
+async def a_chdir(to: Union[str, Path]) -> AsyncIterator[None]:
+    """Asynchronously change the current working directory in a context.
+
+    Parameters
+    ----------
+    to : Union[str, Path]
+        The directory to change to.
+
+    Yields
+    ------
+    AsyncIterator[None]
+        The async context manager.
+    """
+    old_cwd = str(os.getcwd())
+    os.chdir(to)
+    try:
+        yield
+    finally:
+        os.chdir(old_cwd)
+
+
+def strip_ansi(text: str) -> str:
+    """Remove ANSI escape sequences from text.
+
+    Parameters
+    ----------
+    text : str
+        The text to strip.
+
+    Returns
+    -------
+    str
+        The text without ANSI escape sequences.
+    """
+    ansi_pattern = re.compile(r"\x1b\[[0-9;]*m|\x1b\[.*?[@-~]")
+    return ansi_pattern.sub("", text)
+
+
+def create_sync_subprocess(setup: ProcessSetup) -> subprocess.Popen[bytes]:
+    """Create a synchronous subprocess.
+
+    Parameters
+    ----------
+    setup : ProcessSetup
+        The setup data for the subprocess.
+
+    Returns
+    -------
+    subprocess.Popen[bytes]
+        The created subprocess.
+    """
+    return subprocess.Popen(
+        [sys.executable, "-u", str(setup.file_path)],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        stdin=subprocess.PIPE,
+        # text=True,
+        # bufsize=1,  # Line buffered for real-time output
+        # universal_newlines=True,
+        env={**os.environ},
+    )
+
+
+async def create_async_subprocess(setup: ProcessSetup) -> Process:
+    """Create an asynchronous subprocess.
+
+    Parameters
+    ----------
+    setup : ProcessSetup
+        The setup data for the subprocess.
+
+    Returns
+    -------
+    Process
+        The created asynchronous subprocess.
+    """
+    return await asyncio.create_subprocess_exec(
+        sys.executable,
+        "-u",
+        str(setup.file_path),
+        # stdout=asyncio.subprocess.PIPE,
+        # stderr=asyncio.subprocess.PIPE,
+        # stdin=asyncio.subprocess.PIPE,
+        env={**os.environ},
+    )

waldiez/utils/__init__.py

@@ -4,10 +4,10 @@
 
 from .cli_extras import add_cli_extras
 from .conflict_checker import check_conflicts
-from .flaml_warnings import check_flaml_warnings
+from .version import get_waldiez_version
 
 __all__ = [
     "check_conflicts",
-    "check_flaml_warnings",
     "add_cli_extras",
+    "get_waldiez_version",
 ]

waldiez/utils/version.py

@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Try to get the Waldiez version."""
+
+import json
+from functools import cache
+from pathlib import Path
+
+
+def _get_waldiez_version_from_package_json() -> str | None:
+    """Get the Waldiez version from package.json."""
+    package_json_path = Path(__file__).parent.parent.parent / "package.json"
+    if package_json_path.exists():
+        with open(package_json_path, "r", encoding="utf-8") as f:
+            package_data = json.load(f)
+            return package_data.get("version", None)
+    return None
+
+
+def _get_waldiez_version_from_version_py() -> str | None:
+    """Get the Waldiez version from _version.py."""
+    version_py_path = Path(__file__).parent.parent / "_version.py"
+    if version_py_path.exists():
+        with open(version_py_path, "r", encoding="utf-8") as f:
+            for line in f:
+                if line.startswith("__version__"):
+                    return line.split('"')[1]
+    return None
+
+
+@cache
+def get_waldiez_version() -> str:
+    """Get the Waldiez version.
+
+    Returns
+    -------
+    str
+        The Waldiez version, or "dev" if not found.
+    """
+    w_version = _get_waldiez_version_from_version_py()
+    if not w_version:
+        w_version = _get_waldiez_version_from_package_json()
+    if not w_version:
+        w_version = "dev"
+    return w_version
+
+
+if __name__ == "__main__":
+    print(get_waldiez_version())

{waldiez-0.4.8.dist-info → waldiez-0.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.4.8
+Version: 0.4.11
 Dynamic: Keywords
 Summary: Make AG2 Agents Collaborate: Drag, Drop, and Orchestrate with Waldiez.
 Project-URL: Homepage, https://waldiez.io
@@ -33,7 +33,7 @@ Requires-Dist: aiofiles==24.1.0
 Requires-Dist: aiosqlite==0.21.0
 Requires-Dist: asyncer==0.0.8
 Requires-Dist: click<8.2
-Requires-Dist: graphviz<=0.20.3
+Requires-Dist: graphviz<=0.21
 Requires-Dist: httpx<1
 Requires-Dist: jupytext
 Requires-Dist: nest-asyncio==1.6.0
@@ -80,7 +80,7 @@ Requires-Dist: ipython; extra == 'ag2-extras'
 Requires-Dist: langchain-community<1,>=0.3.12; extra == 'ag2-extras'
 Requires-Dist: litellm; extra == 'ag2-extras'
 Requires-Dist: markdownify; extra == 'ag2-extras'
-Requires-Dist: mcp<1.6,>=1.4.0; extra == 'ag2-extras'
+Requires-Dist: mcp<2,>=1.4.0; extra == 'ag2-extras'
 Requires-Dist: mistralai>=1.8.1; extra == 'ag2-extras'
 Requires-Dist: networkx; (python_version < '3.11') and extra == 'ag2-extras'
 Requires-Dist: networkx>=3.5; (python_version >= '3.11') and extra == 'ag2-extras'
@@ -106,10 +106,10 @@ Provides-Extra: dev
 Requires-Dist: ag2[redis]==0.9.2; extra == 'dev'
 Requires-Dist: ag2[websockets]==0.9.2; extra == 'dev'
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
-Requires-Dist: bandit==1.8.3; extra == 'dev'
+Requires-Dist: bandit==1.8.5; extra == 'dev'
 Requires-Dist: black[jupyter]==25.1.0; extra == 'dev'
 Requires-Dist: build==1.2.2.post1; extra == 'dev'
-Requires-Dist: fakeredis>=2.28.1; extra == 'dev'
+Requires-Dist: fakeredis<=3.30.0,>=2.28.1; extra == 'dev'
 Requires-Dist: fastjsonschema>=2.21; extra == 'dev'
 Requires-Dist: flake8==7.2.0; extra == 'dev'
 Requires-Dist: hatchling==1.27.0; extra == 'dev'
@@ -117,7 +117,7 @@ Requires-Dist: jsonschema==4.24.0; extra == 'dev'
 Requires-Dist: jupyter-server==2.16.0; extra == 'dev'
 Requires-Dist: jupyterlab<5.0,>=4.4.0; extra == 'dev'
 Requires-Dist: mypy-extensions>=1.1.0; extra == 'dev'
-Requires-Dist: mypy==1.16.0; extra == 'dev'
+Requires-Dist: mypy==1.16.1; extra == 'dev'
 Requires-Dist: nbclient>=0.10.2; extra == 'dev'
 Requires-Dist: nbconvert>=7.16.6; extra == 'dev'
 Requires-Dist: nbformat>=5.10.4; extra == 'dev'
@@ -134,7 +134,7 @@ Requires-Dist: toml==0.10.2; (python_version <= '3.10') and extra == 'dev'
 Requires-Dist: types-jsonschema==4.24.0.20250528; extra == 'dev'
 Requires-Dist: types-pyyaml==6.0.12.20250516; extra == 'dev'
 Requires-Dist: types-redis==4.6.0.20241004; extra == 'dev'
-Requires-Dist: types-requests==2.32.0.20250602; extra == 'dev'
+Requires-Dist: types-requests==2.32.4.20250611; extra == 'dev'
 Requires-Dist: types-toml==0.10.8.20240310; extra == 'dev'
 Requires-Dist: watchdog==6.0.0; extra == 'dev'
 Requires-Dist: yamllint==1.37.1; extra == 'dev'
@@ -157,19 +157,19 @@ Requires-Dist: natsort==8.4.0; extra == 'docs'
 Provides-Extra: jupyter
 Requires-Dist: jupyter-server==2.16.0; extra == 'jupyter'
 Requires-Dist: jupyterlab<5.0,>=4.3.0; extra == 'jupyter'
-Requires-Dist: waldiez-jupyter==0.4.8; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.4.11; extra == 'jupyter'
 Provides-Extra: mqtt
 Requires-Dist: paho-mqtt<3.0,>=2.1.0; extra == 'mqtt'
 Provides-Extra: redis
 Requires-Dist: ag2[redis]==0.9.2; extra == 'redis'
 Provides-Extra: runner
-Requires-Dist: waldiez-runner==0.4.8; (python_version >= '3.11') and extra == 'runner'
+Requires-Dist: waldiez-runner==0.4.11; (python_version >= '3.11') and extra == 'runner'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.4.8; extra == 'studio'
+Requires-Dist: waldiez-studio==0.4.11; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: ag2[redis]==0.9.2; extra == 'test'
 Requires-Dist: ag2[websockets]==0.9.2; extra == 'test'
-Requires-Dist: fakeredis>=2.28.1; extra == 'test'
+Requires-Dist: fakeredis<=3.30.0,>=2.28.1; extra == 'test'
 Requires-Dist: paho-mqtt<3.0,>=2.1.0; extra == 'test'
 Requires-Dist: pytest-asyncio==1.0.0; extra == 'test'
 Requires-Dist: pytest-cov==6.1.1; extra == 'test'