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

waldiez/models/common/method_utils.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pyright: reportUnknownMemberType=false,reportUnknownVariableType=false
-# pyright: reportUnknownArgumentType=false
+# pyright: reportUnknownArgumentType=false, reportUnusedImport=false
 """Function related utilities."""
 
 import ast
@@ -9,13 +9,13 @@ import importlib.util
 import sys
 import sysconfig
 from pathlib import Path
-from typing import NamedTuple, Optional
+from typing import NamedTuple
 
 # parso for extracting function bodies
 # (keeps comments, docstrings and formatting as-is)
 import parso
-import parso.python  # pyright: ignore
-import parso.tree  # pyright: ignore
+import parso.python
+import parso.tree
 
 # let's limit the variable name length
 MAX_VAR_NAME_LENGTH = 64
@@ -24,8 +24,8 @@ MAX_VAR_NAME_LENGTH = 64
 class ParseResult(NamedTuple):
     """Result of parsing a code string."""
 
-    error: Optional[str]
-    tree: Optional[ast.Module]
+    error: str | None
+    tree: ast.Module | None
 
 
 def is_standard_library(module_name: str) -> bool:
@@ -87,7 +87,7 @@ def parse_code_string(
     return ParseResult(None, tree)
 
 
-def _extract_module_name(node: ast.AST) -> Optional[str]:
+def _extract_module_name(node: ast.AST) -> str | None:
     """Extract the root module name from an import node."""
     if isinstance(node, ast.Import):
         return node.names[0].name.split(".")[0]

waldiez/models/common/naming.py

@@ -117,3 +117,52 @@ def get_valid_instance_name(
 
     new_names[instance_id] = name
     return new_names
+
+
+def safe_filename(name: str, ext: str = "") -> str:
+    """
+    Make a safe cross-platform filename from an arbitrary string.
+
+    Parameters
+    ----------
+    name : str
+        The string to turn into a safe filename.
+    ext :  str
+        Optional extension (with or without leading dot).
+
+    Returns
+    -------
+    str
+        A safe filename string.
+    """
+    # Normalize extension
+    # pylint: disable=inconsistent-quotes
+    ext = f".{ext.lstrip('.')}" if ext else ""
+
+    # Forbidden characters on Windows (also bad on Unix)
+    forbidden = r'[<>:"/\\|?*\x00-\x1F]'
+    name = re.sub(forbidden, "_", name)
+
+    # Trim trailing dots/spaces (illegal on Windows)
+    name = name.rstrip(". ")
+
+    # Collapse multiple underscores
+    name = re.sub(r"_+", "_", name)
+
+    # Reserved Windows device names
+    reserved = re.compile(
+        r"^(con|prn|aux|nul|com[1-9]|lpt[1-9])$", re.IGNORECASE
+    )
+    if reserved.match(name):
+        name = f"_{name}"
+
+    # Fallback if empty
+    if not name:
+        name = "file"
+
+    # Ensure length limit (NTFS max filename length = 255 bytes)
+    max_len = 255 - len(ext)
+    if len(name) > max_len:
+        name = name[:max_len]
+
+    return f"{name}{ext}"

waldiez/models/flow/flow.py

@@ -58,7 +58,7 @@ class WaldiezFlow(WaldiezBase):
             description="The version waldiez that was used to create the flow",
             title="Version",
         ),
-    ] = "0.0.0"  # default to 0.0.0 if not found
+    ]
     type: Annotated[
         Literal["flow"],
         Field(
@@ -462,10 +462,11 @@ class WaldiezFlow(WaldiezBase):
                 agent.id in (chat.source, chat.target)
                 for chat in self.data.chats
             ):
-                raise ValueError(
+                msg = (
                     f"Agent {agent.id} ({agent.name}) "
                     "does not connect to any other node."
                 )
+                raise ValueError(msg)
 
     @model_validator(mode="after")
     def validate_flow(self) -> Self:
@@ -593,21 +594,24 @@ class WaldiezFlow(WaldiezBase):
             If there are no group manager agents.
         """
         if not group_manager.data.initial_agent_id:
-            raise ValueError(
+            msg = (
                 "The flow is a group chat but the group manager agent "
                 f"{group_manager.id} has no initial agent ID."
             )
+            raise ValueError(msg)
         if group_manager.data.initial_agent_id not in all_member_ids:
-            raise ValueError(
+            msg = (
                 "The flow is a group chat but the initial agent ID "
                 f"{group_manager.data.initial_agent_id} is not in the flow."
             )
+            raise ValueError(msg)
         group_members = self.get_group_members(group_manager.id)
         if not group_members:
-            raise ValueError(
+            msg = (
                 "The flow is a group chat but the group manager agent "
                 f"{group_manager.id} has no members in the group."
             )
+            raise ValueError(msg)
         group_manager.set_speakers_order(
             [member.id for member in group_members]
         )
@@ -639,10 +643,11 @@ class WaldiezFlow(WaldiezBase):
             group_manager_id in all_member_ids
             for group_manager_id in group_manager_ids
         ):
-            raise ValueError(
+            msg = (
                 "The flow is a group chat but not all group manager agents are "
                 "in the flow."
             )
+            raise ValueError(msg)
         # check the initial_agent_id for each group
         for group_manager in self.data.agents.groupManagerAgents:
             self._validate_group_manager(group_manager, all_member_ids)

waldiez/models/flow/flow_data.py

@@ -1,8 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright:  reportArgumentType=false
+
 """Waldiez flow data."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Self
@@ -69,7 +72,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Nodes",
             description="The nodes of the flow",
         ),
-    ] = []
+    ]
     edges: Annotated[
         list[dict[str, Any]],
         Field(
@@ -77,7 +80,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Edges",
             description="The edges of the flow",
         ),
-    ] = []
+    ]
     viewport: Annotated[
         dict[str, Any],
         Field(
@@ -85,7 +88,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Viewport",
             description="The viewport of the flow",
         ),
-    ] = {}
+    ]
     # these are the ones we use.
     agents: Annotated[
         WaldiezAgents,
@@ -102,7 +105,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Models",
             default_factory=list,
         ),
