waldiez 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

waldiez/running/import_runner.py

@@ -1,424 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0.
-# Copyright (c) 2024 - 2025 Waldiez and contributors.
-
-# flake8: noqa: C901
-# pylint: disable=too-many-try-statements,import-outside-toplevel,
-# pylint: disable=too-complex,unused-argument
-"""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.
-"""
-
-import asyncio
-import importlib.util
-import threading
-import time
-from pathlib import Path
-from types import ModuleType
-from typing import TYPE_CHECKING, Callable, Union
-
-from waldiez.models.waldiez import Waldiez
-from waldiez.running.patch_io_stream import patch_io_stream
-
-from .base_runner import WaldiezBaseRunner
-from .run_results import WaldiezRunResults
-
-if TYPE_CHECKING:
-    from autogen import ChatResult  # type: ignore
-
-
-class WaldiezImportRunner(WaldiezBaseRunner):
-    """Waldiez runner class."""
-
-    def __init__(
-        self,
-        waldiez: Waldiez,
-        output_path: str | Path | None = None,
-        uploads_root: str | Path | None = None,
-        structured_io: bool = False,
-        isolated: bool = False,
-        threaded: bool = True,
-        skip_patch_io: bool = False,
-    ) -> 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,
-        )
-        self._execution_thread: threading.Thread | None = None
-        self._execution_loop: asyncio.AbstractEventLoop | None = None
-        self._loaded_module: ModuleType | None = None
-
-    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."""
-        if self.threaded:
-            return self._run_threaded(
-                temp_dir=temp_dir,
-                output_file=output_file,
-                uploads_root=uploads_root,
-                skip_mmd=skip_mmd,
-            )
-
-        return self._run_not_threaded(
-            temp_dir=temp_dir,
-            output_file=output_file,
-            uploads_root=uploads_root,
-            skip_mmd=skip_mmd,
-        )
-
-    def _run_not_threaded(
-        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 in a blocking manner."""
-        from autogen.io import IOStream  # type: ignore
-
-        from waldiez.io import StructuredIOStream
-
-        results_container: WaldiezRunResults = {
-            "results": None,
-            "exception": None,
-            "completed": False,
-        }
-        if not self.structured_io and not self.skip_patch_io:
-            patch_io_stream(self.waldiez.is_async)
-        printer: Callable[..., None] = print
-        try:
-            file_name = output_file.name
-            module_name = file_name.replace(".py", "")
-            spec = importlib.util.spec_from_file_location(
-                module_name, temp_dir / file_name
-            )
-            if not spec or not spec.loader:
-                raise ImportError("Could not import the flow")
-            if self.structured_io:
-                stream = StructuredIOStream(
-                    uploads_root=uploads_root, is_async=False
-                )
-                printer = stream.print
-                with IOStream.set_default(stream):
-                    self._loaded_module = importlib.util.module_from_spec(spec)
-                    spec.loader.exec_module(self._loaded_module)
-                    printer("<Waldiez> - Starting workflow...")
-                    printer(self.waldiez.info.model_dump_json())
-                    results = self._loaded_module.main()
-            else:
-                printer = IOStream.get_default().print
-                self._loaded_module = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(self._loaded_module)
-                printer("<Waldiez> - Starting workflow...")
-                printer(self.waldiez.info.model_dump_json())
-                results = self._loaded_module.main()
-            results_container["results"] = results
-            printer("<Waldiez> - Workflow finished")
-        except SystemExit:
-            printer("<Waldiez> - Workflow stopped by user")
-            results_container["results"] = []
-        except Exception as e:  # pylint: disable=broad-exception-caught
-            results_container["exception"] = e
-            printer("<Waldiez> - Workflow execution failed: %s", e)
-        finally:
-            results_container["completed"] = True
-        return results_container["results"] or []
-
-    # pylint: disable=too-many-statements,duplicate-code
-    def _run_threaded(
-        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."""
-        results_container: WaldiezRunResults = {
-            "results": None,
-            "exception": None,
-            "completed": False,
-        }
-
-        def _execute_workflow() -> None:
-            """Execute the workflow in a separate thread."""
-            from autogen.io import IOStream  # pyright: ignore
-
-            from waldiez.io import StructuredIOStream
-
-            if not self.structured_io and not self.skip_patch_io:
-                patch_io_stream(self.waldiez.is_async)
-            printer: Callable[..., None] = print
-            try:
-                file_name = output_file.name
-                module_name = file_name.replace(".py", "")
-                spec = importlib.util.spec_from_file_location(
-                    module_name, temp_dir / file_name
-                )
-                if not spec or not spec.loader:
-                    raise ImportError("Could not import the flow")
-                if self.structured_io:
-                    stream = StructuredIOStream(
-                        uploads_root=uploads_root, is_async=False
-                    )
-                    printer = stream.print
-                    with IOStream.set_default(stream):
-                        self._loaded_module = importlib.util.module_from_spec(
-                            spec
-                        )
-                        spec.loader.exec_module(self._loaded_module)
-                        printer("<Waldiez> - Starting workflow...")
-                        printer(self.waldiez.info.model_dump_json())
-                        results = self._loaded_module.main()
-                else:
-                    printer = IOStream.get_default().print
-                    self._loaded_module = importlib.util.module_from_spec(spec)
-                    spec.loader.exec_module(self._loaded_module)
-                    printer("<Waldiez> - Starting workflow...")
-                    printer(self.waldiez.info.model_dump_json())
-                    results = self._loaded_module.main()
-                results_container["results"] = results
-                printer("<Waldiez> - Workflow finished")
-            except SystemExit:
-                printer("<Waldiez> - Workflow stopped by user")
-                results_container["results"] = []
-            except Exception as e:  # pylint: disable=broad-exception-caught
-                results_container["exception"] = e
-                printer("<Waldiez> - Workflow execution failed: %s", e)
-            finally:
-                results_container["completed"] = True
-                self._execution_loop = None
-                self._execution_thread = None
-
-        # Execute in a separate thread for responsive stopping
-        self._execution_thread = threading.Thread(
-            target=_execute_workflow, daemon=True
-        )
-        self._execution_thread.start()
-
-        # Wait for completion while checking for stop requests
-        while self._execution_thread and self._execution_thread.is_alive():
-            if self._stop_requested.is_set():
-                self.log.info(
-                    "Stop requested, waiting for graceful shutdown..."
-                )
-                self._execution_thread.join(timeout=5.0)
-                if self._execution_thread.is_alive():
-                    self.log.warning("Workflow did not stop gracefully")
-                break
-            if results_container["completed"] is True:
-                break
-            time.sleep(0.1)
-
-        # Handle results
-        exception = results_container["exception"]
-        if exception is not None:
-            self._last_exception = exception
-            raise exception
-
-        self._last_results = results_container["results"] or []
-        return self._last_results
-
-    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"],
-    ]:
-        """Async execution using asyncio tasks."""
-
-        async def _execute_workflow() -> Union[
-            "ChatResult",
-            list["ChatResult"],
-            dict[int, "ChatResult"],
-        ]:
-            """Execute the workflow in an async context."""
-            from autogen.io import IOStream  # pyright: ignore
-
-            from waldiez.io import StructuredIOStream
-
-            printer: Callable[..., None] = print
-            if not self.structured_io and not self.skip_patch_io:
-                patch_io_stream(self.waldiez.is_async)
-            try:
-                file_name = output_file.name
-                module_name = file_name.replace(".py", "")
-                spec = importlib.util.spec_from_file_location(
-                    module_name, temp_dir / file_name
-                )
-                if not spec or not spec.loader:
-                    raise ImportError("Could not import the flow")
-                if self.structured_io:
-                    stream = StructuredIOStream(
-                        uploads_root=uploads_root, is_async=True
-                    )
-                    printer = stream.print
-                    with IOStream.set_default(stream):
-                        printer("<Waldiez> - Starting workflow...")
-                        printer(self.waldiez.info.model_dump_json())
-                        self._loaded_module = importlib.util.module_from_spec(
-                            spec
-                        )
-                        spec.loader.exec_module(self._loaded_module)
-                        results = await self._loaded_module.main()
-                        self._last_results = results
-                else:
-                    printer = IOStream.get_default().print
-                    printer("<Waldiez> - Starting workflow...")
-                    printer(self.waldiez.info.model_dump_json())
-                    self._loaded_module = importlib.util.module_from_spec(spec)
-                    spec.loader.exec_module(self._loaded_module)
-                    results = await self._loaded_module.main()
-                    self._last_results = results
-                printer("<Waldiez> - Workflow finished")
-                return results
-
-            except SystemExit:
-                printer("Workflow stopped by user")
-                return []
-            except Exception as e:
-                self._last_exception = e
-                printer("Workflow execution failed: %s", e)
-                raise
-
-        # Create cancellable task
-        task = asyncio.create_task(_execute_workflow())
-
-        # Monitor for stop requests
-        try:
-            while not task.done():
-                if self._stop_requested.is_set():
-                    self.log.info("Stop requested, cancelling task...")
-                    task.cancel()
-                    break
-                await asyncio.sleep(0.1)
-
-            return await task
-
-        except asyncio.CancelledError:
-            self.log.info("Workflow cancelled")
-            return []
-
-    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:
-        super()._after_run(
-            results=results,
-            output_file=output_file,
-            uploads_root=uploads_root,
-            temp_dir=temp_dir,
-            skip_mmd=skip_mmd,
-        )
-
-        # Clean up module reference
-        self._loaded_module = None
-
-    def _start(
-        self,
-        temp_dir: Path,
-        output_file: Path,
-        uploads_root: Path | None,
-        skip_mmd: bool = False,
-    ) -> None:
-        """Start the Waldiez workflow."""
-
-        def run_in_background() -> None:
-            """Run the workflow in a background thread."""
-            try:
-                # Reuse the blocking run logic but in a background thread
-                self._run_threaded(
-                    temp_dir=temp_dir,
-                    output_file=output_file,
-                    uploads_root=uploads_root,
-                    skip_mmd=skip_mmd,
-                )
-            except Exception as e:  # pylint: disable=broad-exception-caught
-                self._last_exception = e
-                self.log.error("Background workflow failed: %s", e)
-
-        # Start background execution
-        background_thread = threading.Thread(
-            target=run_in_background, daemon=True
-        )
-        background_thread.start()
-
-    async def _a_start(
-        self,
-        temp_dir: Path,
-        output_file: Path,
-        uploads_root: Path | None,
-        skip_mmd: bool = False,
-    ) -> None:
-        """Start the Waldiez workflow asynchronously."""
-
-        async def run_in_background() -> None:
-            """Run the workflow in an async context."""
-            try:
-                await self._a_run(
-                    temp_dir=temp_dir,
-                    output_file=output_file,
-                    uploads_root=uploads_root,
-                    skip_mmd=skip_mmd,
-                )
-            except Exception as e:  # pylint: disable=broad-exception-caught
-                self._last_exception = e
-                self.log.error("Background workflow failed: %s", e)
-
-        # Start background task
-        asyncio.create_task(run_in_background())
-
-    def _stop(self) -> None:
-        """Stop the Waldiez workflow."""
-        self.log.info("Stopping workflow execution...")
-        self._stop_requested.set()
-
-        # Wait for graceful shutdown
-        if self._execution_thread and self._execution_thread.is_alive():
-            self._execution_thread.join(timeout=5.0)
-
-            if self._execution_thread and self._execution_thread.is_alive():
-                self.log.warning("Workflow thread did not stop gracefully")
-
-    async def _a_stop(self) -> None:
-        """Stop the Waldiez workflow asynchronously."""
-        self.log.info("Stopping workflow execution (async)...")
-        self._stop_requested.set()
-
-        # For async, we rely on the task cancellation in _a_run
-        # Let's give it a moment to respond
-        await asyncio.sleep(0.5)

waldiez/running/subprocess_runner.py

@@ -1,100 +0,0 @@
-# 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."""