waldiez 0.1.20__tar.gz → 0.2.1__tar.gz

{waldiez-0.1.20 → waldiez-0.2.1}/.gitignore

@@ -4,7 +4,7 @@
 build/
 dist/
 site/
-reports/
+coverage/
 waldiez_out/
 **/logs/
 **/tmp/
@@ -24,3 +24,4 @@ dmypy.json
 .coverage
 **/*.coverage*
 **/*.ffs_db
+**/*.lcov

{waldiez-0.1.20 → waldiez-0.2.1}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Waldiez
+Copyright (c) 2024- Waldiez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.1.20
+Version: 0.2.1
 Summary: waldiez
-Project-URL: homepage, https://waldiez.github.io/waldiez/
-Project-URL: repository, https://github.com/waldiez/waldiez.git
-Author-email: Panagiotis Kasnesis <pkasnesis@thingenious.io>, Lazaros Toumanidis <laztoum@protonmail.com>, Stella Ioannidou <stella@humancentered.gr>
+Project-URL: homepage, https://waldiez.github.io/waldiez/python
+Project-URL: repository, https://github.com/waldiez/python.git
+Author-email: Panagiotis Kasnesis <pkasnesis@waldiez.io>, Lazaros Toumanidis <laztoum@waldiez.io>, Stella Ioannidou <stella@humancentered.gr>
 License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -18,26 +18,26 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.10
 Requires-Dist: jupytext
-Requires-Dist: pyautogen==0.5.3
+Requires-Dist: pyautogen==0.6.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: typer<0.13,>=0.9
 Provides-Extra: ag2-extras
+Requires-Dist: autogen[captainagent]==0.6.0; (platform_system == 'Linux') and extra == 'ag2-extras'
 Requires-Dist: pgvector>=0.3.6; extra == 'ag2-extras'
 Requires-Dist: psycopg[binary]>=3.2.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[anthropic]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[bedrock]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[captainagent]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[gemini]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[groq]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[lmm]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[mistral]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[neo4j]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-mongodb]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-pgvector]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-qdrant]==0.5.3; (python_version < '3.13') and extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[together]==0.5.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[websurfer]==0.5.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[anthropic]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[bedrock]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[gemini]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[groq]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[lmm]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[mistral]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[neo4j]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[retrievechat-mongodb]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[retrievechat-pgvector]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[retrievechat-qdrant]==0.6.0; (python_version < '3.13') and extra == 'ag2-extras'
+Requires-Dist: pyautogen[retrievechat]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[together]==0.6.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[websurfer]==0.6.0; extra == 'ag2-extras'
 Requires-Dist: pymongo==4.10.1; extra == 'ag2-extras'
 Requires-Dist: qdrant-client[fastembed]; (python_version >= '3.13') and extra == 'ag2-extras'
 Provides-Extra: dev
@@ -46,12 +46,12 @@ 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: mypy==1.14.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.2; extra == 'dev'
+Requires-Dist: pylint==3.3.3; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.8.3; 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-toml==0.10.8.20240310; extra == 'dev'
@@ -66,6 +66,11 @@ 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.27.0; extra == 'docs'
+Provides-Extra: jupyter
+Requires-Dist: jupyterlab>=4.3.0; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.2.1; extra == 'jupyter'
+Provides-Extra: studio
+Requires-Dist: waldiez-studio==0.2.1; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'
 Requires-Dist: pytest-html==4.1.1; extra == 'test'
@@ -77,11 +82,11 @@ Description-Content-Type: text/markdown
 
 # Waldiez
 
-![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
+![CI Build](https://github.com/waldiez/python/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/python/badge.svg)](https://coveralls.io/github/waldiez/python) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
 
 Translate a Waldiez flow:
 
-![Flow](https://raw.githubusercontent.com/waldiez/waldiez/refs/heads/main/docs/static/images/overview.webp)
+![Flow](https://raw.githubusercontent.com/waldiez/python/refs/heads/main/docs/static/images/overview.webp)
 
 To a python script or a jupyter notebook with the corresponding [ag2](https://github.com/ag2ai/ag2/) agents and chats.
 
@@ -102,11 +107,30 @@ python -m pip install waldiez
 From the repository:
 
 ```bash
-python -m pip install git+https://github.com/waldiez/waldiez.git
+python -m pip install git+https://github.com/waldiez/python.git
 ```
 
 ## Usage
 
+### UI Options
+
+- For creating-only (no exporting or running) waldiez flows, you can use the playground at <https://waldiez.github.io>.
+The repo for the js library is [here](https://github.com/waldiez/react).
+- There is also a jupyterlab extension [here](https://github.com/waldiez/jupyter)
+- 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)
+
+<!--
+The jupyterlab extension and studio 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
@@ -148,13 +172,6 @@ $CONTAINER_COMMAND run \
   waldiez/waldiez run --file /flow.waldiez --output /output/output[.py]
 ```
 
-### UI
-
-For creating-only (no exporting or running) waldiez flows, you can use the playground at <https://waldiez.github.io>.  
-The repo for the js library is [here](https://github.com/waldiez/react).  
-We are currently working on waldiez-studio to provide a visual interface for creating and running Waldiez flows (you can find more [here](https://github.com/waldiez/studio)).  
-Until then, you can use our [Jupyter](https://github.com/waldiez/jupyter) or the [VSCode](https://github.com/waldiez/vscode) extension to create and run Waldiez flows.
-
 ### As a library
 
 #### Export a flow
@@ -167,7 +184,7 @@ output_path = "/path/to/an/output.py"  # or .ipynb
 exporter = WaldiezExporter.load(flow_path)
 exporter.export(output_path)
 ```
-  
+
 #### Run a flow
 
 ```python
@@ -195,11 +212,11 @@ runner.run(output_path=output_path)
   ```
 
   If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
-  
-    ```shell
-    pip install --force --no-cache waldiez pyautogen
-    ```
+
+  ```shell
+  pip install --force --no-cache waldiez pyautogen
+  ```
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/waldiez/blob/main/LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/python/blob/main/LICENSE) file for details.

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

@@ -1,10 +1,10 @@
 # Waldiez
 
-![CI Build](https://github.com/waldiez/waldiez/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/waldiez/badge.svg)](https://coveralls.io/github/waldiez/waldiez) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
+![CI Build](https://github.com/waldiez/python/actions/workflows/main.yaml/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/waldiez/python/badge.svg)](https://coveralls.io/github/waldiez/python) [![PyPI version](https://badge.fury.io/py/waldiez.svg?icon=si%3Apython)](https://badge.fury.io/py/waldiez)
 
 Translate a Waldiez flow:
 
-![Flow](https://raw.githubusercontent.com/waldiez/waldiez/refs/heads/main/docs/static/images/overview.webp)
+![Flow](https://raw.githubusercontent.com/waldiez/python/refs/heads/main/docs/static/images/overview.webp)
 
 To a python script or a jupyter notebook with the corresponding [ag2](https://github.com/ag2ai/ag2/) agents and chats.
 
@@ -25,11 +25,30 @@ python -m pip install waldiez
 From the repository:
 
 ```bash
-python -m pip install git+https://github.com/waldiez/waldiez.git
+python -m pip install git+https://github.com/waldiez/python.git
 ```
 
 ## Usage
 
+### UI Options
+
+- For creating-only (no exporting or running) waldiez flows, you can use the playground at <https://waldiez.github.io>.
+The repo for the js library is [here](https://github.com/waldiez/react).
+- There is also a jupyterlab extension [here](https://github.com/waldiez/jupyter)
+- 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)
+
+<!--
+The jupyterlab extension and studio 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
@@ -71,13 +90,6 @@ $CONTAINER_COMMAND run \
   waldiez/waldiez run --file /flow.waldiez --output /output/output[.py]
 ```
 
-### UI
-
-For creating-only (no exporting or running) waldiez flows, you can use the playground at <https://waldiez.github.io>.  
-The repo for the js library is [here](https://github.com/waldiez/react).  
-We are currently working on waldiez-studio to provide a visual interface for creating and running Waldiez flows (you can find more [here](https://github.com/waldiez/studio)).  
-Until then, you can use our [Jupyter](https://github.com/waldiez/jupyter) or the [VSCode](https://github.com/waldiez/vscode) extension to create and run Waldiez flows.
-
 ### As a library
 
 #### Export a flow
@@ -90,7 +102,7 @@ output_path = "/path/to/an/output.py"  # or .ipynb
 exporter = WaldiezExporter.load(flow_path)
 exporter.export(output_path)
 ```
-  
+
 #### Run a flow
 
 ```python
@@ -118,11 +130,11 @@ runner.run(output_path=output_path)
   ```
 
   If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
-  
-    ```shell
-    pip install --force --no-cache waldiez pyautogen
-    ```
+
+  ```shell
+  pip install --force --no-cache waldiez pyautogen
+  ```
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/waldiez/blob/main/LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/python/blob/main/LICENSE) file for details.

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

@@ -2,8 +2,8 @@
 name = "waldiez"
 description = 'waldiez'
 authors = [
-  { name = 'Panagiotis Kasnesis', email = 'pkasnesis@thingenious.io' },
-  { name= 'Lazaros Toumanidis', email= 'laztoum@protonmail.com' },
+  { name = 'Panagiotis Kasnesis', email = 'pkasnesis@waldiez.io' },
+  { name= 'Lazaros Toumanidis', email= 'laztoum@waldiez.io' },
   { name = 'Stella Ioannidou', email = 'stella@humancentered.gr'}
 ]
 readme = "README.md"
@@ -22,7 +22,7 @@ classifiers = [
   "Intended Audience :: Developers",
 ]
 dependencies =[
-    "pyautogen==0.5.3",
+    "pyautogen==0.6.0",
     "jupytext",
     "pydantic>=2.0",
     # together(ag2 extra) 1.2.0 depends on typer<0.13 and >=0.9
@@ -30,8 +30,8 @@ dependencies =[
 ]
 
 [project.urls]
-homepage = 'https://waldiez.github.io/waldiez/'
-repository = 'https://github.com/waldiez/waldiez.git'
+homepage = 'https://waldiez.github.io/waldiez/python'
+repository = 'https://github.com/waldiez/python.git'
 
 [tool.hatch.build.targets.sdist]
 packages = ["waldiez", "waldiez.*"]
@@ -42,18 +42,25 @@ packages = ["waldiez", "waldiez.*"]
 exclude = [ "**/example.py" ]
 
 [project.optional-dependencies]
