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

waldiez/_version.py

@@ -5,4 +5,4 @@
 This file is automatically generated by Hatchling.
 Do not edit this file directly.
 """
-__version__ = VERSION = "0.5.8"
+__version__ = VERSION = "0.5.10"

waldiez/cli.py

@@ -7,8 +7,9 @@
 
 import json
 import os
+import sys
 from pathlib import Path
-from typing import Optional
+from typing import TYPE_CHECKING, Literal, Optional
 
 import anyio
 import typer
@@ -19,9 +20,14 @@ from .cli_extras import add_cli_extras
 from .logger import get_logger
 from .models import Waldiez
 from .utils import get_waldiez_version
+from .ws import add_ws_app
+
+if TYPE_CHECKING:
+    # noinspection PyUnusedImports
+    from waldiez.running import WaldiezBaseRunner
 
 load_dotenv()
-LOG = get_logger()
+LOG = get_logger(level="debug")
 
 app = typer.Typer(
     name="waldiez",
@@ -55,7 +61,13 @@ def show_version(
         raise typer.Exit()
 
 
-@app.command()
+@app.command(
+    context_settings={
+        "help_option_names": ["-h", "--help"],
+        "allow_extra_args": True,
+        "ignore_unknown_options": True,
+    },
+)
 def run(
     file: Annotated[
         Path,
@@ -113,15 +125,52 @@ def run(
         readable=True,
         resolve_path=True,
     ),
+    step: bool = typer.Option(  # noqa: B008
+        False,
+        "--step",
+        "-s",
+        help=(
+            "Run the flow in step-by-step mode. "
+            "This will pause execution after each step, allowing for debugging."
+        ),
+        is_eager=True,
+        rich_help_panel="Debug",
+    ),
+    subprocess: bool = typer.Option(
+        False,
+        "--subprocess",
+        "-p",
+        help=(
+            "Run the flow using the subprocess runner. "
+            "This will execute the flow in a separate process."
+        ),
+        is_eager=True,
+    ),
 ) -> None:
     """Run a Waldiez flow."""
     os.environ["AUTOGEN_USE_DOCKER"] = "0"
     os.environ["NEP50_DISABLE_WARNING"] = "1"
     output_path = _get_output_path(output, force)
-    from waldiez.runner import WaldiezRunner
+    from waldiez.runner import create_runner
 
+    run_mode: Literal["standard", "debug", "subprocess"] = "standard"
+    if subprocess:
+        run_mode = "subprocess"
+    elif step:
+        run_mode = "debug"
+    subprocess_mode = "run"
+    if run_mode == "subprocess":
+        subprocess_mode = "debug" if step else "run"
     try:
-        runner = WaldiezRunner.load(file)
+        runner = create_runner(
+            Waldiez.load(file),
+            mode=run_mode,
+            output_path=output_path,
+            uploads_root=uploads_root,
+            structured_io=structured,
+            dot_env=env_file,
+            subprocess_mode=subprocess_mode,
+        )
     except FileNotFoundError as error:
         typer.echo(f"File not found: {file}")
         raise typer.Exit(code=1) from error
@@ -131,25 +180,7 @@ def run(
     except ValueError as error:
         typer.echo(f"Invalid .waldiez file: {error}")
         raise typer.Exit(code=1) from error
-    if runner.is_async:
-        anyio.run(
-            runner.a_run,
-            output_path,
-            uploads_root,
-            structured,  # structured_io
-            False,  # skip_mmd
-            False,  # skip_timeline
-            env_file,
-        )
-    else:
-        runner.run(
-            output_path=output_path,
-            uploads_root=uploads_root,
-            structured_io=structured,
-            skip_mmd=False,
-            skip_timeline=False,
-            dot_env=env_file,
-        )
+    _do_run(runner, output_path, uploads_root, structured, env_file)
 
 
 @app.command()
@@ -252,7 +283,64 @@ def _get_output_path(output: Optional[Path], force: bool) -> Optional[Path]:
     return output
 
 
+def _do_run(
+    runner: "WaldiezBaseRunner",  # noqa: F821
+    output_path: Path | None,
+    uploads_root: Path | None,
+    structured: bool,
+    env_file: Path | None,
+) -> None:
+    _error: Exception | None = None
+    _stopped: bool = False
+    from waldiez.running import StopRunningException
+
+    try:
+        if runner.waldiez.is_async:
+            anyio.run(
+                runner.a_run,
+                output_path,
+                uploads_root,
+                structured,  # structured_io
+                False,  # skip_mmd
+                False,  # skip_timeline
+                env_file,
+            )
+            # os._exit(0 if _error is None else 1)
+        else:
+            runner.run(
+                output_path=output_path,
+                uploads_root=uploads_root,
+                structured_io=structured,
+                skip_mmd=False,
+                skip_timeline=False,
+                dot_env=env_file,
+            )
+    except Exception as error:
+        _error = (
+            error if StopRunningException.reason not in str(error) else None
+        )
+        _stopped = StopRunningException.reason in str(error)
+        _error = error if not _stopped else None
+        if _error:
+            LOG.error("Execution failed: %s", error)
+        else:
+            LOG.warning(StopRunningException.reason)
+        raise typer.Exit(code=1 if error else 0) from error
+    except KeyboardInterrupt:
+        LOG.warning("Execution interrupted.")
+        _stopped = True
+        typer.echo("Execution stopped by user.")
+    finally:
+        if _stopped:
+            os._exit(0)
+        elif _error:
+            os._exit(1)
+        else:
+            sys.exit(0)
+
+
 add_cli_extras(app)
+add_ws_app(app)
 
 if __name__ == "__main__":
     app()

waldiez/exporting/agent/exporter.py

@@ -300,6 +300,9 @@ class AgentExporter(Exporter[StandardExtras]):
         if captain_result.before_agent:
             extras.append_before_agent(captain_result.before_agent)
 
+        if captain_result.after_agent:
+            extras.append_after_agent(captain_result.after_agent)
+
         return extras
 
     def create_reasoning_extras(self) -> StandardExtras:

waldiez/exporting/agent/extras/captain_agent_extras.py

@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=too-few-public-methods,no-self-use
+# pylint: disable=line-too-long
+# flake8: noqa: E501
 """Captain agent configuration processor."""
 
 import json
@@ -102,8 +104,32 @@ class CaptainAgentProcessor:
         result.set_nested_config(nested_config)
         serialized_nested_config = self.serializer.serialize(nested_config)
         result.add_arg(f"nested_config={serialized_nested_config}", tabs=1)
+        result.append_before_agent(
+            self._patch_default_nested_config(),
+        )
         return result
 
+    @staticmethod
+    def _patch_default_nested_config() -> str:
+        """Patch the default nested configuration.
+
+        Returns
+        -------
+        str
+            The patched nested configuration.
+        """
+        content = """
+# try to avoid having both temperature and top_p in the config
+try:
+    _CAPTAIN_AGENT_DEFAULT_CONFIG = CaptainAgent.DEFAULT_NESTED_CONFIG
+    _CAPTAIN_AGENT_DEFAULT_CONFIG.get("autobuild_build_config", {}).get("default_llm_config", {}).pop("top_p", None)
+    CaptainAgent.DEFAULT_NESTED_CONFIG = _CAPTAIN_AGENT_DEFAULT_CONFIG
+except Exception as e:
+    print(f"Error occurred while patching default nested config: {e}")
+"""
+
+        return content
+
     def _generate_nested_config(
         self,
         agent: WaldiezCaptainAgent,
@@ -135,9 +161,9 @@ class CaptainAgentProcessor:
         ) as f:
             json.dump(llm_config_list, f, ensure_ascii=False, indent=4)
         llm_config = llm_config_list[0]
-        if "temperature" not in llm_config:
+        if "temperature" not in llm_config and "top_p" not in llm_config:
             llm_config["temperature"] = 1
-        if "top_p" not in llm_config:
+        if "top_p" not in llm_config and "temperature" not in llm_config:
             llm_config["top_p"] = 0.95
         if "max_tokens" not in llm_config:
             llm_config["max_tokens"] = 2048
@@ -177,9 +203,15 @@ class CaptainAgentProcessor:
         if not config_list:
             default_model = self._get_default_model(uuid.uuid4().hex)
             default_llm_config = default_model.get_llm_config(skip_price=True)
-            if "temperature" not in default_llm_config:
+            if (
+                "temperature" not in default_llm_config
+                and "top_p" not in default_llm_config
+            ):
                 default_llm_config["temperature"] = temperature
-            if "top_p" not in default_llm_config:
+            if (
+                "top_p" not in default_llm_config
+                and "temperature" not in default_llm_config
+            ):
                 default_llm_config["top_p"] = top_p
             if "max_tokens" not in default_llm_config:
                 default_llm_config["max_tokens"] = max_tokens
@@ -220,15 +252,20 @@ class CaptainAgentProcessor:
             code_execution_config["timeout"] = (
                 self.agent.data.code_execution_config.timeout or 300
             )
-        return {
+        to_return: dict[str, Any] = {
             "default_llm_config": {
-                "temperature": llm_config["temperature"],
-                "top_p": llm_config["top_p"],
                 "max_tokens": llm_config["max_tokens"],
             },
             "code_execution_config": code_execution_config,
             "coding": coding,
         }
+        if llm_config.get("temperature") is not None:
+            to_return["default_llm_config"]["temperature"] = llm_config[
+                "temperature"
+            ]
+        elif llm_config.get("top_p") is not None:
+            to_return["default_llm_config"]["top_p"] = llm_config["top_p"]
+        return to_return
 
     def _get_waldiez_model(self, model_id: str) -> WaldiezModel:
         """Get the Waldiez model by its ID.

