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

waldiez/exporting/tools/processor.py

@@ -18,10 +18,12 @@ class ToolProcessingResult:
     """Result from processing tools."""
 
     content: str = ""
-    builtin_imports: list[str] = field(default_factory=list[str])
-    third_party_imports: list[str] = field(default_factory=list[str])
+    builtin_imports: list[str] = field(default_factory=list)
+    third_party_imports: list[str] = field(
+        default_factory=list,
+    )
     environment_variables: list[EnvironmentVariable] = field(
-        default_factory=list[EnvironmentVariable]
+        default_factory=list,
     )
 
 
@@ -198,10 +200,11 @@ ag2_{tool_name} = ag2_{tool_name}_interop.convert_tool(
                 for key, value in tool.secrets.items():
                     # f.write(f'os.environ["{key}"] = "{value}"\n')
                     # check first if the key already exists in os.environ
-                    f.write(
+                    to_write = (
                         f'os.environ["{key}"] = '
                         f'os.environ.get("{key}", "{value}")\n'
                     )
+                    f.write(to_write)
         except Exception as exc:  # pragma: no cover
             raise ExporterContentError(
                 f"Failed to write secrets file for tool '{tool_name}': {exc}"

waldiez/io/__init__.py

@@ -2,7 +2,8 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 
 # flake8: noqa: F401
-# pylint: disable=unused-import,too-few-public-methods
+# pylint: disable=unused-import,unused-argument,too-few-public-methods
+# pyright: reportAssignmentType=false
 
 """IOSTream extensions.
 
@@ -49,10 +50,11 @@ except ImportError:  # pragma: no cover
             kwargs : dict
                 Keyword arguments.
             """
-            raise ImportError(
+            msg = (
                 "RedisIOStream is not available. "
                 "Please install the required package."
             )
+            raise ImportError(msg)
 
 
 try:
@@ -74,10 +76,11 @@ except ImportError:  # pragma: no cover
             kwargs : dict
                 Keyword arguments.
             """
-            raise ImportError(
+            msg = (
                 "AsyncWebsocketsIOStream is not available. "
                 "Please install the required package."
             )
+            raise ImportError(msg)
 
 
 try:
@@ -97,10 +100,11 @@ except ImportError:  # pragma: no cover
             kwargs : dict
                 Keyword arguments.
             """
-            raise ImportError(
+            msg = (
                 "MqttIOStream is not available. "
                 "Please install the required package."
             )
+            raise ImportError(msg)
 
 
 __all__ = [

waldiez/io/_ws.py

@@ -1,9 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # flake8: noqa: E501
-# pylint: disable=line-too-long
+# pylint: disable=line-too-long,invalid-name
 # pyright: reportUnknownMemberType=false,reportUnknownParameterType=false
 # pyright: reportUnknownVariableType=false,reportUnknownArgumentType=false
+# pyright: reportConstantRedefinition=false,reportUnnecessaryIsInstance=false
+# pyright: reportMissingImports=false
+
 """WebSocket IOStream implementation for AsyncIO."""
 
 import asyncio
@@ -15,14 +18,14 @@ HAS_WS_LIB = False
 try:
     from starlette.websockets import WebSocket  # type: ignore[unused-ignore, unused-import, import-not-found, import-untyped]  # noqa
 
-    HAS_WS_LIB = True  # pyright: ignore
+    HAS_WS_LIB = True
 except ImportError:  # pragma: no cover
     pass
 
 try:
     import websockets  # type: ignore[unused-ignore, unused-import, import-not-found, import-untyped]  # noqa
 
-    HAS_WS_LIB = True  # pyright: ignore
+    HAS_WS_LIB = True
 except ImportError:  # pragma: no cover
     pass
 
@@ -42,7 +45,7 @@ class WebSocketConnection(Protocol):
     async def receive_message(
         self,
         timeout: float = 120,
-    ) -> str:  # pyright: ignore
+    ) -> str:  # pyright: ignore[reportReturnType]
         """Receive a message from the WebSocket connection.
 
         Parameters
@@ -103,7 +106,7 @@ class WebSocketsAdapter:
                 self.websocket.recv(), timeout=timeout
             )
             if isinstance(response, bytes):
-                return response.decode("utf-8")
+                return response.decode("utf-8", errors="replace")
             # noinspection PyUnreachableCode
             return response if isinstance(response, str) else str(response)
         except asyncio.TimeoutError:
@@ -192,12 +195,13 @@ def create_websocket_adapter(websocket: Any) -> WebSocketConnection:
     if hasattr(websocket, "send") and hasattr(websocket, "recv"):
         return WebSocketsAdapter(websocket)
 
-    raise ValueError(
+    msg = (
         "Unsupported WebSocket type. "
         "Must be either websockets.ServerConnection "
         "or starlette.websockets.WebSocket. "
         f"Received: {type(websocket)}"
     )
+    raise ValueError(msg)
 
 
 def is_websocket_available() -> bool:

waldiez/io/models/constants.py

@@ -3,7 +3,7 @@
 
 """Constants and type mappings for content models."""
 
-from typing import Type, TypedDict, Union
+from typing import TypedDict
 
 from typing_extensions import Literal
 
@@ -13,14 +13,14 @@ from .content.image import ImageMediaContent, ImageUrlMediaContent
 from .content.text import TextMediaContent
 from .content.video import VideoMediaContent
 
-MediaContent = Union[
-    TextMediaContent,
-    ImageMediaContent,
-    ImageUrlMediaContent,
-    VideoMediaContent,
-    AudioMediaContent,
-    FileMediaContent,
-]
+MediaContent = (
+    TextMediaContent
+    | ImageMediaContent
+    | ImageUrlMediaContent
+    | VideoMediaContent
+    | AudioMediaContent
+    | FileMediaContent
+)
 
 ContentTypeKey = Literal["text", "image", "image_url", "video", "audio", "file"]
 """Possible content types for the mapping."""
@@ -40,7 +40,7 @@ class ContentMappingEntry(TypedDict):
     """
 
     fields: list[str]
-    cls: Type[MediaContent]
+    cls: type[MediaContent]
     required_field: str
 
 

waldiez/io/models/content/audio.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=unused-argument
+# pyright: reportUnusedParameter=false
 """Audio media content models."""
 
 from pathlib import Path

waldiez/io/models/content/base.py

@@ -1,8 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+
 """Base content models for media types."""
 
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -10,36 +12,36 @@ from pydantic import BaseModel
 class ImageContent(BaseModel):
     """Image content model."""
 
-    url: Optional[str] = None
-    file: Optional[Any] = None  # File type not directly mappable in Python
-    alt: Optional[str] = None
+    url: str | None = None
+    file: Any | None = None  # File type not directly mappable in Python
+    alt: str | None = None
 
 
 class VideoContent(BaseModel):
     """Video content model."""
 
-    url: Optional[str] = None
-    file: Optional[Any] = None
-    duration: Optional[int] = None
-    thumbnailUrl: Optional[str] = None
-    mimeType: Optional[str] = None
+    url: str | None = None
+    file: Any | None = None
+    duration: int | None = None
+    thumbnailUrl: str | None = None
+    mimeType: str | None = None
 
 
 class AudioContent(BaseModel):
     """Audio content model."""
 
-    url: Optional[str] = None
-    file: Optional[Any] = None
-    duration: Optional[int] = None
-    transcript: Optional[str] = None
+    url: str | None = None
+    file: Any | None = None
+    duration: int | None = None
+    transcript: str | None = None
 
 
 class FileContent(BaseModel):
     """File content model."""
 
-    url: Optional[str] = None
-    file: Optional[Any] = None
+    url: str | None = None
+    file: Any | None = None
     name: str
-    size: Optional[int] = None
-    type: Optional[str] = None
-    previewUrl: Optional[str] = None
+    size: int | None = None
+    type: str | None = None
+    previewUrl: str | None = None

waldiez/io/models/content/file.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=unused-argument
+# pyright: reportUnusedParameter=false
 """File media content models."""
 
 from pathlib import Path

waldiez/io/models/content/image.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=unused-argument
+# pyright: reportUnusedParameter=false
 """Image media content models."""
 
 from pathlib import Path

waldiez/io/models/content/text.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=unused-argument
+# pyright: reportUnusedParameter=false
 """Text media content models."""
 
 from pathlib import Path

waldiez/io/models/content/video.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=unused-argument
+# pyright: reportUnusedParameter=false
 """Video and audio media content models."""
 
 from pathlib import Path

waldiez/io/models/user_input.py

@@ -1,12 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 
+# pyright: reportUnnecessaryIsInstance=false,reportUnknownVariableType=false
+# pyright: reportUnknownArgumentType=false,reportArgumentType=false
+# pyright: reportReturnType=false
+
 """User input data models and validation."""
 
 import json
 import os
 from pathlib import Path
-from typing import Any, Union
+from typing import Any
 from urllib.parse import urlparse
 
 from pydantic import BaseModel, Field, field_validator
@@ -31,7 +35,7 @@ class UserInputData(BaseModel):
     """User's input data model."""
 
     content: Annotated[
-        Union[MediaContent, list[MediaContent]],
+        MediaContent | list[MediaContent],
         Field(
             description="The content of the input data.",
             title="Content",
@@ -68,7 +72,7 @@ class UserInputData(BaseModel):
         if isinstance(self.content, list):
             return " ".join(
                 [
-                    item.to_string(uploads_root, base_name)  # pyright: ignore
+                    item.to_string(uploads_root, base_name)
                     for item in self.content
                 ]
             )
@@ -161,10 +165,11 @@ class UserInputData(BaseModel):
                     **{mapping["required_field"]: converted}  # type: ignore
                 )
 
-        raise ValueError(
+        msg = (
             "Missing required field for content type "
             f"'{content_type}' in: {value}"
         )
+        raise ValueError(msg)
 
     @staticmethod
     def _convert_simple_content(
@@ -226,7 +231,7 @@ class UserInputData(BaseModel):
 
         # If it's a dictionary, check if it has a 'type' field
         if isinstance(v, dict):
-            return cls.content_from_dict(v)  # pyright: ignore
+            return cls.content_from_dict(v)
 
         # If it's a list
         if isinstance(v, list):

waldiez/io/models/user_response.py

@@ -1,10 +1,14 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportUnnecessaryIsInstance=false,reportUnknownVariableType=false
+# pyright: reportUnknownArgumentType=false,reportArgumentType=false
+
 """User response model and validation."""
 
 import json
 from pathlib import Path
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable
 
 from pydantic import ValidationError, field_validator
 
@@ -26,7 +30,7 @@ class UserResponse(StructuredBase):
     @classmethod
     def validate_data(
         cls, value: Any
-    ) -> Optional[Union[str, UserInputData, list[UserInputData]]]:
+    ) -> str | UserInputData | list[UserInputData] | None:
         """Validate the data field in UserResponse.
 
         Parameters
@@ -51,16 +55,16 @@ class UserResponse(StructuredBase):
 
         handlers: dict[
             type,
-            Callable[[Any], Union[str, UserInputData, list[UserInputData]]],
+            Callable[[Any], str | UserInputData | list[UserInputData]],
         ] = {
             str: cls._handle_string,
             dict: cls._handle_dict,
             list: cls._handle_list,
         }
 
-        value_type = type(value)  # pyright: ignore
+        value_type = type(value)
         handler = handlers.get(
-            value_type,  # pyright: ignore
+            value_type,
             cls._handle_default,
         )
         result = handler(value)
@@ -71,16 +75,13 @@ class UserResponse(StructuredBase):
         """Check if value is already a valid type."""
         return isinstance(value, UserInputData) or (
             isinstance(value, list)
-            and all(
-                isinstance(item, UserInputData)
-                for item in value  # pyright: ignore
-            )
+            and all(isinstance(item, UserInputData) for item in value)
         )
 
     @classmethod
     def _handle_string(
         cls, value: str
-    ) -> Union[str, UserInputData, list[UserInputData]]:
+    ) -> str | UserInputData | list[UserInputData]:
         """Handle string input.
 
         Parameters
@@ -97,9 +98,9 @@ class UserResponse(StructuredBase):
         try:
             parsed_value = json.loads(value)
             if isinstance(parsed_value, dict):
-                return cls._handle_dict(parsed_value)  # pyright: ignore
+                return cls._handle_dict(parsed_value)
             if isinstance(parsed_value, list):
-                return cls._handle_list(parsed_value)  # pyright: ignore
+                return cls._handle_list(parsed_value)
             return cls._create_text_input(str(parsed_value))
         except json.JSONDecodeError:
             return cls._create_text_input(value)
@@ -127,18 +128,18 @@ class UserResponse(StructuredBase):
     @classmethod
     def _handle_list(
         cls, value: list[Any]
-    ) -> Union[UserInputData, list[UserInputData]]:
+    ) -> UserInputData | list[UserInputData]:
         result: list[UserInputData] = []
 
         for item in value:
             if isinstance(item, UserInputData):
                 result.append(item)
             elif isinstance(item, dict):
-                result.append(cls._handle_dict(item))  # pyright: ignore
+                result.append(cls._handle_dict(item))
             elif isinstance(item, str):
                 result.append(cls._create_text_input(item))
             elif isinstance(item, list):
-                nested_result = cls._handle_list(item)  # pyright: ignore
+                nested_result = cls._handle_list(item)
                 if isinstance(nested_result, list):
                     result.extend(nested_result)
                 else:
@@ -207,7 +208,7 @@ class UserResponse(StructuredBase):
                 uploads_root=uploads_root, base_name=base_name
             ).strip()
         # we have probably returned sth till here
-        if isinstance(self.data, str):  # pyright: ignore # pragma: no cover
+        if isinstance(self.data, str):  # pragma: no cover
             return self.data
         # noinspection PyUnreachableCode
         return (  # pragma: no cover

waldiez/io/mqtt.py

@@ -7,6 +7,9 @@
 # pylint: disable=too-many-arguments,too-many-positional-arguments
 # pylint: disable=too-many-locals,too-many-instance-attributes
 
+# pyright: reportMissingTypeStubs=false,reportUnknownMemberType=false
+# pyright: reportUnusedParameter=false
+
 """An MQTT I/O stream for handling print and input messages."""
 
 import json
@@ -17,12 +20,7 @@ import uuid
 from pathlib import Path
 from threading import Event, Lock
 from types import TracebackType
-from typing import (
-    Any,
-    Callable,
-    Optional,
-    Type,
-)
+from typing import Any, Callable
 
 try:
     from paho.mqtt import client as mqtt
@@ -44,7 +42,7 @@ from .models import (
     UserInputRequest,
     UserResponse,
 )
-from .utils import gen_id, now
+from .utils import gen_id, get_message_dump, now
 
 LOG = logging.getLogger(__name__)
 
@@ -62,8 +60,8 @@ class MqttIOStream(IOStream):
     client: mqtt.Client
     task_id: str
     input_timeout: int
-    on_input_request: Optional[Callable[[str, str, str], None]]
-    on_input_received: Optional[Callable[[str, str], None]]
+    on_input_request: Callable[[str, str, str], None] | None
+    on_input_response: Callable[[str, str], None] | None
     max_retain_messages: int
     output_topic: str
     input_request_topic: str
@@ -87,8 +85,8 @@ class MqttIOStream(IOStream):
         input_timeout: int = 120,
         connect_timeout: int = 10,
         max_retain_messages: int = 1000,
-        on_input_request: Optional[Callable[[str, str, str], None]] = None,
-        on_input_response: Optional[Callable[[str, str], None]] = None,
+        on_input_request: Callable[[str, str, str], None] | None = None,
+        on_input_response: Callable[[str, str], None] | None = None,
         mqtt_client_kwargs: dict[str, Any] | None = None,
         uploads_root: Path | str | None = None,
         username: str | None = None,
@@ -173,9 +171,9 @@ class MqttIOStream(IOStream):
         # Set up TLS
         if use_tls:
             if ca_cert_path:
-                self.client.tls_set(ca_cert_path)  # pyright: ignore
+                self.client.tls_set(ca_cert_path)
             else:  # pragma: no cover
-                self.client.tls_set()  # pyright: ignore
+                self.client.tls_set()
 
         # Set up callbacks
         self.client.on_connect = self._on_connect
@@ -320,11 +318,13 @@ class MqttIOStream(IOStream):
             LOG.debug(
                 "Received message on topic %s: %s",
                 msg.topic,
-                msg.payload.decode(),
+                msg.payload.decode("utf-8", errors="replace"),
             )
 
             if msg.topic == self.input_response_topic:  # pragma: no branch
-                self._handle_input_response(msg.payload.decode())
+                self._handle_input_response(
+                    msg.payload.decode("utf-8", errors="replace")
+                )
 
         except Exception as e:  # pragma: no cover
             LOG.error("Error handling message: %s", e)
@@ -396,7 +396,7 @@ class MqttIOStream(IOStream):
 
     def __exit__(
         self,
-        exc_type: Type[Exception] | None,
+        exc_type: type[Exception] | None,
         exc_value: Exception | None,
         traceback: TracebackType | None,
     ) -> None:
@@ -487,23 +487,10 @@ class MqttIOStream(IOStream):
         message : BaseEvent | BaseMessage
             The message or event to send.
         """
-        try:
-            message_dump = message.model_dump(mode="json")
-        except Exception:
-            try:
-                message_dump = message.model_dump(
-                    serialize_as_any=True, mode="json", fallback=str
-                )
-            except Exception as e:
-                message_dump = {
-                    "error": str(e),
-                    "type": message.__class__.__name__,
-                }
-
+        message_dump = get_message_dump(message)
         message_type = message_dump.get("type", None)
         if not message_type:  # pragma: no cover
             message_type = message.__class__.__name__
-
         self._print(
             {
                 "type": message_type,
@@ -652,7 +639,7 @@ class MqttIOStream(IOStream):
     @staticmethod
     def _create_user_response(
         message_data: dict[str, Any],
-    ) -> Optional["UserResponse"]:
+    ) -> UserResponse | None:
         """Create UserResponse object from validated data."""
         try:
             # Handle nested JSON in 'data' field