+studio = [
+    "waldiez_studio==0.2.1",
+]
+jupyter = [
+    "waldiez_jupyter==0.2.1",
+    "jupyterlab>=4.3.0",
+]
 dev = [
     'autoflake==2.3.1',
     'bandit==1.8.0',
     'black[jupyter]==24.10.0',
     'flake8==7.1.1',
     'isort==5.13.2',
-    'mypy==1.13.0',
+    'mypy==1.14.0',
     'pre-commit==4.0.1',
     'pydocstyle==6.3.0',
-    'pylint==3.3.2',
+    'pylint==3.3.3',
     'python-dotenv==1.0.1',
-    'ruff==0.8.3',
+    'ruff==0.8.4',
     'types-PyYAML==6.0.12.20240917',
     'yamllint==1.35.1',
     'toml; python_version <= "3.10"',
@@ -79,25 +86,28 @@ dev = [
 #
 # https://github.com/ag2ai/ag2/blob/main/setup.py#L33
 #
+# captainagent(ag2 extra) depends on pysqlite3-binary,
+# but the wheels are only for linux (not checked every py version)
+# on windows with py 3.12, it seems to not work.
 ag2_extras =[
     'pgvector>=0.3.6',
     'psycopg[binary]>=3.2.3',
-    'pyautogen[anthropic]==0.5.3',
-    'pyautogen[bedrock]==0.5.3',
-    'pyautogen[captainagent]==0.5.3',
-    'pyautogen[gemini]==0.5.3',
-    'pyautogen[groq]==0.5.3',
-    'pyautogen[lmm]==0.5.3',
-    'pyautogen[mistral]==0.5.3',
-    'pyautogen[neo4j]==0.5.3',
-    'pyautogen[retrievechat-mongodb]==0.5.3',
-    'pyautogen[retrievechat-pgvector]==0.5.3',
-    'pyautogen[retrievechat-qdrant]==0.5.3; python_version < "3.13"',
+    'pyautogen[anthropic]==0.6.0',
+    'pyautogen[bedrock]==0.6.0',
+    'autogen[captainagent]==0.6.0; platform_system == "Linux"',
+    'pyautogen[gemini]==0.6.0',
+    'pyautogen[groq]==0.6.0',
+    'pyautogen[lmm]==0.6.0',
+    'pyautogen[mistral]==0.6.0',
+    'pyautogen[neo4j]==0.6.0',
+    'pyautogen[retrievechat-mongodb]==0.6.0',
+    'pyautogen[retrievechat-pgvector]==0.6.0',
+    'pyautogen[retrievechat-qdrant]==0.6.0; python_version < "3.13"',
     'qdrant-client[fastembed]; python_version >= "3.13"',
-    'pyautogen[retrievechat]==0.5.3',
-    'pyautogen[together]==0.5.3',
-    'pyautogen[together]==0.5.3',
-    'pyautogen[websurfer]==0.5.3',
+    'pyautogen[retrievechat]==0.6.0',
+    'pyautogen[together]==0.6.0',
+    'pyautogen[together]==0.6.0',
+    'pyautogen[websurfer]==0.6.0',
     'pymongo==4.10.1',
 ]
 test = [
@@ -147,6 +157,7 @@ exclude = '''
   | __init__.py
   | .local
   | examples
+  | waldiez_out
 )/
 '''
 
@@ -177,6 +188,7 @@ exclude = [
     '.venv',
     '.local',
     'examples',
+    'waldiez_out',
 ]
 
 [tool.pydantic-mypy]
@@ -191,6 +203,7 @@ skip=[
     '.venv',
     '.local',
     'examples',
+    'waldiez_out',
 ]
 include_trailing_comma=true
 force_grid_wrap=0
@@ -199,7 +212,7 @@ line_length=80
 
 # pydocstyle
 [tool.pydocstyle]
-match-dir='([^!(.venv)].*)([^!(.local)].*)([^!(examples)].*)'
+match-dir='([^!(.venv)].*)([^!(.local)].*)([^!(examples)].*)([^!(waldiez_out)].*)'
 
 # pylint
 [tool.pylint.master]
@@ -219,6 +232,7 @@ ignore-paths = [
     ".venv",
     ".local*",
     "examples",
+    "waldiez_out",
 ]
 
 unsafe-load-any-extension="no"
@@ -234,9 +248,10 @@ min-similarity-lines=10
 [tool.pylint.broad_try_clause]
 max-try-statements=3
 [tool.pylint.design]
-max-args=10
-max-attributes=10
-max-positional-arguments=10
+max-args=11
+max-attributes=11
+max-positional-arguments=11
+max-statements=50
 [tool.pylint.string]
 check-quote-consistency = true
 check-str-concat-over-line-jumps = true
@@ -253,7 +268,8 @@ default-docstring-type = "numpy"
 exclude_dirs = [
     ".venv",
     ".local",
-    "examples"
+    "examples",
+    "waldiez_out",
 ]
 # B104: bind to all interfaces (0.0.0.0)
 # B110: allow pass on try/except
@@ -263,7 +279,6 @@ skips = ['B104', 'B110', 'B404', 'B602', 'B603' ]
 [tool.bandit.assert_used]
 skips = ['*_test.py', '*/test_*.py']
 
-
 # ruff
 [tool.ruff]
 line-length = 80
@@ -271,6 +286,7 @@ extend-exclude = [
     ".venv",
     ".local",
     "examples",
+    "waldiez_out",
 ]
 
 [tool.ruff.lint]
@@ -299,12 +315,6 @@ 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
-  #
-  # DeprecationWarning:
-  # reactor.stop cannot be used inside unit tests
   "ignore::DeprecationWarning",
 ]
 python_files = [

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/__init__.py

@@ -9,7 +9,9 @@ from .exporter import WaldiezExporter
 from .models import Waldiez
 from .runner import WaldiezRunner
 
-warnings.filterwarnings("ignore", "flaml.automl is not available")
+warnings.filterwarnings(
+    "ignore", module="flaml", message="^.*flaml.automl is not available.*$"
+)
 
 
 # pylint: disable=too-few-public-methods

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

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

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/cli.py

@@ -1,10 +1,11 @@
 """Command line interface to convert or run a waldiez file."""
 
-# pylint: disable=missing-function-docstring,missing-param-doc,missing-raises-doc
+# pylint: disable=missing-function-docstring,missing-param-doc,missing-raises-doc  # noqa: E501
 import json
 import logging
 import os
 import sys
+import warnings
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
@@ -12,9 +13,14 @@ import typer
 from typing_extensions import Annotated
 
 from . import Waldiez, __version__
+from .cli_extras import add_cli_extras  # type: ignore
 from .exporter import WaldiezExporter
 from .runner import WaldiezRunner
 
+warnings.filterwarnings(
+    "ignore", module="flaml", message="^.*flaml.automl is not available.*$"
+)
+
 if TYPE_CHECKING:
     from autogen import ChatResult  # type: ignore[import-untyped]
 
@@ -224,6 +230,8 @@ def _log_result(result: "ChatResult", logger: logging.Logger) -> None:
     logger.info(result.cost)
 
 
+add_cli_extras(app)
+
 if __name__ == "__main__":
     _get_logger()
     app()

waldiez-0.2.1/waldiez/cli_extras.py

@@ -0,0 +1,123 @@
+# type: ignore
+# flake8: noqa
+# pylint: skip-file
+# isort: skip_file
+"""Extra typer commands for CLI."""
+
+import typer
+import subprocess  # nosemgrep # nosec
+
+HAVE_STUDIO = False
+HAVE_JUPYTER = False
+try:
+    from waldiez_studio.cli import app as studio_app
+
+    HAVE_STUDIO = True
+except BaseException:
+    pass
+
+try:
+    import waldiez_jupyter
+
+    HAVE_JUPYTER = True
+except BaseException:
+    pass
+
+
+def add_cli_extras(app: typer.Typer) -> None:
+    """Add extra CLI commands to the app.
+
+    Parameters
+    ----------
+    app : typer.Typer
+        The Typer app to add the extra commands to.
+
+    Returns
+    -------
+    typer.Typer
+        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,
+        )
+    if HAVE_JUPYTER:
+        jupyter_app = get_jupyter_app()
+        app.add_typer(jupyter_app, name="lab")
+
+
+def get_jupyter_app() -> typer.Typer:
+    """Get the Jupyter Typer app.
+
+    Returns
+    -------
+    typer.Typer
+        The Jupyter Typer app
+    """
+    jupyter_app = typer.Typer(
+        name="lab",
+        help="Start jupyter lab with the waldiez extension.",
+        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(
+            8888,
+            "--port",
+            help="Port to run JupyterLab on.",
+        ),
+        host: str = typer.Option(
+            "*",
+            "--host",
+            help="Host to run JupyterLab on.",
+        ),
+        browser: bool = typer.Option(
+            False,
+            "--no-browser",
+            help="Don't open the browser.",
+        ),
+        password: str = typer.Option(
+            None,
+            "--password",
+            help="Password to access JupyterLab.",
+        ),
+    ) -> None:
+        """Start JupyterLab."""
+        command = [
+            "jupyter",
+            "lab",
+            f"--port={port}",
+            f"--ip={host}",
+            "--ServerApp.terminado_settings=\"shell_command=['/bin/bash']\"",
+            "--ServerApp.allow_origin='*'",
+            "--ServerApp.disable_check_xsrf=True",
+        ]
+        if browser:
+            command.append("--no-browser")
+        if password:
+            from jupyter_server.auth import passwd
+
+            hashed_password = passwd(password)
+            command.append(f"--ServerApp.password={hashed_password}")
+        subprocess.run(command)
+
+    return jupyter_app

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/exporter.py

@@ -195,7 +195,7 @@ class WaldiezExporter:
         # we first create a .py file with the content
         # and then convert it to a notebook using jupytext
         py_path = path.with_suffix(".tmp.py")
-        with open(py_path, "w", encoding="utf-8") as f:
+        with open(py_path, "w", encoding="utf-8", newline="\n") as f:
             f.write(content)
         if not shutil.which("jupytext"):  # pragma: no cover
             run_command(
@@ -203,7 +203,14 @@ class WaldiezExporter:
                 allow_error=False,
             )
         run_command(
-            ["jupytext", "--to", "notebook", str(py_path)],
+            [
+                sys.executable,
+                "-m",
+                "jupytext",
+                "--to",
+                "notebook",
+                str(py_path),
+            ],
             allow_error=False,
         )
         ipynb_path = str(py_path).replace(".tmp.py", ".tmp.ipynb")
@@ -239,7 +246,7 @@ class WaldiezExporter:
         )
         content += '\n\nif __name__ == "__main__":\n'
         content += "    print(main())\n"
-        with open(path, "w", encoding="utf-8") as file:
+        with open(path, "w", encoding="utf-8", newline="\n") as file:
             file.write(content)
 
     def to_waldiez(self, file_path: Path) -> None:
@@ -250,7 +257,7 @@ class WaldiezExporter:
         file_path : Path
             The file path.
         """
-        with open(file_path, "w", encoding="utf-8") as file:
+        with open(file_path, "w", encoding="utf-8", newline="\n") as file:
             file.write(self.waldiez.model_dump_json())
 
 

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/exporting/agents/rag_user/vector_db.py

@@ -1,5 +1,6 @@
 """Vector DB exporting utils for RAG user agents."""
 
+# flake8: noqa E501
 # pylint: disable=line-too-long
 from typing import Any, Set, Tuple
 

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/exporting/chats/helpers.py

@@ -8,6 +8,7 @@ export_multiple_chats_string
     Get the chats content, when there are more than one chats in the flow.
 """
 
+# flake8: noqa E501
 from typing import Any, Dict, List, Optional, Tuple
 
 from waldiez.models import (

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/exporting/models/__init__.py

@@ -238,5 +238,7 @@ def get_model_api_key(model_name: str) -> str:
     return __ALL_MODEL_API_KEYS__.get(model_name, "")
 '''
 
-    with open(output_dir / "waldiez_api_keys.py", "w", encoding="utf-8") as f:
+    with open(
+        output_dir / "waldiez_api_keys.py", "w", encoding="utf-8", newline="\n"
+    ) as f:
         f.write(api_keys_content)

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/exporting/skills/__init__.py

@@ -88,7 +88,7 @@ def _write_skill_secrets(
     if not skill.secrets:
         return
     secrets_file = output_dir / f"{skill_name}_secrets.py"
-    with secrets_file.open("w", encoding="utf-8") as f:
+    with secrets_file.open("w", encoding="utf-8", newline="\n") as f:
         f.write('"""Secrets for the skill."""\n')
         f.write("from os import environ\n\n")
         for key, value in skill.secrets.items():
@@ -158,6 +158,6 @@ def export_skills(
             )
         _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:
+        with skill_file.open("w", encoding="utf-8", newline="\n") as f:
             f.write(skill.content)
     return skill_imports, skill_secrets

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/models/agents/rag_user/vector_db_config.py

@@ -1,5 +1,7 @@
 """The vector db config for the RAG user agent."""
 
+# flake8: noqa E501
+
 from pathlib import Path
 from typing import Any, Dict, Optional
 

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/models/common/method_utils.py

@@ -1,5 +1,6 @@
 """Function related utilities."""
 
+# flake8: noqa E501
 import ast
 from typing import Dict, List, Literal, Optional, Tuple
 

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/models/model/model_data.py

@@ -1,5 +1,6 @@
 """Waldiez Model Data."""
 
+# flake8: noqa E501
 from typing import Dict, Optional
 
 from pydantic import Field

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/models/waldiez.py

@@ -6,6 +6,7 @@ definitions and their optional additional skills to be used.
 """
 
 import json
+import warnings
 from dataclasses import dataclass
 from functools import cache
 from pathlib import Path
@@ -309,8 +310,10 @@ def _get_flow(
 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
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        try:
+            from autogen.version import __version__ as ag2  # type: ignore
+        except ImportError as error:  # pragma: no cover
+            raise ValueError("pyautogen is not installed.") from error
+    return ag2

{waldiez-0.1.20 → waldiez-0.2.1}/waldiez/runner.py

@@ -155,7 +155,8 @@ class WaldiezRunner:
             req for req in self.waldiez.requirements if req not in sys.modules
         )
         if extra_requirements:
-            printer(f"Installing requirements: {', '.join(extra_requirements)}")
+            requirements_string = ", ".join(extra_requirements)
+            printer(f"Installing requirements: {requirements_string}")
             pip_install = [sys.executable, "-m", "pip", "install"]
             if not in_virtualenv():
                 pip_install.append("--user")
@@ -345,13 +346,15 @@ def refresh_environment() -> None:
     ]
     for mod in modules_to_reload:
         del sys.modules[mod]
+    warnings.filterwarnings(
+        "ignore", module="flaml", message="^.*flaml.automl is not available.*$"
+    )
     import autogen
     from autogen.io import IOStream
 
     importlib.reload(autogen)
     # restore the default IOStream
     IOStream.set_global_default(default_io_stream)
-    warnings.filterwarnings("ignore", "flaml.automl is not available")
 
 
 def get_printer() -> Callable[..., None]: