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

waldiez/io/utils.py

@@ -14,9 +14,16 @@ from autogen.agentchat.contrib.img_utils import get_pil_image  # type: ignore
 from autogen.events import BaseEvent  # type: ignore
 from autogen.messages import BaseMessage  # type: ignore
 
+DEBUG_INPUT_PROMPT = (
+    "[Step] (c)ontinue, (r)un, (q)uit, (i)nfo, (h)elp, (st)ats: "
+)
+START_CHAT_PROMPT = "Enter your message to start the conversation: "
+
 MessageType = Literal[
     "input_request",
     "input_response",
+    "debug_input_request",
+    "debug_input_response",
     "print",
     "input",
 ]
@@ -131,26 +138,25 @@ def get_image(
     return image_data
 
 
-def is_json_dumped(value: str) -> bool:
-    """Check if a string is JSON-dumped.
+def is_json_dumped(value: Any) -> tuple[bool, Any]:
+    """Check if a value is JSON-dumped.
 
     Parameters
     ----------
-    value : str
-        The string to check.
+    value : Any
+        The value to check.
 
     Returns
     -------
     bool
-        True if the string is JSON-dumped, False otherwise.
+        True if the value is JSON-dumped, False otherwise.
     """
+    to_check = value.strip() if isinstance(value, str) else value
     try:
-        parsed = json.loads(value)
-        # If we can parse it as JSON and it's not a string,
-        # we consider it JSON-dumped
-        return not isinstance(parsed, str)
+        parsed = json.loads(to_check)
+        return True, parsed
     except json.JSONDecodeError:
-        return False
+        return False, value
 
 
 def try_parse_maybe_serialized(value: str) -> Any:

waldiez/io/ws.py

@@ -118,8 +118,8 @@ class AsyncWebsocketsIOStream(IOStream):
         end = kwargs.get("end", "\n")
         msg = sep.join(str(arg) for arg in args)
 
-        is_dumped = is_json_dumped(msg)
-        if is_dumped and end.endswith("\n"):  # pragma: no cover
+        is_dumped, msg = is_json_dumped(msg)
+        if is_dumped:  # pragma: no cover
             msg = json.loads(msg)
         else:
             msg = f"{msg}{end}"

waldiez/models/agents/agent/agent.py

@@ -21,10 +21,11 @@ from .code_execution import WaldiezAgentCodeExecutionConfig
 from .nested_chat import WaldiezAgentNestedChat, WaldiezAgentNestedChatMessage
 
 if TYPE_CHECKING:
+    # noinspection PyUnusedImports
     from ...chat import WaldiezChat
 
 
-# noinspection PyUnresolvedReferences
+# noinspection PyUnresolvedReferences,PyNestedDecorators
 class WaldiezAgent(WaldiezBase):
     """Waldiez Agent to be inherited by all other agents.
 

waldiez/models/chat/chat.py

@@ -194,6 +194,7 @@ class WaldiezChat(WaldiezBase):
         WaldiezHandoff
             The handoff representation of the chat.
         """
+        # noinspection PyTypeHints
         target: WaldiezTransitionTarget = WaldiezAgentTarget(
             target_type="AgentTarget",
             value=[self.target],

waldiez/models/chat/chat_data.py

@@ -55,8 +55,6 @@ class WaldiezChatData(WaldiezBase):
         The maximum number of turns for the chat, by default None (no limit).
     silent : bool, optional
         Whether to run the chat silently, by default False (not silent).
-    summary_args : Optional[dict[str, Any]]
-        The summary args to use in autogen.
     real_source : Optional[str]
         The real source of the chat (overrides the source).
     real_target : Optional[str]

waldiez/models/common/base.py

@@ -58,6 +58,7 @@ class WaldiezBase(BaseModel):
             mode = "json"
         if by_alias is None:  # pragma: no branch
             by_alias = True
+        # noinspection PyUnreachableCode
         if not isinstance(by_alias, bool):
             by_alias = True
         return super().model_dump(by_alias=by_alias, mode=mode, **kwargs)
@@ -92,6 +93,7 @@ class WaldiezBase(BaseModel):
         by_alias = kwargs.pop("by_alias", None)
         if by_alias is None:
             by_alias = True
+        # noinspection PyUnreachableCode
         if not isinstance(by_alias, bool):
             by_alias = True
         return super().model_dump_json(by_alias=by_alias, **kwargs)

waldiez/models/common/handoff.py

@@ -343,6 +343,7 @@ class WaldiezTransitionAvailability(WaldiezBase):
     value: str = ""
 
 
+# noinspection PyTypeHints
 class WaldiezLLMBasedTransition(WaldiezBase):
     """Condition wrapper for LLM conditions."""
 
@@ -351,6 +352,7 @@ class WaldiezLLMBasedTransition(WaldiezBase):
     available: WaldiezTransitionAvailability
 
 
+# noinspection PyTypeHints
 class WaldiezContextBasedTransition(WaldiezBase):
     """Condition wrapper for context conditions."""
 

waldiez/models/common/method_utils.py

@@ -123,11 +123,13 @@ def _extract_imports_from_ast(code_string: str) -> tuple[list[str], list[str]]:
 
     for node in ast.walk(tree):
         if isinstance(node, (ast.Import, ast.ImportFrom)):
+            # noinspection PyTypeChecker
             full_import_statement = ast.get_source_segment(code_string, node)
             if not full_import_statement:  # pragma: no cover
                 continue
             full_import_statement = full_import_statement.strip()
 
+            # noinspection PyTypeChecker
             module_name = _extract_module_name(node)
             if not module_name:  # pragma: no cover
                 continue

waldiez/models/model/_llm.py

@@ -31,6 +31,7 @@ if TYPE_CHECKING:
     from .model import WaldiezModel
 
 
+# noinspection PyUnusedLocal
 def get_llm_requirements(
     model: "WaldiezModel",
     ag2_version: str,  # pylint: disable=unused-argument
@@ -154,6 +155,7 @@ def get_llm_imports(model: "WaldiezModel") -> set[str]:
         case "other":
             return {"from llama_index.llms.openai_like import OpenAILike"}
         case _:  # pragma: no cover
+            # noinspection PyUnreachableCode
             raise ValueError(f"Unsupported API type: {model.data.api_type}")
 
 
@@ -201,6 +203,7 @@ def get_llm_arg(model: "WaldiezModel") -> tuple[str, str]:
         case "other":
             return do_other_llm(model)
         case _:  # pragma: no cover
+            # noinspection PyUnreachableCode
             raise ValueError(f"Unsupported API type: {model.data.api_type}")
 
 

waldiez/models/tool/predefined/_email.py

@@ -11,6 +11,7 @@ from ._config import PredefinedToolConfig
 from .protocol import PredefinedTool
 
 
+# noinspection PyBroadException,TryExceptPass
 class SendEmailToolImpl(PredefinedTool):
     """Predefined tool for sending emails."""
 
@@ -139,6 +140,7 @@ class SendEmailToolImpl(PredefinedTool):
             A list of validation error messages, if any.
         """
         updated = dict(self._kwargs)
+        # noinspection DuplicatedCode
         for key, value in kwargs.items():
             if key in self.kwarg_types:
                 typ = self.kwarg_types[key]
@@ -161,6 +163,7 @@ class SendEmailToolImpl(PredefinedTool):
     ) -> dict[str, Any]:
         """Get effective keyword arguments."""
         effective = dict(self._kwargs)
