waldiez 0.1.6__tar.gz → 0.1.7__tar.gz

{waldiez-0.1.6 → waldiez-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.6
+Version: 0.1.7
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/py/
 Project-URL: repository, https://github.com/waldiez/py.git
@@ -33,12 +33,12 @@ Requires-Dist: autogen-agentchat[retrievechat-qdrant]==0.2.37; extra == 'autogen
 Requires-Dist: autogen-agentchat[retrievechat]==0.2.37; extra == 'autogen-extras'
 Requires-Dist: autogen-agentchat[together]==0.2.37; extra == 'autogen-extras'
 Requires-Dist: autogen-agentchat[websurfer]==0.2.37; extra == 'autogen-extras'
-Requires-Dist: chromadb==0.5.15; extra == 'autogen-extras'
+Requires-Dist: chromadb==0.5.17; extra == 'autogen-extras'
 Requires-Dist: fastembed==0.4.1; extra == 'autogen-extras'
-Requires-Dist: pgvector==0.3.5; extra == 'autogen-extras'
+Requires-Dist: pgvector==0.3.6; extra == 'autogen-extras'
 Requires-Dist: psycopg[binary]>=3.2.3; extra == 'autogen-extras'
 Requires-Dist: pymongo==4.10.1; extra == 'autogen-extras'
-Requires-Dist: qdrant-client==1.12.0; extra == 'autogen-extras'
+Requires-Dist: qdrant-client==1.12.1; extra == 'autogen-extras'
 Provides-Extra: dev
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
 Requires-Dist: bandit==1.7.10; extra == 'dev'
@@ -50,21 +50,21 @@ Requires-Dist: pre-commit==4.0.1; extra == 'dev'
 Requires-Dist: pydocstyle==6.3.0; extra == 'dev'
 Requires-Dist: pylint==3.3.1; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.7.1; extra == 'dev'
+Requires-Dist: ruff==0.7.2; extra == 'dev'
 Requires-Dist: types-pyyaml==6.0.12; extra == 'dev'
 Requires-Dist: yamllint==1.35.1; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: mdx-include==1.4.2; extra == 'docs'
 Requires-Dist: mdx-truly-sane-lists==1.3; extra == 'docs'
 Requires-Dist: mkdocs-jupyter==0.25.1; extra == 'docs'
-Requires-Dist: mkdocs-macros-plugin==1.3.6; extra == 'docs'
-Requires-Dist: mkdocs-material==9.5.42; extra == 'docs'
+Requires-Dist: mkdocs-macros-plugin==1.3.7; extra == 'docs'
+Requires-Dist: mkdocs-material==9.5.43; extra == 'docs'
 Requires-Dist: mkdocs-minify-html-plugin==0.2.3; extra == 'docs'
 Requires-Dist: mkdocs==1.6.1; extra == 'docs'
 Requires-Dist: mkdocstrings-python==1.12.2; extra == 'docs'
 Requires-Dist: mkdocstrings[crystal,python]==0.26.2; extra == 'docs'
 Provides-Extra: test
-Requires-Dist: pytest-cov==5.0.0; extra == 'test'
+Requires-Dist: pytest-cov==6.0.0; extra == 'test'
 Requires-Dist: pytest-html==4.1.1; extra == 'test'
 Requires-Dist: pytest-sugar==1.0.0; extra == 'test'
 Requires-Dist: pytest-timeout==2.3.1; extra == 'test'
@@ -109,9 +109,37 @@ python -m pip install git+https://github.com/waldiez/py.git
 
 ```bash
 # Export a Waldiez flow to a python script or a jupyter notebook
-waldiez --export /path/to/a/flow.waldiez --output /path/to/an/output[.py|.ipynb]
+waldiez --export /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py|.ipynb]
 # Export and run the script, optionally force generation if the output file already exists
-waldiez /path/to/a/flow.waldiez --output /path/to/an/output[.py] [--force]
+waldiez /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
+```
+
+### Using docker/podman
+
+```shell
+CONTAINER_COMMAND=docker # or podman
+# pull the image
+$CONTAINER_COMMAND pull waldiez/py
+# Export a Waldiez flow to a python script or a jupyter notebook
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  waldiez/py --export /flow.waldiez --output /output/flow[.py|.ipynb]
+
+# with selinux and/or podman, you might get permission (or file not found) errors, so you can try:
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  --userns=keep-id \
+  --security-opt label=disable \
+  waldiez/py --export /flow.waldiez --output /output/flow[.py|.ipynb]
+```
+
+```shell
+# Export and run the script
+$CONTAINER_COMMAND run --rm -v /path/to/a/flow.waldiez:/flow.waldiez -v /path/to/an/output:/output waldiez/py /flow.waldiez --output /output/output[.py]
 ```
 
 ### As a library
@@ -142,7 +170,8 @@ runner.run(output_path=output_path)
 
 ```python
 # Run the flow with a custom IOStream
-from waldiez import WaldiezIOStream, WaldiezRunner
+from waldiez import WaldiezRunner
+from waldiez.io import WaldiezIOStream
 
 flow_path = "/path/to/a/flow.waldiez"
 output_path = "/path/to/an/output.py"

{waldiez-0.1.6 → waldiez-0.1.7}/README.md

@@ -35,9 +35,37 @@ python -m pip install git+https://github.com/waldiez/py.git
 
 ```bash
 # Export a Waldiez flow to a python script or a jupyter notebook
-waldiez --export /path/to/a/flow.waldiez --output /path/to/an/output[.py|.ipynb]
+waldiez --export /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py|.ipynb]
 # Export and run the script, optionally force generation if the output file already exists
