waldiez 0.3.10__tar.gz → 0.3.12__tar.gz

{waldiez-0.3.10 → waldiez-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldiez
-Version: 0.3.10
+Version: 0.3.12
 Summary: waldiez
 Project-URL: homepage, https://waldiez.github.io/waldiez/python
 Project-URL: repository, https://github.com/waldiez/python.git
@@ -20,38 +20,47 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.10
 Requires-Dist: aiocsv==1.3.2
 Requires-Dist: aiofiles==24.1.0
-Requires-Dist: aiosqlite==0.20.0
+Requires-Dist: aiosqlite==0.21.0
 Requires-Dist: asyncer==0.0.8
 Requires-Dist: graphviz==0.20.3
 Requires-Dist: httpx<1
 Requires-Dist: jupytext
 Requires-Dist: pandas>=2
 Requires-Dist: parso==0.8.4
-Requires-Dist: pyautogen==0.7.2
+Requires-Dist: pyautogen==0.7.3
 Requires-Dist: pydantic<3,>=2.6.1
 Requires-Dist: typer<0.16,>=0.9
 Provides-Extra: ag2-extras
-Requires-Dist: autogen[captainagent]==0.7.2; (platform_system == 'Linux') and extra == 'ag2-extras'
-Requires-Dist: chromadb; (platform_system != 'Linux') and extra == 'ag2-extras'
-Requires-Dist: huggingface-hub>=0.0.17; (platform_system != 'Linux') and extra == 'ag2-extras'
+Requires-Dist: beautifulsoup4; extra == 'ag2-extras'
+Requires-Dist: chromadb>=0.5.23; extra == 'ag2-extras'
+Requires-Dist: crewai-tools==0.33.0; extra == 'ag2-extras'
+Requires-Dist: crewai>0.98.0; extra == 'ag2-extras'
+Requires-Dist: embedchain==0.1.126; extra == 'ag2-extras'
+Requires-Dist: huggingface-hub; extra == 'ag2-extras'
+Requires-Dist: ipython; extra == 'ag2-extras'
+Requires-Dist: langchain-community<1,>=0.3.12; extra == 'ag2-extras'
+Requires-Dist: markdownify; extra == 'ag2-extras'
 Requires-Dist: pgvector>=0.3.6; extra == 'ag2-extras'
+Requires-Dist: protobuf>=4.25.3; extra == 'ag2-extras'
 Requires-Dist: psycopg[binary]>=3.2.3; extra == 'ag2-extras'
-Requires-Dist: pyautogen[anthropic]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[bedrock]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[gemini]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[groq]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[lmm]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[mistral]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[neo4j]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-mongodb]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-pgvector]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat-qdrant]==0.7.2; (python_version < '3.13') and extra == 'ag2-extras'
-Requires-Dist: pyautogen[retrievechat]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[together]==0.7.2; extra == 'ag2-extras'
-Requires-Dist: pyautogen[websurfer]==0.7.2; 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'
-Requires-Dist: sentence-transformers>=2.0.0; (platform_system != 'Linux') and extra == 'ag2-extras'
+Requires-Dist: psycopg[binary]>=3.2.4; extra == 'ag2-extras'
+Requires-Dist: pyautogen[anthropic]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[bedrock]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[cohere]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[gemini]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[groq]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[lmm]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[mistral]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[neo4j]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[ollama]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[together]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pyautogen[websurfer]==0.7.3; extra == 'ag2-extras'
+Requires-Dist: pydantic-ai==0.0.21; extra == 'ag2-extras'
+Requires-Dist: pymongo>=4.11; extra == 'ag2-extras'
+Requires-Dist: pypdf; extra == 'ag2-extras'
+Requires-Dist: qdrant-client[fastembed]; extra == 'ag2-extras'
+Requires-Dist: sentence-transformers; extra == 'ag2-extras'
+Requires-Dist: weaviate-client==4.10.2; extra == 'ag2-extras'
 Provides-Extra: dev
 Requires-Dist: autoflake==2.3.1; extra == 'dev'
 Requires-Dist: bandit==1.8.2; extra == 'dev'