+        # noinspection DuplicatedCode
         if runtime_kwargs:
             # cast only known keys, same rules as validate_kwargs
             for k, v in runtime_kwargs.items():

waldiez/models/tool/predefined/_perplexity.py

@@ -94,7 +94,7 @@ class PerplexitySearchToolImpl(PredefinedTool):
             if key in kwargs:  # pragma: no branch
                 type_of = self.kwarg_types.get(key, str)
                 # pylint: disable=broad-exception-caught
-                # noinspection PyBroadException
+                # noinspection PyBroadException,TryExceptPass
                 try:
                     casted = type_of(value)
                     if key in self.kwargs:  # pragma: no branch

waldiez/models/tool/predefined/_searxng.py

@@ -86,7 +86,7 @@ class SearxNGSearchToolImpl(PredefinedTool):
             if key in kwargs:  # pragma: no branch
                 type_of = self.kwarg_types.get(key, str)
                 # pylint: disable=broad-exception-caught
-                # noinspection PyBroadException
+                # noinspection PyBroadException,TryExceptPass
                 try:
                     casted = type_of(value)
                     if key in self.kwargs:  # pragma: no branch

waldiez/models/tool/predefined/_wikipedia.py

@@ -91,7 +91,7 @@ class WikipediaSearchToolImpl(PredefinedTool):
             if key in kwargs:
                 type_of = self.kwargs_types.get(key, str)
                 # pylint: disable=broad-exception-caught
