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

waldiez/exporting/core/constants.py

@@ -2,6 +2,8 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Constants for Waldiez exporting core."""
 
+from datetime import datetime
+
 from .enums import (
     AgentPosition,
     ExportPosition,
@@ -10,7 +12,7 @@ from .enums import (
 
 FILE_HEADER = (
     "# SPDX-License-Identifier: Apache-2.0.\n"
-    "# Copyright (c) 2024 - 2025 Waldiez and contributors."
+    f"# Copyright (c) 2024 - {datetime.now().year} Waldiez and contributors."
 )
 DEFAULT_IMPORT_POSITION = ImportPosition.THIRD_PARTY
 DEFAULT_EXPORT_POSITION = ExportPosition.AGENTS

waldiez/exporting/core/content.py

@@ -3,7 +3,7 @@
 """Content module for Waldiez exporting core."""
 
 from dataclasses import dataclass, field
-from typing import Any, Optional
+from typing import Any
 
 from .enums import (
     AgentPosition,
@@ -20,9 +20,9 @@ class PositionedContent:
     content: str
     position: ExportPosition
     order: int = 0
-    agent_id: Optional[str] = None
-    agent_position: Optional[AgentPosition] = None
-    metadata: dict[str, Any] = field(default_factory=dict[str, Any])
+    agent_id: str | None = None
+    agent_position: AgentPosition | None = None
+    metadata: dict[str, Any] = field(default_factory=dict)
 
     def __post_init__(self) -> None:
         """Validate positioned content."""
@@ -64,6 +64,6 @@ class ContentMetadata:
     """Metadata about exported content."""
 
     content_type: ContentType
-    source_id: Optional[str] = None
-    dependencies: list[str] = field(default_factory=list[str])
-    tags: set[str] = field(default_factory=set[str])
+    source_id: str | None = None
+    dependencies: list[str] = field(default_factory=list)
+    tags: set[str] = field(default_factory=set)

waldiez/exporting/core/context.py

@@ -2,9 +2,11 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Singleton context for exporters."""
 
+from __future__ import annotations
+
 import threading
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from waldiez.logger import WaldiezLogger, get_logger
 
@@ -137,10 +139,10 @@ class DefaultExporterContext(ExporterContext):
     Direct instantiation may not behave as expected.
     """
 
-    _instance: Optional["DefaultExporterContext"] = None
+    _instance: DefaultExporterContext | None = None
     _lock = threading.Lock()
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> "DefaultExporterContext":
+    def __new__(cls, *args: Any, **kwargs: Any) -> DefaultExporterContext:
         """Create a new instance of DefaultExporterContext.
 
         Parameters

waldiez/exporting/core/exporter.py

@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=too-few-public-methods
+# pyright: reportUnusedParameter=false
+
 """Base exporter classes."""
 
 import abc
-from typing import Any, Generic, Optional
+from typing import Any, Generic
 
 from .constants import DEFAULT_IMPORT_POSITION
 from .content import PositionedContent
@@ -30,7 +32,7 @@ class Exporter(abc.ABC, Generic[Extras]):
 
     def __init__(
         self,
-        context: Optional[ExporterContext] = None,
+        context: ExporterContext | None = None,
         **kwargs: Any,
     ):
         """Initialize the exporter.
@@ -312,7 +314,7 @@ class Exporter(abc.ABC, Generic[Extras]):
         self._ensure_initialized()
         return self._result.get_content_by_position(position)
 
-    def get_main_content(self) -> Optional[str]:
+    def get_main_content(self) -> str | None:
         """Get the main content.
 
         Returns

waldiez/exporting/core/exporters.py

@@ -3,7 +3,7 @@
 
 """Exporters for Waldiez."""
 
-from typing import Any, Optional
+from typing import Any
 
 from .exporter import Exporter
 from .types import Extras
@@ -50,7 +50,7 @@ class ConfigurableExporter(Exporter[Extras]):
         """
         raise NotImplementedError("Subclasses must implement this method.")
 
-    def __init__(self, config: Optional[dict[str, Any]] = None, **kwargs: Any):
+    def __init__(self, config: dict[str, Any] | None = None, **kwargs: Any):
         """Initialize with configuration.
 
         Parameters

waldiez/exporting/core/extras/agent_extras/captain_extras.py