-    ] = []
+    ]
     tools: Annotated[
         list[WaldiezTool],
         Field(
@@ -110,7 +113,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Tools",
             default_factory=list,
         ),
-    ] = []
+    ]
     chats: Annotated[
         list[WaldiezChat],
         Field(
@@ -118,7 +121,7 @@ class WaldiezFlowData(WaldiezBase):
             title="Chats",
             default_factory=list,
         ),
-    ] = []
+    ]
     is_async: Annotated[
         bool,
         Field(
@@ -126,9 +129,9 @@ class WaldiezFlowData(WaldiezBase):
             description="Whether the flow is asynchronous or not",
             title="Is Async",
         ),
-    ] = False
+    ]
     cache_seed: Annotated[
-        Optional[int],
+        int | None,
         Field(
             42,
             alias="cacheSeed",
@@ -138,7 +141,7 @@ class WaldiezFlowData(WaldiezBase):
             ),
             title="Cache Seed",
         ),
-    ] = 42
+    ]
 
     @model_validator(mode="after")
     def validate_flow_chats(self) -> Self:
@@ -200,6 +203,7 @@ class WaldiezFlowData(WaldiezBase):
         WaldiezFlowData
             The default flow data.
         """
+        termination = WaldiezAgentTerminationMessage()
         return cls(
             nodes=[],
             edges=[],
@@ -213,7 +217,7 @@ class WaldiezFlowData(WaldiezBase):
                         created_at=now(),
                         updated_at=now(),
                         data=WaldiezAssistantData(
-                            termination=WaldiezAgentTerminationMessage()
+                            termination=termination,
                         ),
                     ),
                     WaldiezAssistant(
@@ -223,13 +227,15 @@ class WaldiezFlowData(WaldiezBase):
                         updated_at=now(),
                         data=WaldiezAssistantData(
                             # is_multimodal=True,  # we need an api key for this
-                            termination=WaldiezAgentTerminationMessage(),
+                            termination=termination,
                         ),
                     ),
                 ],
                 ragUserProxyAgents=[],
                 reasoningAgents=[],
                 captainAgents=[],
+                groupManagerAgents=[],
+                docAgents=[],
             ),
             models=[],
             tools=[],
@@ -285,11 +291,11 @@ class WaldiezFlowData(WaldiezBase):
 
 def get_flow_data(
     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,
 ) -> dict[str, Any]:
     """Get the flow from the passed data dict.
 

waldiez/models/flow/info.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez chat info model."""
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from pydantic import Field
 from typing_extensions import Annotated
@@ -54,9 +54,9 @@ class WaldiezFlowInfo(WaldiezBase):
         list[WaldiezAgentInfo],
         Field(
             description="List of chat participants with their info",
-            default_factory=list[WaldiezAgentInfo],
+            default_factory=list,
         ),
-    ] = []
+    ]
 
     @classmethod
     def create(

waldiez/models/flow/naming.py

@@ -2,7 +2,8 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Ensure unique names for agents, models, tools, and chats."""
 