-                # noinspection PyBroadException
+                # noinspection PyBroadException,TryExceptPass
                 try:
                     casted = type_of(value)
                     if key in self.kwargs:

waldiez/running/base_runner.py

@@ -7,6 +7,7 @@
 
 import importlib.util
 import inspect
+import json
 import shutil
 import sys
 import tempfile
@@ -26,7 +27,7 @@ from waldiez.models import Waldiez
 from .environment import refresh_environment, reset_env_vars, set_env_vars
 from .exceptions import StopRunningException
 from .post_run import after_run
-from .pre_run import RequirementsMixin
+from .pre_run import RequirementsMixin, dump_waldiez
 from .protocol import WaldiezRunnerProtocol
 from .utils import (
     a_chdir,
@@ -38,8 +39,13 @@ from .utils import (
 )
 
 if TYPE_CHECKING:
-    from autogen.events import BaseEvent  # type: ignore[import-untyped]
-    from autogen.messages import BaseMessage  # type: ignore[import-untyped]
+    # pylint: disable=line-too-long
+    from autogen.events import (  # type: ignore[import-untyped,import-not-found,unused-ignore]  # noqa: E501
+        BaseEvent,
+    )
+    from autogen.messages import (  # type: ignore[import-untyped,import-not-found,unused-ignore] # noqa: E501
+        BaseMessage,
+    )
 
 
 # pylint: disable=too-many-public-methods
@@ -51,7 +57,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         - output_path: Path to save the output file.
         - uploads_root: Root directory for uploads.
         - structured_io: Whether to use structured I/O.
-        - skip_patch_io: Whether to skip patching I/O functions.
         - dot_env: Path to a .env file for environment variables.
 
     Methods to possibly override:
@@ -69,9 +74,9 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
     _output_path: str | Path | None
     _uploads_root: str | Path | None
     _dot_env_path: str | Path | None
-    _skip_patch_io: bool
     _running: bool
     _is_async: bool
+    _waldiez_file: Path
     _input: Callable[..., str] | Callable[..., Coroutine[Any, Any, str]]
     _print: Callable[..., None]
     _send: Callable[[Union["BaseEvent", "BaseMessage"]], None]
@@ -82,7 +87,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         output_path: str | Path | None,
         uploads_root: str | Path | None,
         structured_io: bool,
-        skip_patch_io: bool = False,
         dot_env: str | Path | None = None,
         **kwargs: Any,
     ) -> None:
@@ -91,7 +95,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         WaldiezBaseRunner._structured_io = structured_io
         WaldiezBaseRunner._output_path = output_path
         WaldiezBaseRunner._uploads_root = uploads_root
-        WaldiezBaseRunner._skip_patch_io = skip_patch_io
         WaldiezBaseRunner._dot_env_path = dot_env
         WaldiezBaseRunner._input = input
         WaldiezBaseRunner._print = print
@@ -110,6 +113,33 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             self._logger = logger
         else:
             self._logger = get_logger()