@@ -3,7 +3,7 @@
 """Captain agent extras module."""
 
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from waldiez.exporting.core.result import ExportResult
 
@@ -14,7 +14,7 @@ from .standard_extras import StandardExtras
 class CaptainExtras(StandardExtras):
     """Extras for captain agents."""
 
-    nested_config: Optional[dict[str, Any]] = None
+    nested_config: dict[str, Any] | None = None
 
     def _contribute_specific_content(self, result: ExportResult) -> None:
         """Contribute captain specific content to the export result.

waldiez/exporting/core/extras/agent_extras/group_manager_extras.py

@@ -26,7 +26,7 @@ class GroupManagerExtras(StandardExtras):
     # Pattern-based content
     pattern_definition: str = ""
     pattern_class_name: str = "AutoPattern"
-    pattern_imports: set[str] = field(default_factory=set[str])
+    pattern_imports: set[str] = field(default_factory=set)
 
     # Traditional GroupChat content
     group_chat_definition: str = ""
@@ -88,7 +88,7 @@ class GroupManagerExtras(StandardExtras):
                     order=ContentOrder.LATE_CLEANUP,
                 )
 
-            # Add grop chat argument if specified
+            # Add group chat argument if specified
             if self.group_chat_argument:
                 self.add_arg(self.group_chat_argument, tabs=1)
 

waldiez/exporting/core/extras/agent_extras/rag_user_extras.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
-"""RAG related extas."""
+"""RAG related extras."""
 
 from dataclasses import dataclass, field
 
@@ -15,7 +15,7 @@ class RAGUserExtras(StandardExtras):
     """RAG configuration."""
 
     before_content: str = ""
-    imports: set[str] = field(default_factory=set[str])
+    imports: set[str] = field(default_factory=set)
 
     def _contribute_specific_content(self, result: ExportResult) -> None:
         """Contribute RAG specific content to the export result."""

waldiez/exporting/core/extras/agent_extras/standard_extras.py

@@ -4,7 +4,6 @@
 """Standard agent extras module."""
 
 from dataclasses import dataclass
-from typing import Optional
 
 from ...enums import AgentPosition, ExportPosition
 from ...result import ExportResult
@@ -76,9 +75,9 @@ class SystemMessageConfig:
 class StandardExtras(BaseExtras):
     """Extras for standard agents (UserProxy, Assistant, etc.)."""
 
-    code_execution_config: Optional[CodeExecutionConfig] = None
-    termination_config: Optional[TerminationConfig] = None
-    system_message_config: Optional[SystemMessageConfig] = None
+    code_execution_config: CodeExecutionConfig | None = None
+    termination_config: TerminationConfig | None = None
+    system_message_config: SystemMessageConfig | None = None
 
     def set_code_execution(self, config: CodeExecutionConfig) -> None:
         """Set code execution configuration.
@@ -155,14 +154,10 @@ class StandardExtras(BaseExtras):
             argument = self.termination_config.termination_arg
         else:
             argument = "None"
-        comment: str | None = None
-        if argument == "None":
-            comment = "pyright: ignore"
         return InstanceArgument(
             instance_id=self.instance_id,
             name="is_termination_msg",
             value=argument,
-            comment=comment,
             tabs=1,
         )
 

waldiez/exporting/core/extras/base.py

@@ -1,11 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 
+# pyright: reportUnnecessaryIsInstance=false, reportUnusedParameter=false
+
 """Base extras system for all exporters."""
 
 import abc
+from collections.abc import Sequence
 from dataclasses import dataclass, field
-from typing import Sequence
 
 from ..enums import AgentPosition, ContentOrder, ExportPosition, ImportPosition
 from ..protocols import ExportContributor
@@ -14,18 +16,18 @@ from ..types import ImportStatement, InstanceArgument
 
 
 @dataclass
-class BaseExtras(ExportContributor):
+class BaseExtras(ExportContributor, metaclass=abc.ABCMeta):
     """Base class for all exporter extras with export contribution."""
 
     instance_id: str
     extra_imports: list[ImportStatement] = field(
-        default_factory=list[ImportStatement]
+        default_factory=list,
     )
     before_agent: str = ""
     after_agent: str = ""
     after_all_agents: str = ""
     extra_args: list[InstanceArgument] = field(
-        default_factory=list[InstanceArgument]
+        default_factory=list,
     )
 
     def get_extra_args_content(self) -> str:
