waldiez 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

waldiez/exporting/core/extras/path_resolver.py

@@ -8,7 +8,6 @@ from typing import Optional, Union
 from ..protocols import PathResolver
 
 
-# pylint: disable=too-few-public-methods
 class DefaultPathResolver(PathResolver):
     """Default path resolver for Waldiez items."""
 
@@ -22,36 +21,51 @@ class DefaultPathResolver(PathResolver):
 
         Returns
         -------
-        Optional[Path]
-            The resolved local path or None if not found.
+        str
+            The resolved local path string (raw path format).
         """
-        resolved = _check_local_path(path)
+        resolved = DefaultPathResolver._check_local_path(path)
         if not resolved:
             return _get_raw_path_string(path)
         return _get_raw_path_string(resolved)
 
+    def is_local(self, path: str) -> bool:
+        """Check if the given path is a local path.
 
-def _check_local_path(string: str) -> Optional[Path]:
-    """Check if a string is a local path.
+        Parameters
+        ----------
+        path : str
+            The path to check.
 
-    Parameters
-    ----------
-    string : str
-        The string to check.
+        Returns
+        -------
+        bool
+            True if the path is a local path, False otherwise.
+        """
+        return DefaultPathResolver._check_local_path(path) is not None
 
-    Returns
-    -------
-    bool
-        True if the path is a local path.
-    """
-    # pylint: disable=broad-exception-caught
-    try:
-        path = Path(string).resolve()
-    except BaseException:  # pragma: no cover
+    @staticmethod
+    def _check_local_path(string: str) -> Optional[Path]:
+        """Check if a string is a local path.
+
+        Parameters
+        ----------
+        string : str
+            The string to check.
+
+        Returns
+        -------
+        bool
+            True if the path is a local path.
+        """
+        # pylint: disable=broad-exception-caught
+        try:
+            path = Path(string).resolve()
+        except BaseException:  # pragma: no cover
+            return None
+        if path.exists():
+            return path
         return None
-    if path.exists():
-        return path
-    return None
 
 
 def _get_raw_path_string(path: Union[str, Path]) -> str:
@@ -71,23 +85,7 @@ def _get_raw_path_string(path: Union[str, Path]) -> str:
         path = str(path)
     while path.startswith('r"') and path.endswith('"'):
         path = path[2:-1]
+    while path.startswith("r'") and path.endswith("'"):
+        path = path[2:-1]
+    # return repr(path)
     return f'r"{path}"'
-
-
-# def get_path_string(path: str) -> str:
-#     """Get the path string.
-
-#     Parameters
-#     ----------
-#     path : str
-#         The string to check.
-
-#     Returns
-#     -------
-#     str
-#         The local path string.
-#     """
-#     resolved = _check_local_path(path)
-#     if not resolved:
-#         return _get_raw_path_string(path)
-#     return _get_raw_path_string(resolved)

waldiez/exporting/core/extras/serializer.py

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: disable=too-many-return-statements
 # pyright: reportUnknownArgumentType=false,reportUnknownVariableType=false
 """serializer for converting items to formatted strings."""
 
@@ -90,7 +91,7 @@ def serialize_item(
         return _format_primitive(item)
 
     # Handle circular references in containers
-    if isinstance(item, (dict, list)) 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)
@@ -111,6 +112,20 @@ def serialize_item(
         ]
         return _format_container(items, "[", "]", tabs)
 
+    if isinstance(item, tuple):
+        items = [
+            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)}"
+            for sub_item in item
+        ]
+        return _format_container(items, "{", "}", tabs)
+
     # Fallback for unknown object types
     return repr(item)
 

waldiez/exporting/core/protocols.py

@@ -87,6 +87,20 @@ class PathResolver(Protocol):
             If the path cannot be resolved.
         """
 
+    def is_local(self, path: str) -> bool:  # pyright: ignore
+        """Check if the given path is a local path.
+
+        Parameters
+        ----------
+        path : str
+            The path to check.
+
+        Returns
+        -------
+        bool
+            True if the path is a local path, False otherwise.
+        """
+
 
 class ContentGenerator(Protocol):
     """Protocol for generating content."""
@@ -96,6 +110,7 @@ class ContentGenerator(Protocol):
         merged_result: ExportResult,
         is_async: bool,
         after_run: str,
+        skip_logging: bool,
         **kwargs: Any,
     ) -> str:  # pyright: ignore
         """Generate content based on provided parameters.