+        waldiez_file = kwargs.get("waldiez_file", "")
+        if isinstance(waldiez_file, str) and waldiez_file:
+            waldiez_file_path = Path(waldiez_file).resolve()
+        elif isinstance(waldiez_file, Path):
+            waldiez_file_path = waldiez_file.resolve()
+        else:
+            waldiez_file_path = dump_waldiez(waldiez, output_path=output_path)
+        if not waldiez_file_path or not waldiez_file_path.is_file():
+            raise ValueError("Could not resolve a waldiez file path")
+        WaldiezBaseRunner._waldiez_file = waldiez_file_path
+
+    @staticmethod
+    def print(*args: Any, **kwargs: Any) -> None:
+        """Print a message to the console.
+
+        Parameters
+        ----------
+        *args : Any
+            Positional arguments to print.
+        **kwargs : Any
+            Keyword arguments to print.
+        """
+        if len(args) == 1 and isinstance(args[0], dict):
+            arg = json.dumps(args[0], default=str, ensure_ascii=False)
+            WaldiezBaseRunner._print(arg, **kwargs)
+        else:
+            WaldiezBaseRunner._print(*args, **kwargs)
 
     def is_running(self) -> bool:
         """Check if the workflow is currently running.
@@ -143,7 +173,9 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         return input_sync
 
     @staticmethod
-    async def a_get_user_input(prompt: str, *, password: bool = False) -> str:
+    async def a_get_user_input(
+        prompt: str, *, password: bool = False, **kwargs: Any
+    ) -> str:
         """Get user input with an optional password prompt.
 
         Parameters
@@ -152,6 +184,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             The prompt to display to the user.
         password : bool, optional
             If True, the input will be hidden (default is False).
+        **kwargs : Any
+            Additional keyword arguments to pass to the input function.
 
         Returns
         -------
@@ -164,12 +198,13 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
                 result = await input_function(  # type: ignore
                     prompt,
                     password=password,
+                    **kwargs,
                 )
             except TypeError:
                 result = await input_function(prompt)  # type: ignore
         else:
             try:
-                result = input_function(prompt, password=password)
+                result = input_function(prompt, password=password, **kwargs)
             except TypeError:
                 result = input_function(prompt)
         return result  # pyright: ignore
@@ -179,6 +214,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         prompt: str,
         *,
         password: bool = False,
+        **kwargs: Any,
     ) -> str:
         """Get user input with an optional password prompt.
 
@@ -188,6 +224,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             The prompt to display to the user.
         password : bool, optional
             If True, the input will be hidden (default is False).
+        **kwargs : Any
+            Additional keyword arguments to pass to the input function.
 
         Returns
         -------
@@ -197,11 +235,13 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         input_function = WaldiezBaseRunner.get_input_function()
         if inspect.iscoroutinefunction(input_function):
             try:
-                return syncify(input_function)(prompt, password=password)
+                return syncify(input_function)(
+                    prompt, password=password, **kwargs
+                )
             except TypeError:
                 return syncify(input_function)(prompt)
         try:
-            return str(input_function(prompt, password=password))
+            return str(input_function(prompt, password=password, **kwargs))
         except TypeError:
             return str(input_function(prompt))
 
@@ -301,6 +341,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         self,
         results: list[dict[str, Any]],
         output_file: Path,
+        waldiez_file: Path,
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
@@ -318,6 +359,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
                 temp_dir=temp_dir,
                 output_file=output_file,
                 flow_name=self._waldiez.name,
+                waldiez_file=waldiez_file,
                 uploads_root=uploads_root,
                 skip_mmd=skip_mmd,
                 skip_timeline=skip_timeline,
@@ -330,6 +372,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         self,
         results: list[dict[str, Any]],
         output_file: Path,
+        waldiez_file: Path,
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
@@ -343,6 +386,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
             skip_timeline=skip_timeline,
+            waldiez_file=waldiez_file,
         )
 
     @staticmethod
@@ -365,13 +409,18 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         return output_file, uploads_root_path
 
     @staticmethod
-    async def a_process_event(event: Union["BaseEvent", "BaseMessage"]) -> None:
+    async def a_process_event(
+        event: Union["BaseEvent", "BaseMessage"],
+        skip_send: bool = False,
+    ) -> None:
         """Process an event or message asynchronously.
 
         Parameters
         ----------
         event : Union[BaseEvent, BaseMessage]
             The event or message to process.
