waldiez 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

waldiez/running/environment.py

@@ -26,24 +26,30 @@ def in_virtualenv() -> bool:
 
 def refresh_environment() -> None:
     """Refresh the environment."""
-    # backup the default IOStream
-    from autogen.io import IOStream  # type: ignore
+    with warnings.catch_warnings():
+        warnings.filterwarnings(
+            "ignore",
+            module="flaml",
+            message="^.*flaml.automl is not available.*$",
+        )
+        from autogen.io import IOStream  # type: ignore
 
-    default_io_stream = IOStream.get_default()
-    site.main()
-    # pylint: disable=import-outside-toplevel
-    modules_to_reload = [mod for mod in sys.modules if "autogen" in mod]
-    for mod in modules_to_reload:
-        del sys.modules[mod]
-    warnings.filterwarnings(
-        "ignore", module="flaml", message="^.*flaml.automl is not available.*$"
-    )
-    import autogen  # type: ignore
-    from autogen.io import IOStream
+        default_io_stream = IOStream.get_default()
+        site.main()
+        # pylint: disable=import-outside-toplevel
+        modules_to_reload = [mod for mod in sys.modules if "autogen" in mod]
+        for mod in modules_to_reload:
+            del sys.modules[mod]
+        import autogen  # type: ignore
+        from autogen.io import IOStream
 
-    importlib.reload(autogen)
-    # restore the default IOStream
-    IOStream.set_global_default(default_io_stream)
+        importlib.reload(autogen)
+        # restore the default IOStream
+        IOStream.set_global_default(default_io_stream)
+        # reload any other modules that may have been affected
+        for mod in modules_to_reload:
+            if mod not in sys.modules:
+                importlib.import_module(mod)
 
 
 def set_env_vars(flow_env_vars: List[Tuple[str, str]]) -> Dict[str, str]:

waldiez/running/gen_seq_diagram.py