-from typing import Iterable, TypedDict
+from collections.abc import Iterable
+from typing import TypedDict
 
 from ..agents import WaldiezAgent
 from ..chat import WaldiezChat

waldiez/models/model/_aws.py

@@ -3,8 +3,6 @@
 # flake8: noqa: E501
 """Waldiez Model AWS model."""
 
-from typing import Optional
-
 from pydantic import Field
 from typing_extensions import Annotated
 
@@ -25,51 +23,51 @@ class WaldiezModelAWS(WaldiezBase):
     session_token : Optional[str]
         The AWS session token, by default None.
     profile_name : Optional[str]
-        The AWS profile name, by default Nonde.
+        The AWS profile name, by default None.
     """
 
     region: Annotated[
-        Optional[str],
+        str | None,
         Field(
             None,
             alias="region",
             title="Region",
             description="The AWS region",
         ),
-    ] = None
+    ]
     access_key: Annotated[
-        Optional[str],
+        str | None,
         Field(
             None,
             alias="accessKey",
             title="Access Ke",
             description="The AWS access key",
         ),
-    ] = None
+    ]
     secret_key: Annotated[
-        Optional[str],
+        str | None,
         Field(
             None,
             alias="secretKey",
             title="Secret Key",
             description="The AWS secret key",
         ),
-    ] = None
+    ]
     session_token: Annotated[
-        Optional[str],
+        str | None,
         Field(
             None,
             alias="sessionToken",
             title="Session Token",
             description="The AWS session token",
         ),
-    ] = None
+    ]
     profile_name: Annotated[
-        Optional[str],
+        str | None,
         Field(
             None,
             alias="profileName",
             title="Profile Name",
             description="The AWS Profile name to use",
         ),
-    ] = None
+    ]

waldiez/models/model/_llm.py

@@ -23,6 +23,9 @@
 # https://docs.llamaindex.ai/en/stable/examples/llm/together/
 # https://docs.llamaindex.ai/en/stable/api_reference/llms/openai_like/
 #
+#
+# pyright: reportImportCycles=false,reportUnusedParameter=false
+# pyright: reportUnnecessaryComparison=false,reportUnreachable=false
 
 import os
 from typing import TYPE_CHECKING
@@ -102,6 +105,7 @@ def get_llm_requirements(
     return requirements
 
 
+# pylint: disable=too-many-branches
 def get_llm_imports(model: "WaldiezModel") -> set[str]:
     """Get the LLM import statements for the model.
 
@@ -159,6 +163,7 @@ def get_llm_imports(model: "WaldiezModel") -> set[str]:
             raise ValueError(f"Unsupported API type: {model.data.api_type}")
 
 
+# pylint: disable=too-many-branches
 def get_llm_arg(model: "WaldiezModel") -> tuple[str, str]:
     """Get the LLM argument for the model.
 

waldiez/models/model/_price.py

@@ -3,8 +3,6 @@
 # flake8: noqa: E501
 """Waldiez Model Price."""
 
-from typing import Optional
-
 from pydantic import Field
 from typing_extensions import Annotated
 
@@ -23,8 +21,8 @@ class WaldiezModelPrice(WaldiezBase):
     """
 
     prompt_price_per_1k: Annotated[
-        Optional[float], Field(None, alias="promptPricePer1k")
+        float | None, Field(None, alias="promptPricePer1k")
     ]
     completion_token_price_per_1k: Annotated[
-        Optional[float], Field(None, alias="completionTokenPricePer1k")
+        float | None, Field(None, alias="completionTokenPricePer1k")
     ]

waldiez/models/model/extra_requirements.py

@@ -2,8 +2,6 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez model extra requirements."""
 
-from typing import Set
-
 from .model import WaldiezModel
 
 
@@ -24,7 +22,7 @@ def get_models_extra_requirements(
     list[str]
         The models extra requirements.
     """
-    model_requirements: Set[str] = set()
+    model_requirements: set[str] = set()
     # ref: https://github.com/ag2ai/ag2/blob/main/pyproject.toml
     models_with_additional_requirements = [
         "together",

waldiez/models/model/model.py

@@ -3,7 +3,7 @@
 """Waldiez model model."""
 
 import os
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field
 from typing_extensions import Annotated, Literal
@@ -181,7 +181,7 @@ class WaldiezModel(WaldiezBase):
         return api_key or "REPLACE_ME"
 
     @property
-    def price(self) -> Optional[list[float]]:
+    def price(self) -> list[float] | None:
         """Get the model's price."""
         if self.data.price is None:
             return None

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

@@ -465,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

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