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

waldiez/__init__.py

@@ -9,7 +9,7 @@ from .utils import check_conflicts
 
 # flake8: noqa: F401
 # pylint: disable=import-error,line-too-long
-# pyright: reportMissingImports=false
+# pyright: reportMissingImports=false,reportUnknownVariableType=false
 try:
     # noqa: I001
     from ._version import __version__  # type: ignore[unused-ignore, unused-import, import-not-found, import-untyped]  # noqa

waldiez/_version.py

@@ -5,4 +5,4 @@
 This file is automatically generated by Hatchling.
 Do not edit this file directly.
 """
-__version__ = VERSION = "0.6.0"
+__version__ = VERSION = "0.6.1"

waldiez/cli.py

@@ -3,13 +3,15 @@
 # flake8: noqa: E501
 # pylint: disable=missing-function-docstring, missing-param-doc, missing-raises-doc
 # pylint: disable=line-too-long, import-outside-toplevel
+# pyright: reportUnknownArgumentType=false,reportCallInDefaultInitializer=false
+# pyright:  reportUnusedCallResult=false,reportAny=false
 """Command line interface to convert or run a waldiez file."""
 
 import json
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal
 
 import anyio
 import typer
@@ -81,7 +83,7 @@ def run(
             resolve_path=True,
         ),
     ],
-    output: Optional[Path] = typer.Option(  # noqa: B008
+    output: Path | None = typer.Option(  # noqa: B008
         None,
         help=(
             "Path to the output (.py) file. "
@@ -91,7 +93,7 @@ def run(
         dir_okay=False,
         resolve_path=True,
     ),
-    uploads_root: Optional[Path] = typer.Option(  # noqa: B008
+    uploads_root: Path | None = typer.Option(  # noqa: B008
         None,
         help=(
             "Path to the uploads root directory. "
@@ -104,15 +106,15 @@ def run(
     structured: bool = typer.Option(  # noqa: B008
         False,
         help=(
-            "If set, the output will be structured as a directory with "
-            "the flow file and any additional generated files in it."
+            "If set, structured messages will be used for I/O when "
+            "using print and/or input"
         ),
     ),
     force: bool = typer.Option(  # noqa: B008
         False,
         help="Override the output file if it already exists.",
     ),
-    env_file: Optional[Path] = typer.Option(  # noqa: B008
+    env_file: Path | None = typer.Option(  # noqa: B008
         None,
         "--env-file",
         "-e",
@@ -136,6 +138,14 @@ def run(
         is_eager=True,
         rich_help_panel="Debug",
     ),
+    breakpoints: list[str] = typer.Option(  # noqa: B008
+        ...,
+        "--breakpoints",
+        "-b",
+        default_factory=list,
+        help="Optional list with initial breakpoints (if using step mode).",
+        rich_help_panel="Debug",
+    ),
     subprocess: bool = typer.Option(
         False,
         "--subprocess",
@@ -171,6 +181,7 @@ def run(
             dot_env=env_file,
             subprocess_mode=subprocess_mode,
             waldiez_file=file,
+            breakpoints=breakpoints,
         )
     except FileNotFoundError as error:
         typer.echo(f"File not found: {file}")
@@ -271,7 +282,7 @@ def check(
     LOG.success("Waldiez flow seems valid.")
 
 
-def _get_output_path(output: Optional[Path], force: bool) -> Optional[Path]:
+def _get_output_path(output: Path | None, force: bool) -> Path | None:
     if output is not None:
         output = Path(output).resolve()
     if output is not None and not output.parent.exists():

waldiez/cli_extras/jupyter.py

@@ -2,6 +2,9 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: skip-file
 # isort: skip_file
+# pyright: reportMissingImports=false,reportUnusedImport=false
+# pyright: reportCallInDefaultInitializer=false,reportPrivateImportUsage=false
+# pyright: reportUnknownVariableType=false
 # flake8: noqa: E501
 """Waldiez-jupyter extra typer commands for CLI."""
 

waldiez/cli_extras/runner.py

@@ -3,6 +3,8 @@
 # pylint: skip-file
 # isort: skip_file
 # flake8: noqa: E501,E402
+# pyright: reportMissingImports=false,reportUnusedImport=false
+# pyright: reportUnknownVariableType=false
 """Waldiez-runner extra typer commands for CLI."""
 
 from typing import Any, Callable
@@ -18,7 +20,7 @@ runner_app: Callable[..., Any] | None = None
 try:
     from waldiez_runner.cli import run  # type: ignore[unused-ignore, import-not-found, import-untyped]
 
-    runner_app = run  # pyright: ignore
+    runner_app = run
 
     _have_runner = True
 except BaseException:

waldiez/cli_extras/studio.py

@@ -3,6 +3,8 @@
 # pylint: skip-file
 # isort: skip_file
 # flake8: noqa: E501,E402
+# pyright: reportMissingImports=false,reportUnusedImport=false
+# pyright: reportUnknownVariableType=false
 """Waldiez-studio extra typer commands for CLI."""
 
 from typing import Any, Callable
@@ -18,7 +20,7 @@ studio_app: Callable[..., Any] | None = None
 try:
     from waldiez_studio.cli import run  # type: ignore[unused-ignore, import-not-found, import-untyped]
 
-    studio_app = run  # pyright: ignore
+    studio_app = run
 
     _have_studio = True
 except BaseException:

waldiez/exporter.py

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+
+# pyright: reportMissingTypeStubs=false,reportUnknownMemberType=false
+# pyright: reportUnknownVariableType=false,reportAny=false
+# pyright: reportUnusedCallResult=false
 """
 Waldiez exporter class.
 
