waldiez 0.1.13__tar.gz → 0.1.15__tar.gz

{waldiez-0.1.13 → waldiez-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: waldiez
-Version: 0.1.13
+Version: 0.1.15
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/
 Project-URL: repository, https://github.com/waldiez/waldiez.git
@@ -16,28 +16,29 @@ 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.4.1
 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: 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.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'
+Requires-Dist: pyautogen[bedrock]==0.5.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[captainagent]==0.5.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[gemini]==0.5.0; extra == 'ag2-extras'
+Requires-Dist: pyautogen[groq]==0.5.0; extra == 'ag2-extras'
+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; (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'
@@ -49,8 +50,10 @@ 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: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.8.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'
@@ -123,7 +126,7 @@ $CONTAINER_COMMAND run \
   --rm \
   -v /path/to/a/flow.waldiez:/flow.waldiez \
   -v /path/to/an/output:/output \
-  waldiez/waldiez --export /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb] [--force]
 
 # with selinux and/or podman, you might get permission (or file not found) errors, so you can try:
 $CONTAINER_COMMAND run \
@@ -132,7 +135,7 @@ $CONTAINER_COMMAND run \
   -v /path/to/an/output:/output \
   --userns=keep-id \
   --security-opt label=disable \
-  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb] [--force]
 ```
 
 ```shell
@@ -144,6 +147,13 @@ $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
@@ -244,7 +254,7 @@ with WaldiezIOStream.set_default(io_stream):
 
 ## 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:
+- **autogen-agentchat**: This package conflicts with `ag2` / `pyautogen`. 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
@@ -253,7 +263,7 @@ with WaldiezIOStream.set_default(io_stream):
   If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
   
     ```shell
-    pip install --force --no-cache waldiez
+    pip install --force --no-cache waldiez pyautogen
     ```
 
 ## License

{waldiez-0.1.13 → waldiez-0.1.15}/README.md

@@ -50,7 +50,7 @@ $CONTAINER_COMMAND run \
   --rm \
   -v /path/to/a/flow.waldiez:/flow.waldiez \
   -v /path/to/an/output:/output \
-  waldiez/waldiez --export /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb] [--force]
 
 # with selinux and/or podman, you might get permission (or file not found) errors, so you can try:
 $CONTAINER_COMMAND run \
@@ -59,7 +59,7 @@ $CONTAINER_COMMAND run \
   -v /path/to/an/output:/output \
   --userns=keep-id \
   --security-opt label=disable \
-  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb]
+  waldiez/waldiez convert --file /flow.waldiez --output /output/flow[.py|.ipynb] [--force]
 ```
 
 ```shell
@@ -71,6 +71,13 @@ $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
@@ -171,7 +178,7 @@ with WaldiezIOStream.set_default(io_stream):
 
 ## 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:
+- **autogen-agentchat**: This package conflicts with `ag2` / `pyautogen`. 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
@@ -180,7 +187,7 @@ with WaldiezIOStream.set_default(io_stream):
   If already installed waldiez you might need to reinstall it after uninstalling `autogen-agentchat`:
   
     ```shell
-    pip install --force --no-cache waldiez
+    pip install --force --no-cache waldiez pyautogen
     ```
 
 ## License

{waldiez-0.1.13 → waldiez-0.1.15}/pyproject.toml

