waldiez 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

waldiez/models/tool/tool.py

@@ -5,7 +5,7 @@
 import json
 import re
 from pathlib import Path
-from typing import Any, Union
+from typing import Any
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Literal, Self
@@ -44,9 +44,9 @@ class WaldiezTool(WaldiezBase):
         The tags of the tool.
     requirements : list[str]
         The requirements of the tool.
-    created_at : str
+    created_at : str, optional
         The date and time when the tool was created.
-    updated_at : str
+    updated_at : str, optional
         The date and time when the tool was last updated.
     data : WaldiezToolData
         The data of the tool. See `WaldiezToolData`.
@@ -81,7 +81,7 @@ class WaldiezTool(WaldiezBase):
             description="The tags of the tool.",
             default_factory=list,
         ),
-    ]
+    ] = []
     requirements: Annotated[
         list[str],
         Field(
@@ -89,7 +89,7 @@ class WaldiezTool(WaldiezBase):
             description="The requirements of the tool.",
             default_factory=list,
         ),
-    ]
+    ] = []
     data: Annotated[
         WaldiezToolData,
         Field(..., title="Data", description="The data of the tool."),
@@ -112,12 +112,12 @@ class WaldiezTool(WaldiezBase):
     ]
 
     @staticmethod
-    def load(data_or_path: Union[str, Path, dict[str, Any]]) -> "WaldiezTool":
+    def load(data_or_path: str | Path | dict[str, Any]) -> "WaldiezTool":
         """Load a tool from a read-only file.
 
         Parameters
         ----------
-        data_or_path : Union[str, Path, dict[str, Any]]
+        data_or_path : str | Path | dict[str, Any]
             The path to the read-only file or the loaded data.
 
         Returns

waldiez/models/tool/tool_data.py

@@ -4,8 +4,8 @@
 
 from typing import Any
 
-from pydantic import Field
-from typing_extensions import Annotated
+from pydantic import Field, SerializationInfo, model_serializer, model_validator
+from typing_extensions import Annotated, Self
 
 from ..common import WaldiezBase
 from .tool_type import WaldiezToolType
@@ -61,3 +61,40 @@ class WaldiezToolData(WaldiezBase):
             ),
         ),
     ] = {}
+
+    _raw_content: str = ""
+
+    @model_validator(mode="after")
+    def validate_tool_data(self) -> Self:
+        """Validate the tool data.
+
+        Returns
+        -------
+        Self
+            The validated tool data.
+        """
+        self._raw_content = self.content
+
+        return self
+
+    @model_serializer(mode="plain", when_used="always")
+    def serialize_tool_data(self, info: SerializationInfo) -> dict[str, Any]:
+        """Serialize the tool data.
+
+        Parameters
+        ----------
+        info : SerializationInfo
+            The serialization information.
+
+        Returns
+        -------
+        dict[str, Any]
+            The serialized tool data.
+        """
+        tool_type_key = "toolType" if info.by_alias else "tool_type"
+        return {
+            tool_type_key: self.tool_type,
+            "content": self._raw_content,
+            "secrets": self.secrets,
+            "kwargs": self.kwargs,
+        }

waldiez/models/waldiez.py

@@ -11,7 +11,7 @@ definitions and their optional additional tools to be used.
 import json
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Iterator, Optional
+from typing import Any, Iterator
 
 from .agents import (
     WaldiezAgent,
@@ -43,11 +43,11 @@ class Waldiez:
     def from_dict(
         cls,
         data: dict[str, Any],
-        flow_id: Optional[str] = None,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        tags: Optional[list[str]] = None,
-        requirements: Optional[list[str]] = None,
+        flow_id: str | None = None,
+        name: str | None = None,
+        description: str | None = None,
+        tags: list[str] | None = None,
+        requirements: list[str] | None = None,
     ) -> "Waldiez":
         """Create a Waldiez from dict.
 
@@ -55,15 +55,15 @@ class Waldiez:
         ----------
         data : dict[str, Any]
             The data.
-        flow_id : Optional[str], optional
+        flow_id : str | None, optional
             The flow id, by default None (retrieved from data or generated).
-        name : Optional[str], optional
+        name: str | None, optional
             The name, by default None (retrieved from data).
-        description : Optional[str], optional
+        description : str | None, optional
             The description, by default None (retrieved from data).
-        tags : Optional[list[str]], optional
+        tags: list[str] | None, optional
             The tags, by default None (retrieved from data).
-        requirements : Optional[list[str]], optional
+        requirements: list[str] | None, optional
             The requirements, by default None (retrieved from data).
 
         Returns