waldiez/exporting/agent/extras/handoffs/condition.py

@@ -151,8 +151,10 @@ class ConditionProcessor:
         """Process an expression context condition handoff."""
         expression = self.serializer(condition.expression)
         condition_string = (
-            f"ExpressionContextCondition(expression={expression})"
+            "ExpressionContextCondition("
+            f"expression=ContextExpression({expression}))"
         )
         self.result.content += condition_string
         extra_import = f"{self.IMPORT_PREFIX}ExpressionContextCondition"
         self.result.extra_imports.add(extra_import)
+        self.result.extra_imports.add(f"{self.IMPORT_PREFIX}ContextExpression")

waldiez/exporting/chats/utils/common.py

@@ -73,7 +73,7 @@ def get_event_handler_string(
     content = (
         f"{tab}if on_event:\n"
         f"{tab}    if not isinstance(results, list):\n"
-        f"{tab}        results = [results]\n"
+        f"{tab}        results = [results]  # pylint: disable=redefined-variable-type\n"
         f"{tab}    for index, result in enumerate(results):\n"
     )
     if is_async:
@@ -81,9 +81,10 @@ def get_event_handler_string(
             f"{tab}        async for event in result.events:\n"
             f"{tab}            try:\n"
             f"{tab}                should_continue = await on_event(event)\n"
-            f"{tab}            except Exception as e:\n"
-            f"{tab}                raise RuntimeError(\n"
-            f"{tab}                    'Error in event handler: ' + str(e)\n"
+            f"{tab}            except BaseException as e:\n"
+            f'{tab}                print(f"Error in event handler: {{e}}")\n'
+            f"{tab}                raise SystemExit(\n"
+            f'{tab}                    "Error in event handler: " + str(e)\n'
             f"{tab}                ) from e\n"
         )
     else:
@@ -91,22 +92,23 @@ def get_event_handler_string(
             f"{tab}        for event in result.events:\n"
             f"{tab}            try:\n"
             f"{tab}                should_continue = on_event(event)\n"
-            f"{tab}            except Exception as e:\n"
-            f"{tab}                raise RuntimeError(\n"
-            f"{tab}                    'Error in event handler: ' + str(e)\n"
+            f"{tab}            except BaseException as e:\n"
+            f'{tab}                print(f"Error in event handler: {{e}}")\n'
+            f"{tab}                raise SystemExit(\n"
+            f'{tab}                    "Error in event handler: " + str(e)\n'
             f"{tab}                ) from e\n"
         )
     content += (
-        f"{tab}            if event.type == 'run_completion':\n"
-        f"{tab}                should_continue = False\n"
-        f"{tab}            if not should_continue:\n"
+        f'{tab}            if event.type == "run_completion":\n'
         f"{tab}                break\n"
+        f"{tab}            if not should_continue:\n"
+        f'{tab}                raise SystemExit("Event handler stopped processing")\n'
     )
     content += get_result_dicts_string(tab, is_async)
     content += (
         f"{tab}else:\n"
         f"{tab}    if not isinstance(results, list):\n"
-        f"{tab}        results = [results]\n"
+        f"{tab}        results = [results]  # pylint: disable=redefined-variable-type\n"
         f"{tab}    for index, result in enumerate(results):\n"
     )
     if is_async:
@@ -135,22 +137,22 @@ def get_result_dicts_string(tab: str, is_async: bool) -> str:
     """
     space = f"{tab}        "
     flow_content = f"{space}result_dict = {{\n"
-    flow_content += f"{space}    'index': index,\n"
+    flow_content += f'{space}    "index": index,\n'
     if is_async:
-        flow_content += f"{space}    'messages': await result.messages,\n"
-        flow_content += f"{space}    'summary': await result.summary,\n"
-        flow_content += f"{space}    'cost': (await result.cost).model_dump(mode='json', fallback=str) if await result.cost else None,\n"
-        flow_content += f"{space}    'context_variables': (await result.context_variables).model_dump(mode='json', fallback=str) if await result.context_variables else None,\n"
+        flow_content += f'{space}    "messages": await result.messages,\n'
+        flow_content += f'{space}    "summary": await result.summary,\n'
+        flow_content += f'{space}    "cost": (await result.cost).model_dump(mode="json", fallback=str) if await result.cost else None,\n'
+        flow_content += f'{space}    "context_variables": (await result.context_variables).model_dump(mode="json", fallback=str) if await result.context_variables else None,\n'
         flow_content += (
-            f"{space}    'last_speaker': await result.last_speaker,\n"
+            f'{space}    "last_speaker": await result.last_speaker,\n'
         )
     else:
-        flow_content += f"{space}    'messages': result.messages,\n"
-        flow_content += f"{space}    'summary': result.summary,\n"
-        flow_content += f"{space}    'cost': result.cost.model_dump(mode='json', fallback=str) if result.cost else None,\n"
-        flow_content += f"{space}    'context_variables': result.context_variables.model_dump(mode='json', fallback=str) if result.context_variables else None,\n"
-        flow_content += f"{space}    'last_speaker': result.last_speaker,\n"
-    flow_content += f"{space}    'uuid': str(result.uuid),\n"
+        flow_content += f'{space}    "messages": result.messages,\n'
+        flow_content += f'{space}    "summary": result.summary,\n'
+        flow_content += f'{space}    "cost": result.cost.model_dump(mode="json", fallback=str) if result.cost else None,\n'
+        flow_content += f'{space}    "context_variables": result.context_variables.model_dump(mode="json", fallback=str) if result.context_variables else None,\n'
+        flow_content += f'{space}    "last_speaker": result.last_speaker,\n'
+    flow_content += f'{space}    "uuid": str(result.uuid),\n'
     flow_content += f"{space}}}\n"
     flow_content += f"{space}result_dicts.append(result_dict)\n"
     return flow_content

waldiez/exporting/core/__init__.py

@@ -90,7 +90,6 @@ from .extras.tool_extras import (
 from .protocols import (
     ContentGenerator,
     ExportContributor,
-    ExportingLogger,
     PathResolver,
     Serializer,
     Validator,
@@ -128,7 +127,6 @@ __all__ = [
     "ConfigurableExporter",
     # Protocols
     "ContentGenerator",
-    "ExportingLogger",
     "ExportContributor",
     "Validator",
     "Serializer",

waldiez/exporting/core/context.py

@@ -6,11 +6,11 @@ import threading
 from dataclasses import dataclass
 from typing import Any, Optional
 
-from waldiez.logger import WaldiezLogger
+from waldiez.logger import WaldiezLogger, get_logger
 
 from .extras.path_resolver import DefaultPathResolver
 from .extras.serializer import DefaultSerializer
-from .protocols import ExportingLogger, PathResolver, Serializer, Validator
+from .protocols import PathResolver, Serializer, Validator
 from .types import ExportConfig
 
 
@@ -22,7 +22,7 @@ class ExporterContext:
     path_resolver: PathResolver | None = None
     validator: Validator | None = None
     config: ExportConfig | None = None
-    logger: ExportingLogger | None = None
+    logger: WaldiezLogger | None = None
 
     def get_serializer(self) -> Serializer:
         """Get serializer or raise if not set.
@@ -112,15 +112,15 @@ class ExporterContext:
         """
         self.config = config
 
-    def get_logger(self) -> ExportingLogger:
+    def get_logger(self) -> WaldiezLogger:
         """Get logger or create a default one.
 
         Returns
         -------
-        ExportingLogger
+        WaldiezLogger
             The logger instance.
         """
-        return self.logger or WaldiezLogger()
+        return self.logger or get_logger()
 
 
 # pylint: disable=too-few-public-methods
@@ -168,7 +168,7 @@ class DefaultExporterContext(ExporterContext):
         serializer: Serializer | None = None,
         validator: Validator | None = None,
         path_resolver: PathResolver | None = None,
-        logger: ExportingLogger | None = None,
+        logger: WaldiezLogger | None = None,
         config: ExportConfig | None = None,
     ) -> None:
         if hasattr(self, "_initialized"):
@@ -176,7 +176,7 @@ class DefaultExporterContext(ExporterContext):
         super().__init__(
             serializer=serializer or DefaultSerializer(),
             path_resolver=path_resolver or DefaultPathResolver(),
-            logger=logger or WaldiezLogger(),
+            logger=logger or get_logger(),
             validator=validator,
             config=config,
         )
@@ -185,7 +185,7 @@ class DefaultExporterContext(ExporterContext):
 
 def get_default_exporter_context(
     config: ExportConfig | None = None,
-    logger: ExportingLogger | None = None,
+    logger: WaldiezLogger | None = None,
 ) -> ExporterContext:
     """Get the default exporter context.
 
@@ -204,7 +204,7 @@ def get_default_exporter_context(
     return DefaultExporterContext(
         serializer=DefaultSerializer(),
         path_resolver=DefaultPathResolver(),
-        logger=logger or WaldiezLogger(),
+        logger=logger or get_logger(),
         config=config,
     )
 
@@ -214,7 +214,7 @@ def create_exporter_context(
     validator: Validator | None = None,
     path_resolver: PathResolver | None = None,
     config: ExportConfig | None = None,
-    logger: ExportingLogger | None = None,
+    logger: WaldiezLogger | None = None,
 ) -> ExporterContext:
     """Create an exporter context with the given components.
 
@@ -228,7 +228,7 @@ def create_exporter_context(
         The validator component, by default None
     config : ExportConfig | None, optional
         The export configuration, by default None
-    logger : ExportingLogger | None, optional
+    logger : WaldiezLogger | None, optional
         The logger instance, by default None
 
     Returns
@@ -240,6 +240,6 @@ def create_exporter_context(
         serializer=serializer or DefaultSerializer(),
         path_resolver=path_resolver or DefaultPathResolver(),
         validator=validator,
-        logger=logger or WaldiezLogger(),
+        logger=logger or get_logger(),
         config=config,
     )

waldiez/exporting/core/protocols.py

@@ -139,144 +139,3 @@ class ContentGenerator(Protocol):
         ExporterContentError
             If exporting fails.
         """
-
-
-@runtime_checkable
-class ExportingLogger(Protocol):
-    """Protocol for logging during exporting."""
-
-    def log(
-        self, message: Any, *args: Any, level: str = "info", **kwargs: Any
-    ) -> None:
-        """Log a message with the specified level.
-
-        Parameters
-        ----------
-        message : Any
-            The message to log or message template for formatting.
-        level : str, optional
-            The logging level to use (e.g., "debug", "info", "warning", "error",
-            "critical"). Defaults to "info".
-        *args : Any
-            Arguments to format into the message using % formatting.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-
-    def error(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log an error message.
-
-        Parameters
-        ----------
-        message : Any
-            The error message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-
-    def warning(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log a warning message.
-
-        Parameters
-        ----------
-        message : Any
-            The warning message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-
-    def info(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log an informational message.
-
-        Parameters
-        ----------
-        message : Any
-            The informational message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-
-    def success(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log a success message.
-
-        Parameters
-        ----------
-        message : Any
-            The success message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-
-    def debug(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log a debug message.
-
-        Parameters
-        ----------
-        message : Any
-            The debug message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-        self.log(message, *args, level="debug", **kwargs)
-
-    def critical(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log a critical error message.
-
-        Parameters
-        ----------
-        message : Any
-            The critical error message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-        self.log(message, *args, level="critical", **kwargs)
-
-    def exception(self, message: Any, *args: Any, **kwargs: Any) -> None:
-        """Log an exception message.
-
-        Parameters
-        ----------
-        message : Any
-            The exception message to log or message template.
-        *args : Any
-            Arguments to format into the message.
-        **kwargs : Any
-            Keyword arguments to format into the message using str.format().
-        """
-        self.log(message, *args, level="exception", **kwargs)
-
-    def set_level(self, level: str) -> None:
-        """Set the logging level.
-
-        Parameters
-        ----------
-        level : str
-            The logging level to set
-            (e.g., "debug", "info", "warning", "error", "critical").
-
-        Raises
-        ------
-        ValueError
-            If the provided level is invalid.
-        """
-
-    def get_level(self) -> str:  # pyright: ignore
-        """Get the current logging level.
-
-        Returns
-        -------
-        str
-            The current logging level.
-        """