@@ -64,7 +73,7 @@ Requires-Dist: pre-commit==4.1.0; extra == 'dev'
 Requires-Dist: pydocstyle==6.3.0; extra == 'dev'
 Requires-Dist: pylint==3.3.4; extra == 'dev'
 Requires-Dist: python-dotenv==1.0.1; extra == 'dev'
-Requires-Dist: ruff==0.9.3; extra == 'dev'
+Requires-Dist: ruff==0.9.4; extra == 'dev'
 Requires-Dist: toml; (python_version <= '3.10') and extra == 'dev'
 Requires-Dist: types-pyyaml==6.0.12.20241230; extra == 'dev'
 Requires-Dist: types-toml==0.10.8.20240310; extra == 'dev'
@@ -74,16 +83,16 @@ 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.50; extra == 'docs'
-Requires-Dist: mkdocs-minify-html-plugin==0.2.3; extra == 'docs'
+Requires-Dist: mkdocs-material==9.6.2; extra == 'docs'
+Requires-Dist: mkdocs-minify-html-plugin==0.2.4; extra == 'docs'
 Requires-Dist: mkdocs==1.6.1; extra == 'docs'
-Requires-Dist: mkdocstrings-python==1.13.0; extra == 'docs'
-Requires-Dist: mkdocstrings[crystal,python]==0.27.0; extra == 'docs'
+Requires-Dist: mkdocstrings-python==1.14.1; extra == 'docs'
+Requires-Dist: mkdocstrings[crystal,python]==0.28.0; extra == 'docs'
 Provides-Extra: jupyter
 Requires-Dist: jupyterlab>=4.3.0; extra == 'jupyter'
-Requires-Dist: waldiez-jupyter==0.3.10; extra == 'jupyter'
+Requires-Dist: waldiez-jupyter==0.3.12; extra == 'jupyter'
 Provides-Extra: studio
-Requires-Dist: waldiez-studio==0.3.10; extra == 'studio'
+Requires-Dist: waldiez-studio==0.3.12; extra == 'studio'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio==0.25.3; extra == 'test'
 Requires-Dist: pytest-cov==6.0.0; extra == 'test'

{waldiez-0.3.10 → waldiez-0.3.12}/pyproject.toml