@@ -86,10 +86,10 @@ class Waldiez:
     def load(
         cls,
         waldiez_file: str | Path,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-        tags: Optional[list[str]] = None,
-        requirements: Optional[list[str]] = None,
+        name: str | None = None,
+        description: str | None = None,
+        tags: list[str] | None = None,
+        requirements: list[str] | None = None,
     ) -> "Waldiez":
         """Load a Waldiez from a file.
 
@@ -97,14 +97,14 @@ class Waldiez:
         ----------
         waldiez_file : Union[str, Path]
             The Waldiez file.
-        name : Optional[str], optional
-            The name, by default None.
-        description : Optional[str], optional
-            The description, by default None.
-        tags : Optional[list[str]], optional
-            The tags, by default None.
-        requirements : Optional[list[str]], optional
-            The requirements, by default None.
+        name: str | None, optional
+            The name, by default None (retrieved from data).
+        description : str | None, optional
+            The description, by default None (retrieved from data).
+        tags: list[str] | None, optional
+            The tags, by default None (retrieved from data).
+        requirements: list[str] | None, optional
+            The requirements, by default None (retrieved from data).
 
         Returns
         -------
@@ -133,7 +133,7 @@ class Waldiez:
         )
 
     def model_dump_json(
-        self, by_alias: bool = True, indent: Optional[int] = None
+        self, by_alias: bool = True, indent: int | None = None
     ) -> str:
         """Get the model dump json.
 
@@ -143,7 +143,7 @@ class Waldiez:
         ----------
         by_alias : bool, optional
             Use alias (toCamel), by default True.
-        indent : Optional[int], optional
+        indent : int | None, optional
             The indent, by default None.
 
         Returns
@@ -250,7 +250,7 @@ class Waldiez:
         return self.flow.is_async
 
     @property
-    def cache_seed(self) -> Optional[int]:
+    def cache_seed(self) -> int | None:
         """Get the cache seed."""
         return self.flow.cache_seed
 
@@ -275,7 +275,7 @@ class Waldiez:
         requirements = set(requirements_list)
         requirements.add(f"ag2[openai]=={autogen_version}")
         if self.has_rag_agents:  # pragma: no branch
-            rag_extras = get_retrievechat_extra_requirements(self.agents)
+            rag_extras = get_retrievechat_extra_requirements(list(self.agents))
             requirements.update(rag_extras)
         if self.has_multimodal_agents:  # pragma: no branch
             requirements.add(f"ag2[lmm]=={autogen_version}")
@@ -291,13 +291,13 @@ class Waldiez:
             )
         requirements.update(
             get_models_extra_requirements(
-                self.models,
+                list(self.models),
                 autogen_version=autogen_version,
             )
         )
         requirements.update(
             get_tools_extra_requirements(
-                self.tools,
+                list(self.tools),
                 autogen_version=autogen_version,
             )
         )

waldiez/runner.py

@@ -92,6 +92,7 @@ class WaldiezRunner(WaldiezBaseRunner):
     """Factory class for creating Waldiez runners."""
 
     # pylint: disable=super-init-not-called
+    # noinspection PyMissingConstructor
     def __init__(
         self,
         waldiez: Waldiez,

waldiez/running/base_runner.py

@@ -212,6 +212,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         skip_mmd: bool,
         skip_timeline: bool,
+        **kwargs: Any,
     ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
         """Run the Waldiez flow."""
         raise NotImplementedError(
@@ -225,6 +226,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         uploads_root: Path | None,
         skip_mmd: bool,
         skip_timeline: bool,
+        **kwargs: Any,
     ) -> Union[list["AsyncRunResponseProtocol"], list["RunResponseProtocol"]]:
         """Run the Waldiez flow asynchronously."""
         raise NotImplementedError(
@@ -262,8 +264,6 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             The path to the output file.
         uploads_root : Path | None
             The root path for uploads, if any.
-        structured_io : bool
-            Whether to use structured IO instead of the default 'input/print'.
         skip_mmd : bool
             Whether to skip generating the mermaid diagram.
         """
@@ -444,6 +444,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         structured_io: bool | None = None,
         skip_mmd: bool = False,
         skip_timeline: bool = False,
+        **kwargs: Any,
     ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
         """Run the Waldiez flow in blocking mode.
 
@@ -460,6 +461,8 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             Whether to skip generating the mermaid diagram, by default False.
         skip_timeline : bool
             Whether to skip generating the timeline JSON.
+        **kwargs : Any
+            Additional keyword arguments for the run method.
 
         Returns
         -------
@@ -498,7 +501,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         WaldiezBaseRunner._running = True
         results: Union[
             list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]
-        ] = []
+        ]
         old_env_vars = set_env_vars(self.waldiez.get_flow_env_vars())
         try:
             with chdir(to=temp_dir):
