waldiez 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

waldiez/models/model/extra_requirements.py

@@ -39,11 +39,11 @@ def get_models_extra_requirements(
         for requirement in model.requirements:
             model_requirements.add(requirement)
         if model.data.api_type == "google":
-            model_requirements.add(f"pyautogen[gemini]=={autogen_version}")
+            model_requirements.add(f"ag2[gemini]=={autogen_version}")
             continue
         if model.data.api_type in models_with_additional_requirements:
             model_requirements.add(
-                f"pyautogen[{model.data.api_type}]=={autogen_version}"
+                f"ag2[{model.data.api_type}]=={autogen_version}"
             )
     return model_requirements
 

waldiez/models/skill/extra_requirements.py

@@ -19,6 +19,7 @@ def get_skills_extra_requirements(
         The skills.
     autogen_version : str
         The ag2 version.
+
     Returns
     -------
     List[str]
@@ -27,13 +28,9 @@ def get_skills_extra_requirements(
     skill_requirements: Set[str] = set()
     for skill in skills:
         if skill.skill_type == "langchain":
-            skill_requirements.add(
-                f"pyautogen[interop-langchain]=={autogen_version}"
-            )
+            skill_requirements.add(f"ag2[interop-langchain]=={autogen_version}")
         if skill.skill_type == "crewai":
-            skill_requirements.add(
-                f"pyautogen[interop-crewai]=={autogen_version}"
-            )
+            skill_requirements.add(f"ag2[interop-crewai]=={autogen_version}")
         for requirement in skill.requirements:
             skill_requirements.add(requirement)
     return skill_requirements

waldiez/models/waldiez.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
-"""Waldiez
+"""Waldiez data class.
 
 A Waldiez class contains all the information that is needed to generate
 and run an autogen workflow. It has the model/LLM configurations, the agent
@@ -167,7 +167,7 @@ class Waldiez:
         """Get the agents.
 
         Yields
-        -------
+        ------
         WaldiezAgent
             The flow agents.
         """
@@ -178,7 +178,7 @@ class Waldiez:
         """Get the flow skills.
 
         Yields
-        -------
+        ------
         WaldiezSkill
             The skills.
         """
@@ -189,7 +189,7 @@ class Waldiez:
         """Get the models.
 
         Yields
-        -------
+        ------
         WaldiezModel
             The flow models.
         """
@@ -230,8 +230,9 @@ class Waldiez:
         """Get the flow requirements."""
         autogen_version = get_autogen_version()
         requirements_list = filter(
-            # we use the fixed "pyautogen=={autogen_version}" below
+            # we use the fixed "ag2=={autogen_version}" below
             lambda requirement: not (
+                # cspell:disable-next-line
                 requirement.startswith("pyautogen")
                 or requirement.startswith("ag2")
                 or requirement.startswith("autogen")
@@ -239,12 +240,12 @@ class Waldiez:
             self.flow.requirements,
         )
         requirements = set(requirements_list)
-        requirements.add(f"pyautogen[openai]=={autogen_version}")
+        requirements.add(f"ag2[openai]=={autogen_version}")
         if self.has_rag_agents:
             rag_extras = get_retrievechat_extra_requirements(self.agents)
             requirements.update(rag_extras)
         if self.has_multimodal_agents:
-            requirements.add(f"pyautogen[lmm]=={autogen_version}")
+            requirements.add(f"ag2[lmm]=={autogen_version}")
         if self.has_captain_agents:
             # pysqlite3-binary might not get installed on windows
             captain_extras = [
@@ -276,7 +277,7 @@ class Waldiez:
                 autogen_version=autogen_version,
             )
         )
-        return sorted(list(requirements))
+        return sorted(requirements)
 
     def get_flow_env_vars(self) -> List[Tuple[str, str]]:
         """Get the flow environment variables.

waldiez/runner.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 """Run a waldiez flow.
+
 The flow is first converted to an autogen flow with agents, chats and skills.
 We then chown to temporary directory, call the flow's `main()` and
 return the results. Before running the flow, any additional environment
@@ -144,9 +145,9 @@ class WaldiezRunner:
         Set[str]
             The extra requirements.
         """
-        extra_requirements = set(
+        extra_requirements = {
             req for req in self.waldiez.requirements if req not in sys.modules
-        )
+        }
         if self.waldiez.has_captain_agents:
             check_pysqlite3()
         return extra_requirements
@@ -185,6 +186,7 @@ class WaldiezRunner:
             The runtime uploads root.
         skip_mmd : bool
             Whether to skip the Mermaid diagram generation.
+
         Returns
         -------
         Union[ChatResult, List[ChatResult]]

waldiez/running/__init__.py

@@ -4,6 +4,7 @@
 
 from .environment import (
     in_virtualenv,
+    is_root,
     refresh_environment,
     reset_env_vars,
     set_env_vars,
@@ -26,6 +27,7 @@ __all__ = [
     "chdir",
     "get_printer",
     "in_virtualenv",
+    "is_root",
     "install_requirements",
     "refresh_environment",
     "reset_env_vars",

waldiez/running/environment.py

@@ -25,6 +25,26 @@ def in_virtualenv() -> bool:
     )
 
 
+def is_root() -> bool:
+    """Check if the script is running as root/administrator.
+
+    Returns
+    -------
+    bool
+        True if running as root/administrator, False otherwise.
+    """
+    # pylint: disable=import-outside-toplevel,line-too-long
+    if os.name == "nt":
+        try:
+            import ctypes
+
+            return ctypes.windll.shell32.IsUserAnAdmin() != 0  # type: ignore[unused-ignore,attr-defined]  # noqa: E501
+        except Exception:  # pylint: disable=broad-exception-caught
+            return False
+    else:
+        return os.getuid() == 0
+
+
 def refresh_environment() -> None:
     """Refresh the environment."""
     with warnings.catch_warnings():
@@ -70,7 +90,7 @@ def refresh_environment() -> None:
 
             @contextlib.contextmanager
             def _np_no_nep50_warning() -> Generator[None, None, None]:
-                """Dummy function to avoid the warning.
+                """Avoid no_nep50 warning.
 
                 Yields
                 ------

waldiez/running/gen_seq_diagram.py

@@ -69,12 +69,12 @@ def process_events(df_events: pd.DataFrame) -> str:
     ----------
     df_events : pd.DataFrame
         The DataFrame containing the events data.
+
     Returns
     -------
     str
         The Mermaid sequence diagram text.
     """
-
     # Set to store participants (senders and recipients)
     participants: Set[str] = set()
     recipient: str
@@ -150,7 +150,7 @@ def save_diagram(mermaid_text: str, output_path: Union[str, Path]) -> None:
 def generate_sequence_diagram(
     file_path: Union[str, Path], output_path: Union[str, Path]
 ) -> None:
-    """Main function to generate the Mermaid diagram.
+    """Generate the Mermaid diagram.
 
     Parameters
     ----------
@@ -163,6 +163,7 @@ def generate_sequence_diagram(
     ------
     FileNotFoundError
         If the input file is not found.
+
     ValueError
         If the input file is not a JSON or CSV file.
     """

waldiez/running/running.py

@@ -23,7 +23,7 @@ from typing import (
     Union,
 )
 
-from .environment import in_virtualenv
+from .environment import in_virtualenv, is_root
 from .gen_seq_diagram import generate_sequence_diagram
 
 # pylint: disable=import-outside-toplevel
@@ -126,7 +126,8 @@ def install_requirements(
         # but it might fail if we don't
         break_system_packages = os.environ.get("PIP_BREAK_SYSTEM_PACKAGES", "")
         os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = "1"
-        pip_install.append("--user")
+        if not is_root():
+            pip_install.append("--user")
     pip_install.extend(extra_requirements)
     # pylint: disable=too-many-try-statements
     try:

waldiez/utils/__init__.py

@@ -6,10 +6,12 @@ from .cli_extras import add_cli_extras
 from .conflict_checker import check_conflicts
 from .flaml_warnings import check_flaml_warnings
 from .pysqlite3_checker import check_pysqlite3
+from .rdps_checker import check_rpds_py
 
 __all__ = [
     "check_conflicts",
     "check_flaml_warnings",
     "add_cli_extras",
     "check_pysqlite3",
+    "check_rpds_py",
 ]

waldiez/utils/conflict_checker.py

@@ -17,11 +17,11 @@ def _check_conflicts() -> None:  # pragma: no cover
         print(
             "Conflict detected: 'autogen-agentchat' is installed "
             "in the current environment, \n"
-            "which conflicts with 'ag2' / 'pyautogen'.\n"
+            "which conflicts with 'ag2'.\n"
             "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",
+            "And install 'ag2' (and/or 'waldiez') again: \n"
+            f"{sys.executable} -m pip install --force ag2 waldiez",
             file=sys.stderr,
         )
         sys.exit(1)

waldiez/utils/pysqlite3_checker.py

@@ -8,6 +8,7 @@ Highly recommended to be run in a virtual environment.
 'setuptools' and 'wheel' will also be installed if not already installed.
 """
 
+import contextlib
 import os
 import platform
 import shutil
@@ -22,10 +23,10 @@ PYSQLITE3_VERSION = "0.5.4"
 SQLITE_URL = "https://www.sqlite.org/2025/sqlite-amalgamation-3480000.zip"
 PYSQLITE3_URL = f"https://github.com/coleifer/pysqlite3/archive/refs/tags/{PYSQLITE3_VERSION}.zip"  # pylint: disable=line-too-long
 
-PIP = f"{sys.executable} -m pip"
+PIP = [sys.executable, "-m", "pip"]
 
 
-def run_command(command: str, cwd: str = ".") -> None:
+def run_command(command: list[str], cwd: str = ".") -> None:
     """Run a command.
 
     Parameters
@@ -35,12 +36,11 @@ def run_command(command: str, cwd: str = ".") -> None:
     cwd : str
         The current working directory.
     """
-    cmd_parts = command.split(" ")
     if cwd == ".":
         cwd = os.getcwd()
     try:
         subprocess.run(  # nosemgrep  # nosec
-            cmd_parts,
+            command,
             check=True,
             cwd=cwd,
             env=os.environ,
@@ -64,6 +64,26 @@ def in_virtualenv() -> bool:
     )
 
 
+def is_root() -> bool:
+    """Check if the script is running as root/administrator.
+
+    Returns
+    -------
+    bool
+        True if running as root/administrator, False otherwise.
+    """
+    # pylint: disable=import-outside-toplevel,line-too-long
+    if os.name == "nt":
+        try:
+            import ctypes
+
+            return ctypes.windll.shell32.IsUserAnAdmin() != 0  # type: ignore[unused-ignore,attr-defined]  # noqa: E501
+        except Exception:  # pylint: disable=broad-exception-caught
+            return False
+    else:
+        return os.getuid() == 0
+
+
 def pip_install(*package_names: str, cwd: str = ".") -> None:
     """Install packages using pip.
 
@@ -74,11 +94,19 @@ def pip_install(*package_names: str, cwd: str = ".") -> None:
     cwd : str
         The current working directory.
     """
-    args = "-qq"
+    args = ["install", "-qq"]
+    break_system_packages = ""
+    if not in_virtualenv():
+        break_system_packages = os.environ.get("PIP_BREAK_SYSTEM_PACKAGES", "")
+        os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = "1"
+        if not is_root():
+            args.append("--user")
+    run_command(PIP + args + list(package_names), cwd)
     if not in_virtualenv():
-        args += " --user --break-system-packages"
-    package_names_str = " ".join(package_names)
-    run_command(f"{PIP} install {args} {package_names_str}", cwd)
+        if break_system_packages:
+            os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = break_system_packages
+        else:
+            os.environ.pop("PIP_BREAK_SYSTEM_PACKAGES", None)
 
 
 def pip_uninstall(*package_names: str, cwd: str = ".") -> None:
@@ -91,11 +119,17 @@ def pip_uninstall(*package_names: str, cwd: str = ".") -> None:
     cwd : str
         The current working directory.
     """
-    args = "-qq --yes"
+    args = ["uninstall", "-qq", "--yes"]
+    break_system_packages = ""
     if not in_virtualenv():
-        args += " --break-system-packages"
-    package_names_str = " ".join(package_names)
-    run_command(f"{PIP} uninstall {args} {package_names_str}", cwd)
+        break_system_packages = os.environ.get("PIP_BREAK_SYSTEM_PACKAGES", "")
+        os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = "1"
+    run_command(PIP + args + list(package_names), cwd)
+    if not in_virtualenv():
+        if break_system_packages:
+            os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = break_system_packages
+        else:
+            os.environ.pop("PIP_BREAK_SYSTEM_PACKAGES", None)
 
 
 def download_sqlite_amalgamation() -> str:
@@ -187,15 +221,23 @@ def install_pysqlite3(sqlite_amalgamation_path: str) -> None:
     try:
         pysqlite3_dir = prepare_pysqlite3(sqlite_amalgamation_path)
         pip_install("setuptools")
-        run_command(f"{sys.executable} setup.py build_static", pysqlite3_dir)
-        pip_install("wheel")
-        run_command(
-            f"{PIP} wheel . -w dist",
-            pysqlite3_dir,
-        )
-        wheel_file = os.listdir(os.path.join(pysqlite3_dir, "dist"))[0]
-        wheel_path = os.path.join("dist", wheel_file)
-        pip_install(wheel_path, cwd=pysqlite3_dir)
+        # let's suppress logs
+        with open(os.devnull, "w", encoding="utf-8") as devnull:
+            with (
+                contextlib.redirect_stdout(devnull),
+                contextlib.redirect_stderr(devnull),
+            ):
+                run_command(
+                    [sys.executable, "setup.py", "build_static"], pysqlite3_dir
+                )
+                pip_install("wheel")
+                run_command(
+                    PIP + ["wheel", ".", "-w", "dist"],
+                    pysqlite3_dir,
+                )
+                wheel_file = os.listdir(os.path.join(pysqlite3_dir, "dist"))[0]
+                wheel_path = os.path.join("dist", wheel_file)
+                pip_install(wheel_path, cwd=pysqlite3_dir)
     except BaseException as e:  # pylint: disable=broad-except
         print(f"Failed to install pysqlite3: {e}")
         sys.exit(1)

waldiez/utils/rdps_checker.py

@@ -0,0 +1,122 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""
+Check for rpds-py on Windows ARM64.
+
+Since we cannot use direct git dependency for `rpds-py` in `pyproject.toml`,
+let's check it here.
+
+NOTE: We should regularly check if this is still needed.
+"""
+# pylint: disable=import-outside-toplevel,unused-import
+
+# "rpds-py @ git+https://github.com/crate-py/rpds.git@v0.24.0 ;
+# sys_platform == "win32" and platform_machine == "AARCH64"",
+
+import os
+import platform
+import subprocess
+import sys
+
+PIP = [sys.executable, "-m", "pip"]
+RDPS_PY_VERSION = "0.24.0"
+RDPS_PY_URL = f"git+https://github.com/crate-py/rpds.git@{RDPS_PY_VERSION}"
+
+
+def is_windows_arm64() -> bool:
+    """Check if the current platform is Windows ARM64.
+
+    Returns
+    -------
+    bool
+        True if the platform is Windows ARM64, False otherwise.
+    """
+    return sys.platform == "win32" and platform.machine().lower() in [
+        "arm64",
+        "aarch64",
+    ]
+
+
+def is_rpds_py_installed() -> bool:
+    """Check if `rpds-py` is installed.
+
+    Returns
+    -------
+    bool
+        True if `rpds-py` is installed, False otherwise.
+    """
+    try:
+        import rpds  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
+def is_root() -> bool:
+    """Check if the script is running as root/administrator.
+
+    Returns
+    -------
+    bool
+        True if running as root/administrator, False otherwise.
+    """
+    # pylint: disable=import-outside-toplevel,line-too-long
+    if os.name == "nt":
+        try:
+            import ctypes
+
+            return ctypes.windll.shell32.IsUserAnAdmin() != 0  # type: ignore[unused-ignore,attr-defined]  # noqa: E501
+        except Exception:  # pylint: disable=broad-exception-caught
+            return False
+    else:
+        return os.getuid() == 0
+
+
+def in_virtualenv() -> bool:
+    """Check if the current environment is a virtual environment.
+
+    Returns
+    -------
+    bool
+        True if in a virtual environment, False otherwise.
+    """
+    return hasattr(sys, "real_prefix") or (
+        hasattr(sys, "base_prefix")
+        and os.path.realpath(sys.base_prefix) != os.path.realpath(sys.prefix)
+    )
+
+
+def install_rpds_py() -> None:
+    """Install `rpds-py`."""
+    command = PIP + ["install", "-qq"]
+    if not in_virtualenv():
+        break_system_packages = os.environ.get("PIP_BREAK_SYSTEM_PACKAGES", "")
+        os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = "1"
+        if not is_root():
+            command.append("--user")
+    command.append(RDPS_PY_URL)
+    try:
+        subprocess.check_call(command)
+    except subprocess.CalledProcessError as e:
+        print(f"Failed to install rpds-py: {e}")
+    finally:
+        if not in_virtualenv():
+            # restore the old env var
+            if break_system_packages:
+                os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = break_system_packages
+            else:
+                del os.environ["PIP_BREAK_SYSTEM_PACKAGES"]
+
+
+def check_rpds_py() -> None:
+    """Check if `rpds-py` is installed on Windows ARM64."""
+    if not is_windows_arm64():
+        return
+    if is_rpds_py_installed():
+        return
+    install_rpds_py()
+
+
+if __name__ == "__main__":
+    check_rpds_py()