@@ -22,10 +22,11 @@ classifiers = [
   "Intended Audience :: Developers",
 ]
 dependencies =[
-    "ag2==0.4.1",
+    "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]
@@ -52,30 +53,40 @@ dev = [
     'pydocstyle==6.3.0',
     'pylint==3.3.2',
     'python-dotenv==1.0.1',
-    'ruff==0.8.1',
+    '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',
 ]
+# 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" }
+# ]
 ag2_extras =[
     'fastembed==0.4.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',
+    '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; 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',
+    'pyautogen[lmm]==0.5.0',
+    'pyautogen[mistral]==0.5.0',
+    'pyautogen[groq]==0.5.0',
+    'pyautogen[bedrock]==0.5.0',
+    '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.13 → waldiez-0.1.15}/waldiez/_version.py

@@ -1,3 +1,3 @@
 """Version information for Waldiez."""
 
-__version__ = "0.1.13"
+__version__ = "0.1.15"

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/cli.py

@@ -25,6 +25,7 @@ app = typer.Typer(
     context_settings={
         "help_option_names": ["-h", "--help"],
         "allow_extra_args": True,
+        "ignore_unknown_options": True,
     },
     add_completion=False,
     no_args_is_help=True,

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/conflict_checker.py

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

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/models/agents/group_manager/speakers.py

@@ -148,8 +148,8 @@ class WaldiezGroupManagerSpeakers(WaldiezBase):
             default_factory=dict,
             title="Allowed or disallowed transitions",
             description=(
-                "A mapping (agent.id => List[agent.ids])",
-                "with the allowed or disallowed transitions.",
+                "A mapping (agent.id => List[agent.ids])"
+                "with the allowed or disallowed transitions."
             ),
             alias="allowedOrDisallowedTransitions",
         ),

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/models/common/base.py

@@ -14,7 +14,7 @@ class WaldiezBase(BaseModel):
     """
 
     model_config = ConfigDict(
-        extra="forbid",
+        extra="ignore",
         # treat `skillId` as `skill_id`
         alias_generator=to_camel,
         # allow passing either `skill_id` or `skillId`

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/models/flow/flow_data.py

@@ -42,15 +42,27 @@ class WaldiezFlowData(WaldiezBase):
     # (they for graph connections, positions, etc.)
     nodes: Annotated[
         List[Dict[str, Any]],
-        Field(default_factory=list),
+        Field(
+            default_factory=list,
+            title="Nodes",
+            description="The nodes of the flow",
+        ),
     ]
     edges: Annotated[
         List[Dict[str, Any]],
-        Field(default_factory=list),
+        Field(
+            default_factory=list,
+            title="Edges",
+            description="The edges of the flow",
+        ),
     ]
     viewport: Annotated[
         Dict[str, Any],
-        Field(default_factory=dict),
+        Field(
+            default_factory=dict,
+            title="Viewport",
+            description="The viewport of the flow",
+        ),
     ]
     # these are the ones we use.
     agents: Annotated[

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/models/model/model_data.py

@@ -74,13 +74,70 @@ class WaldiezModelData(WaldiezBase):
             alias="baseUrl",
         ),
     ]
-    api_key: Annotated[Optional[str], Field(None, alias="apiKey")]
-    api_type: Annotated[WaldiezModelAPIType, Field("other", alias="apiType")]
-    api_version: Annotated[Optional[str], Field(None, alias="apiVersion")]
-    temperature: Annotated[Optional[float], Field(None, alias="temperature")]
-    top_p: Annotated[Optional[float], Field(None, alias="topP")]
-    max_tokens: Annotated[Optional[int], Field(None, alias="maxTokens")]
+    api_key: Annotated[
+        Optional[str],
+        Field(
+            None,
+            alias="apiKey",
+            title="API Key",
+            description="The api key to use with the model",
+        ),
+    ]
+    api_type: Annotated[
+        WaldiezModelAPIType,
+        Field(
+            "other",
+            alias="apiType",
+            title="API Type",
+            description="The api type of the model",
+        ),
+    ]
+    api_version: Annotated[
+        Optional[str],
+        Field(
+            None,
+            alias="apiVersion",
+            title="API Version",
+            description="The api version of the model",
+        ),
+    ]
+    temperature: Annotated[
+        Optional[float],
+        Field(
+            None,
+            alias="temperature",
+            title="Temperature",
+            description="The temperature of the model",
+        ),
+    ]
+    top_p: Annotated[
+        Optional[float],
+        Field(
+            None,
+            alias="topP",
+            title="Top P",
+            description="The top p of the model",
+        ),
+    ]
+    max_tokens: Annotated[
+        Optional[int],
+        Field(
+            None,
+            alias="maxTokens",
+            title="Max Tokens",
+            description="The max tokens of the model",
+        ),
+    ]
     default_headers: Annotated[
-        Dict[str, str], Field(alias="defaultHeaders", default_factory=dict)
+        Dict[str, str],
+        Field(
+            alias="defaultHeaders",
+            default_factory=dict,
+            title="Default Headers",
+            description="The default headers of the model",
+        ),
+    ]
+    price: Annotated[
+        Optional[WaldiezModelPrice],
+        Field(None, title="Price", description="The price of the model"),
     ]
-    price: Annotated[Optional[WaldiezModelPrice], Field(None)]

{waldiez-0.1.13 → waldiez-0.1.15}/waldiez/models/waldiez.py

@@ -211,16 +211,17 @@ class Waldiez:
             lambda requirement: not (
                 requirement.startswith("pyautogen")
                 or requirement.startswith("ag2")
+                or requirement.startswith("autogen")
             ),
             self.flow.requirements,
         )
         requirements = set(requirements_list)
         if self.has_rag_agents:
-            requirements.add(f"ag2[retrievechat]=={autogen_version}")
+            requirements.add(f"pyautogen[retrievechat]=={autogen_version}")
         else:
-            requirements.add(f"ag2=={autogen_version}")
+            requirements.add(f"pyautogen=={autogen_version}")
         if self.has_multimodal_agents:
-            requirements.add(f"ag2[lmm]=={autogen_version}")
+            requirements.add(f"pyautogen[lmm]=={autogen_version}")
         # ref: https://github.com/ag2ai/ag2/blob/main/setup.py
         models_with_additional_requirements = [
             "together",
@@ -234,7 +235,7 @@ class Waldiez:
         for model in self.models:
             if model.data.api_type in models_with_additional_requirements:
                 requirements.add(
-                    f"ag2[{model.data.api_type}]==" f"{autogen_version}"
+                    f"pyautogen[{model.data.api_type}]==" f"{autogen_version}"
                 )
         return list(requirements)