@@ -526,6 +529,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             sys.path.pop(0)
         return results
 
+    # noinspection DuplicatedCode
     async def a_run(
         self,
         output_path: str | Path | None = None,
@@ -578,7 +582,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
         WaldiezBaseRunner._running = True
         results: Union[
             list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]
-        ] = []
+        ]
         old_env_vars = set_env_vars(self.waldiez.get_flow_env_vars())
         try:
             async with a_chdir(to=temp_dir):
@@ -656,6 +660,7 @@ class WaldiezBaseRunner(WaldiezRunnerProtocol):
             skip_timeline=skip_timeline,
         )
 
+    # noinspection DuplicatedCode
     async def a_start(
         self,
         output_path: str | Path | None,

waldiez/running/environment.py

@@ -135,6 +135,7 @@ def reload_autogen() -> None:  # noqa: C901  # pragma: no cover
 
     except Exception as e:
         # If reload fails, at least try to re-import autogen
+        # noinspection PyBroadException
         try:
             import autogen  # type: ignore  # noqa: F401
 
@@ -174,6 +175,7 @@ def reload_chroma_if_needed() -> None:  # pragma: no cover
         return
 
 
+# noinspection DuplicatedCode
 def try_handle_the_np_thing() -> None:
     """Try to handle the numpy deprecation warning."""
     # we might get:

waldiez/running/patch_io_stream.py

@@ -95,6 +95,7 @@ def get_printer() -> Callable[..., None]:  # noqa: C901
         The printer function that handles Unicode encoding errors gracefully.
     """
     try:
+        # noinspection PyUnresolvedReferences
         from autogen.io import IOStream  # pyright: ignore
 
         printer = IOStream.get_default().print
@@ -102,6 +103,7 @@ def get_printer() -> Callable[..., None]:  # noqa: C901
         # Fallback to standard print if autogen is not available
         printer = print
 
+    # noinspection PyBroadException
     def safe_printer(*args: Any, **kwargs: Any) -> None:  # noqa: C901
         """Safe printer that handles Unicode encoding errors.
 

waldiez/running/post_run.py

@@ -15,6 +15,7 @@ from .patch_io_stream import get_printer
 from .timeline_processor import TimelineProcessor
 
 
+# noinspection PyUnusedLocal
 def after_run(
     temp_dir: Path,
     output_file: Optional[Union[str, Path]],
@@ -71,6 +72,7 @@ def after_run(
     shutil.rmtree(temp_dir)
 
 
+# noinspection PyBroadException
 def _make_mermaid_diagram(
     temp_dir: Path,
     output_file: Optional[Union[str, Path]],
@@ -93,6 +95,7 @@ def _make_mermaid_diagram(
                 pass
 
 
+# noinspection PyBroadException
 def _make_timeline_json(
     temp_dir: Path,
 ) -> None:

waldiez/running/pre_run.py

@@ -13,6 +13,7 @@ from .environment import in_virtualenv, is_root
 from .utils import strip_ansi
 
 
+# noinspection PyUnresolvedReferences
 def install_requirements(
     extra_requirements: set[str],
     upgrade: bool = False,

waldiez/running/standard_runner.py

@@ -15,6 +15,7 @@ variables specified in the waldiez file are set.
 """
 
 import asyncio
+import getpass
 import importlib.util
 import sys
 import threading
@@ -35,6 +36,7 @@ if TYPE_CHECKING:
         AsyncRunResponseProtocol,
         RunResponseProtocol,
     )
+    from autogen.messages import BaseMessage  # type: ignore
 
 
 class WaldiezStandardRunner(WaldiezBaseRunner):
@@ -77,6 +79,26 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         self._loaded_module = module
         return module
 
+    @staticmethod
+    def standard_input(prompt: str, *, password: bool = False) -> str:
+        """Fallback / common input function for the workflow.
+
+        Parameters
+        ----------
+        prompt : str
+            The prompt to display to the user.
+        password : bool, optional
+            If True, use getpass to hide input (default is False).
+
+        Returns
+        -------
+        str
+            The user input as a string.
+        """
+        if password:
+            return getpass.getpass(prompt)
+        return input(prompt)
+
     def _run(
         self,
         temp_dir: Path,
@@ -84,6 +106,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         skip_mmd: bool,
         skip_timeline: bool,
+        **kwargs: Any,
     ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
         """Run the Waldiez workflow."""
         from autogen.io import IOStream  # type: ignore
@@ -93,7 +116,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         self._print: Callable[..., None] = print
         self._input: (
             Callable[..., str] | Callable[..., Coroutine[Any, Any, str]]
-        ) = input
+        ) = WaldiezStandardRunner.standard_input
         results_container: WaldiezRunResults = {
             "results": [],
             "exception": None,
@@ -134,7 +157,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
 
     def _on_event(
         self,
-        event: "BaseEvent",
+        event: Union["BaseEvent", "BaseMessage"],
     ) -> bool:
         """Process an event from the workflow."""
         self._event_count += 1
@@ -248,7 +271,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
 
     async def _a_on_event(
         self,
-        event: "BaseEvent",
+        event: Union["BaseEvent", "BaseMessage"],
     ) -> bool:
         """Process an event from the workflow asynchronously."""
         self._event_count += 1
@@ -293,6 +316,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
         uploads_root: Path | None,
         skip_mmd: bool = False,
         skip_timeline: bool = False,
+        **kwargs: Any,
     ) -> Union[list["RunResponseProtocol"], list["AsyncRunResponseProtocol"]]:
         """Run the Waldiez workflow asynchronously."""
 
@@ -304,7 +328,7 @@ class WaldiezStandardRunner(WaldiezBaseRunner):
 
             from waldiez.io import StructuredIOStream
 
-            results: Union[list["AsyncRunResponseProtocol"], list["RunResponseProtocol"]] = []
+            results: Union[list["AsyncRunResponseProtocol"], list["RunResponseProtocol"]]
             try:
                 self._loaded_module = self._load_module(output_file, temp_dir)
                 if self._stop_requested.is_set():

waldiez/running/timeline_processor.py

@@ -64,6 +64,7 @@ DEFAULT_AGENT_COLOR = "#E5E7EB"
 LOG = WaldiezLogger()
 
 
+# noinspection PyMethodMayBeStatic
 class TimelineProcessor:
     """Class to process timeline data from CSV files."""
 
@@ -147,6 +148,7 @@ class TimelineProcessor:
                         default_name,
                     )
             else:
+                # noinspection PyTypeChecker
                 last_valid_name = current_name
 
         return data
@@ -215,6 +217,7 @@ class TimelineProcessor:
         pd.Timestamp
             The parsed datetime.
         """
+        # noinspection PyBroadException
         try:
             return pd.to_datetime(date_str)
         except Exception:
@@ -223,6 +226,7 @@ class TimelineProcessor:
                 return coerced
             return pd.Timestamp("1970-01-01")
 
+    # noinspection PyMethodMayBeStatic
     def generate_agent_colors(self, agent_names: list[str]) -> dict[str, str]:
         """Generate color mapping for agents.
 
@@ -502,7 +506,11 @@ class TimelineProcessor:
             if matches:
                 # Return the first match, but prefer longer matches
                 best_match = max(matches, key=len)
-                return best_match
+                return (
+                    best_match
+                    if isinstance(best_match, str)
+                    else str(best_match)
+                )
 
         # Last resort: look for any word that might be a model name
         # This catches custom or unknown models
@@ -520,6 +528,7 @@ class TimelineProcessor:
 
         return "Unknown"
 
+    # noinspection PyTypeChecker
     def is_human_input_waiting_period(
         self,
         prev_session: Series,
@@ -631,6 +640,7 @@ class TimelineProcessor:
 
         return False
 
+    # noinspection PyTypeChecker
     def categorize_gap_activity(
         self,
         prev_session: Series,
@@ -727,6 +737,7 @@ class TimelineProcessor:
             "detail": f"Processing ({gap_duration:.1f}s)",
         }
 
+    # noinspection PyUnusedLocal
     def compress_timeline(
         self,
     ) -> tuple[list[dict[str, Any]], list[dict[str, Any]], float, float]:

waldiez/running/utils.py

@@ -7,6 +7,8 @@ import os
 import re
 import subprocess
 import sys
+
+# noinspection PyProtectedMember
 from asyncio.subprocess import Process
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass

waldiez/utils/conflict_checker.py

@@ -40,6 +40,6 @@ def check_conflicts() -> None:  # pragma: no cover
     """Check for conflicts."""
     # pylint: disable=global-statement
     global __waldiez_checked_conflicts
-    if __waldiez_checked_conflicts is False:
+    if not __waldiez_checked_conflicts:
         __waldiez_checked_conflicts = True
         _check_conflicts()

waldiez/utils/version.py

@@ -10,6 +10,7 @@ from pathlib import Path
 
 def _get_waldiez_version_from_importlib() -> str | None:
     """Get the Waldiez version from the version package."""
+    # noinspection PyBroadException
     try:
         return version("waldiez")
     except Exception:  # pylint: disable=broad-exception-caught