waldiez 0.5.2__py3-none-any.whl → 0.5.3__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.2"
+__version__ = VERSION = "0.5.3"

waldiez/cli.py

@@ -139,6 +139,7 @@ def run(
             structured,
             not patch_io,  # skip_patch_io
             False,  # skip_mmd
+            False,  # skip_timeline
         )
     else:
         runner.run(
@@ -148,6 +149,7 @@ def run(
             threaded=threaded,
             skip_patch_io=not patch_io,
             skip_mmd=False,
+            skip_timeline=False,
         )
 
 

waldiez/models/chat/chat_message.py

@@ -159,7 +159,7 @@ class WaldiezChatMessage(WaldiezBase):
                 )
             content = self.content
         if self.type == "rag_message_generator":
-            if self.use_carryover:
+            if not self.use_carryover:
                 content = get_last_carryover_method_content(
                     text_content=self.content or "",
                 )

waldiez/runner.py

@@ -222,6 +222,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -239,6 +240,8 @@ class WaldiezRunner(WaldiezBaseRunner):
             The runtime uploads root.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
 
         Returns
         -------
@@ -252,6 +255,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             output_file=output_file,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def _a_run(
@@ -260,6 +264,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -277,6 +282,8 @@ class WaldiezRunner(WaldiezBaseRunner):
             The runtime uploads root.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
 
         Returns
         -------
@@ -290,6 +297,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             output_file=output_file,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def _after_run(
@@ -303,6 +311,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Actions to perform after running the flow.
 
@@ -322,13 +331,16 @@ class WaldiezRunner(WaldiezBaseRunner):
             The path to the temporary directory created for the run.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
         """
         self._implementation._after_run(
             results,
             output_file,
             uploads_root,
             temp_dir,
-            skip_mmd,
+            skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def _a_after_run(
@@ -342,6 +354,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Asynchronously perform actions after running the flow.
 
@@ -357,13 +370,16 @@ class WaldiezRunner(WaldiezBaseRunner):
             The path to the temporary directory created for the run.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
         """
         await self._implementation._a_after_run(
             results,
             output_file,
             uploads_root,
             temp_dir,
-            skip_mmd,
+            skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def start(
@@ -373,6 +389,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         structured_io: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Start the flow.
 
@@ -390,12 +407,16 @@ class WaldiezRunner(WaldiezBaseRunner):
             If None, it will use the value from the context.
         skip_mmd : bool = False
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool = False
+            Whether to skip generating the timeline JSON.
         """
         self._implementation.start(
             output_path=output_path,
             uploads_root=uploads_root,
             structured_io=structured_io,
             skip_patch_io=skip_patch_io,
+            skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def _start(
@@ -404,6 +425,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Start the flow.
 
@@ -415,12 +437,15 @@ class WaldiezRunner(WaldiezBaseRunner):
             The runtime uploads root.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
         """
         self._implementation._start(
             temp_dir=temp_dir,
             output_file=output_file,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def a_start(
@@ -430,6 +455,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         structured_io: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Asynchronously start the flow.
 
@@ -445,6 +471,8 @@ class WaldiezRunner(WaldiezBaseRunner):
             Whether to skip patching I/O, by default None.
         skip_mmd : bool = False
             Whether to skip generating the mermaid diagram, by default False.
+        skip_timeline : bool = False
+            Whether to skip generating the timeline JSON, by default False.
         """
         await self._implementation.a_start(
             output_path=output_path,
@@ -452,6 +480,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             structured_io=structured_io,
             skip_patch_io=skip_patch_io,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def _a_start(
@@ -460,6 +489,7 @@ class WaldiezRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool = False,
     ) -> None:
         """Asynchronously start the flow.
 
@@ -473,12 +503,15 @@ class WaldiezRunner(WaldiezBaseRunner):
             The runtime uploads root.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool, optional
+            Whether to skip generating the timeline JSON, by default False.
         """
         await self._implementation._a_start(
             temp_dir=temp_dir,
             output_file=output_file,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def _stop(self) -> None:

waldiez/running/base_runner.py

@@ -20,7 +20,6 @@ from typing_extensions import Self
 from waldiez.exporter import WaldiezExporter
 from waldiez.logger import WaldiezLogger, get_logger
 from waldiez.models import Waldiez
-from waldiez.utils import get_waldiez_version
 
 from .environment import refresh_environment, reset_env_vars, set_env_vars
 from .post_run import after_run
@@ -149,6 +148,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -165,6 +165,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -181,6 +182,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Start running the Waldiez flow in a non-blocking way."""
         raise NotImplementedError(
@@ -193,6 +195,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Start running the Waldiez flow in a non-blocking way asynchronously.
 
@@ -224,6 +227,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Run after the flow execution."""
         # Save results
@@ -237,6 +241,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             flow_name=self.waldiez.name,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
         self.log.info("Cleanup completed")
 
@@ -251,6 +256,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Run after the flow execution asynchronously."""
         self._after_run(
@@ -259,6 +265,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             uploads_root=uploads_root,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def _stop(self) -> None:
@@ -309,9 +316,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             for req in self.waldiez.requirements
             if req not in sys.modules and "waldiez" not in req
         }
-        waldiez_version = get_waldiez_version()
-        if "waldiez" not in sys.modules:
-            extra_requirements.add(f"waldiez=={waldiez_version}")
         return extra_requirements
 
     def install_requirements(self) -> None:
@@ -390,6 +394,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         threaded: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -408,10 +413,12 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             by default False.
         threaded : bool | None
             Whether to run the flow in a threaded environment, by default None.
-        skip_mmd : bool
-            Whether to skip generating the mermaid diagram, by default False.
         skip_patch_io : bool | None
             Whether to skip patching the IO streams, by default None.
+        skip_mmd : bool
+            Whether to skip generating the mermaid diagram, by default False.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
 
         Returns
         -------
@@ -468,6 +475,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
                     output_file=output_file,
                     uploads_root=uploads_root_path,
                     skip_mmd=skip_mmd,
+                    skip_timeline=skip_timeline,
                 )
         finally:
             WaldiezBaseRunner._running = False
@@ -478,6 +486,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             uploads_root=uploads_root_path,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
         if sys.path[0] == str(temp_dir):
             sys.path.pop(0)
@@ -490,6 +499,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         structured_io: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -510,6 +520,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             Whether to skip patching I/O, by default None.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram, by default False.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON, by default False.
 
         Returns
         -------
@@ -553,6 +565,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
                     output_file=output_file,
                     uploads_root=uploads_root_path,
                     skip_mmd=skip_mmd,
+                    skip_timeline=skip_timeline,
                 )
         finally:
             WaldiezBaseRunner._running = False
@@ -562,6 +575,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             uploads_root=uploads_root_path,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
         if sys.path[0] == str(temp_dir):
             sys.path.pop(0)
@@ -574,6 +588,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         structured_io: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Start running the Waldiez flow in a non-blocking way.
 
@@ -589,6 +604,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             Whether to skip patching I/O, by default None.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram, by default False.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON, by default False.
 
         Raises
         ------
@@ -617,6 +634,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             output_file=output_file,
             uploads_root=uploads_root_path,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def a_start(
@@ -626,6 +644,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         structured_io: bool | None = None,
         skip_patch_io: bool | None = None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Asynchronously start running the Waldiez flow in a non-blocking way.
 
@@ -639,8 +658,10 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             Whether to use structured IO instead of the default 'input/print'.
         skip_patch_io : bool | None = None
             Whether to skip patching I/O, by default None.
-        skip_mmd : bool | None = None
-            Whether to skip generating the mermaid diagram, by default None.
+        skip_mmd : bool = False
+            Whether to skip generating the mermaid diagram, by default False.
+        skip_timeline : bool = False
+            Whether to skip generating the timeline JSON, by default False.
 
         Raises
         ------
@@ -669,6 +690,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             output_file=output_file,
             uploads_root=uploads_root_path,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def after_run(
@@ -682,6 +704,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Actions to perform after running the flow.
 
@@ -697,6 +720,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             The path to the temporary directory used during the run.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+            Whether to skip generating the timeline JSON.
         """
         self._after_run(
             results=results,
@@ -704,6 +729,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             uploads_root=uploads_root,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     async def a_after_run(
@@ -717,6 +743,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         """Asynchronously perform actions after running the flow.
 
@@ -732,6 +759,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             The path to the temporary directory used during the run.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
+        skip_timeline : bool
+
         """
         await self._a_after_run(
             results=results,
@@ -739,6 +768,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             uploads_root=uploads_root,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
     def stop(self) -> None:

waldiez/running/environment.py

@@ -3,6 +3,7 @@
 # pylint: disable=import-outside-toplevel,reimported
 """Environment related utilities."""
 
+import importlib
 import os
 import site
 import sys
@@ -86,20 +87,19 @@ def reload_autogen() -> None:  # noqa: C901
         default_io_stream = IOStream.get_default()
     except (ImportError, AttributeError):
         pass
-
+    autogen_modules = sorted(
+        [
+            name
+            for name in sys.modules
+            if name.startswith("autogen.")
+            and not name.startswith("autogen.io")
+            and not name.startswith("autogen.tools")
+        ],
+        key=len,
+        reverse=True,  # Longer names (deeper modules) first
+    )
     try:
         # Remove autogen modules in reverse dependency order
-        autogen_modules = sorted(
-            [
-                name
-                for name in sys.modules
-                if name.startswith("autogen.")
-                and not name.startswith("autogen.io")
-                and not name.startswith("autogen.tools")
-            ],
-            key=len,
-            reverse=True,  # Longer names (deeper modules) first
-        )
         for mod_name in autogen_modules:
             if mod_name in sys.modules:
                 del sys.modules[mod_name]
@@ -111,6 +111,14 @@ def reload_autogen() -> None:  # noqa: C901
         # pylint: disable=unused-import
         import autogen  # pyright: ignore
 
+        for mod_name in sorted(autogen_modules, key=len, reverse=False):
+            # Re-import each module
+            try:
+                importlib.import_module(mod_name)
+            except ImportError as e:
+                # If a module fails to import, we can log it or handle it
+                print(f"Failed to re-import {mod_name}: {e}", file=sys.stderr)
+
         # Restore IOStream state if we had it
         if default_io_stream is not None:
             try:
@@ -125,7 +133,18 @@ def reload_autogen() -> None:  # noqa: C901
         # If reload fails, at least try to re-import autogen
         try:
             import autogen  # type: ignore  # noqa: F401
-        except ImportError:
+
+            for mod_name in sorted(autogen_modules, key=len, reverse=False):
+                # Re-import each module
+                try:
+                    importlib.import_module(mod_name)
+                except ImportError as err:
+                    # If a module fails to import, we can log it or handle it
+                    print(
+                        f"Failed to re-import {mod_name}: {err}",
+                        file=sys.stderr,
+                    )
+        except Exception:  # pylint: disable=broad-exception-caught
             pass
         raise e
 

waldiez/running/import_runner.py

@@ -63,6 +63,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union["ChatResult", list["ChatResult"], dict[int, "ChatResult"]]:
         """Run the Waldiez workflow."""
         if self.threaded:
@@ -71,6 +72,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
                 output_file=output_file,
                 uploads_root=uploads_root,
                 skip_mmd=skip_mmd,
+                skip_timeline=skip_timeline,
             )
 
         return self._run_not_threaded(
@@ -78,14 +80,17 @@ class WaldiezImportRunner(WaldiezBaseRunner):
             output_file=output_file,
             uploads_root=uploads_root,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
+    # pylint: disable=too-many-locals
     def _run_not_threaded(
         self,
         temp_dir: Path,
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -149,6 +154,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -246,6 +252,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> Union[
         "ChatResult",
         list["ChatResult"],
@@ -336,6 +343,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         temp_dir: Path,
         skip_mmd: bool,
+        skip_timeline: bool,
     ) -> None:
         super()._after_run(
             results=results,
@@ -343,6 +351,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
             uploads_root=uploads_root,
             temp_dir=temp_dir,
             skip_mmd=skip_mmd,
+            skip_timeline=skip_timeline,
         )
 
         # Clean up module reference
@@ -354,6 +363,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Start the Waldiez workflow."""
 
@@ -366,6 +376,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
                     output_file=output_file,
                     uploads_root=uploads_root,
                     skip_mmd=skip_mmd,
+                    skip_timeline=skip_timeline,
                 )
             except Exception as e:  # pylint: disable=broad-exception-caught
                 self._last_exception = e
@@ -383,6 +394,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
         output_file: Path,
         uploads_root: Path | None,
         skip_mmd: bool = False,
+        skip_timeline: bool = False,
     ) -> None:
         """Start the Waldiez workflow asynchronously."""
 
@@ -394,6 +406,7 @@ class WaldiezImportRunner(WaldiezBaseRunner):
                     output_file=output_file,
                     uploads_root=uploads_root,
                     skip_mmd=skip_mmd,
+                    skip_timeline=skip_timeline,
                 )
             except Exception as e:  # pylint: disable=broad-exception-caught
                 self._last_exception = e