@@ -29,7 +33,8 @@ class WaldiezExporter:
         waldiez (Waldiez): The Waldiez instance.
     """
 
-    flow_extras: FlowExtras
+    flow_extras: FlowExtras | None
+    waldiez: Waldiez
 
     def __init__(self, waldiez: Waldiez) -> None:
         """Initialize the Waldiez exporter.
@@ -40,6 +45,7 @@ class WaldiezExporter:
             The Waldiez instance.
         """
         self.waldiez = waldiez
+        self.flow_extras = None
 
     @classmethod
     def load(cls, file_path: Path) -> "WaldiezExporter":
@@ -173,13 +179,13 @@ class WaldiezExporter:
             cell_metadata_filter="-all",
         )
         with open(py_path, "r", encoding="utf-8") as py_out:
-            jp_content = jupytext.read(  # pyright: ignore
+            jp_content = jupytext.read(
                 py_out,
                 fmt="py:percent",
                 config=config,
             )
         ipynb_path = str(py_path).replace(".tmp.py", ".tmp.ipynb")
-        jupytext.write(  # pyright: ignore
+        jupytext.write(
             jp_content,
             ipynb_path,
             fmt="ipynb",

waldiez/exporting/agent/exporter.py

@@ -2,10 +2,11 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=too-many-arguments,too-many-positional-arguments
 # pylint: disable=too-many-return-statements,too-many-instance-attributes
+# pyright: reportUnusedParameter=false
 """Export agents."""
 
 from pathlib import Path
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable
 
 from waldiez.models import (
     WaldiezAgent,
@@ -45,14 +46,12 @@ class AgentExporter(Exporter[StandardExtras]):
         tool_names: dict[str, str],
         is_async: bool = False,
         for_notebook: bool = False,
-        cache_seed: Optional[int] = None,
-        initial_chats: Optional[list[WaldiezAgentConnection]] = None,
-        group_chat_members: Optional[list[WaldiezAgent]] = None,
-        arguments_resolver: Optional[
-            Callable[[WaldiezAgent], list[str]]
-        ] = None,
-        output_dir: Optional[Union[str, Path]] = None,
-        context: Optional[ExporterContext] = None,
+        cache_seed: int | None = None,
+        initial_chats: list[WaldiezAgentConnection] | None = None,
+        group_chat_members: list[WaldiezAgent] | None = None,
+        arguments_resolver: Callable[[WaldiezAgent], list[str]] | None = None,
+        output_dir: str | Path | None = None,
+        context: ExporterContext | None = None,
         **kwargs: Any,
     ):
         """Initialize the agent exporter.
@@ -336,7 +335,7 @@ class AgentExporter(Exporter[StandardExtras]):
 
         return reason_extras
 
