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

waldiez/_version.py

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

waldiez/cli.py

@@ -170,6 +170,7 @@ def run(
             structured_io=structured,
             dot_env=env_file,
             subprocess_mode=subprocess_mode,
+            waldiez_file=file,
         )
     except FileNotFoundError as error:
         typer.echo(f"File not found: {file}")

waldiez/exporting/agent/exporter.py

@@ -73,17 +73,17 @@ class AgentExporter(Exporter[StandardExtras]):
             Whether the flow is async, by default False
         for_notebook : bool, optional
             Whether exporting for notebook, by default False
-        cache_seed : Optional[int], optional
+        cache_seed : int, optional
             Cache seed if any, by default None
-        initial_chats : Optional[list[WaldiezAgentConnection]], optional
+        initial_chats : list[WaldiezAgentConnection], optional
             Initial chats for group managers, by default None
-        group_chat_members : Optional[list[WaldiezAgent]], optional
+        group_chat_members : list[WaldiezAgent], optional
             Group chat members if group manager, by default None
-        arguments_resolver : Optional[Callable], optional
+        arguments_resolver : Callable, optional
             Function to resolve additional arguments, by default None
-        output_dir : Optional[Union[str, Path]], optional
+        output_dir : str | Path, optional
             Output directory for generated files, by default None
-        context : Optional[ExporterContext], optional
+        context : ExporterContext, optional
             Exporter context with dependencies, by default None
         **kwargs : Any
             Additional keyword arguments.

waldiez/exporting/agent/extras/group_manager_agent_extas.py

@@ -252,8 +252,12 @@ class GroupManagerProcessor:
             cache_seed=self.cache_seed,
             as_dict=True,
         )
+        manager_name = self.agent_names[self.agent.id]
         pattern_lines.append(
-            f"    group_manager_args={{\n{llm_config_arg}    }},"
+            "    group_manager_args={\n"
+            f"{llm_config_arg}"
+            f'       "name": "{manager_name}",\n'
+            "    },"
         )
 
         # Add context variables if present
@@ -445,6 +449,7 @@ class GroupManagerProcessor:
 
         return self._get_transition_target(self.agent.data.after_work)
 
+    # noinspection PyTypeHints
     def _get_transition_target(
         self, target: WaldiezTransitionTarget
     ) -> tuple[str, str]:

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

@@ -49,6 +49,7 @@ class AfterWorkProcessor:
         self.all_chats = all_chats
         self.serializer = serializer
 