+        skip_send : bool
+            Skip sending the event.
         """
         if hasattr(event, "type"):  # pragma: no branch
             if event.type == "input_request":
@@ -387,17 +436,22 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
                     prompt, password=password
                 )
                 await event.content.respond(user_input)
-            else:
+            elif not skip_send:
                 WaldiezBaseRunner._send(event)
 
     @staticmethod
-    def process_event(event: Union["BaseEvent", "BaseMessage"]) -> None:
+    def process_event(
+        event: Union["BaseEvent", "BaseMessage"],
+        skip_send: bool = False,
+    ) -> None:
         """Process an event or message synchronously.
 
         Parameters
         ----------
         event : Union[BaseEvent, BaseMessage]
             The event or message to process.
+        skip_send : bool
+            Skip sending the event.
         """
         if hasattr(event, "type"):  # pragma: no branch
             if event.type == "input_request":
@@ -413,7 +467,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
                     prompt, password=password
                 )
                 event.content.respond(user_input)
-            else:
+            elif not skip_send:
                 WaldiezBaseRunner._send(event)
 
     def before_run(
@@ -708,6 +762,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             results=results,
             output_file=output_file,
             uploads_root=uploads_root_path,
+            waldiez_file=WaldiezBaseRunner._waldiez_file,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
             skip_timeline=skip_timeline,
@@ -745,6 +800,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         self._after_run(
             results=results,
             output_file=output_file,
+            waldiez_file=WaldiezBaseRunner._waldiez_file,
             uploads_root=uploads_root,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
@@ -784,6 +840,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
             skip_timeline=skip_timeline,
+            waldiez_file=WaldiezBaseRunner._waldiez_file,
         )
 
     @property
@@ -791,6 +848,11 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         """Get the Waldiez instance."""
         return self._waldiez
 
+    @property
+    def waldiez_file(self) -> Path:
+        """Get the path to the waldiez file."""
+        return self._waldiez_file
+
     @property
     def is_async(self) -> bool:
         """Check if the workflow is async."""
@@ -826,11 +888,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         """Get the uploads root path for the runner."""
         return WaldiezBaseRunner._uploads_root
 
-    @property
-    def skip_patch_io(self) -> bool:
-        """Check if the runner is skipping patching IO."""
-        return WaldiezBaseRunner._skip_patch_io
-
     @classmethod
     def load(
         cls,
@@ -909,6 +966,10 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol, RequirementsMixin):
         """
         return self._stop_requested.is_set()
 
+    def set_stop_requested(self) -> None:
+        """Set the stop requested flag."""
+        self._stop_requested.set()
+
     def __enter__(self) -> Self:
         """Enter the context manager."""
         return self

waldiez/running/post_run.py

@@ -20,6 +20,7 @@ def after_run(
     temp_dir: Path,
     output_file: Optional[Union[str, Path]],
     flow_name: str,
+    waldiez_file: Path,
     uploads_root: Optional[Path] = None,
     skip_mmd: bool = False,
     skip_timeline: bool = False,
@@ -34,6 +35,8 @@ def after_run(
         The output file.
     flow_name : str
         The flow name.
+    waldiez_file : Path
+        The path of the waldiez file used (or dumped) for the run.
     uploads_root : Optional[Path], optional
         The runtime uploads root, by default None
     skip_mmd : bool, optional
@@ -69,6 +72,9 @@ def after_run(
             output_file=output_file,
             destination_dir=destination_dir,
         )
+        dst_waldiez = destination_dir / waldiez_file.name
+        if not dst_waldiez.exists() and waldiez_file.is_file():
+            shutil.copyfile(waldiez_file, dst_waldiez)
     shutil.rmtree(temp_dir)