-    def generate_main_content(self) -> Optional[str]:
+    def generate_main_content(self) -> str | None:
         """Generate the main agent definition.
 
         Returns

waldiez/exporting/agent/extras/captain_agent_extras.py

@@ -10,7 +10,7 @@ import os
 import uuid
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from waldiez.models import (
     WaldiezAgent,
@@ -37,8 +37,8 @@ class CaptainAgentProcessor:
         agent: WaldiezAgent,
         agent_names: dict[str, str],
         all_models: list[WaldiezModel],
-        serializer: Optional[Serializer] = None,
-        output_dir: Optional[Path] = None,
+        serializer: Serializer | None = None,
+        output_dir: Path | None = None,
     ):
         self.agent = agent
         self.agent_names = agent_names
@@ -48,9 +48,9 @@ class CaptainAgentProcessor:
 
     def process(
         self,
-        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,
     ) -> CaptainExtras:
         """Process group manager and return extras.
 

waldiez/exporting/agent/extras/doc_agent_extras.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=too-few-public-methods,no-self-use
+# pyright: reportUninitializedInstanceVariable=false
 
 # before agent: query engine initialization
 # agent extra args:
@@ -13,7 +14,6 @@
 # import shutil
 import shutil
 from pathlib import Path
-from typing import Optional
 
 from waldiez.exporting.core.extras.path_resolver import DefaultPathResolver
 from waldiez.exporting.core.protocols import PathResolver
@@ -49,10 +49,10 @@ class DocAgentProcessor:
         agent_names: dict[str, str],
         model_names: dict[str, str],
         all_models: list[WaldiezModel],
-        cache_seed: Optional[int] = None,
+        cache_seed: int | None = None,
         serializer: Serializer | None = None,
         path_resolver: PathResolver | None = None,
-        output_dir: Optional[Path] = None,
+        output_dir: Path | None = None,
     ):
         self.agent = agent
         self.agent_name = agent_names.get(agent.id, agent.name)
@@ -65,9 +65,9 @@ class DocAgentProcessor:
 
     def process(
         self,
-        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,
     ) -> StandardExtras:
         """Process the document agent configuration.
 

waldiez/exporting/agent/extras/group_manager_agent_extas.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-self-use,too-few-public-methods
 """Group manager agent configuration processor."""
 
-from typing import Callable, Optional
+from typing import Callable
 
 from waldiez.models import (
     WaldiezAgent,
@@ -35,7 +35,8 @@ class GroupManagerProcessor:
         model_names: dict[str, str],
         all_models: list[WaldiezModel],
         serializer: Callable[..., str],
-        cache_seed: Optional[int] = None,
+        cache_seed: int | None = None,
+        strategy: GroupManagerStrategy | None = None,
     ):
         """Initialize the group manager processor.
 
@@ -57,6 +58,8 @@ class GroupManagerProcessor:
             Function to serialize data into a string format.
         cache_seed : Optional[int], optional
             Seed for caching purposes, by default None.
+        strategy :  Optional[GroupManagerStrategy]
+            Optional strategy to force (pattern based or traditional)
         """
         self.agent = agent
         self.initial_chats = initial_chats
@@ -66,12 +69,13 @@ class GroupManagerProcessor:
         self.all_models = all_models
         self.serializer = serializer
         self.cache_seed = cache_seed
+        self.strategy = strategy
 
     def process(
         self,
-        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,
     ) -> GroupManagerExtras:
         """Process group manager and return extras.
 
@@ -133,6 +137,8 @@ class GroupManagerProcessor:
 
     def _determine_strategy(self) -> GroupManagerStrategy:
         """Determine which strategy to use for this group manager."""
+        if self.strategy is not None:
+            return self.strategy
         if self.is_pattern_strategy(self.initial_chats):
             # Use AG2 Pattern system
             return GroupManagerStrategy.PATTERN
@@ -145,10 +151,11 @@ class GroupManagerProcessor:
         extras.pattern_class_name = self._get_pattern_class_name()
 
         # Add required imports