@@ -108,6 +123,8 @@ class ContentGenerator(Protocol):
             Whether to generate async content.
         after_run : str
             Additional content to add after the main flow execution.
+        skip_logging : bool
+            Whether to skip logging setup.
         **kwargs : Any
             Parameters to influence content generation.
 

waldiez/exporting/core/types.py

@@ -150,6 +150,7 @@ class InstanceArgument:
     with_new_line_after: bool = False
     with_new_line_if_empty: bool = False
     skip_if_empty_string: bool = True
+    skip_trailing_comma: bool = False
     comment: Optional[str] = None
 
     def has_content(self) -> bool:
@@ -192,9 +193,11 @@ class InstanceArgument:
         ):
             return "\n" if self.with_new_line_if_empty else ""
         space = " " * (self.tabs * self.tabs_length)
-        content = f"{space}{self.name}={self.value}," + (
-            f"  # {self.comment}" if self.comment else ""
-        )
+        content = f"{space}{self.name}={self.value}"
+        if not self.skip_trailing_comma:
+            content += ","
+        if self.comment:
+            content += f"  # {self.comment}"
         if self.with_new_line_before or prepend_new_line:
             content = "\n" + content
         if self.with_new_line_after or append_new_line:
@@ -253,14 +256,10 @@ class ExportConfig:
         The root directory for uploads, if applicable.
     cache_seed : Optional[int]
         The seed for caching, if applicable.
-    structured_io : bool
-        Whether the export should use structured I/O.
     output_extension : str
         The file extension for the exported content.
     is_async : bool
         Whether the exported content should be asynchronous.
-    skip_patch_io : bool
-        Whether to skip patching I/O operations.
     """
 
     name: str = "Waldiez Flow"
@@ -274,8 +273,6 @@ class ExportConfig:
     output_directory: Optional[str | Path] = None
     uploads_root: Optional[Path] = None
     cache_seed: Optional[int] = None
-    structured_io: bool = False
-    skip_patch_io: bool = True
 
     @property
     def for_notebook(self) -> bool:

waldiez/exporting/flow/execution_generator.py

@@ -2,10 +2,11 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Generates the main() and call_main() functions."""
 
-# pylint: disable=no-self-use,unused-argument
+# pylint: disable=no-self-use,unused-argument,line-too-long
+# flake8: noqa: E501
 
 from ..core import get_comment
-from .utils.common import RETURN_TYPE_HINT, main_doc_string
+from .utils.common import main_doc_string
 
 
 class ExecutionGenerator:
@@ -18,6 +19,7 @@ class ExecutionGenerator:
         for_notebook: bool,
         cache_seed: int | None,
         after_run: str,
+        skip_logging: bool,
     ) -> str:
         """Generate the complete flow script content.
 
@@ -34,6 +36,8 @@ class ExecutionGenerator:
         after_run : str, optional
             Additional content to add after the main chat execution,
             by default ""
+        skip_logging : bool, optional
+            Whether to skip logging setup, by default False
 
         Returns
         -------
@@ -46,6 +50,7 @@ class ExecutionGenerator:
             cache_seed=cache_seed,
             after_run=after_run,
             for_notebook=for_notebook,
+            skip_logging=skip_logging,
         )
         call_main_function = ExecutionGenerator.generate_call_main_function(
             is_async=is_async,
@@ -69,6 +74,7 @@ class ExecutionGenerator:
         cache_seed: int | None,
         after_run: str,
         for_notebook: bool,
+        skip_logging: bool,
     ) -> str:
         """Generate the main function for the flow script.
 
@@ -84,6 +90,8 @@ class ExecutionGenerator:
             Additional content to add after the main chat execution.
         for_notebook : bool
             Whether the export is intended for a notebook environment.
+        skip_logging : bool, optional
+            Whether to skip logging setup, by default False
 
         Returns
         -------
@@ -100,9 +108,18 @@ class ExecutionGenerator:
         flow_content += f"{comment}\n"
         if is_async:
             flow_content += "async "
-
-        flow_content += f"def main() -> {RETURN_TYPE_HINT}:\n"
-        flow_content += f"    {main_doc_string()}\n"
+        on_event_arg = "on_event: Optional[Callable[[BaseEvent], bool]] = None"
+        if is_async:
+            on_event_arg = (
+                "on_event: Optional["
+                "Callable[[BaseEvent], Coroutine[None, None, bool]]"
+                "] = None"
+            )
+        return_type_hint = (
+            "AsyncRunResponseProtocol" if is_async else "RunResponseProtocol"
+        )
+        flow_content += f"def main({on_event_arg}) -> {return_type_hint}:\n"
+        flow_content += f"    {main_doc_string(is_async=is_async)}\n"
         space = "    "
         if cache_seed is not None:
             flow_content += (
@@ -111,10 +128,11 @@ class ExecutionGenerator:
             )
             space = f"{space}    "
         flow_content += f"{content}" + "\n"
-        if is_async:
-            flow_content += f"{space}await stop_logging()"
-        else:
-            flow_content += f"{space}stop_logging()"
+        if not skip_logging:
+            if is_async:
+                flow_content += f"{space}await stop_logging()"
+            else:
+                flow_content += f"{space}stop_logging()"
         flow_content += "\n"
         if after_run:
             flow_content += after_run + "\n"
@@ -140,30 +158,47 @@ class ExecutionGenerator:
             The complete call_main function content.
         """
         content = "\n"
+        tab = "    "
         if for_notebook:
             if is_async:
                 return "# %%\nawait main()\n"
             return "# %%\nmain()\n"
         if is_async:
             content += "async def call_main() -> None:\n"
+            return_type_hint = "list[AsyncRunResponseProtocol]"
         else:
             content += "def call_main() -> None:\n"
-        content += '    """Run the main function and print the results."""\n'
-        content += f"    results: {RETURN_TYPE_HINT} = "
+            return_type_hint = "list[RunResponseProtocol]"
+        content += f'{tab}"""Run the main function and print the results."""\n'
+        content += f"{tab}results: {return_type_hint} = "
         if is_async:
             content += "await "
         content += "main()\n"
-        content += "    if isinstance(results, dict):\n"
-        content += "        # order by key\n"
-        content += "        ordered_results = dict(sorted(results.items()))\n"
-        content += "        for _, result in ordered_results.items():\n"
-        content += "            pprint(asdict(result))\n"
-        content += "    else:\n"
-        content += "        if not isinstance(results, list):\n"
-        content += "            results = [results]\n"
-        content += "        for result in results:\n"
-        content += "            pprint(asdict(result))\n"
+        content += f"{tab}results_dicts: list[dict[str, Any]] = []\n"
+        content += f"{tab}for result in results:\n"
+        if is_async:
+            content += f"{tab}{tab}result_summary = await result.summary\n"
+            content += f"{tab}{tab}result_messages = await result.messages\n"
+            content += f"{tab}{tab}result_cost = await result.cost\n"
+        else:
+            content += f"{tab}{tab}result_summary = result.summary\n"
+            content += f"{tab}{tab}result_messages = result.messages\n"
+            content += f"{tab}{tab}result_cost = result.cost\n"
+        content += f"{tab}{tab}cost: dict[str, Any] | None = None\n"
+        content += f"{tab}{tab}if result_cost:\n"
+        content += f'{tab}{tab}{tab}cost = result_cost.model_dump(mode="json", fallback=str)\n'
+        content += f"{tab}{tab}results_dicts.append(\n"
+        content += f"{tab}{tab}{tab}{{\n"
+        content += f"{tab}{tab}{tab}{tab}'summary': result_summary,\n"
+        content += f"{tab}{tab}{tab}{tab}'messages': result_messages,\n"
+        content += f"{tab}{tab}{tab}{tab}'cost': cost,\n"
+        content += f"{tab}{tab}{tab}}}\n"
+        content += f"{tab}{tab})\n"
         content += "\n"
+        content += f"{tab}results_dict = {{\n"
+        content += f"{tab}{tab}'results': results_dicts,\n"
+        content += f"{tab}}}\n"
+        content += f"{tab}print(json.dumps(results_dict, indent=2))\n"
         return content
 
     @staticmethod

waldiez/exporting/flow/exporter.py

@@ -21,8 +21,6 @@ class FlowExporter(Exporter[FlowExtras]):
         waldiez: Waldiez,
         output_dir: Path | None,
         for_notebook: bool,
-        structured_io: bool = False,
-        skip_patch_io: bool = True,
         context: Optional[ExporterContext] = None,
         **kwargs: Any,
     ) -> None:
@@ -54,8 +52,6 @@ class FlowExporter(Exporter[FlowExtras]):
             is_async=waldiez.is_async,
             output_directory=str(self.output_dir) if self.output_dir else None,
             cache_seed=waldiez.cache_seed,
-            structured_io=structured_io,
-            skip_patch_io=skip_patch_io,
         )
         self._extras = self._generate_extras()
 
@@ -108,4 +104,5 @@ class FlowExporter(Exporter[FlowExtras]):
             merged_result=merged_result,
             is_async=self.waldiez.is_async,
             after_run=after_run,
+            skip_logging=orchestrator.should_skip_logging(),
         )

waldiez/exporting/flow/factory.py

@@ -47,8 +47,6 @@ def create_flow_exporter(
     ChatsExporter
         The created chats exporter.
     """