-waldiez /path/to/a/flow.waldiez --output /path/to/an/output[.py] [--force]
+waldiez /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
+```
+
+### Using docker/podman
+
+```shell
+CONTAINER_COMMAND=docker # or podman
+# pull the image
+$CONTAINER_COMMAND pull waldiez/py
+# Export a Waldiez flow to a python script or a jupyter notebook
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  waldiez/py --export /flow.waldiez --output /output/flow[.py|.ipynb]
+
+# with selinux and/or podman, you might get permission (or file not found) errors, so you can try:
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  --userns=keep-id \
+  --security-opt label=disable \
+  waldiez/py --export /flow.waldiez --output /output/flow[.py|.ipynb]
+```
+
+```shell
+# Export and run the script
+$CONTAINER_COMMAND run --rm -v /path/to/a/flow.waldiez:/flow.waldiez -v /path/to/an/output:/output waldiez/py /flow.waldiez --output /output/output[.py]
 ```
 
 ### As a library
@@ -68,7 +96,8 @@ runner.run(output_path=output_path)
 
 ```python
 # Run the flow with a custom IOStream
-from waldiez import WaldiezIOStream, WaldiezRunner
+from waldiez import WaldiezRunner
+from waldiez.io import WaldiezIOStream
 
 flow_path = "/path/to/a/flow.waldiez"
 output_path = "/path/to/an/output.py"

{waldiez-0.1.6 → waldiez-0.1.7}/pyproject.toml