-        extras.pattern_imports.add(
+        pattern_import = (
             "from autogen.agentchat.group.patterns import "
             f"{extras.pattern_class_name}"
         )
+        extras.pattern_imports.add(pattern_import)
 
         # Get user agent if applicable
         user_agent = None
@@ -222,7 +229,7 @@ class GroupManagerProcessor:
         return pattern_map.get(selection_method, "AutoPattern")
 
     def _generate_pattern_definition(
-        self, pattern_class: str, user_agent: Optional[WaldiezAgent]
+        self, pattern_class: str, user_agent: WaldiezAgent | None
     ) -> str:
         """Generate the pattern definition string."""
         if not isinstance(self.agent, WaldiezGroupManager):
@@ -253,12 +260,13 @@ class GroupManagerProcessor:
             as_dict=True,
         )
         manager_name = self.agent_names[self.agent.id]
-        pattern_lines.append(
+        pattern_line = (
             "    group_manager_args={\n"
             f"{llm_config_arg}"
             f'       "name": "{manager_name}",\n'
             "    },"
         )
+        pattern_lines.append(pattern_line)
 
         # Add context variables if present
         if self.agent.data.context_variables:
@@ -339,7 +347,7 @@ class GroupManagerProcessor:
 
     def _generate_speakers_configuration(
         self,
-    ) -> tuple[list[str], Optional[str]]:
+    ) -> tuple[list[str], str | None]:
         """Generate speakers configuration for traditional group chat."""
         if not isinstance(self.agent, WaldiezGroupManager):
             return [], None
@@ -350,10 +358,11 @@ class GroupManagerProcessor:
 
         # Max retries
         if speakers.max_retries_for_selecting is not None:
-            config_lines.append(
+            config_line = (
                 "    max_retries_for_selecting_speaker="
                 f"{speakers.max_retries_for_selecting},"
             )
+            config_lines.append(config_line)
 
         # Selection method
         if speakers.selection_method != "custom":
@@ -394,7 +403,7 @@ class GroupManagerProcessor:
 
         if isinstance(allow_repeat, bool):
             lines.append(f"    allow_repeat_speaker={allow_repeat},")
-        else:
+        elif allow_repeat is not None:
             # List of agent names
             agent_names = ", ".join(
                 self.agent_names[agent_id] for agent_id in allow_repeat
@@ -425,15 +434,14 @@ class GroupManagerProcessor:
         # Serialize transitions
         transitions_str = self.serializer(transitions_dict, tabs=1)
         transitions_str = transitions_str.replace('"', "").replace("'", "")
-
-        lines.extend(
-            [
-                "    allowed_or_disallowed_speaker_transitions="
-                f"{transitions_str},",
-                '    speaker_transitions_type="'
-                f'"{self.agent.data.speakers.transitions_type}",',
-            ]
+        allowed_or_disallowed_line = (
+            f"    allowed_or_disallowed_speaker_transitions={transitions_str},"
         )
+        transition_type_line = (
+            '    speaker_transitions_type="'
+            f'"{self.agent.data.speakers.transitions_type}",'
+        )
+        lines.extend([allowed_or_disallowed_line, transition_type_line])
 
         return lines
 
@@ -475,8 +483,8 @@ class GroupManagerProcessor:
             ),
             "GroupManagerTarget": (
                 "GroupManagerTarget()",
-                f"{import_prefix}.targets.group_manager_target "
-                "import GroupManagerTarget",
+                # pylint: disable=line-too-long
+                f"{import_prefix}.targets.group_manager_target import GroupManagerTarget",  # noqa: E501
             ),
         }
 
@@ -501,10 +509,13 @@ class GroupManagerProcessor:
                     for agent in self.group_chat_members
                 ]
             target_names_str = ", ".join(target_names)
+            import_line = (
+                f"{import_prefix}.targets.transition_target "
+                "import RandomAgentTarget"
+            )
             return (
                 f"RandomAgentTarget(agents=[{target_names_str}])",
-                f"{import_prefix}.targets.transition_target "
-                "import RandomAgentTarget",
+                import_line,
             )
 
         return "", ""

waldiez/exporting/agent/extras/group_member_extras.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=no-self-use,too-few-public-methods
+# pyright: reportUninitializedInstanceVariable=false
 """Group member agent configuration processor."""
 
 from dataclasses import dataclass, field