+    # noinspection PyTypeHints
     def process(self, after_work: WaldiezTransitionTarget) -> AfterWorkResult:
         """Process after-work configuration.
 

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

@@ -69,6 +69,7 @@ class TransitionAvailableProcessor:
             )
             result.extra_imports.add(f"{import_prefix}ContextExpression")
             return result
+        # noinspection PyUnreachableCode
         raise ValueError(
             f"Unsupported transition availability type: {available.type}"
         )

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

@@ -146,6 +146,7 @@ class HandoffProcessor:
         reg_string += ")"
         return reg_string
 
+    # noinspection PyTypeHints
     def _process_after_work(
         self, after_work: WaldiezTransitionTarget
     ) -> TargetResult:

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

@@ -36,6 +36,7 @@ class TargetResult:
     extra_imports: Set[str] = field(default_factory=set)  # pyright: ignore
 
 
+# noinspection PyTypeHints
 class TransitionTargetProcessor:
     """Processor for transition targets."""
 

waldiez/exporting/agent/termination.py

@@ -47,4 +47,5 @@ class TerminationProcessor:
                 termination_arg=function_name,
                 before_content="\n\n" + content + "\n",
             )
+        # noinspection PyUnreachableCode
         return TerminationConfig()

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/extras/serializer.py

@@ -10,7 +10,7 @@ from typing import Any, Optional
 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: Optional[set[int]] = 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/types.py

@@ -314,6 +314,7 @@ class ExportConfig:
         if for_notebook:
             output_extension = "ipynb"
         cache_seed = kwargs.pop("cache_seed", None)
+        # noinspection PyUnreachableCode
         if cache_seed is not None and not isinstance(cache_seed, int):
             cache_seed = None
         return cls(

waldiez/exporting/core/utils/llm_config.py

@@ -97,7 +97,7 @@ def _get_agent_llm_config_arg_as_dict(
 ) -> str:
     tab = " " * tab_leng * tabs if tabs > 0 else ""
     if not agent.data.model_ids:
-        return f'{tab}"llm_config": False' + "\n"
+        return f'{tab}"llm_config": False,' + "\n"
     content = f'{tab}"llm_config": autogen.LLMConfig(' + "\n"
     content += f"{tab}    config_list=["
     got_at_least_one_model = False
@@ -110,7 +110,7 @@ def _get_agent_llm_config_arg_as_dict(
             content += "\n" + f"{tab}        {model_name}_llm_config,"
             got_at_least_one_model = True
     if not got_at_least_one_model:  # pragma: no cover
-        return f'{tab}"llm_config": False' + "\n"
+        return f'{tab}"llm_config": False,' + "\n"
     content += "\n" + f"{tab}    ]," + "\n"
     content += f"{tab}    cache_seed={cache_seed}," + "\n"
     if temperature is not None:

waldiez/exporting/flow/execution_generator.py

@@ -125,6 +125,7 @@ class ExecutionGenerator:
         flow_content += "    result_dicts: list[dict[str, Any]] = []\n"
         space = "    "
         if cache_seed is not None:
+            # noinspection SqlDialectInspection
             flow_content += (
                 f"    with Cache.disk(cache_seed={cache_seed}"
                 ") as cache:  # pyright: ignore\n"

waldiez/exporting/flow/utils/common.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: disable=line-too-long
 # flake8: noqa: E501
-"""Common utils for the final generatio."""
+"""Common utils for the final flow generation."""
 
 from waldiez.models import Waldiez
 

waldiez/exporting/flow/utils/importing.py

@@ -7,6 +7,7 @@ from typing import Optional
 from waldiez.exporting.core import ImportPosition
 
 BUILTIN_IMPORTS = [
+    "import asyncio",
     "import csv",
     "import importlib",
     "import json",
@@ -208,7 +209,6 @@ def get_the_imports_string(
         final_string += "\n"
 
     if is_async:
-        builtin_imports.insert(0, "import asyncio")
         final_string += (
             "\nimport aiofiles"
             "\nimport aiosqlite"

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 += (
@@ -166,52 +132,14 @@ def get_sync_sqlite_out() -> str:
     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"

waldiez/io/__init__.py

@@ -30,7 +30,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]
@@ -125,4 +125,6 @@ __all__ = [
     "AudioContent",
     "VideoMediaContent",
     "VideoContent",
+    "DEBUG_INPUT_PROMPT",
+    "START_CHAT_PROMPT",
 ]

waldiez/io/_ws.py

@@ -2,6 +2,8 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # flake8: noqa: E501
 # pylint: disable=line-too-long
+# pyright: reportUnknownMemberType=false,reportUnknownParameterType=false
+# pyright: reportUnknownVariableType=false,reportUnknownArgumentType=false
 """WebSocket IOStream implementation for AsyncIO."""
 
 import asyncio

waldiez/io/structured.py

@@ -10,7 +10,6 @@ import threading
 from getpass import getpass
 from pathlib import Path
 from typing import Any
-from uuid import uuid4
 
 from autogen.events import BaseEvent  # type: ignore
 from autogen.io import IOStream  # type: ignore
@@ -23,6 +22,9 @@ from .models import (
     UserResponse,
 )
 from .utils import (
+    DEBUG_INPUT_PROMPT,
+    START_CHAT_PROMPT,
+    MessageType,
     gen_id,
     get_image,
     get_message_dump,
@@ -63,29 +65,43 @@ class StructuredIOStream(IOStream):
         """
         sep = kwargs.get("sep", " ")
         end = kwargs.get("end", "\n")
+        flush = kwargs.get("flush", True)
+        payload_type = kwargs.get("type", "print")
         message = sep.join(map(str, args))
-        is_dumped = is_json_dumped(message)
-        if is_dumped and end.endswith("\n"):
+        if len(args) == 1 and isinstance(args[0], dict):
+            message = args[0]  # pyright: ignore
+            payload_type = message.get("type", payload_type)  # pyright: ignore
+            is_dumped = True
+        else:
+            is_dumped, message = is_json_dumped(message)
+        if is_dumped:
             # If the message is already JSON-dumped,
             # let's try not to double dump it
-            message = json.loads(message)
             payload: dict[str, Any] = {
-                "type": "print",
-                "id": uuid4().hex,
+                "id": gen_id(),
                 "timestamp": now(),
-                "data": message,
+                # "data": message,
             }
+            if isinstance(message, dict):
+                payload.update(message)  # pyright: ignore
+            else:
+                payload["data"] = message
+            if "type" not in payload:
+                payload["type"] = payload_type
         else:
-            message += end
-            payload = PrintMessage(
-                id=uuid4().hex,
-                timestamp=now(),
-                data=message,
-            ).model_dump(mode="json")
-        flush = kwargs.get("flush", True)
-        payload_type = kwargs.get("type", "print")
-        payload["type"] = payload_type
-        print(json.dumps(payload, default=str), flush=flush)
+            print_message = PrintMessage(data=message)  # pyright: ignore
+            payload = print_message.model_dump(mode="json", fallback=str)
+            payload["type"] = payload_type
+        dumped = json.dumps(payload, default=str, ensure_ascii=False) + end
+        if kwargs.get("file") and kwargs["file"] in [
+            sys.stderr,
+            sys.__stderr__,
+            sys.stdout,
+            sys.__stdout__,
+        ]:
+            print(dumped, file=kwargs["file"], flush=flush)
+        else:
+            print(dumped, flush=flush)
 
     def input(self, prompt: str = "", *, password: bool = False) -> str:
         """Structured input from stdin.
@@ -102,14 +118,21 @@ class StructuredIOStream(IOStream):
         str
             The line read from the input stream.
         """
