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

waldiez/models/model/model_data.py

@@ -3,10 +3,10 @@
 # flake8: noqa: E501
 """Waldiez Model Data."""
 
-from typing import Any, Optional
+from typing import Annotated, Any, Literal
 
 from pydantic import Field, model_validator
-from typing_extensions import Annotated, Literal, Self
+from typing_extensions import Self
 
 from ..common import WaldiezBase, update_dict
 from ._aws import WaldiezModelAWS
@@ -59,23 +59,23 @@ class WaldiezModelData(WaldiezBase):
     """
 
     base_url: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             title="Base URL",
             description="The base url of the model",
             alias="baseUrl",
         ),
-    ] = None
+    ]
     api_key: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             alias="apiKey",
             title="API Key",
             description="The api key to use with the model",
         ),
-    ] = None
+    ]
     api_type: Annotated[
         WaldiezModelAPIType,
         Field(
@@ -84,52 +84,52 @@ class WaldiezModelData(WaldiezBase):
             title="API Type",
             description="The api type of the model",
         ),
-    ] = "other"
+    ]
     api_version: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             alias="apiVersion",
             title="API Version",
             description="The api version of the model",
         ),
-    ] = None
+    ]
     temperature: Annotated[
-        Optional[float],
+        float | None,
         Field(
             default=None,
             alias="temperature",
             title="Temperature",
             description="The temperature of the model",
         ),
-    ] = None
+    ]
     top_p: Annotated[
-        Optional[float],
+        float | None,
         Field(
             default=None,
             alias="topP",
             title="Top P",
             description="The top p of the model",
         ),
-    ] = None
+    ]
     max_tokens: Annotated[
-        Optional[int],
+        int | None,
         Field(
             default=None,
             alias="maxTokens",
             title="Max Tokens",
             description="The max tokens of the model",
         ),
-    ] = None
+    ]
     aws: Annotated[
-        Optional[WaldiezModelAWS],
+        WaldiezModelAWS | None,
         Field(
             default=None,
             alias="aws",
             title="AWS",
             description="The AWS related parameters",
         ),
-    ] = None
+    ]
     extras: Annotated[
         dict[str, Any],
         Field(
@@ -138,7 +138,7 @@ class WaldiezModelData(WaldiezBase):
             title="Extras",
             description="Any extra attributes to include in the LLM Config",
         ),
-    ] = {}
+    ]
     default_headers: Annotated[
         dict[str, str],
         Field(
@@ -147,13 +147,13 @@ class WaldiezModelData(WaldiezBase):
             title="Default Headers",
             description="The default headers of the model",
         ),
-    ] = {}
+    ]
     price: Annotated[
-        Optional[WaldiezModelPrice],
+        WaldiezModelPrice | None,
         Field(
             default=None, title="Price", description="The price of the model"
         ),
-    ] = None
+    ]
 
     @model_validator(mode="after")
     def validate_model_data(self) -> Self:

waldiez/models/tool/extra_requirements.py

@@ -2,8 +2,6 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez tool extra requirements."""
 
-from typing import Set
-
 from .predefined import get_predefined_tool_requirements
 from .tool import WaldiezTool
 
@@ -11,7 +9,7 @@ from .tool import WaldiezTool
 def get_tools_extra_requirements(
     tools: list[WaldiezTool],
     autogen_version: str,
-) -> Set[str]:
+) -> set[str]:
     """Get the tools extra requirements.
 
     Parameters
@@ -26,7 +24,7 @@ def get_tools_extra_requirements(
     list[str]
         The tools extra requirements.
     """
-    tool_requirements: Set[str] = set()
+    tool_requirements: set[str] = set()
     for tool in tools:
         if tool.tool_type == "langchain":
             tool_requirements.add(f"ag2[interop-langchain]=={autogen_version}")

waldiez/models/tool/predefined/_duckduckgo.py

@@ -115,6 +115,7 @@ def {self.name}(query: str, num_results: int = 5) -> list[dict[str, Any]]:
         return content
 
 