-    structured_io = kwargs.pop("structured_io", False)
-    skip_patch_io = kwargs.pop("skip_patch_io", True)
     if context is None:
         config = ExportConfig(
             name=waldiez.name,
@@ -60,8 +58,6 @@ def create_flow_exporter(
             output_directory=output_dir,
             uploads_root=uploads_root,
             cache_seed=waldiez.cache_seed,
-            structured_io=structured_io,
-            skip_patch_io=skip_patch_io,
         )
         context = ExporterContext(
             config=config,
@@ -81,8 +77,6 @@ def create_flow_exporter(
                 output_directory=output_dir,
                 uploads_root=uploads_root,
                 cache_seed=waldiez.cache_seed,
-                structured_io=structured_io,
-                skip_patch_io=skip_patch_io,
             )
         else:
             context.config.update(
@@ -95,8 +89,6 @@ def create_flow_exporter(
                 output_directory=output_dir,
                 uploads_root=uploads_root,
                 cache_seed=waldiez.cache_seed,
-                structured_io=structured_io,
-                skip_patch_io=skip_patch_io,
             )
 
     return FlowExporter(
@@ -104,7 +96,6 @@ def create_flow_exporter(
         output_dir=output_dir,
         uploads_root=uploads_root,
         for_notebook=for_notebook,
-        structured_io=structured_io,
         context=context,
         **kwargs,
     )

waldiez/exporting/flow/file_generator.py

@@ -40,6 +40,7 @@ class FileGenerator(ContentGenerator):
         merged_result: ExportResult,
         is_async: bool,
         after_run: str,
+        skip_logging: bool,
         **kwargs: Any,
     ) -> str:
         """Generate the complete flow notebook content.
@@ -52,6 +53,8 @@ class FileGenerator(ContentGenerator):
             Whether to generate async conten
         after_run : str
             Additional content to add after the main flow execution.
+        skip_logging : bool
+            Whether to skip logging setup.
         **kwargs : Any
             Additional keyword arguments for the generator.
 
@@ -101,6 +104,7 @@ class FileGenerator(ContentGenerator):
             is_async=is_async,
             after_run=after_run,
             for_notebook=self.config.for_notebook,
+            skip_logging=skip_logging,
         )
 
         # 5. Combine everything
@@ -160,6 +164,7 @@ class FileGenerator(ContentGenerator):
         is_async: bool,
         for_notebook: bool,
         after_run: str,
+        skip_logging: bool,
     ) -> tuple[str, str, str]:
         cache_seed = (
             self.context.config.cache_seed if self.context.config else None
@@ -172,6 +177,7 @@ class FileGenerator(ContentGenerator):
             for_notebook=for_notebook,
             cache_seed=cache_seed,
             after_run=after_run,
+            skip_logging=skip_logging,
         )
         call_main = execution_gen.generate_call_main_function(
             is_async=is_async,

waldiez/exporting/flow/orchestrator.py

@@ -23,7 +23,6 @@ from .utils import (
     generate_header,
     get_after_run_content,
     get_np_no_nep50_handle,
-    get_set_io_stream,
     get_sqlite_out,
     get_start_logging,
     get_stop_logging,
@@ -174,24 +173,15 @@ class ExportOrchestrator:
             position=ExportPosition.IMPORTS,  # after imports (need np)
             order=ContentOrder.CLEANUP,
         )
-        merged_result.add_content(
-            get_start_logging(
-                is_async=self.waldiez.is_async,
-                for_notebook=self.config.for_notebook,
-            ),
-            position=ExportPosition.IMPORTS,  # after imports, before models
-            order=ContentOrder.CLEANUP.value + 1,  # after imports
-            skip_strip=True,  # keep newlines
-        )
-        if not self.config.skip_patch_io:
+        if not self.should_skip_logging():
             merged_result.add_content(
-                get_set_io_stream(
-                    use_structured_io=self.config.structured_io,
+                get_start_logging(
                     is_async=self.waldiez.is_async,
-                    uploads_root=self.config.uploads_root,
+                    for_notebook=self.config.for_notebook,
                 ),
                 position=ExportPosition.IMPORTS,  # after imports, before models
-                order=ContentOrder.CLEANUP.value + 2,  # after start logging
+                order=ContentOrder.CLEANUP.value + 1,  # after imports
+                skip_strip=True,  # keep newlines
             )
         # merged_result.add_content
         merged_result.add_content(
@@ -199,12 +189,13 @@ class ExportOrchestrator:
             position=ExportPosition.AGENTS,
             order=ContentOrder.LATE_CLEANUP.value + 1,  # after all agents
         )
-        merged_result.add_content(
-            get_stop_logging(is_async=self.waldiez.is_async),
-            position=ExportPosition.AGENTS,
-            order=ContentOrder.LATE_CLEANUP.value
-            + 2,  # before def main (chats)
-        )
+        if not self.should_skip_logging():
+            merged_result.add_content(
+                get_stop_logging(is_async=self.waldiez.is_async),
+                position=ExportPosition.AGENTS,
+                order=ContentOrder.LATE_CLEANUP.value
+                + 2,  # before def main (chats)
+            )
         all_imports: list[tuple[str, ImportPosition]] = [
             (item.statement, item.position)
             for item in merged_result.get_sorted_imports()
@@ -421,3 +412,18 @@ class ExportOrchestrator:
             agent_result = agent_exporter.export()
             results.append(agent_result)
         return results
+
+    def should_skip_logging(self) -> bool:
+        """Determine if logging should be skipped.
+
+        Returns
+        -------
+        bool
+            True if logging should be skipped, False otherwise.
+        """
+        return self.waldiez.has_doc_agents
+        # if not self.waldiez.tools:
+        #     return False
+        # if self.waldiez.flow.is_group_chat:
+        #     return any(tool.is_predefined for tool in self.waldiez.tools)
+        # return False

waldiez/exporting/flow/utils/__init__.py

@@ -6,7 +6,6 @@ from .common import (
     generate_header,
     get_after_run_content,
     get_np_no_nep50_handle,
-    get_set_io_stream,
 )
 from .importing import get_sorted_imports, get_the_imports_string
 from .logging import get_sqlite_out, get_start_logging, get_stop_logging
@@ -20,5 +19,4 @@ __all__ = [
     "get_start_logging",
     "get_stop_logging",
     "get_sqlite_out",
-    "get_set_io_stream",
 ]