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

waldiez/models/agents/user_proxy/user_proxy.py

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportArgumentType=false,reportIncompatibleVariableOverride=false
+
 """User proxy agent model."""
 
 from pydantic import Field
@@ -24,7 +27,7 @@ class WaldiezUserProxy(WaldiezAgent):
         The user proxy agent's data
     """
 
-    agent_type: Annotated[  # pyright: ignore
+    agent_type: Annotated[
         Literal["user", "user_proxy"],
         Field(
             "user_proxy",
@@ -37,11 +40,11 @@ class WaldiezUserProxy(WaldiezAgent):
             alias="agentType",
         ),
     ]
-    data: Annotated[  # pyright: ignore
+    data: Annotated[
         WaldiezUserProxyData,
         Field(
             title="Data",
             description="The user proxy agent's data",
-            default_factory=WaldiezUserProxyData,  # pyright: ignore
+            default_factory=WaldiezUserProxyData,
         ),
     ]

waldiez/models/agents/user_proxy/user_proxy_data.py

@@ -29,4 +29,4 @@ class WaldiezUserProxyData(WaldiezAgentData):
             description="The human input mode, Defaults to `ALWAYS`",
             alias="humanInputMode",
         ),
-    ] = "ALWAYS"
+    ]

waldiez/models/chat/chat.py

@@ -1,13 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportDeprecated=false,reportUnknownMemberType=false
+# pyright: reportAttributeAccessIssue=false,reportUnknownVariableType=false
+
 """Waldiez chat model."""
 
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Literal, Self
 
-from ..agents import WaldiezAgent, WaldiezRagUserProxy
 from ..common import (
     WaldiezAgentTarget,
     WaldiezBase,
@@ -34,6 +37,9 @@ from .chat_nested import (
     WaldiezChatNested,
 )
 
+if TYPE_CHECKING:
+    from ..agents import WaldiezAgent
+
 WaldiezChatType = Literal["chat", "nested", "group", "hidden"]
 """Possible chat types: "chat", "nested", "group", "hidden"."""
 
@@ -61,7 +67,7 @@ class WaldiezChat(WaldiezBase):
         The nested chat message/reply if any.
     message : WaldiezChatMessage
         The chat message.
-    message_content : Optional[str]
+    message_content : str | None
         The chat message content if any. If method, the method's body.
 
     Functions
@@ -146,12 +152,12 @@ class WaldiezChat(WaldiezBase):
         return self.data.message
 
     @property
-    def message_content(self) -> Optional[str]:
+    def message_content(self) -> str | None:
         """Get the message content."""
         return self.data.message_content
 
     @property
-    def max_turns(self) -> Optional[int]:
+    def max_turns(self) -> int | None:
         """Get the max rounds for the chat."""
         return self.data.max_turns
 
@@ -227,8 +233,8 @@ class WaldiezChat(WaldiezBase):
 
     def get_message_function(
         self,
-        name_prefix: Optional[str] = None,
-        name_suffix: Optional[str] = None,
+        name_prefix: str | None = None,
+        name_suffix: str | None = None,
         is_rag: bool = False,
     ) -> tuple[str, str]:
         """Get the message function.
@@ -281,10 +287,10 @@ class WaldiezChat(WaldiezBase):
 
     @staticmethod
     def _get_nested_chat_function(
-        content: Optional[str],
+        content: str | None,
         function_name_base: str,
-        name_prefix: Optional[str] = None,
-        name_suffix: Optional[str] = None,
+        name_prefix: str | None = None,
+        name_suffix: str | None = None,
     ) -> tuple[str, str]:
         """Get the nested chat function.
 
@@ -323,16 +329,16 @@ class WaldiezChat(WaldiezBase):
 
     def get_nested_chat_message_function(
         self,
-        name_prefix: Optional[str] = None,
-        name_suffix: Optional[str] = None,
+        name_prefix: str | None = None,
+        name_suffix: str | None = None,
     ) -> tuple[str, str]:
         """Get the nested chat message function.
 
         Parameters
         ----------
-        name_prefix : str
+        name_prefix : str | None
             The function name prefix.
-        name_suffix : str
+        name_suffix : str | None
             The function name suffix.
 
         Returns
@@ -358,16 +364,16 @@ class WaldiezChat(WaldiezBase):
 
     def get_nested_chat_reply_function(
         self,
-        name_prefix: Optional[str] = None,
-        name_suffix: Optional[str] = None,
+        name_prefix: str | None = None,
+        name_suffix: str | None = None,
     ) -> tuple[str, str]:
         """Get the nested chat reply function.
 
         Parameters
         ----------
-        name_prefix : str
+        name_prefix : str | None
             The function name prefix.
-        name_suffix : str
+        name_suffix : str | None
             The function name suffix.
 
         Returns
@@ -394,7 +400,7 @@ class WaldiezChat(WaldiezBase):
     def get_chat_args(
         self,
         for_queue: bool,
-        sender: Optional[WaldiezAgent] = None,
+        sender: Optional["WaldiezAgent"] = None,
     ) -> dict[str, Any]:
         """Get the chat arguments to use in autogen.
 
