waldiez 0.1.14__tar.gz → 0.1.16__tar.gz

{waldiez-0.1.14 → waldiez-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.14
+Version: 0.1.16
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/
 Project-URL: repository, https://github.com/waldiez/waldiez.git
@@ -18,9 +18,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.10
 Requires-Dist: jupytext
 Requires-Dist: pyautogen==0.5.0
+Requires-Dist: pydantic>=2.0
 Requires-Dist: typer<0.13,>=0.9
 Provides-Extra: ag2-extras
-Requires-Dist: fastembed==0.4.2; 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.0; extra == 'ag2-extras'
@@ -32,12 +32,12 @@ Requires-Dist: pyautogen[lmm]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pyautogen[mistral]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pyautogen[retrievechat-mongodb]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pyautogen[retrievechat-pgvector]==0.5.0; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-qdrant]==0.5.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[retrievechat-qdrant]==0.5.0; (python_version < '3.13') and extra == 'ag2-extras'
 Requires-Dist: pyautogen[retrievechat]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pyautogen[together]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pyautogen[websurfer]==0.5.0; extra == 'ag2-extras'
 Requires-Dist: pymongo==4.10.1; extra == 'ag2-extras'
-Requires-Dist: qdrant-client==1.12.1; extra == 'ag2-extras'
+Requires-Dist: qdrant-client[fastembed]; (python_version >= '3.13') and extra == 'ag2-extras'
 Provides-Extra: dev
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
 Requires-Dist: bandit==1.8.0; extra == 'dev'
@@ -50,7 +50,9 @@ Requires-Dist: pydocstyle==6.3.0; extra == 'dev'
 Requires-Dist: pylint==3.3.2; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
 Requires-Dist: ruff==0.8.2; 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'
 Requires-Dist: yamllint==1.35.1; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: mdx-include==1.4.2; extra == 'docs'

{waldiez-0.1.14 → waldiez-0.1.16}/pyproject.toml

@@ -24,8 +24,9 @@ classifiers = [
 dependencies =[
     "pyautogen==0.5.0",
     "jupytext",
+    "pydantic>=2.0",
     # together(ag2 extra) 1.2.0 depends on typer<0.13 and >=0.9
-    "typer>=0.9,<0.13"
+    "typer>=0.9,<0.13",
 ]
 
 [project.urls]
@@ -55,16 +56,38 @@ dev = [
     'ruff==0.8.2',
     'types-PyYAML==6.0.12.20240917',
     'yamllint==1.35.1',
+    'toml; python_version <= "3.10"',
+    'types-toml== 0.10.8.20240310',
 ]
+# let's stay with <3.13 for now
+####
+# fastembed and fastembed-gpu are not available, yet for python 3.13
+# ref: https://github.com/qdrant/qdrant-client/blob/master/pyproject.toml
+# fastembed = [
+#     { version = "0.3.6", optional = true, python = "<3.13" }
+# ]
+# fastembed-gpu = [
+#     { version = "0.3.6", optional = true, python = "<3.13" }
+# ]
+####
+# the pinned chromadb version (pyautogen[retrievechat]) (0.5.3)
+# needs numpy <2.0.0
+# but pyautogen wants numpy >=1.21.0 for python 3.13
+#
+# refs:
+# https://github.com/chroma-core/chroma/blob/0.5.3/pyproject.toml#L24C3-L24C30
+#
+# https://github.com/ag2ai/ag2/blob/main/setup.py#L33
+#
 ag2_extras =[
-    'fastembed==0.4.2',
     'pgvector>=0.3.6',
     'psycopg[binary]>=3.2.3',
     'pyautogen[captainagent]==0.5.0',
     'pyautogen[retrievechat]==0.5.0',
     'pyautogen[retrievechat-pgvector]==0.5.0',
     'pyautogen[retrievechat-mongodb]==0.5.0',
-    'pyautogen[retrievechat-qdrant]==0.5.0',
+    'pyautogen[retrievechat-qdrant]==0.5.0; python_version < "3.13"',
+    'qdrant-client[fastembed]; python_version >= "3.13"',
     'pyautogen[gemini]==0.5.0',
     'pyautogen[together]==0.5.0',
     'pyautogen[anthropic]==0.5.0',
@@ -75,7 +98,6 @@ ag2_extras =[
     'pyautogen[websurfer]==0.5.0',
     'pyautogen[together]==0.5.0',
     'pymongo==4.10.1',
-    'qdrant-client==1.12.1',
 ]
 test = [
     'pytest==8.3.4',

{waldiez-0.1.14 → waldiez-0.1.16}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.14"
+__version__ = "0.1.16"

{waldiez-0.1.14 → waldiez-0.1.16}/waldiez/conflict_checker.py

@@ -12,10 +12,13 @@ def check_conflicts() -> None:  # pragma: no cover
     try:
         version("autogen-agentchat")
         print(
-            "Conflict detected: 'autogen-agentchat' is installed, "
+            "Conflict detected: 'autogen-agentchat' is installed "
+            "in the current environment, \n"
             "which conflicts with 'ag2' / 'pyautogen'.\n"
-            "Please uninstall 'autogen-agentchat': pip uninstall -y autogen-agentchat \n"
-            "And install 'pyautogen' (or 'waldiez') again: pip install --force pyautogen waldiez"
+            "Please uninstall 'autogen-agentchat': \n"
+            f"{sys.executable} -m pip uninstall -y autogen-agentchat \n"
+            "And install 'pyautogen' (and/or 'waldiez') again: \n"
+            f"{sys.executable} -m pip install --force pyautogen waldiez"
         )
         sys.exit(1)
     except PackageNotFoundError: