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

waldiez/exporting/flow/utils/common.py

@@ -183,6 +183,22 @@ def get_after_run_content(
     return content
 
 
+def get_common_env_var_setup() -> str:
+    """Get common environment variable setup for Waldiez flows.
+
+    Returns
+    -------
+    str
+        The content to set up common environment variables.
+    """
+    content = """
+# Common environment variable setup for Waldiez flows
+os.environ["AUTOGEN_USE_DOCKER"] = "0"
+os.environ["ANONYMIZED_TELEMETRY"] = "False"
+"""
+    return content
+
+
 def get_np_no_nep50_handle() -> str:
     """Handle the "module numpy has no attribute _no_pep50_warning" error.
 

waldiez/exporting/flow/utils/logging.py

@@ -49,7 +49,7 @@ def get_start_logging(is_async: bool, for_notebook: bool) -> str:
         "Start logging.",
         for_notebook=for_notebook,
     )
-    if is_async is False:
+    if not is_async:
         return f'''
 {tab}{comment}
 {tab}def start_logging() -> None:
@@ -83,6 +83,7 @@ def get_start_logging(is_async: bool, for_notebook: bool) -> str:
 
 
 # pylint: disable=differing-param-doc,differing-type-doc
+# noinspection PyUnresolvedReferences
 def get_sync_sqlite_out() -> str:
     r"""Get the sqlite to csv and json conversion code string.
 
@@ -165,6 +166,7 @@ def get_sync_sqlite_out() -> str:
 
 
 # pylint: disable=differing-param-doc,differing-type-doc,line-too-long
+# noinspection PyUnresolvedReferences
 def get_async_sqlite_out() -> str:
     r"""Get the sqlite to csv and json conversion code string.
 
@@ -325,6 +327,7 @@ def get_sqlite_out_call(tabs: int, is_async: bool) -> str:
     return content
 
 
+# noinspection PyUnresolvedReferences
 def get_stop_logging(is_async: bool, tabs: int = 0) -> str:
     r"""Get the function to stop logging and gather logs.
 
@@ -343,7 +346,7 @@ def get_stop_logging(is_async: bool, tabs: int = 0) -> str:
     Example
     -------
     ```python
-    >>> get_logging_stop_string()
+    >>> get_stop_logging()
     def stop_logging() -> None:
         \"\"\"Stop logging.\"\"\"
         runtime_logging.stop()

waldiez/exporting/models/factory.py

@@ -3,7 +3,6 @@
 """Factory function for creating a ModelsExporter instance."""
 
 from pathlib import Path
-from typing import Optional, Union
 
 from waldiez.models import WaldiezAgent, WaldiezModel
 
@@ -19,9 +18,9 @@ def create_models_exporter(
     models: list[WaldiezModel],
     model_names: dict[str, str],
     for_notebook: bool = False,
-    cache_seed: Optional[int] = None,
-    output_dir: Optional[Union[str, Path]] = None,
-    context: Optional[ExporterContext] = None,
+    cache_seed: int | None = None,
+    output_dir: str | Path | None = None,
+    context: ExporterContext | None = None,
 ) -> ModelsExporter:
     """Create a models exporter.
 
@@ -39,11 +38,11 @@ def create_models_exporter(
         Mapping of model IDs to names.
     for_notebook : bool, optional
         Whether the export is for a notebook, by default False
-    cache_seed : Optional[int], optional
+    cache_seed : int | None, optional
         The cache seed if any, by default None
-    output_dir : Optional[Union[str, Path]], optional
+    output_dir : str | Path | None, optional
         Output directory for generated files, by default None
-    context : Optional[ExporterContext], optional
+    context : ExporterContext | None, optional
         Exporter context with dependencies, by default None
 
     Returns

waldiez/exporting/tools/exporter.py

@@ -4,7 +4,7 @@
 """Tools exporter."""
 
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any, Optional
 
 from waldiez.models import WaldiezAgent, WaldiezTool
 
@@ -32,8 +32,8 @@ class ToolsExporter(Exporter[ToolExtras]):
         agent_names: dict[str, str],
         tools: list[WaldiezTool],
         tool_names: dict[str, str],
-        output_dir: Optional[Union[str, Path]] = None,
-        context: Optional[ExporterContext] = None,
+        output_dir: str | Path | None = None,
+        context: ExporterContext | None = None,
         **kwargs: Any,
     ):
         """Initialize the tools exporter.
@@ -50,9 +50,9 @@ class ToolsExporter(Exporter[ToolExtras]):
             The tools to export.
         tool_names : dict[str, str]
             Mapping of tool IDs to names.
-        output_dir : Optional[Union[str, Path]], optional
+        output_dir : str | Path | None
             Output directory for generated files, by default None
-        context : Optional[ExporterContext], optional
+        context : ExporterContext | None
             Exporter context with dependencies, by default None
         **kwargs
             Additional keyword arguments.

waldiez/exporting/tools/factory.py

@@ -3,7 +3,6 @@
 """Factory function for creating a ToolsExporter instance."""
 
 from pathlib import Path
-from typing import Optional, Union
 
 from waldiez.models import WaldiezAgent, WaldiezTool
 
@@ -17,8 +16,8 @@ def create_tools_exporter(
     agent_names: dict[str, str],
     tools: list[WaldiezTool],
     tool_names: dict[str, str],
-    output_dir: Optional[Union[str, Path]] = None,
-    context: Optional[ExporterContext] = None,
+    output_dir: str | Path | None = None,
+    context: ExporterContext | None = None,
 ) -> ToolsExporter:
     """Create a tools exporter.
 
@@ -34,9 +33,9 @@ def create_tools_exporter(
         The tools to export.
     tool_names : dict[str, str]
         Mapping of tool IDs to names.
-    output_dir : Optional[Union[str, Path]], optional
+    output_dir : str | Path | None, optional
         Output directory for generated files, by default None
-    context : Optional[ExporterContext], optional
+    context : ExporterContext | None, optional
         Exporter context with dependencies, by default None
 
     Returns

waldiez/exporting/tools/processor.py

@@ -5,7 +5,6 @@
 
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Optional
 
 from waldiez.models import WaldiezTool
 
@@ -34,7 +33,7 @@ class ToolProcessor:
         flow_name: str,
         tools: list[WaldiezTool],
         tool_names: dict[str, str],
-        output_dir: Optional[Path] = None,
+        output_dir: Path | None = None,
     ):
         """Initialize the tool processor.
 
@@ -46,7 +45,7 @@ class ToolProcessor:
             The tools to process.
         tool_names : dict[str, str]
             Mapping of tool IDs to names.
-        output_dir : Optional[Path], optional
+        output_dir : Path | None, optional
             Output directory for generated files, by default None
         """
         self.flow_name = flow_name
@@ -217,6 +216,7 @@ ag2_{tool_name} = ag2_{tool_name}_interop.convert_tool(
         )
 
     # pylint: disable=no-self-use
+    # noinspection PyMethodMayBeStatic
     def _sort_imports(self, imports: list[str]) -> list[str]:
         """Sort imports: 'import' statements first, then 'from' statements.
 

waldiez/exporting/tools/registration.py

@@ -99,6 +99,7 @@ class ToolRegistrationProcessor:
         return "\n".join(registrations) if registrations else ""
 
     # pylint: disable=no-self-use
+    # noinspection PyMethodMayBeStatic
     def _create_registration(
         self,
         caller_name: str,

waldiez/io/_ws.py

@@ -93,6 +93,7 @@ class WebSocketsAdapter:
             The received message, decoded as a string.
         """
         # pylint: disable=too-many-try-statements
+        # noinspection PyBroadException
         try:
             response = await asyncio.wait_for(
                 self.websocket.recv(), timeout=timeout
@@ -143,6 +144,7 @@ class StarletteAdapter:
         str
             The received message, decoded as a string.
         """
+        # noinspection PyBroadException
         try:
             return await asyncio.wait_for(
                 self.websocket.receive_text(), timeout=timeout

waldiez/io/models/content/audio.py

@@ -11,6 +11,7 @@ from pydantic import BaseModel
 from .base import AudioContent
 
 
+# noinspection PyUnusedLocal
 class AudioMediaContent(BaseModel):
     """Audio media content."""
 

waldiez/io/models/content/file.py

@@ -11,6 +11,7 @@ from pydantic import BaseModel
 from .base import FileContent
 
 
+# noinspection PyUnusedLocal
 class FileMediaContent(BaseModel):
     """File media content."""
 

waldiez/io/models/content/image.py

@@ -12,6 +12,7 @@ from ...utils import get_image
 from .base import ImageContent
 
 
+# noinspection DuplicatedCode
 class ImageMediaContent(BaseModel):
     """Image media content."""
 

waldiez/io/models/content/text.py

@@ -9,6 +9,7 @@ from pydantic import BaseModel
 from typing_extensions import Literal
 
 
+# noinspection PyUnusedLocal
 class TextMediaContent(BaseModel):
     """Text media content."""
 

waldiez/io/models/content/video.py

@@ -11,6 +11,7 @@ from typing_extensions import Literal
 from .base import VideoContent
 
 
+# noinspection PyUnusedLocal
 class VideoMediaContent(BaseModel):
     """Video media content."""
 

waldiez/io/models/user_input.py

@@ -186,6 +186,7 @@ class UserInputData(BaseModel):
 
         return None  # pragma: no cover
 
+    # noinspection PyNestedDecorators
     @field_validator("content", mode="before")
     @classmethod
     def validate_content(cls, v: Any) -> MediaContent:  # noqa: C901,D102

waldiez/io/models/user_response.py

@@ -21,6 +21,7 @@ class UserResponse(StructuredBase):
     type: MessageType = "input_response"
     data: UserInputData | list[UserInputData] | str
 
+    # noinspection PyNestedDecorators
     @field_validator("data", mode="before")
     @classmethod
     def validate_data(

waldiez/io/mqtt.py

@@ -33,6 +33,7 @@ except ImportError as error:  # pragma: no cover
         "MQTT client not installed. Please install paho-mqtt with `pip install paho-mqtt`."
     ) from error
 
+from autogen.events import BaseEvent  # type: ignore
 from autogen.io import IOStream  # type: ignore
 from autogen.messages import BaseMessage  # type: ignore
 
@@ -54,6 +55,7 @@ MQTT_MAX_RECONNECT_COUNT = 12
 MQTT_MAX_RECONNECT_DELAY = 60
 
 
+# noinspection PyUnusedLocal,PyBroadException
 class MqttIOStream(IOStream):
     """MQTT I/O stream."""
 
@@ -299,6 +301,7 @@ class MqttIOStream(IOStream):
                 reconnect_count += 1
             LOG.info("Reconnect failed after %s attempts.", reconnect_count)
 
+    # noinspection PyUnresolvedReferences
     def _on_message(
         self, client: mqtt.Client, userdata: Any, msg: mqtt.MQTTMessage
     ) -> None:
@@ -476,13 +479,13 @@ class MqttIOStream(IOStream):
             )
         self._print(payload)
 
-    def send(self, message: BaseMessage) -> None:
+    def send(self, message: BaseEvent | BaseMessage) -> None:
         """Send a structured message to MQTT.
 
         Parameters
         ----------
-        message : BaseMessage
-            The message to send.
+        message : BaseEvent | BaseMessage
+            The message or event to send.
         """
         try:
             message_dump = message.model_dump(mode="json")

waldiez/io/redis.py

@@ -32,6 +32,7 @@ except ImportError as error:  # pragma: no cover
     ) from error
 from autogen.events import BaseEvent  # type: ignore
 from autogen.io import IOStream  # type: ignore
+from autogen.messages import BaseMessage  # type: ignore
 
 from .models import (
     PrintMessage,
@@ -52,6 +53,7 @@ else:
 LOG = logging.getLogger(__name__)
 
 
+# noinspection PyBroadException
 class RedisIOStream(IOStream):
     """Redis I/O stream."""
 
@@ -158,10 +160,8 @@ class RedisIOStream(IOStream):
 
         Parameters
         ----------
-        message : str
+        payload : dict[str, Any]
             The message to print.
-        message_type : str
-            The message type.
         """
         LOG.debug("Sending print message: %s", payload)
         RedisIOStream.try_do(
@@ -177,10 +177,8 @@ class RedisIOStream(IOStream):
 
         Parameters
         ----------
-        message : str
+        payload : dict[str, Any]
             The message to print.
-        message_type : str
-            The message type.
         """
         LOG.debug("Sending print message: %s", payload)
         RedisIOStream.try_do(
@@ -289,12 +287,12 @@ class RedisIOStream(IOStream):
         self._print(payload)
         return user_input
 
-    def send(self, message: BaseEvent) -> None:
+    def send(self, message: BaseEvent | BaseMessage) -> None:
         """Send a structured message to Redis.
 
         Parameters
         ----------
-        message : dict[str, Any]
+        message : BaseEvent | BaseMessage
             The message to send.
         """
         message_dump = get_message_dump(message)
@@ -549,7 +547,7 @@ class RedisIOStream(IOStream):
 
         Parameters
         ----------
-        func : Awaitable[Any]
+        func : Callable[..., Awaitable[Any]]
             The async function to call.
         args : Any
             The positional arguments.

waldiez/io/structured.py

@@ -14,6 +14,7 @@ from uuid import uuid4
 
 from autogen.events import BaseEvent  # type: ignore
 from autogen.io import IOStream  # type: ignore
+from autogen.messages import BaseMessage  # type: ignore
 
 from .models import (
     PrintMessage,
@@ -135,12 +136,12 @@ class StructuredIOStream(IOStream):
 
     # noinspection PyMethodMayBeStatic
     # pylint: disable=no-self-use,broad-exception-caught
-    def send(self, message: BaseEvent) -> None:
-        """Structured sending of a BaseEvent.
+    def send(self, message: BaseEvent | BaseMessage) -> None:
+        """Structured sending of a BaseEvent or BaseMessage.
 
         Parameters
         ----------
-        message : BaseEvent
+        message : BaseEvent | BaseMessage
             The message to send.
         """
         message_dump = get_message_dump(message)
@@ -251,7 +252,7 @@ class StructuredIOStream(IOStream):
         str | dict[str, Any]
             The loaded user input, either as a string or a dictionary.
         """
-        response: str | dict[str, Any] = user_input_raw
+        response: str | dict[str, Any]
         try:
             # Attempt to parse the input as JSON
             response = json.loads(user_input_raw)
@@ -283,8 +284,8 @@ class StructuredIOStream(IOStream):
 
         Parameters
         ----------
-        user_input : str
-            The raw user input string.
+        user_input : dict[str, Any]
+            The user input dictionary containing the response data.
         request_id : str
             The request ID to match against.
 
@@ -341,6 +342,7 @@ class StructuredIOStream(IOStream):
             data="",
         )
 
+    # noinspection PyMethodMayBeStatic
     def _handle_list_response(
         self,
         data: list[dict[str, Any]],

waldiez/io/utils.py

@@ -12,6 +12,7 @@ from typing import Any, Literal, Union
 
 from autogen.agentchat.contrib.img_utils import get_pil_image  # type: ignore
 from autogen.events import BaseEvent  # type: ignore
+from autogen.messages import BaseMessage  # type: ignore
 
 MessageType = Literal[
     "input_request",
@@ -169,6 +170,7 @@ def try_parse_maybe_serialized(value: str) -> Any:
     """
     for parser in (json.loads, ast.literal_eval):
         # pylint: disable=broad-exception-caught, too-many-try-statements
+        # noinspection PyBroadException
         try:
             parsed: dict[str, Any] | list[Any] | str = parser(value)
             # Normalize: if it's a single-item list of a string
@@ -185,14 +187,12 @@ def try_parse_maybe_serialized(value: str) -> Any:
     return value  # Return original if all parsing fails
 
 
-def get_message_dump(
-    message: BaseEvent,
-) -> dict[str, Any]:
+def get_message_dump(message: BaseEvent | BaseMessage) -> dict[str, Any]:
     """Get the message dump.
 
     Parameters
     ----------
-    message : BaseEvent
+    message : BaseEvent | BaseMessage
         The message to dump.
 
     Returns
@@ -200,7 +200,14 @@ def get_message_dump(
     dict[str, Any]
         The dumped message.
     """
+    if not hasattr(message, "model_dump"):  # pragma: no cover
+        return {
+            "error": "Message does not have model_dump method.",
+            "type": message.__class__.__name__,
+        }
+
     # pylint: disable=broad-exception-caught
+    # noinspection PyBroadException
     try:
         message_dump = message.model_dump(mode="json")
     except Exception:

waldiez/io/ws.py

@@ -12,6 +12,7 @@ from typing import Any
 
 from autogen.events import BaseEvent  # type: ignore
 from autogen.io import IOStream  # type: ignore
+from autogen.messages import BaseMessage  # type: ignore
 
 from ._ws import (
     WebSocketConnection,
@@ -110,7 +111,7 @@ class AsyncWebsocketsIOStream(IOStream):
         ----------
         args : tuple
             The arguments to print.
-        kwargs : dict
+        kwargs : Any
             The keyword arguments to print.
         """
         sep = kwargs.get("sep", " ")
@@ -134,12 +135,12 @@ class AsyncWebsocketsIOStream(IOStream):
             LOG.info(json_dump)
         self._try_send(json_dump)
 
-    def send(self, message: BaseEvent) -> None:
+    def send(self, message: BaseEvent | BaseMessage) -> None:
         """Send a message to the WebSocket connection.
 
         Parameters
         ----------
-        message : BaseEvent
+        message : BaseEvent | BaseMessage
             The message to send.
         """
         message_dump = get_message_dump(message)

waldiez/logger.py

@@ -6,6 +6,7 @@
 import inspect
 import os
 import re
+import string
 import threading
 import traceback
 from datetime import datetime
@@ -323,6 +324,7 @@ class WaldiezLogger:
     def _get_caller_info(cls) -> str:
         """Get caller information (filename and line number) from the stack."""
         frame = inspect.currentframe()
+        # noinspection PyBroadException
         try:
             if frame is None:  # pragma: no cover
                 return ""
@@ -377,7 +379,15 @@ class WaldiezLogger:
     @staticmethod
     def _has_format_braces(msg_str: str) -> bool:
         """Check if the message contains .format() style placeholders."""
-        return bool(re.search(r"\{[^}]*\}", msg_str))
+        # noinspection PyBroadException
+        try:
+            formatter = string.Formatter()
+            for _, field_name, _, _ in formatter.parse(msg_str):
+                if field_name is not None:
+                    return True
+            return False
+        except Exception:  # pylint: disable=broad-exception-caught
+            return False
 
     @staticmethod
     def _has_percent_placeholders(msg_str: str) -> bool:

waldiez/models/agents/agent/agent.py

@@ -24,6 +24,7 @@ if TYPE_CHECKING:
     from ...chat import WaldiezChat
 
 
+# noinspection PyUnresolvedReferences
 class WaldiezAgent(WaldiezBase):
     """Waldiez Agent to be inherited by all other agents.
 

waldiez/models/agents/agent/agent_data.py

@@ -146,7 +146,7 @@ class WaldiezAgentData(WaldiezBase):
         Field(
             default_factory=list,
             title="Tools",
-            description=("A list of tools (id and executor) to register."),
+            description="A list of tools (id and executor) to register.",
         ),
     ] = []
     nested_chats: Annotated[
@@ -194,7 +194,7 @@ class WaldiezAgentData(WaldiezBase):
         Field(
             default_factory=list,
             title="Handoffs",
-            description=("A list of handoffs (target ids) to register."),
+            description="A list of handoffs (target ids) to register.",
         ),
     ] = []
     after_work: Annotated[

waldiez/models/agents/agent/nested_chat.py

@@ -50,16 +50,13 @@ class WaldiezAgentNestedChat(WaldiezBase):
     messages : list[WaldiezAgentNestedChatMessage]
         The list of messages (chat ids and 'is_reply'z)
         to include the in the nested chat registration.
-    order : int
-        The order of the nested chat (if used as a handoff).
-        Defaults to 0.
     """
 
     triggered_by: Annotated[
         list[str],
         Field(
             title="Triggered By",
-            description=("A list of agent ids that trigger the nested chat."),
+            description="A list of agent ids that trigger the nested chat.",
             alias="triggeredBy",
             default_factory=list,
         ),

waldiez/models/agents/agent/termination_message.py

@@ -33,13 +33,6 @@ class WaldiezAgentTerminationMessage(WaldiezBase):
         The method must be called `is_termination_message`,
         have one argument (`message`) which is a dict, and
         return a bool (whether the message is a termination message or not.)
-    string : str
-        The value of the termination message.
-
-    Functions
-    ---------
-    validate_termination_message() -> Self
-        Validate the termination message configuration.
     """
 
     type: Annotated[

waldiez/models/agents/agent/update_system_message.py

@@ -27,9 +27,9 @@ class WaldiezAgentUpdateSystemMessage(WaldiezBase):
 
     Attributes
     ----------
-    update_function_type : Literal["string", "callable"]
+    type : Literal["string", "callable"]
         The type of the update function. Can be either a string or a callable.
-    update_function : str
+    content : str
         The string template or function definition to update
         the agent's system message. Can be a string or a Callable.
         If the `function_type` is 'string' it will be used as a