@@ -51,7 +53,7 @@ class BaseExtras(ExportContributor):
         if isinstance(arg, InstanceArgument):
             if arg not in self.extra_args:
                 self.extra_args.append(arg)
-        elif isinstance(arg, str) and arg.strip():  # pyright: ignore
+        elif isinstance(arg, str) and arg.strip():
             # If it's a string, create an InstanceArgument
             # split by '=' (it's an argument line)
             parts = arg.split("=", 1)

waldiez/exporting/core/extras/flow_extras.py

@@ -5,7 +5,6 @@
 """Flow specific extras module."""
 
 from dataclasses import dataclass, field
-from typing import Optional
 
 from waldiez.utils import get_waldiez_version
 
@@ -25,10 +24,10 @@ class FlowExtras(BaseExtras):
     version: str = field(default_factory=get_waldiez_version)
 
     # Sub-exporter results
-    tools_result: Optional[ExportResult] = None
-    models_result: Optional[ExportResult] = None
-    agents_result: Optional[ExportResult] = None
-    chats_result: Optional[ExportResult] = None
+    tools_result: ExportResult | None = None
+    models_result: ExportResult | None = None
+    agents_result: ExportResult | None = None
+    chats_result: ExportResult | None = None
 
     # Generated script parts
     header_content: str = ""

waldiez/exporting/core/extras/model_extras.py

@@ -4,7 +4,7 @@
 """Agent specific extras module."""
 
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from waldiez.exporting.core.result import ExportResult
 
@@ -16,7 +16,7 @@ from .base import BaseExtras
 class ModelExtras(BaseExtras):
     """Extras for model exporters."""
 
-    llm_config: Optional[dict[str, Any]] = None
+    llm_config: dict[str, Any] | None = None
     config_file_path: str = ""
 
     def set_llm_config(self, config: dict[str, Any]) -> None:

waldiez/exporting/core/extras/path_resolver.py

@@ -3,7 +3,6 @@
 """Default path resolver for Waldiez items."""
 
 from pathlib import Path
-from typing import Union
 
 from ..protocols import PathResolver
 
@@ -70,7 +69,7 @@ class DefaultPathResolver(PathResolver):
         return None
 
 
-def _get_raw_path_string(path: Union[str, Path]) -> str:
+def _get_raw_path_string(path: str | Path) -> str:
     """Get the raw path string.
 
     Parameters

waldiez/exporting/core/extras/serializer.py

@@ -5,12 +5,12 @@
 """serializer for converting items to formatted strings."""
 
 import json
-from typing import Any, Optional
+from typing import Any
 
 from ..protocols import Serializer
 
 
-# pylint: disable=too-few-public-methods
+# pylint: disable=too-few-public-methods,no-self-use
 class DefaultSerializer(Serializer):
     """Default serializer for Waldiez items."""
 
@@ -37,7 +37,7 @@ class DefaultSerializer(Serializer):
 def serialize_item(
     item: Any,
     tabs: int = 1,
-    _visited: Optional[set[int]] = None,
+    visited: set[int] | None = None,
 ) -> str:
     """Convert an item to a formatted string with given indentation.
 
