waldiez 0.2.1__tar.gz → 0.2.2__tar.gz

{waldiez-0.2.1 → waldiez-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.2.1
+Version: 0.2.2
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/python
 Project-URL: repository, https://github.com/waldiez/python.git
@@ -53,7 +53,7 @@ Requires-Dist: pylint==3.3.3; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
 Requires-Dist: ruff==0.8.4; extra == 'dev'
 Requires-Dist: toml; (python_version <= '3.10') and extra == 'dev'
-Requires-Dist: types-pyyaml==6.0.12.20240917; extra == 'dev'
+Requires-Dist: types-pyyaml==6.0.12.20241221; extra == 'dev'
 Requires-Dist: types-toml==0.10.8.20240310; extra == 'dev'
 Requires-Dist: yamllint==1.35.1; extra == 'dev'
 Provides-Extra: docs
@@ -68,9 +68,9 @@ Requires-Dist: mkdocstrings-python==1.12.2; extra == 'docs'
 Requires-Dist: mkdocstrings[crystal,python]==0.27.0; extra == 'docs'
 Provides-Extra: jupyter
 Requires-Dist: jupyterlab>=4.3.0; extra == 'jupyter'
-Requires-Dist: waldiez-jupyter==0.2.1; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.2.2; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.2.1; extra == 'studio'
+Requires-Dist: waldiez-studio==0.2.2; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'
 Requires-Dist: pytest-html==4.1.1; extra == 'test'
@@ -120,17 +120,17 @@ The repo for the js library is [here](https://github.com/waldiez/react).
 - You also can use the vscode extension:
   - [repo](https://github.com/waldiez/vscode)
   - [marketplace](https://marketplace.visualstudio.com/items?itemName=Waldiez.waldiez-vscode)
-- Finally, you can use [waldiez-studio](https://github.com/waldiez/studio)
+- Finally, you can use [waldiez-studio](https://github.com/waldiez/studio), which includes a FastAPI app to handle the conversion and running of waldiez flows.
 
-<!--
-The jupyterlab extension and studio also provided as extras in the main package.
+The jupyterlab extension and waldiez studio are also provided as extras in the main package.
 
 ```shell
 pip install waldiez[studio]  # or pip install waldiez_studio
 pip install waldiez[jupyter]  # or pip install waldiez_jupyter
 # or both
 pip install waldiez[studio,jupyter]
-``` -->
+```
+
 ### CLI
 
 ```bash

{waldiez-0.2.1 → waldiez-0.2.2}/README.md

@@ -38,17 +38,17 @@ The repo for the js library is [here](https://github.com/waldiez/react).
 - You also can use the vscode extension:
   - [repo](https://github.com/waldiez/vscode)
   - [marketplace](https://marketplace.visualstudio.com/items?itemName=Waldiez.waldiez-vscode)
-- Finally, you can use [waldiez-studio](https://github.com/waldiez/studio)
+- Finally, you can use [waldiez-studio](https://github.com/waldiez/studio), which includes a FastAPI app to handle the conversion and running of waldiez flows.
 
-<!--
-The jupyterlab extension and studio also provided as extras in the main package.
+The jupyterlab extension and waldiez studio are also provided as extras in the main package.
 
 ```shell
 pip install waldiez[studio]  # or pip install waldiez_studio
 pip install waldiez[jupyter]  # or pip install waldiez_jupyter
 # or both
 pip install waldiez[studio,jupyter]
-``` -->
+```
+
 ### CLI
 
 ```bash

{waldiez-0.2.1 → waldiez-0.2.2}/pyproject.toml

@@ -43,10 +43,10 @@ exclude = [ "**/example.py" ]
 
 [project.optional-dependencies]
 studio = [
-    "waldiez_studio==0.2.1",
+    "waldiez_studio==0.2.2",
 ]
 jupyter = [
-    "waldiez_jupyter==0.2.1",
+    "waldiez_jupyter==0.2.2",
     "jupyterlab>=4.3.0",
 ]
 dev = [
@@ -61,7 +61,7 @@ dev = [
     'pylint==3.3.3',
     'python-dotenv==1.0.1',
     'ruff==0.8.4',
-    'types-PyYAML==6.0.12.20240917',
+    'types-PyYAML==6.0.12.20241221',
     'yamllint==1.35.1',
     'toml; python_version <= "3.10"',
     'types-toml== 0.10.8.20240310',

{waldiez-0.2.1 → waldiez-0.2.2}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"

{waldiez-0.2.1 → waldiez-0.2.2}/waldiez/cli_extras.py

@@ -4,13 +4,16 @@
 # isort: skip_file
 """Extra typer commands for CLI."""
 
+from typing import Callable
+
 import typer
+from typer.models import CommandInfo
 import subprocess  # nosemgrep # nosec
 
 HAVE_STUDIO = False
 HAVE_JUPYTER = False
 try:
-    from waldiez_studio.cli import app as studio_app
+    from waldiez_studio.cli import run as studio_app
 
     HAVE_STUDIO = True
 except BaseException:
@@ -38,18 +41,17 @@ def add_cli_extras(app: typer.Typer) -> None:
         The app with the extra commands added
     """
     if HAVE_STUDIO:
-        app.add_typer(
-            studio_app,
-            name="studio",
-            help="Start Waldiez Studio.",
-            no_args_is_help=False,
+        app.registered_commands.append(
+            CommandInfo(name="studio", callback=studio_app)
         )
     if HAVE_JUPYTER:
         jupyter_app = get_jupyter_app()
-        app.add_typer(jupyter_app, name="lab")
+        app.registered_commands.append(
+            CommandInfo(name="lab", callback=jupyter_app)
+        )
 
 
-def get_jupyter_app() -> typer.Typer:
+def get_jupyter_app() -> Callable[..., None]:
     """Get the Jupyter Typer app.
 
     Returns
@@ -58,26 +60,22 @@ def get_jupyter_app() -> typer.Typer:
         The Jupyter Typer app
     """
     jupyter_app = typer.Typer(
-        name="lab",
-        help="Start jupyter lab with the waldiez extension.",
+        add_completion=False,
+        no_args_is_help=False,
+        pretty_exceptions_enable=False,
+    )
+
+    @jupyter_app.callback(
+        name="start",
+        help="Start JupyterLab.",
         context_settings={
             "help_option_names": ["-h", "--help"],
             "allow_extra_args": True,
             "ignore_unknown_options": True,
         },
-        add_completion=False,
         no_args_is_help=False,
         invoke_without_command=True,
         add_help_option=True,
-        pretty_exceptions_enable=False,
-        epilog=(
-            "Use `waldiez lab [COMMAND] --help` for command-specific help. "
-        ),
-    )
-
-    @jupyter_app.command(
-        name="start",
-        help="Start JupyterLab.",
     )
     def start(
         port: int = typer.Option(
@@ -92,8 +90,7 @@ def get_jupyter_app() -> typer.Typer:
         ),
         browser: bool = typer.Option(
             False,
-            "--no-browser",
-            help="Don't open the browser.",
+            help="Open the browser after starting JupyterLab.",
         ),
         password: str = typer.Option(
             None,
@@ -111,7 +108,7 @@ def get_jupyter_app() -> typer.Typer:
             "--ServerApp.allow_origin='*'",
             "--ServerApp.disable_check_xsrf=True",
         ]
-        if browser:
+        if not browser:
             command.append("--no-browser")
         if password:
             from jupyter_server.auth import passwd
@@ -120,4 +117,4 @@ def get_jupyter_app() -> typer.Typer:
             command.append(f"--ServerApp.password={hashed_password}")
         subprocess.run(command)
 
-    return jupyter_app
+    return start