waldiez 0.1.10__tar.gz → 0.1.12__tar.gz

{waldiez-0.1.10 → waldiez-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.10
+Version: 0.1.12
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/
 Project-URL: repository, https://github.com/waldiez/waldiez.git
@@ -16,47 +16,48 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.10
-Requires-Dist: ag2==0.3.2
+Requires-Dist: ag2==0.4.1
 Requires-Dist: jupytext
+Requires-Dist: typer<0.13,>=0.9
 Provides-Extra: ag2-extras
-Requires-Dist: ag2[anthropic]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[bedrock]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[gemini]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[groq]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[lmm]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[mistral]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[retrievechat-mongodb]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[retrievechat-pgvector]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[retrievechat-qdrant]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[retrievechat]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[together]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: ag2[websurfer]==0.3.2; extra == 'ag2-extras'
-Requires-Dist: chromadb==0.5.3; extra == 'ag2-extras'
+Requires-Dist: ag2[anthropic]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[bedrock]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[captainagent]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[gemini]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[groq]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[lmm]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[mistral]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[retrievechat-mongodb]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[retrievechat-pgvector]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[retrievechat-qdrant]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[retrievechat]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[together]==0.4.1; extra == 'ag2-extras'
+Requires-Dist: ag2[websurfer]==0.4.1; extra == 'ag2-extras'
 Requires-Dist: fastembed==0.4.2; extra == 'ag2-extras'
-Requires-Dist: pgvector>=0.2.5; extra == 'ag2-extras'
-Requires-Dist: psycopg[binary]>=3.1.18; extra == 'ag2-extras'
+Requires-Dist: pgvector>=0.3.6; extra == 'ag2-extras'
+Requires-Dist: psycopg[binary]>=3.2.3; extra == 'ag2-extras'
 Requires-Dist: pymongo==4.10.1; extra == 'ag2-extras'
 Requires-Dist: qdrant-client==1.12.1; extra == 'ag2-extras'
 Provides-Extra: dev
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
-Requires-Dist: bandit==1.7.10; extra == 'dev'
+Requires-Dist: bandit==1.8.0; extra == 'dev'
 Requires-Dist: black[jupyter]==24.10.0; extra == 'dev'
 Requires-Dist: flake8==7.1.1; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
 Requires-Dist: mypy==1.13.0; extra == 'dev'
 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: pylint==3.3.2; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.7.4; extra == 'dev'
-Requires-Dist: types-pyyaml==6.0.12; extra == 'dev'
+Requires-Dist: ruff==0.8.1; extra == 'dev'
+Requires-Dist: types-pyyaml==6.0.12.20240917; 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.7; extra == 'docs'
-Requires-Dist: mkdocs-material==9.5.45; extra == 'docs'
+Requires-Dist: mkdocs-material==9.5.47; 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'
@@ -67,7 +68,7 @@ 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'
 Requires-Dist: pytest-xdist==3.6.1; extra == 'test'
-Requires-Dist: pytest==8.3.3; extra == 'test'
+Requires-Dist: pytest==8.3.4; extra == 'test'
 Description-Content-Type: text/markdown
 
 # Waldiez
@@ -82,9 +83,8 @@ To a python script or a jupyter notebook with the corresponding [ag2](https://gi
 
 ## Features
 
-- Export .waldiez flows to .py or .ipynb
+- Convert .waldiez flows to .py or .ipynb
 - Run a .waldiez flow
-- Include a `logs` folder with the logs of the flow in csv format
 - Provide a custom [IOSStream](https://ag2ai.github.io/ag2/docs/reference/io/base#iostream) to handle input and output.
 
 ## Installation
@@ -106,10 +106,10 @@ python -m pip install git+https://github.com/waldiez/waldiez.git
 ### CLI
 
 ```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/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/flow[.py] [--force]
+# Convert a Waldiez flow to a python script or a jupyter notebook
+waldiez convert --file /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py|.ipynb]
+# Convert and run the script, optionally force generation if the output file already exists
+waldiez run --file /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
 ```
 
 ### Using docker/podman
@@ -118,7 +118,7 @@ waldiez /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
 CONTAINER_COMMAND=docker # or podman
 # pull the image
 $CONTAINER_COMMAND pull waldiez/waldiez
-# Export a Waldiez flow to a python script or a jupyter notebook
+# Convert a Waldiez flow to a python script or a jupyter notebook
 $CONTAINER_COMMAND run \
   --rm \
   -v /path/to/a/flow.waldiez:/flow.waldiez \
@@ -132,12 +132,16 @@ $CONTAINER_COMMAND run \
   -v /path/to/an/output:/output \
   --userns=keep-id \
   --security-opt label=disable \
-  waldiez/waldiez --export /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /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/waldiez /flow.waldiez --output /output/output[.py]
+# Convert and run the script
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  waldiez/waldiez run --file /flow.waldiez --output /output/output[.py]
 ```
 
 ### As a library
@@ -236,6 +240,21 @@ with WaldiezIOStream.set_default(io_stream):
 - [ag2 (formerly AutoGen)](https://github.com/ag2ai/ag2)
 - [juptytext](https://github.com/mwouts/jupytext)
 - [pydantic](https://github.com/pydantic/pydantic)
+- [typer](https://github.com/fastapi/typer)
+
+## Known Conflicts
+
+- **autogen-agentchat**: This package conflicts with `ag2`. Ensure that `autogen-agentchat` is uninstalled before installing `waldiez`. If you have already installed `autogen-agentchat`, you can uninstall it with the following command:
+
+  ```shell
+  pip uninstall autogen-agentchat -y
+  ```
+
+  If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
+  
+    ```shell
+    pip install --force --no-cache waldiez
+    ```
 
 ## License
 

{waldiez-0.1.10 → waldiez-0.1.12}/README.md

@@ -10,9 +10,8 @@ To a python script or a jupyter notebook with the corresponding [ag2](https://gi
 
 ## Features
 
-- Export .waldiez flows to .py or .ipynb
+- Convert .waldiez flows to .py or .ipynb
 - Run a .waldiez flow
-- Include a `logs` folder with the logs of the flow in csv format
 - Provide a custom [IOSStream](https://ag2ai.github.io/ag2/docs/reference/io/base#iostream) to handle input and output.
 
 ## Installation
@@ -34,10 +33,10 @@ python -m pip install git+https://github.com/waldiez/waldiez.git
 ### CLI
 
 ```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/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/flow[.py] [--force]
+# Convert a Waldiez flow to a python script or a jupyter notebook
+waldiez convert --file /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py|.ipynb]
+# Convert and run the script, optionally force generation if the output file already exists
+waldiez run --file /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
 ```
 
 ### Using docker/podman
@@ -46,7 +45,7 @@ waldiez /path/to/a/flow.waldiez --output /path/to/an/output/flow[.py] [--force]
 CONTAINER_COMMAND=docker # or podman
 # pull the image
 $CONTAINER_COMMAND pull waldiez/waldiez
-# Export a Waldiez flow to a python script or a jupyter notebook
+# Convert a Waldiez flow to a python script or a jupyter notebook
 $CONTAINER_COMMAND run \
   --rm \
   -v /path/to/a/flow.waldiez:/flow.waldiez \
@@ -60,12 +59,16 @@ $CONTAINER_COMMAND run \
   -v /path/to/an/output:/output \
   --userns=keep-id \
   --security-opt label=disable \
-  waldiez/waldiez --export /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /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/waldiez /flow.waldiez --output /output/output[.py]
+# Convert and run the script
+$CONTAINER_COMMAND run \
+  --rm \
+  -v /path/to/a/flow.waldiez:/flow.waldiez \
+  -v /path/to/an/output:/output \
+  waldiez/waldiez run --file /flow.waldiez --output /output/output[.py]
 ```
 
 ### As a library
@@ -164,6 +167,21 @@ with WaldiezIOStream.set_default(io_stream):
 - [ag2 (formerly AutoGen)](https://github.com/ag2ai/ag2)
 - [juptytext](https://github.com/mwouts/jupytext)
 - [pydantic](https://github.com/pydantic/pydantic)
+- [typer](https://github.com/fastapi/typer)
+
+## Known Conflicts
+
+- **autogen-agentchat**: This package conflicts with `ag2`. Ensure that `autogen-agentchat` is uninstalled before installing `waldiez`. If you have already installed `autogen-agentchat`, you can uninstall it with the following command:
+
+  ```shell
+  pip uninstall autogen-agentchat -y
+  ```
+
+  If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
+  
+    ```shell
+    pip install --force --no-cache waldiez
+    ```
 
 ## License
 

{waldiez-0.1.10 → waldiez-0.1.12}/pyproject.toml

@@ -21,9 +21,11 @@ classifiers = [
   "Intended Audience :: Science/Research",
   "Intended Audience :: Developers",
 ]
-dependencies = [
+dependencies =[
+    "ag2==0.4.1",
     "jupytext",
-    "ag2==0.3.2"
+    # together(ag2 extra) 1.2.0 depends on typer<0.13 and >=0.9
+    "typer>=0.9,<0.13"
 ]
 
 [project.urls]
@@ -41,42 +43,42 @@ exclude = [ "**/example.py" ]
 [project.optional-dependencies]
 dev = [
     'autoflake==2.3.1',
-    'bandit==1.7.10',
+    'bandit==1.8.0',
     'black[jupyter]==24.10.0',
     'flake8==7.1.1',
     'isort==5.13.2',
     'mypy==1.13.0',
     'pre-commit==4.0.1',
     'pydocstyle==6.3.0',
-    'pylint==3.3.1',
+    'pylint==3.3.2',
     'python-dotenv==1.0.1',
-    'ruff==0.7.4',
-    'types-PyYAML==6.0.12',
+    'ruff==0.8.1',
+    'types-PyYAML==6.0.12.20240917',
     'yamllint==1.35.1',
 ]
 ag2_extras =[
-    'chromadb==0.5.3',
     'fastembed==0.4.2',
-    'pgvector>=0.2.5',
-    'psycopg[binary]>=3.1.18',
-    'ag2[retrievechat]==0.3.2',
-    'ag2[retrievechat-pgvector]==0.3.2',
-    'ag2[retrievechat-mongodb]==0.3.2',
-    'ag2[retrievechat-qdrant]==0.3.2',
-    'ag2[gemini]==0.3.2',
-    'ag2[together]==0.3.2',
-    'ag2[anthropic]==0.3.2',
-    'ag2[lmm]==0.3.2',
-    'ag2[mistral]==0.3.2',
-    'ag2[groq]==0.3.2',
-    'ag2[bedrock]==0.3.2',
-    'ag2[websurfer]==0.3.2',
-    'ag2[together]==0.3.2',
+    'pgvector>=0.3.6',
+    'psycopg[binary]>=3.2.3',
+    'ag2[captainagent]==0.4.1',
+    'ag2[retrievechat]==0.4.1',
+    'ag2[retrievechat-pgvector]==0.4.1',
+    'ag2[retrievechat-mongodb]==0.4.1',
+    'ag2[retrievechat-qdrant]==0.4.1',
+    'ag2[gemini]==0.4.1',
+    'ag2[together]==0.4.1',
+    'ag2[anthropic]==0.4.1',
+    'ag2[lmm]==0.4.1',
+    'ag2[mistral]==0.4.1',
+    'ag2[groq]==0.4.1',
+    'ag2[bedrock]==0.4.1',
+    'ag2[websurfer]==0.4.1',
+    'ag2[together]==0.4.1',
     'pymongo==4.10.1',
     'qdrant-client==1.12.1',
 ]
 test = [
-    'pytest==8.3.3',
+    'pytest==8.3.4',
     'pytest-cov==6.0.0',
     'pytest-html==4.1.1',
     'pytest-sugar==1.0.0',
@@ -89,7 +91,7 @@ docs = [
   'mkdocs==1.6.1',
   'mkdocs-jupyter==0.25.1',
   'mkdocs-macros-plugin==1.3.7',
-  'mkdocs-material==9.5.45',
+  'mkdocs-material==9.5.47',
   'mkdocs-minify-html-plugin==0.2.3',
   'mkdocstrings[crystal,python]==0.27.0',
   'mkdocstrings-python==1.12.2'

waldiez-0.1.12/waldiez/__init__.py

@@ -0,0 +1,31 @@
+"""Waldiez package."""
+
+from ._version import __version__
+from .conflict_checker import check_conflicts
+from .exporter import WaldiezExporter
+from .models import Waldiez
+from .runner import WaldiezRunner
+
+# flag to check if ag2 and autogen-agentchat
+# are installed at the same time
+__WALDIEZ_CHECKED_FOR_CONFLICTS = False
+
+
+def _check_conflicts_once() -> None:
+    """Check for conflicts once."""
+    # pylint: disable=global-statement
+    global __WALDIEZ_CHECKED_FOR_CONFLICTS
+    if __WALDIEZ_CHECKED_FOR_CONFLICTS is False:
+        check_conflicts()
+        __WALDIEZ_CHECKED_FOR_CONFLICTS = True
+
+
+_check_conflicts_once()
+
+
+__all__ = [
+    "Waldiez",
+    "WaldiezExporter",
+    "WaldiezRunner",
+    "__version__",
+]

{waldiez-0.1.10 → waldiez-0.1.12}/waldiez/__main__.py

@@ -1,6 +1,6 @@
 """Waldiez entrypoint when called as a module."""
 
-from .cli import main
+from .cli import app
 
 if __name__ == "__main__":
-    main()
+    app()

{waldiez-0.1.10 → waldiez-0.1.12}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.10"
+__version__ = "0.1.12"

waldiez-0.1.12/waldiez/cli.py

@@ -0,0 +1,228 @@
+"""Command line interface to convert or run a waldiez file."""
+
+# pylint: disable=missing-function-docstring,missing-param-doc,missing-raises-doc
+import json
+import logging
+import os
+import sys
+from pathlib import Path
+from typing import TYPE_CHECKING, Optional
+
+import typer
+from typing_extensions import Annotated
+
+from . import Waldiez, __version__
+from .exporter import WaldiezExporter
+from .runner import WaldiezRunner
+
+if TYPE_CHECKING:
+    from autogen import ChatResult  # type: ignore[import-untyped]
+
+
+app = typer.Typer(
+    name="waldiez",
+    help="Handle Waldiez flows.",
+    context_settings={
+        "help_option_names": ["-h", "--help"],
+        "allow_extra_args": True,
+    },
+    add_completion=False,
+    no_args_is_help=True,
+    invoke_without_command=True,
+    add_help_option=True,
+    pretty_exceptions_enable=False,
+    epilog=("Use `waldiez [COMMAND] --help` for command-specific help. "),
+)
+
+
+@app.callback()
+def show_version(
+    version: bool = typer.Option(
+        False,
+        "--version",
+        "-v",
+        help="Show the version of the Waldiez package.",
+    ),
+) -> None:
+    """Show the version of the Waldiez package and exit."""
+    if version:
+        typer.echo(f"waldiez version: {__version__}")
+        raise typer.Exit()
+
+
+@app.command()
+def run(
+    file: Annotated[
+        Path,
+        typer.Option(
+            ...,
+            help="Path to the Waldiez flow (*.waldiez) file.",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            readable=True,
+            resolve_path=True,
+        ),
+    ],
+    output: Optional[Path] = typer.Option(
+        None,
+        help=(
+            "Path to the output (.py) file. "
+            "The output's directory will contain "
+            "the generated flow (.py) and any additional generated files."
+        ),
+        dir_okay=False,
+        resolve_path=True,
+    ),
+    force: bool = typer.Option(
+        False,
+        help="Override the output file if it already exists.",
+    ),
+) -> None:
+    """Run a Waldiez flow."""
+    output_path = _get_output_path(output, force)
+    with file.open("r", encoding="utf-8") as _file:
+        try:
+            data = json.load(_file)
+        except json.decoder.JSONDecodeError as error:
+            typer.echo("Invalid .waldiez file. Not a valid json?")
+            raise typer.Exit(code=1) from error
+    waldiez = Waldiez.from_dict(data)
+    runner = WaldiezRunner(waldiez)
+    results = runner.run(stream=None, output_path=output_path)
+    logger = _get_logger()
+    if isinstance(results, list):
+        logger.info("Results:")
+        for result in results:
+            _log_result(result, logger)
+            sep = "-" * 80
+            print(f"\n{sep}\n")
+    else:
+        _log_result(results, logger)
+
+
+@app.command()
+def convert(
+    file: Annotated[
+        Path,
+        typer.Option(
+            ...,
+            help="Path to the Waldiez flow (*.waldiez) file.",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            readable=True,
+            resolve_path=True,
+        ),
+    ],
+    output: Annotated[
+        Path,
+        typer.Option(
+            ...,
+            help=(
+                "Path to the output file. "
+                "The file extension determines the output format: "
+                "`.py` for Python script, `.ipynb` for Jupyter notebook."
+            ),
+            file_okay=True,
+            dir_okay=False,
+            resolve_path=True,
+        ),
+    ],
+    force: bool = typer.Option(
+        False,
+        help="Override the output file if it already exists.",
+    ),
+) -> None:
+    """Convert a Waldiez flow to a Python script or a Jupyter notebook."""
+    _get_output_path(output, force)
+    with file.open("r", encoding="utf-8") as _file:
+        try:
+            data = json.load(_file)
+        except json.decoder.JSONDecodeError as error:
+            typer.echo("Invalid .waldiez file. Not a valid json?")
+            raise typer.Exit(code=1) from error
+    waldiez = Waldiez.from_dict(data)
+    exporter = WaldiezExporter(waldiez)
+    exporter.export(output, force=force)
+    generated = str(output).replace(os.getcwd(), ".")
+    typer.echo(f"Generated: {generated}")
+
+
+@app.command()
+def check(
+    file: Annotated[
+        Path,
+        typer.Option(
+            ...,
+            help="Path to the Waldiez flow (*.waldiez) file.",
+            exists=True,
+            file_okay=True,
+            dir_okay=False,
+            readable=True,
+            resolve_path=True,
+        ),
+    ],
+) -> None:
+    """Validate a Waldiez flow."""
+    with file.open("r", encoding="utf-8") as _file:
+        data = json.load(_file)
+    Waldiez.from_dict(data)
+    typer.echo("Waldiez flow is valid.")
+
+
+def _get_output_path(output: Optional[Path], force: bool) -> Optional[Path]:
+    if output is not None:
+        output = Path(output).resolve()
+    if output is not None and not output.parent.exists():
+        output.parent.mkdir(parents=True)
+    if output is not None and output.exists():
+        if force is False:
+            typer.echo("Output file already exists.")
+            raise typer.Exit(code=1)
+        output.unlink()
+    return output
+
+
+def _get_logger(level: int = logging.INFO) -> logging.Logger:
+    """Get the logger for the Waldiez package.
+
+    Parameters
+    ----------
+    level : int or str, optional
+        The logging level. Default is logging.INFO.
+
+    Returns
+    -------
+    logging.Logger
+        The logger.
+    """
+    # check if we already have setup a config
+
+    if not logging.getLogger().handlers:
+        logging.basicConfig(
+            level=level,
+            format="%(levelname)s %(message)s",
+            stream=sys.stderr,
+            force=True,
+        )
+    logger = logging.getLogger("waldiez::cli")
+    current_level = logger.getEffectiveLevel()
+    if current_level != level:
+        logger.setLevel(level)
+    return logger
+
+
+def _log_result(result: "ChatResult", logger: logging.Logger) -> None:
+    """Log the result of the Waldiez flow."""
+    logger.info("Chat History:\n")
+    logger.info(result.chat_history)
+    logger.info("Summary:\n")
+    logger.info(result.summary)
+    logger.info("Cost:\n")
+    logger.info(result.cost)
+
+
+if __name__ == "__main__":
+    _get_logger()
+    app()

waldiez-0.1.12/waldiez/conflict_checker.py

@@ -0,0 +1,23 @@
+"""Check for conflicts with 'autogen-agentchat' package."""
+
+# pylint: disable=line-too-long
+
+import sys
+from importlib.metadata import PackageNotFoundError, version
+
+
+# fmt: off
+def check_conflicts() -> None:  # pragma: no cover
+    """Check for conflicts with 'autogen-agentchat' package."""
+    try:
+        version("autogen-agentchat")
+        print(
+            "Conflict detected: 'autogen-agentchat' is installed, which conflicts with 'ag2'.\n"
+            "Please uninstall 'autogen-agentchat': pip uninstall -y autogen-agentchat \n"
+            "And install 'ag2' (or 'waldiez') again: pip install --force ag2"
+        )
+        sys.exit(1)
+    except PackageNotFoundError:
+        pass
+
+# fmt: on

{waldiez-0.1.10 → waldiez-0.1.12}/waldiez/exporting/skills/__init__.py

@@ -69,6 +69,32 @@ def get_agent_skill_registration(
     return content
 
 
+def _write_skill_secrets(
+    skill: WaldiezSkill,
+    skill_name: str,
+    output_dir: Path,
+) -> None:
+    """Write the skill secrets to a file.
+
+    Parameters
+    ----------
+    skill : WaldiezSkill
+        The skill.
+    skill_name : str
+        The name of the skill.
+    output_dir : Path
+        The output directory to save the secrets to.
+    """
+    if not skill.secrets:
+        return
+    secrets_file = output_dir / f"{skill_name}_secrets.py"
+    with secrets_file.open("w", encoding="utf-8") as f:
+        f.write('"""Secrets for the skill."""\n')
+        f.write("from os import environ\n\n")
+        for key, value in skill.secrets.items():
+            f.write(f'environ["{key}"] = "{value}"\n')
+
+
 def export_skills(
     skills: List[WaldiezSkill],
     skill_names: Dict[str, str],
@@ -116,12 +142,21 @@ def export_skills(
     skill_secrets: Set[Tuple[str, str]] = set()
     for skill in skills:
         skill_name = skill_names[skill.id]
-        skill_imports.add(f"from {skill_name} import {skill_name}")
         skill_secrets.update(skill.secrets.items())
         if not output_dir:
+            skill_imports.add(f"from {skill_name} import {skill_name}")
             continue
         if not isinstance(output_dir, Path):
             output_dir = Path(output_dir)
+        if not skill.secrets:
+            skill_imports.add(f"from {skill_name} import {skill_name}")
+        else:
+            # have the secrets before the skill
+            skill_imports.add(
+                f"import {skill_name}_secrets  # noqa\n"
+                f"from {skill_name} import {skill_name}"
+            )
+        _write_skill_secrets(skill, skill_name, output_dir)
         skill_file = output_dir / f"{skill_name}.py"
         with skill_file.open("w", encoding="utf-8") as f:
             f.write(skill.content)

{waldiez-0.1.10 → waldiez-0.1.12}/waldiez/runner.py

@@ -169,8 +169,12 @@ class WaldiezRunner:
             print_function(
                 f"Installing requirements: {', '.join(extra_requirements)}"
             )
+            pip_install = [sys.executable, "-m", "pip", "install"]
+            if not in_virtualenv():
+                pip_install.append("--user")
+            pip_install.extend(extra_requirements)
             with subprocess.Popen(
-                [sys.executable, "-m", "pip", "install", *extra_requirements],
+                pip_install,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
             ) as proc:
@@ -341,3 +345,16 @@ class WaldiezRunner:
             self._running = False
             self._stream.reset(token)
             del token
+
+
+def in_virtualenv() -> bool:
+    """Check if we are inside a virtualenv.
+
+    Returns
+    -------
+    bool
+        True if inside a virtualenv, False otherwise.
+    """
+    return hasattr(sys, "real_prefix") or (
+        hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
+    )

waldiez-0.1.10/waldiez/__init__.py

@@ -1,13 +0,0 @@
-"""Waldiez package."""
-
-from ._version import __version__
-from .exporter import WaldiezExporter
-from .models import Waldiez
-from .runner import WaldiezRunner
-
-__all__ = [
-    "Waldiez",
-    "WaldiezExporter",
-    "WaldiezRunner",
-    "__version__",
-]

waldiez-0.1.10/waldiez/cli.py

@@ -1,166 +0,0 @@
-"""Command line interface to convert or run a waldiez file."""
-
-import argparse
-import json
-import logging
-import os
-import sys
-from pathlib import Path
-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.
-
-    Returns
-    -------
-    argparse.ArgumentParser
-        The argument parser.
-    """
-    parser = argparse.ArgumentParser(
-        description="Run or export a Waldiez flow.",
-        prog="waldiez",
-    )
-    parser.add_argument(
-        "file",
-        type=str,
-        help="Path to the Waldiez flow (*.waldiez) file.",
-    )
-    parser.add_argument(
-        "-e",
-        "--export",
-        action="store_true",
-        help=(
-            "Export the Waldiez flow to a Python script or a jupyter notebook."
-        ),
-    )
-    parser.add_argument(
-        "-o",
-        "--output",
-        type=str,
-        help=(
-            "Path to the output file. "
-            "If exporting, the file extension determines the output format. "
-            "If running, the output's directory will contain "
-            "the generated flow (.py) and any additional generated files."
-        ),
-    )
-    parser.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        help=("Override the output file if it already exists. "),
-    )
-    parser.add_argument(
-        "-v",
-        "--version",
-        action="version",
-        version=f"waldiez version: {__version__}",
-    )
-    return parser
-
-
-def _log_result(result: "ChatResult") -> None:
-    """Log the result of the Waldiez flow."""
-    logger = logging.getLogger("waldiez::cli")
-    logger.info("Chat History:\n")
-    logger.info(result.chat_history)
-    logger.info("Summary:\n")
-    logger.info(result.summary)
-    logger.info("Cost:\n")
-    logger.info(result.cost)
-
-
-def _run(data: Dict[str, Any], output_path: Optional[str]) -> None:
-    """Run the Waldiez flow."""
-    waldiez = Waldiez.from_dict(data)
-    runner = WaldiezRunner(waldiez)
-    results = runner.run(stream=None, output_path=output_path)
-    if isinstance(results, list):
-        for result in results:
-            _log_result(result)
-            sep = "-" * 80
-            print(f"\n{sep}\n")
-    else:
-        _log_result(results)
-
-
-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.file
-    if not os.path.exists(waldiez_file):
-        logger.error("File not found: %s", waldiez_file)
-        sys.exit(1)
-    if not waldiez_file.endswith((".json", ".waldiez")):
-        logger.error("Only .json or .waldiez files are supported.")
-        sys.exit(1)
-    with open(waldiez_file, "r", encoding="utf-8") as file:
-        try:
-            data = json.load(file)
-        except json.decoder.JSONDecodeError:
-            logger.error("Invalid .waldiez file: %s. Not a valid json?", file)
-            return
-    if args.export is True:
-        if args.output is None:
-            logger.error("Please provide an output file.")
-            sys.exit(1)
-        if not args.output.endswith((".py", ".ipynb", ".json", ".waldiez")):
-            logger.error(
-                "Only Python scripts, Jupyter notebooks "
-                "and JSON/Waldiez files are supported."
-            )
-            sys.exit(1)
-        output_file = Path(args.output).resolve()
-        waldiez = Waldiez.from_dict(data)
-        exporter = WaldiezExporter(waldiez)
-        exporter.export(output_file, force=args.force)
-        generated = str(output_file).replace(os.getcwd(), ".")
-        logger.info("Generated: %s", generated)
-    else:
-        _run(data, args.output)
-
-
-def _get_logger(level: int = logging.INFO) -> logging.Logger:
-    """Get the logger for the Waldiez package.
-
-    Parameters
-    ----------
-    level : int or str, optional
-        The logging level. Default is logging.INFO.
-
-    Returns
-    -------
-    logging.Logger
-        The logger.
-    """
-    # check if we already have setup a config
-
-    if not logging.getLogger().handlers:
-        logging.basicConfig(
-            level=level,
-            format="%(levelname)s %(message)s",
-            stream=sys.stderr,
-            force=True,
-        )
-    logger = logging.getLogger("waldiez::cli")
-    current_level = logger.getEffectiveLevel()
-    if current_level != level:
-        logger.setLevel(level)
-    return logger
-
-
-if __name__ == "__main__":
-    main()