@@ -24,15 +24,14 @@ classifiers = [
 dependencies =[
     "aiocsv==1.3.2",
     "aiofiles==24.1.0",
-    "aiosqlite==0.20.0",
+    "aiosqlite==0.21.0",
     "asyncer==0.0.8",
     "graphviz==0.20.3",
     "pandas>=2",
-    "pyautogen==0.7.2",
+    "pyautogen==0.7.3",
     "jupytext",
     "parso==0.8.4",
     "pydantic>=2.6.1,<3",
-    # together(ag2 extra) 1.2.0 depends on typer<0.13 and >=0.9
     "typer>=0.9,<0.16",
     "httpx<1",
 ]
@@ -51,10 +50,10 @@ exclude = [ "**/example.py" ]
 
 [project.optional-dependencies]
 studio = [
-    "waldiez_studio==0.3.10",
+    "waldiez_studio==0.3.12",
 ]
 jupyter = [
-    "waldiez_jupyter==0.3.10",
+    "waldiez_jupyter==0.3.12",
     "jupyterlab>=4.3.0",
 ]
 dev = [
@@ -69,58 +68,46 @@ dev = [
     'pydocstyle==6.3.0',
     'pylint==3.3.4',
     'python-dotenv==1.0.1',
-    'ruff==0.9.3',
+    'ruff==0.9.4',
     'types-PyYAML==6.0.12.20241230',
     '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
-#
-# 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 =[
+    # models
+    'pyautogen[anthropic]==0.7.3',
+    'pyautogen[bedrock]==0.7.3',
+    'pyautogen[cohere]==0.7.3',
+    'pyautogen[gemini]==0.7.3',
+    'pyautogen[groq]==0.7.3',
+    'pyautogen[lmm]==0.7.3',
+    'pyautogen[mistral]==0.7.3',
+    'pyautogen[ollama]==0.7.3',
+    'pyautogen[together]==0.7.3',
+    # utils
+    'pyautogen[neo4j]==0.7.3',
+    'pyautogen[websurfer]==0.7.3',
+    'chromadb>=0.5.23',
     'pgvector>=0.3.6',
     'psycopg[binary]>=3.2.3',
-    'pyautogen[anthropic]==0.7.2',
-    'pyautogen[bedrock]==0.7.2',
-    'autogen[captainagent]==0.7.2; platform_system == "Linux"',
-    'chromadb; platform_system != "Linux"',
-    'sentence-transformers>=2.0.0; platform_system != "Linux"',
-    'huggingface-hub>=0.0.17; platform_system != "Linux"',
-    'pyautogen[gemini]==0.7.2',
-    'pyautogen[groq]==0.7.2',
-    'pyautogen[lmm]==0.7.2',
-    'pyautogen[mistral]==0.7.2',
-    'pyautogen[neo4j]==0.7.2',
-    'pyautogen[retrievechat-mongodb]==0.7.2',
-    'pyautogen[retrievechat-pgvector]==0.7.2',
-    'pyautogen[retrievechat-qdrant]==0.7.2; python_version < "3.13"',
-    'qdrant-client[fastembed]; python_version >= "3.13"',
-    'pyautogen[retrievechat]==0.7.2',
-    'pyautogen[together]==0.7.2',
-    'pyautogen[together]==0.7.2',
-    'pyautogen[websurfer]==0.7.2',
-    'pymongo>=4.10.1',
+    'protobuf>=4.25.3',
+    'pypdf',
+    'ipython',
+    'markdownify',
+    'beautifulsoup4',
+    'sentence-transformers',
+    'huggingface-hub',
+    'qdrant-client[fastembed]',
+    'pgvector>=0.3.6',
+    'psycopg[binary]>=3.2.4',
+    'crewai-tools==0.33.0',
+    'embedchain==0.1.126',
+    'crewai>0.98.0',
+    'weaviate-client==4.10.2',
+    'langchain-community>=0.3.12,<1',
+    'pydantic-ai==0.0.21',
+    'pymongo>=4.11',
 ]
 test = [
     'pytest==8.3.4',
@@ -137,10 +124,10 @@ docs = [
   'mkdocs==1.6.1',
   'mkdocs-jupyter==0.25.1',
   'mkdocs-macros-plugin==1.3.7',
-  'mkdocs-material==9.5.50',
-  'mkdocs-minify-html-plugin==0.2.3',
-  'mkdocstrings[crystal,python]==0.27.0',
-  'mkdocstrings-python==1.13.0'
+  'mkdocs-material==9.6.2',
+  'mkdocs-minify-html-plugin==0.2.4',
+  'mkdocstrings[crystal,python]==0.28.0',
+  'mkdocstrings-python==1.14.1'
 ]
 
 [project.scripts]

{waldiez-0.3.10 → waldiez-0.3.12}/waldiez/_version.py

@@ -2,4 +2,4 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Version information for Waldiez."""
 
-__version__ = "0.3.10"
+__version__ = "0.3.12"

{waldiez-0.3.10 → waldiez-0.3.12}/waldiez/exporter.py

@@ -6,21 +6,12 @@ to an autogen's flow with one or more chats.
 
 The resulting file(s): a `flow.py` file with one `main()` function
 to trigger the chat(s).
-If additional tools/skills are used,
-they are exported as their `skill_name` in the same directory with
-the `flow.py` file. So the `flow.py` could have entries like:
-`form {flow_name}_{skill1_name} import {skill1_name}`
-`form {flow_name}_{skill2_name} import {skill2_name}`
 """
 
-# pylint: disable=inconsistent-quotes
-
-import os
-import shutil
-import subprocess
-import sys
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import Union
+
+import jupytext  # type: ignore[import-untyped]
 
 from .exporting import FlowExporter
 from .models import Waldiez
@@ -125,25 +116,10 @@ class WaldiezExporter:
         py_path = path.with_suffix(".tmp.py")
         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(
-                [sys.executable, "-m", "pip", "install", "jupytext"],
-                allow_error=False,
-            )
-        run_command(
-            [
-                sys.executable,
-                "-m",
-                "jupytext",
-                "--to",
-                "notebook",
-                str(py_path),
-            ],
-            allow_error=False,
-        )
+        with open(py_path, "r", encoding="utf-8") as py_out:
+            content = jupytext.read(py_out, fmt="py:light")
         ipynb_path = str(py_path).replace(".tmp.py", ".tmp.ipynb")
-        if not os.path.exists(ipynb_path):  # pragma: no cover
-            raise RuntimeError("Could not generate notebook")
+        jupytext.write(content, ipynb_path, fmt="ipynb")
         Path(ipynb_path).rename(ipynb_path.replace(".tmp.ipynb", ".ipynb"))
         py_path.unlink(missing_ok=True)
 
@@ -182,42 +158,3 @@ class WaldiezExporter:
         """
         with open(file_path, "w", encoding="utf-8", newline="\n") as file:
             file.write(self.waldiez.model_dump_json())
-
-
-def run_command(
-    cmd: List[str],
-    cwd: Optional[Path] = None,
-    allow_error: bool = True,
-) -> None:
-    """Run a command.
-
-    Parameters
-    ----------
-    cmd : List[str]
-        The command to run.
-    cwd : Path, optional
-        The working directory, by default None (current working directory).
-    allow_error : bool, optional
-        Whether to allow errors, by default True.
-
-    Raises
-    ------
-    RuntimeError
-        If the command fails and allow_error is False.
-    """
-    if not cwd:
-        cwd = Path.cwd()
-    # pylint: disable=broad-except
-    try:
-        subprocess.run(
-            cmd,
-            check=True,
-            cwd=cwd,
-            env=os.environ,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-        )  # nosemgrep # nosec
-    except BaseException as error:  # pragma: no cover
-        if allow_error:
-            return
-        raise RuntimeError(f"Error running command: {error}") from error

{waldiez-0.3.10 → waldiez-0.3.12}/waldiez/exporting/agent/agent_exporter.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
-from waldiez.models import WaldiezAgent, WaldiezChat
+from waldiez.models import WaldiezAgent, WaldiezChat, WaldiezModel
 
 from ..base import (
     AgentPosition,
@@ -18,9 +18,8 @@ from ..base import (
     ImportPosition,
 )
 from .utils import (
-    get_agent_class_name,
     get_agent_code_execution_config,
-    get_agent_imports,
+    get_captain_agent_extras,
     get_group_manager_extras,
     get_is_termination_message,
     get_rag_user_extras,
@@ -36,9 +35,9 @@ class AgentExporter(BaseExporter, ExporterMixin):
         self,
         agent: WaldiezAgent,
         agent_names: Dict[str, str],
-        model_names: Dict[str, str],
-        skill_names: Dict[str, str],
+        models: Tuple[List[WaldiezModel], Dict[str, str]],
         chats: Tuple[List[WaldiezChat], Dict[str, str]],
+        skill_names: Dict[str, str],
         is_async: bool,
         group_chat_members: List[WaldiezAgent],
         for_notebook: bool,
@@ -53,12 +52,12 @@ class AgentExporter(BaseExporter, ExporterMixin):
             The agent to export.
         agent_names : Dict[str, str]
             The agent ids to names mapping.
-        model_names : Dict[str, str]
-            The model ids to names mapping.
-        skill_names : Dict[str, str]
-            The skill ids to names mapping.
+        models : Tuple[List[WaldiezModel], Dict[str, str]]
+            All the models and the model ids to names mapping.
         chats : Tuple[List[WaldiezChat], Dict[str, str]]
             All the chats and the chat ids to names mapping.
+        skill_names : Dict[str, str]
+            The skill ids to names mapping.
         is_async : bool
             Whether the whole flow is async.
         for_notebook : bool
@@ -72,14 +71,14 @@ class AgentExporter(BaseExporter, ExporterMixin):
         if output_dir is not None and not isinstance(output_dir, Path):
             output_dir = Path(output_dir)
         self.output_dir = output_dir
-        self.model_names = model_names
+        self.models = models[0]
+        self.model_names = models[1]
         self.skill_names = skill_names
         self.arguments_resolver = arguments_resolver
         self.group_chat_members = group_chat_members
         self.chats = chats
         self.is_async = is_async
         self._agent_name = agent_names[agent.id]
-        self._agent_class = get_agent_class_name(self.agent)
         # content, argument, import
         self._code_execution = get_agent_code_execution_config(
             agent=self.agent,
@@ -119,6 +118,13 @@ class AgentExporter(BaseExporter, ExporterMixin):
             agent=self.agent,
             serializer=self.serializer,
         )
+        self._captain = get_captain_agent_extras(
+            agent=self.agent,
+            agent_names=self.agent_names,
+            all_models=self.models,
+            serializer=self.serializer,
+            output_dir=self.output_dir,
+        )
 
     def get_imports(self) -> Optional[List[Tuple[str, ImportPosition]]]:
         """Get the imports.
@@ -130,7 +136,7 @@ class AgentExporter(BaseExporter, ExporterMixin):
         """
         position = ImportPosition.THIRD_PARTY
         # default imports based on the agent class.
-        agent_imports = get_agent_imports(self._agent_class)
+        agent_imports = self.agent.ag2_imports
         # if code execution is enabled, update the imports.
         if self._code_execution[2]:
             agent_imports.add(self._code_execution[2])
@@ -220,7 +226,6 @@ class AgentExporter(BaseExporter, ExporterMixin):
         """
         agent = self.agent
         agent_name = self._agent_name
-        agent_class = self._agent_class
         retrieve_arg = self._rag[1]
         group_chat_arg = self._group_chat[1]
         is_termination = self._termination[0]
@@ -231,8 +236,10 @@ class AgentExporter(BaseExporter, ExporterMixin):
             default_auto_reply = (
                 f'"{self.string_escape(agent.data.agent_default_auto_reply)}"'
             )
-        extras = f"{group_chat_arg}{retrieve_arg}{self._reasoning}"
-        agent_str = f"""{agent_name} = {agent_class}(
+        extras = (
+            f"{group_chat_arg}{retrieve_arg}{self._reasoning}{self._captain}"
+        )
+        agent_str = f"""{agent_name} = {self.agent.ag2_class}(
     name="{agent_name}",
     description="{agent.description}"{system_message_arg},
     human_input_mode="{agent.data.human_input_mode}",

{waldiez-0.3.10 → waldiez-0.3.12}/waldiez/exporting/agent/utils/__init__.py

@@ -2,8 +2,7 @@
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Utility functions for generating agent related strings."""
 
-from .agent_class_name import get_agent_class_name
-from .agent_imports import get_agent_imports
+from .captain_agent import get_captain_agent_extras
 from .code_execution import get_agent_code_execution_config
 from .group_manager import get_group_manager_extras
 from .rag_user import get_rag_user_extras
@@ -13,10 +12,9 @@ from .teachability import get_agent_teachability_string
 from .termination_message import get_is_termination_message
 
 __all__ = [
-    "get_agent_class_name",
-    "get_agent_imports",
     "get_agent_code_execution_config",
     "get_agent_teachability_string",
+    "get_captain_agent_extras",
     "get_group_manager_extras",
     "get_is_termination_message",
     "get_rag_user_extras",