@@ -26,10 +27,10 @@ class GroupMemberProcessorResult:
     before_agent: str = ""
     after_agent: str = ""
     extra_arguments: list[InstanceArgument] = field(
-        default_factory=list[InstanceArgument]
+        default_factory=list,
     )
     extra_imports: set[ImportStatement] = field(
-        default_factory=set[ImportStatement]
+        default_factory=set,
     )
 
 
@@ -108,10 +109,10 @@ class GroupMemberAgentProcessor:
         tab = "    "
         arg_string = "["
 
-        arcg_content = self._process_update_functions()
+        arg_content = self._process_update_functions()
 
-        if arcg_content:
-            arg_string += f"{arcg_content}\n{tab}"
+        if arg_content:
+            arg_string += f"{arg_content}\n{tab}"
             self.result.extra_imports.add(
                 ImportStatement("from autogen import UpdateSystemMessage")
             )

waldiez/exporting/agent/extras/handoffs/after_work.py

@@ -27,7 +27,7 @@ class AfterWorkResult:
 
     content: str = ""
     before_content: str = ""
-    extra_imports: set[str] = field(default_factory=set[str])
+    extra_imports: set[str] = field(default_factory=set)
 
 
 class AfterWorkProcessor:

waldiez/exporting/agent/extras/handoffs/available.py

@@ -14,7 +14,7 @@ class TransitionAvailableResult:
     """Result from processing transition availability."""
 
     content: str = ""
-    extra_imports: set[str] = field(default_factory=set[str])
+    extra_imports: set[str] = field(default_factory=set)
 
 
 class TransitionAvailableProcessor:

waldiez/exporting/agent/extras/handoffs/condition.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: reportUnnecessaryIsInstance=false,reportUnreachable=false
 """Handoff condition processing for Waldiez agents."""
 
 from dataclasses import dataclass, field
@@ -30,7 +31,7 @@ class ConditionResult:
     """
 
     content: str = ""
-    extra_imports: set[str] = field(default_factory=set[str])
+    extra_imports: set[str] = field(default_factory=set)
 
 
 class ConditionProcessor:
@@ -82,7 +83,7 @@ class ConditionProcessor:
         elif isinstance(
             condition,
             WaldiezExpressionContextCondition,
-        ):  # pyright: ignore
+        ):
             self._process_expression_context_condition(condition)
         else:
             raise ValueError(f"Unsupported condition type: {type(condition)}")

waldiez/exporting/agent/extras/handoffs/handoff.py

@@ -35,7 +35,7 @@ class HandoffResult:
     """
 
     after_agent: str = ""
-    extra_imports: set[str] = field(default_factory=set[str])
+    extra_imports: set[str] = field(default_factory=set)
 
 
 class HandoffProcessor:

waldiez/exporting/agent/extras/handoffs/target.py

@@ -4,7 +4,7 @@
 """Transition target processor for Waldiez agents."""
 
 from dataclasses import dataclass, field
-from typing import Callable, Set
+from typing import Callable
 
 from waldiez.exporting.chats.utils.nested import get_nested_chat_queue
 from waldiez.models import (
@@ -33,7 +33,7 @@ class TargetResult:
 
     content: str = ""
     before_content: str = ""
-    extra_imports: Set[str] = field(default_factory=set)  # pyright: ignore
+    extra_imports: set[str] = field(default_factory=set)
 
 
 # noinspection PyTypeHints
@@ -128,10 +128,11 @@ class TransitionTargetProcessor:
     ) -> str:
         """Process random agent target."""
         if not isinstance(target, WaldiezRandomAgentTarget):
-            raise ValueError(
+            msg = (
                 "Expected WaldiezRandomAgentTarget"
                 " for random agent target processing."
             )
+            raise ValueError(msg)
         agent_vars = [self.agent_names[agent_id] for agent_id in target.value]
         agents_str = ", ".join(agent_vars)
         return f"RandomAgentTarget([{agents_str}])"
@@ -141,10 +142,11 @@ class TransitionTargetProcessor:
     ) -> str:
         """Process group chat target."""
         if not isinstance(target, WaldiezGroupOrNestedTarget):
-            raise ValueError(
+            msg = (
                 "Expected WaldiezGroupOrNestedTarget for group chat target "
                 "processing."
             )
+            raise ValueError(msg)
         chat_name = self.chat_names[target.value[0]]
         return f"GroupChatTarget({chat_name})"