@@ -173,10 +173,13 @@ def generate_sequence_diagram(
     if file_path.suffix not in [".json", ".csv"]:
         raise ValueError("Input file must be a JSON or CSV file.")
     is_csv = file_path.suffix == ".csv"
-    if is_csv:
-        df_events = pd.read_csv(file_path)
-    else:
-        df_events = pd.read_json(file_path)
+    try:
+        if is_csv:
+            df_events = pd.read_csv(file_path)
+        else:
+            df_events = pd.read_json(file_path)
+    except pd.errors.EmptyDataError:
+        return
 
     # Generate the Mermaid sequence diagram text
     mermaid_text = process_events(df_events)

waldiez/running/running.py

@@ -10,6 +10,7 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import warnings
 from contextlib import asynccontextmanager, contextmanager
 from pathlib import Path
 from typing import (
@@ -157,7 +158,7 @@ async def a_install_requirements(
     printer(f"Installing requirements: {requirements_string}")
     pip_install = [sys.executable, "-m", "pip", "install"]
     if not in_virtualenv():
-        pip_install.append("--user")
+        pip_install.extend(["--user", "--break-system-packages"])
     pip_install.extend(extra_requirements)
     proc = await asyncio.create_subprocess_exec(
         *pip_install,
@@ -198,15 +199,14 @@ def after_run(
     if isinstance(output_path, str):
         output_path = Path(output_path)
     output_dir = output_path.parent if output_path else Path.cwd()
-    if output_dir.is_file():
-        output_dir = output_dir.parent
     if skip_mmd is False:
         events_csv_path = temp_dir / "logs" / "events.csv"
         if events_csv_path.exists():
             printer("Generating mermaid sequence diagram...")
             mmd_path = temp_dir / f"{flow_name}.mmd"
             generate_sequence_diagram(events_csv_path, mmd_path)
-            shutil.copyfile(mmd_path, output_dir / f"{flow_name}.mmd")
+            if mmd_path.exists():
+                shutil.copyfile(mmd_path, output_dir / f"{flow_name}.mmd")
     if output_path:
         destination_dir = output_path.parent
         destination_dir = (
@@ -217,23 +217,65 @@ def after_run(
         destination_dir.mkdir(parents=True, exist_ok=True)
         # copy the contents of the temp dir to the destination dir
         printer(f"Copying the results to {destination_dir}")
-        for item in temp_dir.iterdir():
-            # skip cache files
-            if (
-                item.name.startswith("__pycache__")
-                or item.name.endswith(".pyc")
-                or item.name.endswith(".pyo")
-                or item.name.endswith(".pyd")
-                or item.name == ".cache"
-            ):
-                continue
-            if item.is_file():
-                shutil.copy(item, destination_dir)
-            else:
-                shutil.copytree(item, destination_dir / item.name)
+        copy_results(
+            temp_dir=temp_dir,
+            output_path=output_path,
+            output_dir=output_dir,
+            destination_dir=destination_dir,
+        )
     shutil.rmtree(temp_dir)
 
 
+def copy_results(
+    temp_dir: Path,
+    output_path: Path,
+    output_dir: Path,
+    destination_dir: Path,
+) -> None:
+    """Copy the results to the output directory.
+
+    Parameters
+    ----------
+    temp_dir : Path
+        The temporary directory.
+    output_path : Path
+        The output path.
+    output_dir : Path
+        The output directory.
+    destination_dir : Path
+        The destination directory.
+    """
+    temp_dir.mkdir(parents=True, exist_ok=True)
+    for item in temp_dir.iterdir():
+        # skip cache files
+        if (
+            item.name.startswith("__pycache__")
+            or item.name.endswith(".pyc")
+            or item.name.endswith(".pyo")
+            or item.name.endswith(".pyd")
+            or item.name == ".cache"
+        ):
+            continue
+        if item.is_file():
+            # let's also copy the tree of thoughts image
+            # to the output directory
+            if item.name.endswith("tree_of_thoughts.png"):
+                shutil.copy(item, output_dir / item.name)
+            shutil.copy(item, destination_dir)
+        else:
+            shutil.copytree(item, destination_dir / item.name)
+    if output_path.is_file():
+        if output_path.suffix == ".waldiez":
+            output_path = output_path.with_suffix(".py")
+        if output_path.suffix == ".py":
+            src = temp_dir / output_path.name
+            if src.exists():
+                dst = destination_dir / output_path.name
+                if dst.exists():
+                    dst.unlink()
+                shutil.copyfile(src, output_dir / output_path.name)
+
+
 def get_printer() -> Callable[..., None]:
     """Get the printer function.
 
@@ -242,7 +284,13 @@ def get_printer() -> Callable[..., None]:
     Callable[..., None]
         The printer function.
     """
-    from autogen.io import IOStream  # type: ignore
+    with warnings.catch_warnings():
+        warnings.filterwarnings(
+            "ignore",
+            module="flaml",
+            message="^.*flaml.automl is not available.*$",
+        )
+        from autogen.io import IOStream  # type: ignore
 
     printer = IOStream.get_default().print
 

waldiez/utils/__init__.py

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Utils to call on init."""
+
+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
+
+__all__ = [
+    "check_conflicts",
+    "check_flaml_warnings",
+    "add_cli_extras",
+    "check_pysqlite3",
+]

waldiez/utils/cli_extras/__init__.py

@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: skip-file
+# isort: skip_file
+"""Extra typer commands for CLI."""
+
+import typer
+
+from .jupyter import add_jupyter_cli
+from .studio import add_studio_cli
+
+
+def add_cli_extras(app: typer.Typer) -> None:
+    """Add extra CLI commands to the app.
+
+    Parameters
+    ----------
+    app : typer.Typer
+        The Typer app to add the extra commands to.
+
+    Returns
+    -------
+    typer.Typer
+        The app with the extra commands added
+    """
+    add_jupyter_cli(app)
+    add_studio_cli(app)
+
+
+__all__ = ["add_cli_extras"]

waldiez/{cli_extras.py → utils/cli_extras/jupyter.py}

@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
 # pylint: skip-file
-# type: ignore
 # isort: skip_file
-"""Extra typer commands for CLI."""
+# flake8: noqa: E501
+"""Waldiez-jupyter extra typer commands for CLI."""
 
 from typing import Callable
 
@@ -11,40 +11,29 @@ import typer
 from typer.models import CommandInfo
 import subprocess  # nosemgrep # nosec
 
-HAVE_STUDIO = False
 HAVE_JUPYTER = False
-try:
-    from waldiez_studio.cli import run as studio_app
-
-    HAVE_STUDIO = True
-except BaseException:
-    pass
 
 try:
-    import waldiez_jupyter  # noqa: F401
+    import waldiez_jupyter  # type: ignore[unused-ignore, unused-import, import-not-found, import-untyped]  # noqa
 
     HAVE_JUPYTER = True
 except BaseException:
     pass
 
 
-def add_cli_extras(app: typer.Typer) -> None:
-    """Add extra CLI commands to the app.
+def add_jupyter_cli(app: typer.Typer) -> None:
+    """Add Jupyter extra command to the app if available.
 
     Parameters
     ----------
     app : typer.Typer
-        The Typer app to add the extra commands to.
+        The Typer app to add the extra command to.
 
     Returns
     -------
     typer.Typer
-        The app with the extra commands added
+        The app with the extra command added
     """
-    if HAVE_STUDIO:
-        app.registered_commands.append(
-            CommandInfo(name="studio", callback=studio_app)
-        )
     if HAVE_JUPYTER:
         jupyter_app = get_jupyter_app()
         app.registered_commands.append(
@@ -112,9 +101,9 @@ def get_jupyter_app() -> Callable[..., None]:
         if not browser:
             command.append("--no-browser")
         if password:
-            from jupyter_server.auth import passwd
+            from jupyter_server.auth import passwd  # type: ignore[unused-ignore, import-not-found, attr-defined]  # noqa
 
-            hashed_password = passwd(password)
+            hashed_password = passwd(password)  # type: ignore[unused-ignore, no-untyped-call]  # noqa
             command.append(f"--ServerApp.password={hashed_password}")
         subprocess.run(command)
 

waldiez/utils/cli_extras/studio.py

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: skip-file
+# isort: skip_file
+"""Waldiez-studio extra typer commands for CLI."""
+
+from typing import Any, Callable
+
+import typer
+from typer.models import CommandInfo
+
+HAVE_STUDIO = False
+studio_app: Callable[..., Any] | None = None
+
+try:
+    from waldiez_studio.cli import run  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
+
+    studio_app = run
+
+    HAVE_STUDIO = True
+except BaseException:
+    pass
+
+
+def add_studio_cli(app: typer.Typer) -> None:
+    """Add studio command to the app if available.
+
+    Parameters
+    ----------
+    app : typer.Typer
+        The Typer app to add the studio command to.
+    """
+    if HAVE_STUDIO:
+        app.registered_commands.append(
+            CommandInfo(name="studio", callback=studio_app)
+        )

waldiez/{conflict_checker.py → utils/conflict_checker.py}

@@ -6,9 +6,11 @@
 import sys
 from importlib.metadata import PackageNotFoundError, version
 
+__WALDIEZ_CHECKED_FOR_CONFLICTS = False
+
 
 # fmt: off
-def check_conflicts() -> None:  # pragma: no cover
+def _check_conflicts() -> None:  # pragma: no cover
     """Check for conflicts with 'autogen-agentchat' package."""
     try:
         version("autogen-agentchat")
@@ -19,10 +21,19 @@ def check_conflicts() -> None:  # pragma: no cover
             "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"
+            f"{sys.executable} -m pip install --force pyautogen waldiez",
+            file=sys.stderr,
         )
         sys.exit(1)
     except PackageNotFoundError:
         pass
-
 # fmt: on
+
+
+def check_conflicts() -> None:  # pragma: no cover
+    """Check for conflicts with 'autogen-agentchat' package."""
+    # pylint: disable=global-statement
+    global __WALDIEZ_CHECKED_FOR_CONFLICTS
+    if __WALDIEZ_CHECKED_FOR_CONFLICTS is False:
+        _check_conflicts()
+        __WALDIEZ_CHECKED_FOR_CONFLICTS = True

waldiez/utils/flaml_warnings.py

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+"""Try to suppress the annoying flaml.automl not being available warning."""
+
+import logging
+
+__WALDIEZ_CHECKED_FLAML_WARNINGS = False
+
+
+def check_flaml_warnings() -> None:  # pragma: no cover
+    """Check for flaml warnings once."""
+    # pylint: disable=global-statement
+    global __WALDIEZ_CHECKED_FLAML_WARNINGS
+    if __WALDIEZ_CHECKED_FLAML_WARNINGS is False:
+        flam_logger = logging.getLogger("flaml")
+        flam_logger.setLevel(logging.ERROR)
+        __WALDIEZ_CHECKED_FLAML_WARNINGS = True

waldiez/utils/pysqlite3_checker.py

@@ -0,0 +1,249 @@
+# SPDX-License-Identifier: Apache-2.0.
+# Copyright (c) 2024 - 2025 Waldiez and contributors.
+# flake8: noqa: E501
+"""Try to install pysqlite3-binary.
+
+Highly recommended to be run in a virtual environment.
+'setuptools' and 'wheel' will also be installed if not already installed.
+"""
+
+import os
+import shutil
+import site
+import subprocess
+import sys
+import tempfile
+import urllib.request
+import zipfile
+
+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"
+
+
+def run_command(command: str, cwd: str = ".") -> None:
+    """Run a command.
+
+    Parameters
+    ----------
+    command : str
+        The command to run.
+    cwd : str
+        The current working directory.
+    """
+    cmd_parts = command.split(" ")
+    if cwd == ".":
+        cwd = os.getcwd()
+    try:
+        subprocess.run(  # nosemgrep  # nosec
+            cmd_parts,
+            check=True,
+            cwd=cwd,
+            env=os.environ,
+            encoding="utf-8",
+        )
+    except subprocess.CalledProcessError as e:
+        print(f"Error running command: {e}")
+        sys.exit(1)
+
+
+def in_virtualenv() -> bool:
+    """Check if the script is running in a virtual environment.
+
+    Returns
+    -------
+    bool
+        True if in a virtual environment, False otherwise.
+    """
+    return hasattr(sys, "real_prefix") or (
+        hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
+    )
+
+
+def pip_install(*package_names: str, cwd: str = ".") -> None:
+    """Install packages using pip.
+
+    Parameters
+    ----------
+    *package_names : tuple[str, ...]
+        The package names or paths to install.
+    cwd : str
+        The current working directory.
+    """
+    args = "-qq"
+    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)
+
+
+def pip_uninstall(*package_names: str, cwd: str = ".") -> None:
+    """Uninstall packages using pip.
+
+    Parameters
+    ----------
+    *package_names : tuple[str, ...]
+        The package names to uninstall.
+    cwd : str
+        The current working directory.
+    """
+    args = "-qq --yes"
+    if not in_virtualenv():
+        args += " --break-system-packages"
+    package_names_str = " ".join(package_names)
+    run_command(f"{PIP} uninstall {args} {package_names_str}", cwd)
+
+
+def download_sqlite_amalgamation() -> str:
+    """Download the SQLite amalgamation source code.
+
+    Returns
+    -------
+    str
+        The path to the extracted SQLite source code.
+    """
+    zip_path = "sqlite_amalgamation.zip"
+    extract_path = "sqlite_amalgamation"
+
+    # Download the SQLite source code
+    print("Downloading SQLite amalgamation source code...")
+    urllib.request.urlretrieve(SQLITE_URL, zip_path)  # nosec
+
+    # Extract the SQLite source code
+    print("Extracting SQLite source code...")
+    with zipfile.ZipFile(zip_path, "r") as zip_ref:
+        zip_ref.extractall(extract_path)
+
+    # Clean up the zip file
+    os.remove(zip_path)
+
+    # Return the path to the extracted source code
+    return os.path.join(extract_path, "sqlite-amalgamation-3480000")
+
+
+def rename_package_name(pysqlite3_dir: str) -> None:
+    """Rename the package name in the setup.py file.
+
+    Parameters
+    ----------
+    pysqlite3_dir : str
+        The path to the pysqlite3 directory.
+    """
+    setup_file = os.path.join(pysqlite3_dir, "setup.py")
+    with open(setup_file, "r", encoding="utf-8") as file:
+        setup_py = file.read()
+    # sed -i "s|name='pysqlite3-binary'|name=PACKAGE_NAME|g" setup.py
+    setup_py = setup_py.replace(
+        "name='pysqlite3'", "name='pysqlite3-binary'"
+    ).replace("name=PACKAGE_NAME,", "name='pysqlite3-binary',")
+    with open(setup_file, "w", encoding="utf-8", newline="\n") as file:
+        file.write(setup_py)
+
+
+def prepare_pysqlite3(sqlite_amalgamation_path: str) -> str:
+    """Prepare pysqlite3 using the SQLite amalgamation source code.
+
+    Parameters
+    ----------
+    sqlite_amalgamation_path : str
+        The path to the SQLite amalgamation source code.
+
+    Returns
+    -------
+    str
+        The path to the pysqlite3 directory.
+    """
+    pysqlite3_zip = "pysqlite3.zip"
+    pysqlite3_extract = "pysqlite3"
+    urllib.request.urlretrieve(PYSQLITE3_URL, pysqlite3_zip)  # nosec
+    with zipfile.ZipFile(pysqlite3_zip, "r") as zip_ref:
+        zip_ref.extractall(pysqlite3_extract)
+    os.remove(pysqlite3_zip)
+    sqlite3_c = os.path.join(sqlite_amalgamation_path, "sqlite3.c")
+    sqlite3_h = os.path.join(sqlite_amalgamation_path, "sqlite3.h")
+    pysqlite3_dir = os.path.join(
+        pysqlite3_extract, f"pysqlite3-{PYSQLITE3_VERSION}"
+    )
+    shutil.copy(sqlite3_c, pysqlite3_dir)
+    shutil.copy(sqlite3_h, pysqlite3_dir)
+    rename_package_name(pysqlite3_dir)
+    return pysqlite3_dir
+
+
+def install_pysqlite3(sqlite_amalgamation_path: str) -> None:
+    """Install pysqlite3 using the SQLite amalgamation source code.
+
+    Parameters
+    ----------
+    sqlite_amalgamation_path : str
+        The path to the SQLite amalgamation source code.
+    """
+    # pylint: disable=too-many-try-statements
+    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)
+    except BaseException as e:  # pylint: disable=broad-except
+        print(f"Failed to install pysqlite3: {e}")
+        sys.exit(1)
+
+
+def check_pysqlite3() -> None:
+    """Check the installation of pysqlite3."""
+    # pylint: disable=unused-import, import-outside-toplevel, line-too-long
+    try:
+        import pysqlite3  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
+    except ImportError:
+        print("pysqlite3 not found or cannot be imported.")
+        # Uninstall pysqlite3-binary if it is already installed
+        pip_uninstall("pysqlite3", "pysqlite3-binary")
+        source_path = download_sqlite_amalgamation()
+        install_pysqlite3(source_path)
+        site.main()
+        # Re-import pysqlite3 as sqlite3
+        import pysqlite3  # type: ignore[unused-ignore, import-untyped, import-not-found]  # noqa
+
+
+def test_sqlite_usage() -> None:
+    """Test the usage of the sqlite3 module."""
+    # pylint: disable=import-outside-toplevel
+    sys.modules["sqlite3"] = sys.modules.pop("pysqlite3")
+    import sqlite3  # noqa
+
+    print(sqlite3.__file__)
+    # it should be sth like: /path/to/site-packages/pysqlite3/__init__.py
+    conn = sqlite3.connect(":memory:")
+    cursor = conn.cursor()
+    cursor.execute("CREATE TABLE test (id INTEGER PRIMARY KEY, name TEXT)")
+    cursor.execute("INSERT INTO test (name) VALUES ('test')")
+    cursor.execute("SELECT * FROM test")
+    rows = cursor.fetchall()
+    print(rows)
+    conn.close()
+
+
+def main() -> None:
+    """Run the check."""
+    if "--force" in sys.argv:
+        pip_uninstall("pysqlite3", "pysqlite3-binary")
+    cwd = os.getcwd()
+    tmpdir = tempfile.mkdtemp()
+    os.chdir(tmpdir)
+    check_pysqlite3()
+    os.chdir(cwd)
+    shutil.rmtree(tmpdir)
+    test_sqlite_usage()
+
+
+if __name__ == "__main__":
+    main()