waldiez 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

waldiez/__init__.py

@@ -1,10 +1,28 @@
 """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",

waldiez/_version.py

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

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/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.dist-info → waldiez-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.10
+Version: 0.1.11
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/
 Project-URL: repository, https://github.com/waldiez/waldiez.git
@@ -16,30 +16,30 @@ 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
 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'
@@ -48,15 +48,15 @@ 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.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.46; 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'
@@ -237,6 +237,20 @@ with WaldiezIOStream.set_default(io_stream):
 - [juptytext](https://github.com/mwouts/jupytext)
 - [pydantic](https://github.com/pydantic/pydantic)
 
+## 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
 
 This project is licensed under the MIT License - see the [LICENSE](https://github.com/waldiez/waldiez/blob/main/LICENSE) file for details.

{waldiez-0.1.10.dist-info → waldiez-0.1.11.dist-info}/RECORD

@@ -1,7 +1,8 @@
-waldiez/__init__.py,sha256=AuVJ8ZOPmJoTeKQ_ryezU14tG-DFRb7djvr72a5G63Y,251
+waldiez/__init__.py,sha256=ASGmxP3JcASIv89_tMYhYxvW0FlHK1jM0Nfb1hMN-z0,722
 waldiez/__main__.py,sha256=9xR-F2ohZcRPDG6KrM7cJpXciKX-u6WdL221ckyJ04k,112
-waldiez/_version.py,sha256=aGsOr3FrjYf-m6nS_nxDmjwu-JEPOi_lBm3E0JiKowY,63
+waldiez/_version.py,sha256=sJthgAdM_fnhfUw7CJUqaPJliLLYbXnDEyzn7i1rA9U,63
 waldiez/cli.py,sha256=wStRkt056Y-F2CcuD6Zlov-ooUpWndyNesV9s_MjyHU,4798
+waldiez/conflict_checker.py,sha256=T5FA7hsxpuW0Byb4YyZQ3-uVxzNnoTQV199YRBKjvmE,707
 waldiez/exporter.py,sha256=iKe-l_Me8NRWsXHIdBcrOrnLT9XIyp4iYi4HLuuj2jA,9342
 waldiez/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 waldiez/runner.py,sha256=hBHgtfxcV7LlGMAwGEf7xbNp3_qEvFsnbTTnKfe-Y1g,11097
@@ -29,7 +30,7 @@ waldiez/exporting/flow/__init__.py,sha256=WhdPrjXQAcihrS1KUtPNgbx0y1tqD5HtGykzpE
 waldiez/exporting/flow/def_main.py,sha256=YpdhqO4iFng3r7if69ZPMJAibPVNDqnrOrWvGw7CJq8,1052
 waldiez/exporting/flow/flow.py,sha256=x2AlXr7aJJfrPMeuXQYfT9sG5GycMwf0kRkovZWKGag,6206
 waldiez/exporting/models/__init__.py,sha256=_Yt6sBAyRrN3LSAg4Nrh4dP7pmtIzGzWu4G1AutxK-Q,7078
-waldiez/exporting/skills/__init__.py,sha256=oIA9f5ABtYSbS0kMY_4ovU3-m6meVk5blEu_xViZsRU,3536
+waldiez/exporting/skills/__init__.py,sha256=RQUDX77TQR8zI0mSXpCiK6wjx6Db3MapI_BEGQWV61A,4638
 waldiez/exporting/utils/__init__.py,sha256=tP1V4g9-MyARlfOEL_1YWMJNW7UivUrrukq7DIwdq6k,1018
 waldiez/exporting/utils/comments.py,sha256=X9j8w48rh3DfFDjiMverU9DBSuE9yuMMbbStxBbN1sE,3190
 waldiez/exporting/utils/importing.py,sha256=dA4HCQ-OxmodUjovgXyLI9IwNvLwbY67P41969XoZ7g,8649
@@ -84,8 +85,8 @@ waldiez/models/model/model_data.py,sha256=pDPKUbltaXWjCuDArgwTOEHw_igfk_DkxzFzdn
 waldiez/models/skill/__init__.py,sha256=rU88bajKOGMYoHFcE8MP0jW9H0MswbQmvz5wxS35BYE,169
 waldiez/models/skill/skill.py,sha256=fhsAI413an2_d4DBIkf7dzEuWk6rGs2t4sl97a4dj20,3473
 waldiez/models/skill/skill_data.py,sha256=RTWn8Od6w7g-nRIpsS29sqZ8sPm5dCPiK7-qXmU-KD4,815
-waldiez-0.1.10.dist-info/METADATA,sha256=ibuvQH4YJ62Rqm2sjh3uIqjnxILAcOP3evtEXqkeH2w,8790
-waldiez-0.1.10.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-waldiez-0.1.10.dist-info/entry_points.txt,sha256=5Po4yQXPa_QEdtTevpEBgr3rGoIvDMeQuJR2zqwBLBo,45
-waldiez-0.1.10.dist-info/licenses/LICENSE,sha256=VQEHM6WMQLRu1qaGl3GWsoOknDwro-69eGo4NLIJPIM,1064
-waldiez-0.1.10.dist-info/RECORD,,
+waldiez-0.1.11.dist-info/METADATA,sha256=hzcUFwIJ4SXtYWeEbhfTNy8A7fkVupJFm5GJhfCbuOg,9288
+waldiez-0.1.11.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+waldiez-0.1.11.dist-info/entry_points.txt,sha256=5Po4yQXPa_QEdtTevpEBgr3rGoIvDMeQuJR2zqwBLBo,45
+waldiez-0.1.11.dist-info/licenses/LICENSE,sha256=VQEHM6WMQLRu1qaGl3GWsoOknDwro-69eGo4NLIJPIM,1064
+waldiez-0.1.11.dist-info/RECORD,,