@@ -412,9 +418,10 @@ class WaldiezChat(WaldiezBase):
         """
         args_dict = self.data.get_chat_args(for_queue)
         if (
-            isinstance(sender, WaldiezRagUserProxy)
+            sender
             and sender.is_rag_user
             and self.message.type == "rag_message_generator"
+            and hasattr(sender.data, "retrieve_config")
         ):
             # check for n_results in agent data, to add in context
             n_results = sender.data.retrieve_config.n_results

waldiez/models/chat/chat_data.py

@@ -1,8 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportArgumentType=false
+
 """Chat data model."""
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import Field, field_validator, model_validator
 from typing_extensions import Annotated, Self
@@ -71,7 +74,7 @@ class WaldiezChatData(WaldiezBase):
             title="Description",
             description="The description of the chat.",
         ),
-    ] = "A new chat"
+    ]
     position: Annotated[
         int,
         Field(
@@ -79,7 +82,7 @@ class WaldiezChatData(WaldiezBase):
             title="Position",
             description="The position of the chat in the flow (Ignored).",
         ),
-    ] = -1
+    ]
     order: Annotated[
         int,
         Field(
@@ -87,7 +90,7 @@ class WaldiezChatData(WaldiezBase):
             title="Order",
             description="The order of the chat in the flow.",
         ),
-    ] = -1
+    ]
     clear_history: Annotated[
         bool,
         Field(
@@ -96,9 +99,9 @@ class WaldiezChatData(WaldiezBase):
             title="Clear History",
             description="Whether to clear the chat history.",
         ),
-    ] = True
+    ]
     message: Annotated[
-        Union[str, WaldiezChatMessage],
+        str | WaldiezChatMessage,
         Field(
             title="Message",
             description="The message of the chat.",
@@ -123,14 +126,14 @@ class WaldiezChatData(WaldiezBase):
         ),
     ]
     max_turns: Annotated[
-        Optional[int],
+        int | None,
         Field(
             default=None,
             alias="maxTurns",
             title="Max Turns",
             description="The maximum number of turns for the chat.",
         ),
-    ] = None
+    ]
     prerequisites: Annotated[
         list[str],
         Field(
@@ -138,7 +141,7 @@ class WaldiezChatData(WaldiezBase):
             description="The prerequisites (chat ids) for the chat (if async).",
             default_factory=list,
         ),
-    ] = []
+    ]
     silent: Annotated[
         bool,
         Field(
@@ -146,25 +149,25 @@ class WaldiezChatData(WaldiezBase):
             title="Silent",
             description="Whether to run the chat silently.",
         ),
-    ] = False
+    ]
     real_source: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             alias="realSource",
             title="Real Source",
             description="The real source of the chat (overrides the source).",
         ),
-    ] = None
+    ]
     real_target: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             alias="realTarget",
             title="Real Target",
             description="The real target of the chat (overrides the target).",
         ),
-    ] = None
+    ]
     source_type: Annotated[
         WaldiezAgentType,
         Field(
@@ -201,7 +204,7 @@ class WaldiezChatData(WaldiezBase):
         ),
     ]
     after_work: Annotated[
-        Optional[WaldiezHandoffTransition],
+        WaldiezHandoffTransition | None,
         Field(
             None,
             title="After Work",
@@ -211,13 +214,13 @@ class WaldiezChatData(WaldiezBase):
             ),
             alias="afterWork",
         ),
-    ] = None
-    _message_content: Optional[str] = None
+    ]
+    _message_content: str | None = None
     _chat_id: int = 0
     _prerequisites: list[int] = []
 
     @property
-    def message_content(self) -> Optional[str]:
+    def message_content(self) -> str | None:
         """Get the message content."""
         return self._message_content
 
@@ -334,7 +337,7 @@ class WaldiezChatData(WaldiezBase):
         return value
 
     @property
-    def summary_args(self) -> Optional[dict[str, Any]]:
+    def summary_args(self) -> dict[str, Any] | None:
         """Get the summary args."""
         if self.summary.method not in (
             "reflection_with_llm",

waldiez/models/chat/chat_message.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez Message Model."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field, model_validator
 from typing_extensions import Annotated, Literal, Self
@@ -72,7 +72,7 @@ class WaldiezChatMessage(WaldiezBase):
                 "the `sender.message_generator` method will be used."
             ),
         ),
-    ] = "none"
+    ]
     use_carryover: Annotated[
         bool,
         Field(
@@ -80,15 +80,15 @@ class WaldiezChatMessage(WaldiezBase):
             title="Use Carryover",
             description="Use the carryover from the context.",
         ),
-    ] = False
+    ]
     content: Annotated[
-        Optional[str],
+        str | None,
         Field(
             default=None,
             title="Content",
             description="The content of the message (string or method).",
         ),
-    ] = None
+    ]
     context: Annotated[
         dict[str, Any],
         Field(
@@ -96,9 +96,9 @@ class WaldiezChatMessage(WaldiezBase):
             title="Context",
             description="Extra context of the message.",
         ),
-    ] = {}
+    ]
 
-    _content_body: Optional[str] = None
+    _content_body: str | None = None
 
     def is_method(self) -> bool:
         """Check if the message is a method.
@@ -111,7 +111,7 @@ class WaldiezChatMessage(WaldiezBase):
         return self.type in ("method", "rag_message_generator")
 
     @property
-    def content_body(self) -> Optional[str]:
+    def content_body(self) -> str | None:
         """Get the content body."""
         return self._content_body
 
@@ -141,7 +141,7 @@ class WaldiezChatMessage(WaldiezBase):
         ValueError
             If the content is invalid.
         """
-        content: Optional[str] = None
+        content: str | None = None
         if self.type == "none":
             content = "None"
         if self.type == "method":

waldiez/models/chat/chat_nested.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Nested chat model."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import Field, field_validator, model_validator
 from typing_extensions import Annotated, Self
@@ -36,32 +36,32 @@ class WaldiezChatNested(WaldiezBase):
     """
 
     message: Annotated[
-        Optional[WaldiezChatMessage],
+        WaldiezChatMessage | None,
         Field(
             default=None,
             title="Message",
             description="The message in a nested chat (sender -> recipient).",
         ),
-    ] = None
+    ]
     reply: Annotated[
-        Optional[WaldiezChatMessage],
+        WaldiezChatMessage | None,
         Field(
             default=None,
             title="Reply",
             description="The reply in a nested chat (recipient -> sender).",
         ),
-    ] = None
+    ]
 
-    _message_content: Optional[str] = None
-    _reply_content: Optional[str] = None
+    _message_content: str | None = None
+    _reply_content: str | None = None
 
     @property
-    def message_content(self) -> Optional[str]:
+    def message_content(self) -> str | None:
         """Get the message content."""
         return self._message_content
 
     @property
-    def reply_content(self) -> Optional[str]:
+    def reply_content(self) -> str | None:
         """Get the reply content."""
         return self._reply_content
 

waldiez/models/chat/chat_summary.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Waldiez chat summary options."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import (
     Field,
@@ -37,13 +37,13 @@ class WaldiezChatSummary(WaldiezBase):
     """
 
     method: Annotated[
-        Optional[WaldiezChatSummaryMethod],
+        WaldiezChatSummaryMethod | None,
         Field(
             default="last_msg",
             title="Method",
             description="The method to use for the LLM summary.",
         ),
-    ] = "last_msg"
+    ]
     prompt: Annotated[
         str,
         Field(
@@ -51,7 +51,7 @@ class WaldiezChatSummary(WaldiezBase):
             title="Prompt",
             description="The prompt for the LLM summary method.",
         ),
-    ] = "Summarize the conversation."
+    ]
     args: Annotated[
         dict[str, str],
         Field(
@@ -59,13 +59,13 @@ class WaldiezChatSummary(WaldiezBase):
             description="The additional arguments for the LLM summary method.",
             default_factory=dict,
         ),
-    ] = {}
+    ]
 
     # noinspection PyNestedDecorators
     @field_validator("method", mode="before")
     @classmethod
     def validate_summary_method(
-        cls, value: Optional[WaldiezChatSummaryMethod]
+        cls, value: WaldiezChatSummaryMethod | None
     ) -> WaldiezChatSummaryMethod | None:
         """Validate the summary method.
 

waldiez/models/common/__init__.py

@@ -38,6 +38,7 @@ from .naming import (
     MAX_VARIABLE_LENGTH,
     get_valid_instance_name,
     get_valid_python_variable_name,
+    safe_filename,
 )
 from .waldiez_version import get_waldiez_version
 
@@ -56,6 +57,7 @@ __all__ = [
     "generate_function",
     "now",
     "parse_code_string",
+    "safe_filename",
     "WaldiezDefaultCondition",
     "WaldiezAgentTarget",
     "WaldiezContextBasedCondition",

waldiez/models/common/ag2_version.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportMissingTypeStubs=false
 """Get the autogen version."""
 
 import warnings

waldiez/models/common/dict_utils.py

@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportUnknownVariableType=false
 """Dictionary related utilities."""
 
 import ast
 import json
 import re
-from typing import Any, Union
+from typing import Any
 
 BOOL_VALUES = {"true", "false"}
 NULL_VALUES = {"none", "null", "nil", "undefined"}
@@ -21,7 +23,7 @@ def _strip_outer_quotes(value: str) -> str:
     return value_stripped
 
 
-def _detect_null_or_boolean(value: str) -> Union[None, bool, str]:
+def _detect_null_or_boolean(value: str) -> bool | str | None:
     """
     Detect null values or booleans.
 
@@ -45,7 +47,7 @@ def _detect_null_or_boolean(value: str) -> Union[None, bool, str]:
     return value
 
 
-def _detect_numeric_type(value: str) -> Union[int, float, str]:
+def _detect_numeric_type(value: str) -> int | float | str:
     """
     Detect if string represents an integer or float.
 
@@ -72,7 +74,7 @@ def _detect_numeric_type(value: str) -> Union[int, float, str]:
 
 def _detect_container_type(
     value: str,
-) -> Union[dict[str, Any], list[Any], tuple[Any], set[Any], str]:
+) -> dict[str, Any] | list[Any] | tuple[Any] | set[Any] | str:
     """
     Detect if string represents a container type (dict, list, tuple, set).
 
@@ -97,7 +99,7 @@ def _detect_container_type(
     try:
         parsed = json.loads(value)
         if isinstance(parsed, (dict, list)):
-            return parsed  # pyright: ignore
+            return parsed
     except (json.JSONDecodeError, TypeError):
         pass
 
@@ -105,7 +107,7 @@ def _detect_container_type(
     try:
         parsed = ast.literal_eval(value)
         if isinstance(parsed, (dict, list, tuple, set)):
-            return parsed  # pyright: ignore
+            return parsed
     except (ValueError, SyntaxError):
         pass
 

waldiez/models/common/handoff.py

@@ -1,8 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pylint: disable=invalid-name
+
 """Waldiez Agent Handoff class."""
 
-from typing import Any, Union
+from typing import Any
 
 from pydantic import Field
 from typing_extensions import Annotated, Literal
@@ -115,13 +118,13 @@ class WaldiezSimpleTarget(WaldiezBase):
         Field(
             "TerminateTarget", description="The type of the transition target."
         ),
-    ] = "TerminateTarget"
+    ]
     value: Annotated[
         list[str],
         Field(
             default_factory=list,
         ),
-    ] = []  # not actually used (just for consistency with other targets)
+    ]  # not actually used (just for consistency with other targets)
 
 
 class WaldiezGroupOrNestedTarget(WaldiezBase):
@@ -157,12 +160,10 @@ class WaldiezGroupOrNestedTarget(WaldiezBase):
 
 
 WaldiezTransitionTarget = Annotated[
-    Union[
-        WaldiezAgentTarget,
-        WaldiezRandomAgentTarget,
-        WaldiezGroupOrNestedTarget,
-        WaldiezSimpleTarget,
-    ],
+    WaldiezAgentTarget
+    | WaldiezRandomAgentTarget
+    | WaldiezGroupOrNestedTarget
+    | WaldiezSimpleTarget,
     Field(discriminator="target_type"),
 ]
 
@@ -228,7 +229,7 @@ class WaldiezContextStrLLMCondition(WaldiezBase):
 
 
 WaldiezLLMBasedCondition = Annotated[
-    Union[WaldiezStringLLMCondition, WaldiezContextStrLLMCondition],
+    WaldiezStringLLMCondition | WaldiezContextStrLLMCondition,
     Field(discriminator="condition_type"),
 ]
 
@@ -293,15 +294,15 @@ class WaldiezExpressionContextCondition(WaldiezBase):
 
 
 WaldiezContextBasedCondition = Annotated[
-    Union[WaldiezStringContextCondition, WaldiezExpressionContextCondition],
+    WaldiezStringContextCondition | WaldiezExpressionContextCondition,
     Field(discriminator="condition_type"),
 ]
 
 
 # Union type for just the condition types (without targets)
-WaldiezHandoffCondition = Union[
-    WaldiezLLMBasedCondition, WaldiezContextBasedCondition
-]
+WaldiezHandoffCondition = (
+    WaldiezLLMBasedCondition | WaldiezContextBasedCondition
+)
 
 
 # pylint: disable=too-few-public-methods
@@ -362,9 +363,9 @@ class WaldiezContextBasedTransition(WaldiezBase):
 
 
 # Union type for complete transitions (condition + target)
-WaldiezHandoffTransition = Union[
-    WaldiezLLMBasedTransition, WaldiezContextBasedTransition
-]
+WaldiezHandoffTransition = (
+    WaldiezLLMBasedTransition | WaldiezContextBasedTransition
+)
 
 
 class WaldiezHandoff(WaldiezBase):