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

waldiez/exporting/flow/utils/logging.py

@@ -82,47 +82,13 @@ 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.
+    """Get the sqlite to csv and json conversion code string.
 
     Returns
     -------
     str
         The sqlite to csv and json conversion code string.
-
-    Example
-    -------
-    ```python
-    >>> get_sqlite_outputs()
-    def get_sqlite_out(dbname: str, table: str, csv_file: str) -> None:
-        \"\"\"Convert a sqlite table to csv and json files.
-
-    Parameters
-    ----------
-        dbname : str
-            The sqlite database name.
-        table : str
-            The table name.
-        csv_file : str
-            The csv file name.
-        \"\"\"
-        conn = sqlite3.connect(dbname)
-        query = f"SELECT * FROM {table}"  # nosec
-        cursor = conn.execute(query)
-        rows = cursor.fetchall()
-        column_names = [description[0] for description in cursor.description]
-        data = [dict(zip(column_names, row, strict=True)) for row in rows]
-        conn.close()
-        with open(csv_file, "w", newline="", encoding="utf-8") as file:
-            csv_writer = csv.DictWriter(file, fieldnames=column_names)
-            csv_writer.writeheader()
-            csv_writer.writerows(data)
-        json_file = csv_file.replace(".csv", ".json")
-        with open(json_file, "w", encoding="utf-8") as file:
-            json.dump(data, file, indent=4, ensure_ascii=False)
-    ```
     """
     content = "\n\n"
     content += (
@@ -160,58 +126,20 @@ def get_sync_sqlite_out() -> str:
     content += "        csv_writer.writeheader()\n"
     content += "        csv_writer.writerows(data)\n"
     content += '    json_file = csv_file.replace(".csv", ".json")\n'
-    content += '    with open(json_file, "w", encoding="utf-8") as file:\n'
+    content += '    with open(json_file, "w", encoding="utf-8", newline="\\n") as file:\n'
     content += "        json.dump(data, file, indent=4, ensure_ascii=False)\n"
     content += "\n"
     return content
 
 
-# pylint: disable=differing-param-doc,differing-type-doc,line-too-long
-# noinspection PyUnresolvedReferences
+# pylint: disable=line-too-long
 def get_async_sqlite_out() -> str:
-    r"""Get the sqlite to csv and json conversion code string.
+    """Get the sqlite to csv and json conversion code string.
 
     Returns
     -------
     str
         The sqlite to csv and json conversion code string.
-
-    Example
-    -------
-    ```python
-    >>> get_sqlite_outputs()
-    async def get_sqlite_out(dbname: str, table: str, csv_file: str) -> None:
-        \"\"\"Convert a sqlite table to csv and json files.
-
-    Parameters
-    ----------
-        dbname : str
-            The sqlite database name.
-        table : str
-            The table name.
-        csv_file : str
-            The csv file name.
-        \"\"\"
-        conn = await aiosqlite.connect(dbname)
-        query = f"SELECT * FROM {table}"  # nosec
-        try:
-            cursor = await conn.execute(query)
-        except BaseException:  # pylint: disable=broad-exception-caught
-            await conn.close()
-            return
-        rows = await cursor.fetchall()
-        column_names = [description[0] for description in cursor.description]
-        data = [dict(zip(column_names, row, strict=True)) for row in rows]
-        await cursor.close()
-        await conn.close()
-        async with aiofiles.open(csv_file, "w", newline="", encoding="utf-8") as file:
-            csv_writer = csv.DictWriter(file, fieldnames=column_names)
-            csv_writer.writeheader()
-            csv_writer.writerows(data)
-        json_file = csv_file.replace(".csv", ".json")
-        async with aiofiles.open(json_file, "w", encoding="utf-8") as file:
-            await file.write(json.dumps(data, indent=4, ensure_ascii=False)
-    ```
     """
     # fmt: off
     content = "\n\n"
@@ -244,7 +172,7 @@ def get_async_sqlite_out() -> str:
     content += "        await csv_writer.writeheader()\n"
     content += "        await csv_writer.writerows(data)\n"
     content += '    json_file = csv_file.replace(".csv", ".json")\n'
-    content += '    async with aiofiles.open(json_file, "w", encoding="utf-8") as file:\n'
+    content += '    async with aiofiles.open(json_file, "w", encoding="utf-8", newline="\\n") as file:\n'
     content += "        await file.write(json.dumps(data, indent=4, ensure_ascii=False))\n"
     content += "\n"
     # fmt: on

waldiez/exporting/models/exporter.py

@@ -3,7 +3,7 @@
 """Models exporter module."""
 
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 from waldiez.models import WaldiezAgent, WaldiezModel
 
@@ -31,9 +31,9 @@ class ModelsExporter(Exporter[ModelExtras]):
         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,
         **kwargs: Any,
     ):
         """Initialize the models exporter."""
@@ -94,7 +94,7 @@ class ModelsExporter(Exporter[ModelExtras]):
 
         return extras
 
-    def generate_main_content(self) -> Optional[str]:
+    def generate_main_content(self) -> str | None:
         """Generate the main models content (LLM configs).
 
         Returns
@@ -146,7 +146,7 @@ class ModelsExporter(Exporter[ModelExtras]):
             or "llm_config=False" if no models are configured.
         """
         if not agent.data.model_ids:
-            return "    llm_config=False,  # pyright: ignore\n"
+            return "    llm_config=False,\n"
 
         # Get model configs for this agent
         model_configs: list[str] = []
@@ -154,9 +154,9 @@ class ModelsExporter(Exporter[ModelExtras]):
             model_name = self.model_names.get(model_id)
             if model_name:
                 model_configs.append(f"{model_name}_llm_config")
-        tab = " " * 4
+        tab: str = " " * 4
         if not model_configs:
-            return f"{tab}llm_config=False, # pyright: ignore\n"
+            return f"{tab}llm_config=False,\n"
 
         config_list = f",\n{tab}{tab}{tab}".join(model_configs)
         llm_config = f"""{tab}llm_config=autogen.LLMConfig(

waldiez/exporting/models/processor.py

@@ -5,7 +5,6 @@
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 from waldiez.models import WaldiezModel
 
@@ -20,7 +19,7 @@ class ModelProcessingResult:
     """Result from processing models."""
 
     llm_configs_content: str = ""
-    api_keys_file: Optional[Path] = None
+    api_keys_file: Path | None = None
     needs_api_key_loader: bool = False
 
 
@@ -32,8 +31,8 @@ class ModelProcessor:
         flow_name: str,
         models: list[WaldiezModel],
         model_names: dict[str, str],
-        serializer: Optional[Serializer] = None,
-        output_dir: Optional[Path] = None,
+        serializer: Serializer | None = None,
+        output_dir: Path | None = None,
     ):
         self.flow_name = flow_name
         self.models = models
@@ -93,8 +92,9 @@ __{flow_name_upper}_MODEL_API_KEYS__ = {{'''
         for model in self.models:
             model_name = self.model_names[model.id]
             key_env = model.api_key_env_key
+            api_keys_content += "\n"
             api_keys_content += (
-                "\n" + f'    "{model_name}": '
+                f'    "{model_name}": '
                 f'{{"key": "{model.api_key}", "env_key": "{key_env}"}},'
             )
 

waldiez/exporting/tools/exporter.py

@@ -4,7 +4,7 @@
 """Tools exporter."""
 
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from waldiez.models import WaldiezAgent, WaldiezTool
 
@@ -148,7 +148,7 @@ class ToolsExporter(Exporter[ToolExtras]):
                     )
         return extras
 
-    def generate_main_content(self) -> Optional[str]:
+    def generate_main_content(self) -> str | None:
         """Generate the main tools content."""
         # handled as positioned content
         return None

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.
 
@@ -30,7 +31,7 @@ from .models import (
     VideoMediaContent,
 )
 from .structured import StructuredIOStream
-from .utils import MediaType, MessageType
+from .utils import DEBUG_INPUT_PROMPT, START_CHAT_PROMPT, MediaType, MessageType
 
 try:
     from .redis import RedisIOStream  # type: ignore[no-redef,unused-ignore]
@@ -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__ = [
@@ -125,4 +129,6 @@ __all__ = [
     "AudioContent",
     "VideoMediaContent",
     "VideoContent",
+    "DEBUG_INPUT_PROMPT",
+    "START_CHAT_PROMPT",
 ]

waldiez/io/_ws.py

@@ -1,7 +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
@@ -13,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
 
@@ -40,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
@@ -101,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:
@@ -190,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):