@@ -47,6 +47,8 @@ def serialize_item(
         The item to convert.
     tabs : int, optional
         The number of tabs, by default 1.
+    visited : set[int], optional
+        A set of visited IDs, by default None
 
     Returns
     -------
@@ -81,8 +83,8 @@ def serialize_item(
     }
     ```
     """
-    if _visited is None:
-        _visited = set()
+    if visited is None:
+        visited = set()
 
     if callable(item):
         return item.__name__
@@ -92,37 +94,37 @@ def serialize_item(
         return _format_primitive(item)
 
     # Handle circular references in containers
-    if isinstance(item, (dict, list, tuple, set)) and id(item) in _visited:
+    if isinstance(item, (dict, list, tuple, set)) and id(item) in visited:
         return '"<circular reference>"'
 
     next_indent = " " * 4 * (tabs + 1)
-    _visited.add(id(item))
+    visited.add(id(item))
 
     if isinstance(item, dict):
         items: list[str] = []
         for key, value in item.items():
             key_str = f'{next_indent}"{key}"'
-            value_str = serialize_item(value, tabs + 1, _visited)
+            value_str = serialize_item(value, tabs + 1, visited)
             items.append(f"{key_str}: {value_str}")
         return _format_container(items, "{", "}", tabs)
 
     if isinstance(item, list):
         items = [
-            f"{next_indent}{serialize_item(sub_item, tabs + 1, _visited)}"
+            f"{next_indent}{serialize_item(sub_item, tabs + 1, visited)}"
             for sub_item in item
         ]
         return _format_container(items, "[", "]", tabs)
 
     if isinstance(item, tuple):
         items = [
-            f"{next_indent}{serialize_item(sub_item, tabs + 1, _visited)}"
+            f"{next_indent}{serialize_item(sub_item, tabs + 1, visited)}"
             for sub_item in item
         ]
         return _format_container(items, "(", ")", tabs)
 
     if isinstance(item, set):
         items = [
-            f"{next_indent}{serialize_item(sub_item, tabs + 1, _visited)}"
+            f"{next_indent}{serialize_item(sub_item, tabs + 1, visited)}"
             for sub_item in item
         ]
         return _format_container(items, "{", "}", tabs)

waldiez/exporting/core/protocols.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=too-few-public-methods
+# pyright: reportReturnType=false
 """Core exporting protocols."""
 
 from typing import Any, Protocol, runtime_checkable
@@ -28,7 +29,7 @@ class ExportContributor(Protocol):
 class Validator(Protocol):
     """Protocol for validation components."""
 
-    def validate(self, content: Any) -> ValidationResult:  # pyright: ignore
+    def validate(self, content: Any) -> ValidationResult:
         """Validate content and return result.
 
         Parameters
@@ -47,7 +48,7 @@ class Validator(Protocol):
 class Serializer(Protocol):
     """Protocol for serialization components."""
 
-    def serialize(self, obj: Any, **kwargs: Any) -> str:  # pyright: ignore
+    def serialize(self, obj: Any, **kwargs: Any) -> str:
         """Serialize an object to string representation.
 
         Parameters
@@ -68,7 +69,7 @@ class Serializer(Protocol):
 class PathResolver(Protocol):
     """Protocol for resolving a path."""
 
-    def resolve(self, path: str) -> str:  # pyright: ignore
+    def resolve(self, path: str) -> str:
         """Resolve a path.
 
         Parameters
@@ -87,7 +88,7 @@ class PathResolver(Protocol):
             If the path cannot be resolved.
         """
 
-    def is_local(self, path: str) -> bool:  # pyright: ignore
+    def is_local(self, path: str) -> bool:
         """Check if the given path is a local path.
 
         Parameters
@@ -112,7 +113,7 @@ class ContentGenerator(Protocol):
         after_run: str,
         skip_logging: bool,
         **kwargs: Any,
-    ) -> str:  # pyright: ignore
+    ) -> str:
         """Generate content based on provided parameters.
 
         Parameters

waldiez/exporting/core/result.py

@@ -4,7 +4,7 @@
 """Export result containers and related classes."""
 
 from dataclasses import dataclass, field
-from typing import Any, Optional, Union
+from typing import Any
 
 from .constants import (
     DEFAULT_EXPORT_POSITION,
@@ -31,21 +31,21 @@ from .validation import ValidationResult
 class ExportResult:
     """Complete export result with all components."""
 
-    main_content: Optional[str] = None
+    main_content: str | None = None
     imports: set[ImportStatement] = field(
-        default_factory=set[ImportStatement],
+        default_factory=set,
     )
     positioned_content: list[PositionedContent] = field(
-        default_factory=list[PositionedContent],
+        default_factory=list,
     )
     instance_arguments: list[InstanceArgument] = field(
-        default_factory=list[InstanceArgument],
+        default_factory=list,
     )
     environment_variables: list[EnvironmentVariable] = field(
-        default_factory=list[EnvironmentVariable]
+        default_factory=list
     )
-    validation_result: Optional[ValidationResult] = None
-    metadata: dict[str, Any] = field(default_factory=dict[str, Any])
+    validation_result: ValidationResult | None = None
+    metadata: dict[str, Any] = field(default_factory=dict)
 
     def add_import(
         self, statement: str, position: ImportPosition = DEFAULT_IMPORT_POSITION
@@ -69,12 +69,9 @@ class ExportResult:
 
     def add_imports(
         self,
-        statements: Union[
-            set[str],
-            list[str],
-            set[ImportStatement],
-            list[ImportStatement],
-        ],
+        statements: (
+            set[str] | list[str] | set[ImportStatement] | list[ImportStatement]
+        ),
         position: ImportPosition = DEFAULT_IMPORT_POSITION,
     ) -> None:
         """Add multiple import statements.
@@ -106,7 +103,7 @@ class ExportResult:
         value: Any,
         instance_id: str,
         tabs: int = 0,
-        comment: Optional[str] = None,
+        comment: str | None = None,
     ) -> None:
         """Add an instance argument.
 
@@ -120,7 +117,7 @@ class ExportResult:
             The ID of the instance this argument belongs to.
         tabs : int, optional
             Number of tabs for indentation, by default 0
-        comment : Optional[str], optional
+        comment : str | None, optional
             Optional comment for the argument, by default None
         """
         if name and value is not None:  # pragma: no branch
@@ -142,7 +139,7 @@ class ExportResult:
 
     def add_instance_arguments(
         self,
-        arguments: Union[list[InstanceArgument], set[InstanceArgument]],
+        arguments: list[InstanceArgument] | set[InstanceArgument],
     ) -> None:
         """Add multiple instance arguments.
 
@@ -217,9 +214,9 @@ class ExportResult:
         position: ExportPosition = DEFAULT_EXPORT_POSITION,
         order: ContentOrder | int = ContentOrder.MAIN_CONTENT,
         skip_strip: bool = False,
-        agent_id: Optional[str] = None,
-        agent_position: Optional[AgentPosition] = None,
-        metadata: Optional[dict[str, Any]] = None,
+        agent_id: str | None = None,
+        agent_position: AgentPosition | None = None,
+        metadata: dict[str, Any] | None = None,
     ) -> None:
         """Add positioned content.
 
@@ -257,7 +254,7 @@ class ExportResult:
         self,
         name: str,
         value: str,
-        description: Optional[str] = None,
+        description: str | None = None,
         required: bool = True,
     ) -> None:
         """Add environment variable.
@@ -268,7 +265,7 @@ class ExportResult:
             The name of the environment variable.
         value : str
             The value of the environment variable.
-        description : Optional[str], optional
+        description : str | None, optional
             Description of the variable, by default None
         required : bool, optional
             Whether the variable is required, by default True
@@ -353,7 +350,7 @@ class ExportResult:
         return sorted(content)
 
     def get_agent_content(
-        self, agent_id: str, agent_position: Optional[AgentPosition] = None
+        self, agent_id: str, agent_position: AgentPosition | None = None
     ) -> list[PositionedContent]:
         """Get content positioned relative to a specific agent.
 
@@ -561,8 +558,8 @@ class ExportResultBuilder:
         content: str,
         position: ExportPosition = DEFAULT_EXPORT_POSITION,
         order: ContentOrder = ContentOrder.MAIN_CONTENT,
-        agent_id: Optional[str] = None,
-        agent_position: Optional[AgentPosition] = None,
+        agent_id: str | None = None,
+        agent_position: AgentPosition | None = None,
     ) -> "ExportResultBuilder":
         """Add positioned content.
 
@@ -574,7 +571,7 @@ class ExportResultBuilder:
             The content position, by default AGENTS
         order : int, optional
             The order within position, by default 0
-        agent_id : Optional[str], optional
+        agent_id : str | None, optional
             Agent ID for agent-relative positioning, by default None
         agent_position : Optional[AgentPosition], optional
             Position relative to agent, by default None
@@ -594,7 +591,7 @@ class ExportResultBuilder:
         return self
 
     def with_env_var(
-        self, name: str, value: str, description: Optional[str] = None
+        self, name: str, value: str, description: str | None = None
     ) -> "ExportResultBuilder":
         """Add environment variable.
 
@@ -604,7 +601,7 @@ class ExportResultBuilder:
             Variable name.
         value : str
             Variable value.
-        description : Optional[str], optional
+        description : str | None, optional
             Variable description, by default None
 
         Returns