@@ -50,14 +50,14 @@ dev = [
     'pydocstyle==6.3.0',
     'pylint==3.3.1',
     'python-dotenv==1.0.1',
-    'ruff==0.7.1',
+    'ruff==0.7.2',
     'types-PyYAML==6.0.12',
     'yamllint==1.35.1',
 ]
 autogen_extras =[
-    'chromadb==0.5.15',
+    'chromadb==0.5.17',
     'fastembed==0.4.1',
-    'pgvector==0.3.5',
+    'pgvector==0.3.6',
     'psycopg[binary]>=3.2.3',
     'autogen-agentchat[retrievechat]==0.2.37',
     'autogen-agentchat[retrievechat-pgvector]==0.2.37',
@@ -72,11 +72,11 @@ autogen_extras =[
     'autogen-agentchat[bedrock]==0.2.37',
     'autogen-agentchat[websurfer]==0.2.37',
     'pymongo==4.10.1',
-    'qdrant-client==1.12.0',
+    'qdrant-client==1.12.1',
 ]
 test = [
     'pytest==8.3.3',
-    'pytest-cov==5.0.0',
+    'pytest-cov==6.0.0',
     'pytest-html==4.1.1',
     'pytest-sugar==1.0.0',
     'pytest-timeout==2.3.1',
@@ -87,8 +87,8 @@ docs = [
   'mdx_truly_sane_lists==1.3',
   'mkdocs==1.6.1',
   'mkdocs-jupyter==0.25.1',
-  'mkdocs-macros-plugin==1.3.6',
-  'mkdocs-material==9.5.42',
+  'mkdocs-macros-plugin==1.3.7',
+  'mkdocs-material==9.5.43',
   'mkdocs-minify-html-plugin==0.2.3',
   'mkdocstrings[crystal,python]==0.26.2',
   'mkdocstrings-python==1.12.2'
@@ -271,7 +271,15 @@ line-ending = "lf"
 
 # pytest
 [tool.pytest.ini_options]
-# filterwarnings = []
+filterwarnings = [
+  # DeprecationWarning:
+  #   Type google._upb._message.MessageMapContainer uses PyType_Spec with a metaclass that has custom tp_new.
+  #   This is deprecated and will no longer be allowed in Python 3.14.
+  #
+  # autogen/logger/logger_utils.py:9: DeprecationWarning:
+  # datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version
+  "ignore::DeprecationWarning",
+]
 python_files = [
     "tests.py",
     "test_*.py",
@@ -283,7 +291,7 @@ addopts = """
     --exitfirst \
     --durations=10 \
     --color=yes \
-    --timeout=30
+    --timeout=60
 """
 
 

{waldiez-0.1.6 → waldiez-0.1.7}/waldiez/__init__.py

@@ -2,14 +2,12 @@
 
 from ._version import __version__
 from .exporter import WaldiezExporter
-from .io_stream import WaldiezIOStream
 from .models import Waldiez
 from .runner import WaldiezRunner
 
 __all__ = [
     "Waldiez",
     "WaldiezExporter",
-    "WaldiezIOStream",
     "WaldiezRunner",
     "__version__",
 ]

{waldiez-0.1.6 → waldiez-0.1.7}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.6"
+__version__ = "0.1.7"

{waldiez-0.1.6 → waldiez-0.1.7}/waldiez/cli.py

@@ -6,14 +6,15 @@ import logging
 import os
 import sys
 from pathlib import Path
-from typing import Any, Dict, Optional
-
-from autogen import ChatResult  # type: ignore[import-untyped]
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from . import Waldiez, __version__
 from .exporter import WaldiezExporter
 from .runner import WaldiezRunner
 
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore[import-untyped]
+
 
 def get_parser() -> argparse.ArgumentParser:
     """Get the argument parser for the Waldiez package.
@@ -28,7 +29,7 @@ def get_parser() -> argparse.ArgumentParser:
         prog="waldiez",
     )
     parser.add_argument(
-        "waldiez",
+        "file",
         type=str,
         help="Path to the Waldiez flow (*.waldiez) file.",
     )
@@ -66,7 +67,7 @@ def get_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _log_result(result: ChatResult) -> None:
+def _log_result(result: "ChatResult") -> None:
     """Log the result of the Waldiez flow."""
     logger = logging.getLogger("waldiez::cli")
     logger.info("Chat History:\n")
@@ -94,9 +95,12 @@ def _run(data: Dict[str, Any], output_path: Optional[str]) -> None:
 def main() -> None:
     """Parse the command line arguments and run the Waldiez flow."""
     parser = get_parser()
+    if len(sys.argv) == 1:
+        parser.print_help()
+        sys.exit(0)
     args = parser.parse_args()
     logger = _get_logger()
-    waldiez_file: str = args.waldiez
+    waldiez_file: str = args.file
     if not os.path.exists(waldiez_file):
         logger.error("File not found: %s", waldiez_file)
         sys.exit(1)

{waldiez-0.1.6/waldiez → waldiez-0.1.7/waldiez/io}/stream/provider.py

@@ -185,7 +185,11 @@ class InputProviderWrapper:
         """Stop the provider."""
         if self.thread:
             self.thread.running = False
-            self.thread.join(timeout=1)
+            try:
+                self.thread.socket.close()
+            except OSError:  # pragma: no cover
+                pass
+            self.thread.join(timeout=0)
             del self.thread
             self.thread = None
 

{waldiez-0.1.6/waldiez → waldiez-0.1.7/waldiez/io}/stream/server.py

@@ -7,6 +7,7 @@ and forwards messages between them.
 # pylint: disable=import-outside-toplevel,no-member,reimported,unused-import,redefined-outer-name,invalid-name  # noqa
 import logging
 import sys
+import time
 from threading import Thread
 from types import TracebackType
 from typing import Dict, Optional, Type, cast
@@ -179,7 +180,6 @@ class TCPServerThread(Thread):
         self,
         interface: str,
         port: int,
-        timeout: Optional[float] = None,
     ) -> None:
         """Create a new TCP server.
 
@@ -189,33 +189,53 @@ class TCPServerThread(Thread):
             Interface to listen on. Defaults to '' (all interfaces)
         port : int
             Port to listen on.
-        timeout : Optional[float]
-            Timeout for the server.
         """
         super().__init__(
             name="TCPServerThread",
-            daemon=True,
+            daemon=False,
             target=self.run,
         )
-        from twisted.internet.endpoints import TCP4ServerEndpoint
-
-        self.timeout = timeout
         self.reactor = get_reactor()
         self._port = port
-        endpoint = TCP4ServerEndpoint(  # type: ignore[no-untyped-call]
+        self._interface = interface
+        self._initialize()
+
+    def _initialize(self) -> None:
+        """Initialize the server."""
+        from twisted.internet.endpoints import TCP4ServerEndpoint
+
+        self.endpoint = TCP4ServerEndpoint(  # type: ignore[no-untyped-call]
             self.reactor,
-            port,
-            interface=interface,
+            self._port,
+            interface=self._interface,
         )
         server_factory = ServerFactory()
-        deferred = endpoint.listen(server_factory)  # type: ignore
+        deferred = self.endpoint.listen(server_factory)  # type: ignore
         deferred.addCallback(callback=self.on_start)
+        deferred.addErrback(errback=self.on_error)
 
     @property
     def port(self) -> int:
         """Get the port."""
         return self._port
 
+    def on_error(self, failure: Failure) -> None:  # pragma: no cover
+        """On error callback.
+
+        Parameters
+        ----------
+        failure : Failure
+            The failure.
+
+        Raises
+        ------
+        RuntimeError
+            If the failure is not handled.
+        """
+        LOGGER.error(failure.getErrorMessage())
+        del self.endpoint
+        self._initialize()
+
     def on_start(self, port: Port) -> None:
         """On connect callback.
 
@@ -257,12 +277,7 @@ class ServerWrapper:
     server: TCPServerThread
     timeout: float
 
-    def __init__(
-        self,
-        interface: str,
-        port: int,
-        timeout: Optional[float] = None,
-    ) -> None:
+    def __init__(self, interface: str, port: int) -> None:
         """Create a new TCP server.
 
         Parameters
@@ -272,10 +287,21 @@ class ServerWrapper:
         port : int
             Port to listen on.
         """
-        self.timeout = timeout if timeout is not None else 0.2
+        self._interface = interface
+        self._port = port
+        self._init_server()
+
+    def _init_server(self) -> None:
+        """Initialize the server."""
         self.server = TCPServerThread(
-            interface=interface, port=port, timeout=self.timeout
+            interface=self._interface, port=self._port
         )
+        retries = 0
+        while self.server.factory is None and retries < 30:  # pragma: no cover
+            retries += 1
+            time.sleep(1)
+        if self.server.factory is None:  # pragma: no cover
+            raise RuntimeError("Server not started")
 
     @property
     def port(self) -> int:
@@ -286,7 +312,7 @@ class ServerWrapper:
         RuntimeError
             If the server is not running
         """
-        if self.server.factory is None:
+        if self.server.factory is None:  # pragma: no cover
             raise RuntimeError("server is not running")
         return self.server.port
 
@@ -298,8 +324,9 @@ class ServerWrapper:
         RuntimeError
             If the server is not running
         """
-        if self.server is None:
-            raise RuntimeError("server is not running")
+        if self.server.factory is None:  # pragma: no cover
+            del self.server
+            self._init_server()
         self.server.start()
 
     def stop(self) -> None:
@@ -340,7 +367,7 @@ class TCPServer:
     @property
     def port(self) -> int:
         """Get the port."""
-        if self._wrapper is None:
+        if self._wrapper is None:  # pragma: no cover
             return self._port
         return self._wrapper.port
 
@@ -348,7 +375,6 @@ class TCPServer:
         """Initialize the wrapper."""
         self._wrapper = ServerWrapper(
             port=self._port,
-            timeout=self._timeout,
             interface=self._interface,
         )
 

{waldiez-0.1.6 → waldiez-0.1.7}/waldiez/models/waldiez.py

@@ -7,12 +7,10 @@ definitions and their optional additional skills to be used.
 
 import json
 from dataclasses import dataclass
+from functools import cache
 from pathlib import Path
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
-#  let's be strict with autogen version
-from autogen.version import __version__ as autogen_version  # type: ignore
-
 from .agents import WaldiezAgent
 from .chat import WaldiezChat
 from .flow import WaldiezFlow
@@ -203,6 +201,7 @@ class Waldiez:
     @property
     def requirements(self) -> List[str]:
         """Get the flow requirements."""
+        autogen_version = _get_autogen_version()
         requirements_list = filter(
             lambda requirement: not (
                 requirement.startswith("pyautogen")
@@ -299,3 +298,14 @@ def _get_flow(
     if "requirements" not in data:
         data["requirements"] = []
     return data
+
+
+@cache
+def _get_autogen_version() -> str:
+    """Get the autogen version."""
+    # pylint: disable=import-outside-toplevel
+    try:
+        from autogen.version import __version__ as atg_version  # type: ignore
+    except ImportError:  # pragma: no cover
+        atg_version = "0.0.0"
+    return atg_version

{waldiez-0.1.6 → waldiez-0.1.7}/waldiez/runner.py

@@ -19,14 +19,25 @@ from contextlib import contextmanager
 from contextvars import ContextVar
 from pathlib import Path
 from types import TracebackType
-from typing import Callable, Dict, Iterator, List, Optional, Type, Union
-
-from autogen import ChatResult  # type: ignore
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Type,
+    Union,
+)
 
 from .exporter import WaldiezExporter
-from .io_stream import WaldiezIOStream
 from .models.waldiez import Waldiez
 
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore
+
+    from .io import WaldiezIOStream
+
 
 @contextmanager
 def _chdir(to: Union[str, Path]) -> Iterator[None]:
@@ -60,7 +71,7 @@ class WaldiezRunner:
         self._waldiez = waldiez
         self._running = False
         self._file_path = file_path
-        self._stream: ContextVar[Optional[WaldiezIOStream]] = ContextVar(
+        self._stream: ContextVar[Optional["WaldiezIOStream"]] = ContextVar(
             "waldiez_stream", default=None
         )
         self._exporter = WaldiezExporter(waldiez)
@@ -225,9 +236,9 @@ class WaldiezRunner:
 
     def _do_run(
         self, output_path: Optional[Union[str, Path]]
-    ) -> Union[ChatResult, List[ChatResult]]:
+    ) -> Union["ChatResult", List["ChatResult"]]:
         """Run the Waldiez workflow."""
-        results: Union[ChatResult, List[ChatResult]] = []
+        results: Union["ChatResult", List["ChatResult"]] = []
         temp_dir = Path(tempfile.mkdtemp())
         file_name = "flow.py" if not output_path else Path(output_path).name
         if file_name.endswith((".json", ".waldiez")):
@@ -259,19 +270,22 @@ class WaldiezRunner:
     def _run(
         self,
         output_path: Optional[Union[str, Path]],
-    ) -> Union[ChatResult, List[ChatResult]]:
+    ) -> Union["ChatResult", List["ChatResult"]]:
         self._install_requirements()
         token = self._stream.get()
         if token is not None:
+            # pylint: disable=import-outside-toplevel
+            from .io import WaldiezIOStream
+
             with WaldiezIOStream.set_default(token):
                 return self._do_run(output_path)
         return self._do_run(output_path)
 
     def run(
         self,
-        stream: Optional[WaldiezIOStream] = None,
+        stream: Optional["WaldiezIOStream"] = None,
         output_path: Optional[Union[str, Path]] = None,
-    ) -> Union[ChatResult, List[ChatResult]]:
+    ) -> Union["ChatResult", List["ChatResult"]]:
         """Run the Waldiez workflow.
 
         Parameters