-        request_id = uuid4().hex
+        request_id = gen_id()
         prompt = prompt or ">"
         if not prompt or prompt in [">", "> "]:  # pragma: no cover
             # if the prompt is just ">" or "> ",
             # let's use a more descriptive one
-            prompt = "Enter your message to start the conversation: "
-
-        self._send_input_request(prompt, request_id, password)
+            prompt = START_CHAT_PROMPT
+        input_type = "chat"
+        if prompt.strip() == DEBUG_INPUT_PROMPT.strip():
+            input_type = "debug"
+        self._send_input_request(
+            prompt,
+            request_id,
+            password,
+            input_type=input_type,
+        )
         user_input_raw = self._read_user_input(prompt, password, request_id)
         response = self._handle_user_input(user_input_raw, request_id)
         user_response = response.to_string(
@@ -152,14 +175,21 @@ class StructuredIOStream(IOStream):
         self,
         prompt: str,
         request_id: str,
-        password: bool,
+        password: bool = False,
+        input_type: str = "chat",
     ) -> None:
+        if input_type not in ("chat", "debug"):
+            input_type = "chat"
+        request_type = (
+            "debug_input_request" if input_type == "debug" else "input_request"
+        )
         payload = UserInputRequest(
+            type=request_type,  # type: ignore
             request_id=request_id,
             prompt=prompt,
             password=password,
         ).model_dump(mode="json")
-        print(json.dumps(payload), flush=True)
+        print(json.dumps(payload, default=str), flush=True)
 
     def _read_user_input(
         self,
@@ -294,7 +324,12 @@ class StructuredIOStream(IOStream):
         UserResponse
             The structured user response.
         """
-        # Load the user input
+        response_type: MessageType
+        _response_type = user_input.get("type", "input_response")
+        if _response_type not in ("input_response", "debug_input_response"):
+            response_type = "input_response"
+        else:
+            response_type = _response_type
         if user_input.get("request_id") == request_id:
             # We have a valid response to our request
             data = user_input.get("data")
@@ -302,6 +337,7 @@ class StructuredIOStream(IOStream):
                 # let's check if text|image keys are sent (outside data)
                 if "image" in user_input or "text" in user_input:
                     return UserResponse(
+                        type=response_type,
                         request_id=request_id,
                         data=self._format_multimedia_response(
                             request_id=request_id, data=user_input
@@ -311,10 +347,12 @@ class StructuredIOStream(IOStream):
                 return self._handle_list_response(
                     data,  # pyright: ignore
                     request_id=request_id,
+                    response_type=response_type,
                 )
             if not data or not isinstance(data, (str, dict)):
                 # No / invalid data provided in the response
                 return UserResponse(
+                    type=response_type,
                     request_id=request_id,
                     data="",
                 )
@@ -324,6 +362,7 @@ class StructuredIOStream(IOStream):
                 data = self._load_user_input(data)
             if isinstance(data, dict):
                 return UserResponse(
+                    type=response_type,
                     data=self._format_multimedia_response(
                         request_id=request_id,
                         data=data,  # pyright: ignore
@@ -333,11 +372,14 @@ class StructuredIOStream(IOStream):
             # For other types (numbers, bools ,...),
             #  let's just convert to string
             return UserResponse(
-                data=str(data), request_id=request_id
+                type=response_type,
+                data=str(data),
+                request_id=request_id,
             )  # pragma: no cover
         # This response doesn't match our request_id, log and return empty
         self._log_mismatched_response(request_id, user_input)
         return UserResponse(
+            type=response_type,
             request_id=request_id,
             data="",
         )
@@ -347,10 +389,12 @@ class StructuredIOStream(IOStream):
         self,
         data: list[dict[str, Any]],
         request_id: str,
+        response_type: MessageType,
     ) -> UserResponse:
         if len(data) == 0:  # pyright: ignore
             # Empty list, return empty response
             return UserResponse(
+                type=response_type,
                 request_id=request_id,
                 data="",
             )
@@ -367,10 +411,12 @@ class StructuredIOStream(IOStream):
         if not input_data:  # pragma: no cover
             # No valid data in the list, return empty response
             return UserResponse(
+                type=response_type,
                 request_id=request_id,
                 data="",
             )
         return UserResponse(
+            type=response_type,
             request_id=request_id,
             data=input_data,
         )
@@ -387,9 +433,16 @@ class StructuredIOStream(IOStream):
             The response received
         """
         # Create a log message
+        got_id: str | None = None
+        if isinstance(response, dict):
+            got_id = response.get("request_id")  # pyright: ignore
+        response_str = str(response)  # pyright: ignore
+        message = response_str[:100] + (
+            "..." if len(response_str) > 100 else ""
+        )
         log_payload: dict[str, Any] = {
             "type": "warning",
-            "id": uuid4().hex,
+            "id": gen_id(),
             "timestamp": now(),
             "data": {
                 "message": (
@@ -398,8 +451,8 @@ class StructuredIOStream(IOStream):
                 ),
                 "details": {
                     "expected_id": expected_id,
-                    "received": str(response)[:100]
-                    + ("..." if len(str(response)) > 100 else ""),
+                    "received_id": got_id,
+                    "message": message,
                 },
             },
         }