+# pylint: disable=invalid-name
 DuckDuckGoSearchTool = DuckDuckGoSearchToolImpl()
 DuckDuckGoSearchConfig = PredefinedToolConfig(
     name=DuckDuckGoSearchTool.name,

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():
@@ -462,6 +465,7 @@ def {self.name}(
         return base + exported
 
 
+# pylint: disable=invalid-name
 SendEmailTool = SendEmailToolImpl()
 SendEmailConfig = PredefinedToolConfig(
     name=SendEmailTool.name,

waldiez/models/tool/predefined/_google.py

@@ -173,6 +173,7 @@ def {self.name}(
         return content
 
 
+# pylint: disable=invalid-name
 GoogleSearchTool = GoogleSearchToolImpl()
 GoogleSearchConfig = PredefinedToolConfig(
     name=GoogleSearchTool.name,

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
@@ -156,6 +156,7 @@ def {self.name}(
         return content
 
 
+# pylint: disable=invalid-name
 PerplexitySearchTool = PerplexitySearchToolImpl()
 PerplexitySearchConfig = PredefinedToolConfig(
     name=PerplexitySearchTool.name,

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
@@ -146,6 +146,7 @@ def {self.name}(
         return content
 
 
+# pylint: disable=invalid-name
 SearxNGSearchTool = SearxNGSearchToolImpl()
 SearxNGSearchConfig = PredefinedToolConfig(
     name=SearxNGSearchTool.name,

waldiez/models/tool/predefined/_tavily.py

@@ -146,6 +146,7 @@ def {self.name}(
         return content
 
 
+# pylint: disable=invalid-name
 TavilySearchTool = TavilySearchToolImpl()
 TavilySearchConfig = PredefinedToolConfig(
     name=TavilySearchTool.name,

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:
@@ -145,6 +145,7 @@ def {self.name}(query: str, language: str = "en", top_k: int = 3, verbose: bool
         return content
 
 
+# pylint: disable=invalid-name
 WikipediaSearchTool = WikipediaSearchToolImpl()
 WikipediaSearchConfig = PredefinedToolConfig(
     name=WikipediaSearchTool.name,

waldiez/models/tool/predefined/_youtube.py

@@ -138,6 +138,7 @@ def {self.name}(
         return content
 
 
+# pylint: disable=invalid-name
 YouTubeSearchTool = YouTubeSearchToolImpl()
 YouTubeSearchConfig = PredefinedToolConfig(
     name=YouTubeSearchTool.name,

waldiez/models/tool/tool.py

@@ -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."),
@@ -324,22 +324,25 @@ class WaldiezTool(WaldiezBase):
             config = get_predefined_tool_config(self.name)
             if not config:
                 available_tools = list_predefined_tools()
-                raise ValueError(
+                msg = (
                     f"Unknown predefined tool: {self.name}. "
                     f"Available tools: {available_tools}"
                 )
+                raise ValueError(msg)
             missing_secrets = config.validate_secrets(self.data.secrets)
             if missing_secrets:
-                raise ValueError(
+                msg = (
                     f"Missing required secrets for {self.name}: "
                     f"{missing_secrets}"
                 )
+                raise ValueError(msg)
             invalid_kwargs = config.validate_kwargs(self.data.kwargs)
             if invalid_kwargs:
-                raise ValueError(
+                msg = (
                     f"Invalid keyword arguments for {self.name}: "
                     f"{invalid_kwargs}"
                 )
+                raise ValueError(msg)
             # Update tool metadata from predefined config
             if not self.description:
                 self.description = config.description

waldiez/models/tool/tool_data.py

@@ -34,7 +34,7 @@ class WaldiezToolData(WaldiezBase):
                 "The type of the tool: shared, custom, langchain, crewai."
             ),
         ),
-    ] = "custom"
+    ]
     content: Annotated[
         str,
         Field(
@@ -60,7 +60,7 @@ class WaldiezToolData(WaldiezBase):
                 "Keyword arguments for the tool, used for initialization."
             ),
         ),
-    ] = {}
+    ]
 
     _raw_content: str = ""
 

waldiez/models/waldiez.py

@@ -8,10 +8,15 @@ and run an autogen workflow. It has the model/LLM configurations, the agent
 definitions and their optional additional tools to be used.
 """
 
+import asyncio
 import json
+import tempfile
+from collections.abc import Iterator
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Iterator
+from typing import Any
+
+import aiofiles
 
 from .agents import (
     WaldiezAgent,
@@ -19,7 +24,7 @@ from .agents import (
     get_captain_agent_extra_requirements,
     get_retrievechat_extra_requirements,
 )
-from .common import get_autogen_version
+from .common import get_autogen_version, safe_filename
 from .flow import (
     WaldiezAgentConnection,
     WaldiezFlow,
@@ -92,7 +97,7 @@ class Waldiez:
             requirements=requirements,
         )
         validated = WaldiezFlow.model_validate(flow)
-        return cls(flow=validated)  # pyright: ignore
+        return cls(flow=validated)
 
     @classmethod
     def load(
@@ -131,7 +136,7 @@ class Waldiez:
         data: dict[str, Any] = {}
         if not Path(waldiez_file).exists():
             raise ValueError(f"File not found: {waldiez_file}")
-        with open(waldiez_file, "r", encoding="utf-8") as file:
+        with open(waldiez_file, "r", encoding="utf-8", newline="\n") as file:
             try:
                 data = json.load(file)
             except json.decoder.JSONDecodeError as error:
@@ -144,6 +149,59 @@ class Waldiez:
             requirements=requirements,
         )
 
+    @classmethod
+    async def a_load(
+        cls,
+        waldiez_file: str | Path,
+        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.
+
+        Parameters
+        ----------
+        waldiez_file : Union[str, Path]
+            The Waldiez file.
+        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
+        -------
+        Waldiez
+            The Waldiez.
+
+        Raises
+        ------
+        ValueError
+            If the file is not found or invalid JSON.
+        """
+        data: dict[str, Any] = {}
+        if not Path(waldiez_file).exists():
+            raise ValueError(f"File not found: {waldiez_file}")
+        async with aiofiles.open(
+            waldiez_file, "r", encoding="utf-8", newline="\n"
+        ) as file:
+            try:
+                contents = await file.read()
+                data = json.loads(contents)
+            except json.decoder.JSONDecodeError as error:
+                raise ValueError(f"Invalid JSON: {waldiez_file}") from error
+        return cls.from_dict(
+            data,
+            name=name,
+            description=description,
+            tags=tags,
+            requirements=requirements,
+        )
+
     def model_dump_json(
         self, by_alias: bool = True, indent: int | None = None
     ) -> str:
@@ -200,6 +258,26 @@ class Waldiez:
         """Get the chats."""
         return self.flow.ordered_flow
 
+    @property
+    def is_group_pattern_based(
+        self,
+    ) -> bool:
+        """Check if the group manager should use pattern strategy.
+
+        Returns
+        -------
+        bool
+            True if pattern strategy should be used, False otherwise.
+        """
+        if not self.initial_chats:
+            return True
+
+        first_chat = self.initial_chats[0]["chat"]
+        return (
+            isinstance(first_chat.data.message, str)
+            or not first_chat.data.message.is_method()
+        )
+
     @property
     def agents(self) -> Iterator[WaldiezAgent]:
         """Get the agents.
@@ -367,3 +445,73 @@ class Waldiez:
         if not agent.is_group_manager:
             return []
         return self.flow.get_group_chat_members(agent.id)
+
+    def dump(self, to: str | Path | None = None) -> Path:
+        """Dump waldiez flow to a file.
+
+        Parameters
+        ----------
+        to : str | Path | None
+            Optional output path to determine the directory to save the flow to.
+
+        Returns
+        -------
+        Path
+            The path to the generated file.
+        """
+        file_path = Path(to) if to else None
+        if file_path:
+            file_name = file_path.name
+            if not file_name.endswith(".waldiez"):
+                file_path.with_suffix(".waldiez")
+
+        else:
+            full_name = self.name
+            file_name = safe_filename(full_name, "waldiez")
+        file_dir: Path
+        if file_path:
+            file_dir = file_path if file_path.is_dir() else file_path.parent
+        else:
+            file_dir = Path(tempfile.mkdtemp())
+        file_dir.mkdir(parents=True, exist_ok=True)
+        output_path = file_dir / file_name
+        with output_path.open(
+            "w", encoding="utf-8", errors="replace", newline="\n"
+        ) as f_open:
+            f_open.write(self.model_dump_json())
+        return output_path
+
+    async def a_dump(self, to: str | Path | None = None) -> Path:
+        """Dump waldiez flow to a file asynchronously.
+
+        Parameters
+        ----------
+        to : str | Path | None
+            Optional output path to determine the directory to save the flow to.
+
+        Returns
+        -------
+        Path
+            The path to the generated file.
+        """
+        file_path = Path(to) if to else None
+        if file_path:
+            file_name = file_path.name
+            if not file_name.endswith(".waldiez"):
+                file_path.with_suffix(".waldiez")
+        else:
+            full_name = self.name
+            file_name = safe_filename(full_name, "waldiez")
+        file_dir: Path
+        if file_path:
+            file_dir = file_path if file_path.is_dir() else file_path.parent
+        else:
+            tmp_dir = await asyncio.to_thread(tempfile.mkdtemp)
+            file_dir = Path(tmp_dir)
+        file_dir.mkdir(parents=True, exist_ok=True)
+        output_path = file_dir / file_name
+        async with aiofiles.open(
+            output_path, "w", encoding="utf-8", errors="replace", newline="\n"
+        ) as f_open:
+            await f_open.write(self.model_dump_json())
+        return output_path

waldiez/runner.py

@@ -20,7 +20,7 @@ during the flow execution.
 from pathlib import Path
 from typing import Any
 
-from typing_extensions import Literal
+from typing_extensions import Literal, override
 
 from .models.waldiez import Waldiez
 from .running import (
@@ -81,12 +81,12 @@ def create_runner(
             f"Unknown runner mode '{mode}'. Available: {available}"
         )
 
-    runner_class = runners[mode]
+    runner_cls = runners[mode]
     if mode == "subprocess":
         subprocess_mode = kwargs.pop("subprocess_mode", "run")
         if subprocess_mode not in ["run", "debug"]:
             subprocess_mode = "run"
-        return runner_class(
+        return runner_cls(
             waldiez=waldiez,
             output_path=output_path,
             uploads_root=uploads_root,
@@ -95,7 +95,9 @@ def create_runner(
             mode=subprocess_mode,
             **kwargs,
         )
-    return runner_class(
+    if mode != "debug" and "breakpoints" in kwargs:  # pragma: no cover
+        kwargs.pop("breakpoints", None)
+    return runner_cls(
         waldiez=waldiez,
         output_path=output_path,
         uploads_root=uploads_root,
@@ -111,7 +113,7 @@ class WaldiezRunner(WaldiezBaseRunner):
 
     # pylint: disable=super-init-not-called
     # noinspection PyMissingConstructor
-    def __init__(
+    def __init__(  # pyright: ignore[reportMissingSuperCall]
         self,
         waldiez: Waldiez,
         mode: Literal["standard", "debug"] = "standard",
@@ -150,6 +152,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             **kwargs,
         )
 
+    @override
     def __repr__(self) -> str:  # pragma: no cover
         """Get the string representation of the runner.
 
@@ -179,6 +182,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             f"{type(self).__name__} has no attribute '{name}'"
         )  # pragma: no cover
 
+    @override
     def _run(
         self,
         temp_dir: Path,
@@ -197,6 +201,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             **kwargs,
         )
 
+    @override
     async def _a_run(
         self,
         temp_dir: Path,
@@ -217,6 +222,7 @@ class WaldiezRunner(WaldiezBaseRunner):
             **kwargs,
         )
 
+    @override
     @classmethod
     def load(
         cls,