waldiez 0.4.7__py3-none-any.whl → 0.4.8__py3-none-any.whl

waldiez/running/__init__.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
-"""Common utility functions."""
+"""Running related functions."""
 
 from .environment import (
     in_virtualenv,

waldiez/running/environment.py

@@ -3,12 +3,9 @@
 # pylint: disable=import-outside-toplevel,reimported
 """Environment related utilities."""
 
-import importlib
 import os
-import site
 import sys
-import warnings
-from typing import Dict, Generator, List, Tuple
+from typing import Generator
 
 
 def in_virtualenv() -> bool:
@@ -25,7 +22,7 @@ def in_virtualenv() -> bool:
     )
 
 
-def is_root() -> bool:
+def is_root() -> bool:  # pragma: no cover  # os specific
     """Check if the script is running as root/administrator.
 
     Returns
@@ -33,13 +30,15 @@ def is_root() -> bool:
     bool
         True if running as root/administrator, False otherwise.
     """
-    # pylint: disable=import-outside-toplevel,line-too-long
+    # pylint: disable=import-outside-toplevel,line-too-long,no-member
     if os.name == "nt":
+        # noinspection PyBroadException
+        # pylint: disable=broad-exception-caught
         try:
             import ctypes
 
             return ctypes.windll.shell32.IsUserAnAdmin() != 0  # type: ignore[unused-ignore,attr-defined]  # noqa: E501
-        except Exception:  # pylint: disable=broad-exception-caught
+        except Exception:
             return False
     else:
         return os.getuid() == 0
@@ -47,75 +46,57 @@ def is_root() -> bool:
 
 def refresh_environment() -> None:
     """Refresh the environment."""
-    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]
-        import autogen  # type: ignore
-        from autogen.io import IOStream
-
-        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)
-        # a swarm chat without a user agent
-        # creates a new user (this has a default code execution with docker)
-        # captain also generates new agents that also have
-        # default code execution with docker
-        # temp (until we handle/detect docker setup)
-        os.environ["AUTOGEN_USE_DOCKER"] = "0"
-        # we might get:
-        # module 'numpy' has no attribute '_no_nep50_warning'
-        # in autogen/agentchat/contrib/captainagent/tool_retriever.py
-        os.environ["NEP50_DEPRECATION_WARNING"] = "0"
-        os.environ["NEP50_DISABLE_WARNING"] = "1"
-        os.environ["NPY_PROMOTION_STATE"] = "weak"
-        import numpy as np
-
-        if not hasattr(np, "_no_pep50_warning"):
-            import contextlib
-
-            @contextlib.contextmanager
-            def _np_no_nep50_warning() -> Generator[None, None, None]:
-                """Avoid no_nep50 warning.
-
-                Yields
-                ------
-                None
-                    Dummy value.
-                """
-                yield
-
-            setattr(np, "_no_pep50_warning", _np_no_nep50_warning)  # noqa
-
-
-def set_env_vars(flow_env_vars: List[Tuple[str, str]]) -> Dict[str, str]:
+    # a group chat without a user agent
+    # creates a new user (this has a default code execution with docker)
+    # captain also generates new agents that also have
+    # default code execution with docker
+    # temp (until we handle/detect docker setup)
+    os.environ["AUTOGEN_USE_DOCKER"] = "0"
+    try_handle_the_np_thing()
+
+
+def try_handle_the_np_thing() -> None:
+    """Try to handle the numpy deprecation warning."""
+    # we might get:
+    # module 'numpy' has no attribute '_no_nep50_warning'
+    # (sentnence_transformers?)
+    # in autogen/agentchat/contrib/captainagent/tool_retriever.py
+    os.environ["NEP50_DEPRECATION_WARNING"] = "0"
+    os.environ["NEP50_DISABLE_WARNING"] = "1"
+    os.environ["NPY_PROMOTION_STATE"] = "weak"
+    import numpy as np
+
+    if not hasattr(np, "_no_pep50_warning"):
+        import contextlib
+
+        @contextlib.contextmanager
+        def _np_no_nep50_warning() -> Generator[None, None, None]:
+            """Avoid no_nep50 warning.
+
+            Yields
+            ------
+            None
+                Nothing.
+            """
+            yield  # pragma: no cover
+
+        setattr(np, "_no_pep50_warning", _np_no_nep50_warning)  # noqa
+
+
+def set_env_vars(flow_env_vars: list[tuple[str, str]]) -> dict[str, str]:
     """Set environment variables and return the old ones (if any).
 
     Parameters
     ----------
-    flow_env_vars : List[Tuple[str, str]]
+    flow_env_vars : list[tuple[str, str]]
         The environment variables to set.
 
     Returns
     -------
-    Dict[str, str]
+    dict[str, str]
         The old environment variables.
     """
-    old_vars: Dict[str, str] = {}
+    old_vars: dict[str, str] = {}
     for var_key, var_value in flow_env_vars:
         if var_key:
             current = os.environ.get(var_key, "")
@@ -124,12 +105,12 @@ def set_env_vars(flow_env_vars: List[Tuple[str, str]]) -> Dict[str, str]:
     return old_vars
 
 
-def reset_env_vars(old_vars: Dict[str, str]) -> None:
+def reset_env_vars(old_vars: dict[str, str]) -> None:
     """Reset the environment variables.
 
     Parameters
     ----------
-    old_vars : Dict[str, str]
+    old_vars : dict[str, str]
         The old environment variables.
     """
     for var_key, var_value in old_vars.items():

waldiez/running/gen_seq_diagram.py

@@ -5,7 +5,7 @@
 import json
 import re
 from pathlib import Path
-from typing import Any, Dict, Set, Union
+from typing import Any, Set, Union
 
 import pandas as pd
 
@@ -38,7 +38,7 @@ def escape_mermaid_text(text: str) -> str:
     return output
 
 
-def get_json_state(json_state: Any) -> Dict[str, Any]:
+def get_json_state(json_state: Any) -> dict[str, Any]:
     """Get the JSON state of the event.
 
     Parameters
@@ -52,7 +52,7 @@ def get_json_state(json_state: Any) -> Dict[str, Any]:
         The JSON state of the event.
     """
     if isinstance(json_state, dict):
-        return json_state
+        return json_state  # pyright: ignore
     if isinstance(json_state, str):
         try:
             return json.loads(json_state)
@@ -68,7 +68,7 @@ def process_events(df_events: pd.DataFrame) -> str:
     Parameters
     ----------
     df_events : pd.DataFrame
-        The DataFrame containing the events data.
+        The DataFrame containing the events' data.
 
     Returns
     -------
@@ -83,7 +83,7 @@ def process_events(df_events: pd.DataFrame) -> str:
     seq_text = SEQ_TXT
 
     # Loop through each event in the DataFrame
-    for i in range(len(df_events["json_state"])):
+    for i in range(len(df_events["json_state"])):  # pyright: ignore
         # Parse the JSON state of the event
         df_j = get_json_state(df_events["json_state"][i])
         # Skip events that are not relevant (e.g., replies or missing messages)
@@ -91,26 +91,28 @@ def process_events(df_events: pd.DataFrame) -> str:
             df_events["event_name"][i] != "reply_func_executed"
         ):
             sender = df_j["sender"]
-            recipient = df_events["source_name"][i]
+            # noinspection PyTypeChecker
+            recipient = df_events["source_name"][i]  # pyright: ignore
 
             # Extract message content if available
             if (
                 isinstance(df_j["message"], dict)
                 and "content" in df_j["message"]
             ):
-                message = "Content: " + str(df_j["message"]["content"])
+                content = str(df_j["message"]["content"])  # pyright: ignore
+                message = "Content: " + content
             else:
-                message = str(df_j["message"])
+                message = str(df_j["message"])  # pyright: ignore
 
             # Escape the message for Mermaid compatibility and
             # truncate long messages
             message = escape_mermaid_text(message)
 
             # Add sender and recipient to participants set
-            participants.add(recipient)
+            participants.add(recipient)  # pyright: ignore
             participants.add(sender)
 
-            # Split message into main message and context
+            # Split into the main message and the context
             # if "Content" is present
             if "Content: " in message:
                 message_parts = message.split("Content: ")
@@ -155,7 +157,7 @@ def generate_sequence_diagram(
     Parameters
     ----------
     file_path : Union[str, Path]
-        The path to the JSON or CSV file containing the events data.
+        The path to the JSON or CSV file containing the events' data.
     output_path : Union[str, Path]
         The path to save the Mermaid diagram.
 
@@ -176,10 +178,10 @@ def generate_sequence_diagram(
     is_csv = file_path.suffix == ".csv"
     try:
         if is_csv:
-            df_events = pd.read_csv(file_path)
+            df_events = pd.read_csv(file_path)  # pyright: ignore
         else:
-            df_events = pd.read_json(file_path)
-    except pd.errors.EmptyDataError:
+            df_events = pd.read_json(file_path)  # pyright: ignore
+    except pd.errors.EmptyDataError:  # pragma: no cover
         return
 
     # Generate the Mermaid sequence diagram text

waldiez/running/running.py

@@ -6,20 +6,20 @@ import asyncio
 import datetime
 import io
 import os
+import re
 import shutil
 import subprocess
 import sys
 import tempfile
-import warnings
 from contextlib import asynccontextmanager, contextmanager
 from pathlib import Path
 from typing import (
+    Any,
     AsyncIterator,
     Callable,
     Iterator,
     Optional,
     Set,
-    Tuple,
     Union,
 )
 
@@ -73,6 +73,23 @@ async def a_chdir(to: Union[str, Path]) -> AsyncIterator[None]:
         os.chdir(old_cwd)
 
 
+def strip_ansi(text: str) -> str:
+    """Remove ANSI escape sequences from text.
+
+    Parameters
+    ----------
+    text : str
+        The text to strip.
+
+    Returns
+    -------
+    str
+        The text without ANSI escape sequences.
+    """
+    ansi_pattern = re.compile(r"\x1b\[[0-9;]*m|\x1b\[.*?[@-~]")
+    return ansi_pattern.sub("", text)
+
+
 def before_run(
     output_path: Optional[Union[str, Path]],
     uploads_root: Optional[Union[str, Path]],
@@ -120,9 +137,10 @@ def install_requirements(
     requirements_string = ", ".join(extra_requirements)
     printer(f"Installing requirements: {requirements_string}")
     pip_install = [sys.executable, "-m", "pip", "install"]
+    break_system_packages = ""
     if not in_virtualenv():  # it should
         # if not, let's try to install as user
-        # not sure if --break-system-packages is safe
+        # not sure if --break-system-packages is safe,
         # 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"
@@ -138,10 +156,10 @@ def install_requirements(
         ) as proc:
             if proc.stdout:
                 for line in io.TextIOWrapper(proc.stdout, encoding="utf-8"):
-                    printer(line.strip())
+                    printer(strip_ansi(line.strip()))
             if proc.stderr:
                 for line in io.TextIOWrapper(proc.stderr, encoding="utf-8"):
-                    printer(line.strip())
+                    printer(strip_ansi(line.strip()))
     finally:
         if not in_virtualenv():
             # restore the old env var
@@ -166,10 +184,12 @@ async def a_install_requirements(
     requirements_string = ", ".join(extra_requirements)
     printer(f"Installing requirements: {requirements_string}")
     pip_install = [sys.executable, "-m", "pip", "install"]
+    break_system_packages = ""
     if not in_virtualenv():
         break_system_packages = os.environ.get("PIP_BREAK_SYSTEM_PACKAGES", "")
         os.environ["PIP_BREAK_SYSTEM_PACKAGES"] = "1"
-        pip_install.extend(["--user"])
+        if not is_root():
+            pip_install.extend(["--user"])
     pip_install.extend(extra_requirements)
     # pylint: disable=too-many-try-statements
     try:
@@ -180,10 +200,10 @@ async def a_install_requirements(
         )
         if proc.stdout:
             async for line in proc.stdout:
-                printer(line.decode().strip())
+                printer(strip_ansi(line.decode().strip()))
         if proc.stderr:
             async for line in proc.stderr:
-                printer(line.decode().strip())
+                printer(strip_ansi(line.decode().strip()))
     finally:
         if not in_virtualenv():
             if break_system_packages:
@@ -213,7 +233,7 @@ def after_run(
         The flow name.
     skip_mmd : bool, optional
         Whether to skip the mermaid sequence diagram generation,
-        by default False
+        by default, False
     """
     if isinstance(output_path, str):
         output_path = Path(output_path)
@@ -276,7 +296,7 @@ def copy_results(
         ):
             continue
         if item.is_file():
-            # let's also copy the tree of thoughts image
+            # let's also copy the "tree of thoughts" image
             # to the output directory
             if item.name.endswith("tree_of_thoughts.png") or item.name.endswith(
                 "reasoning_tree.json"
@@ -305,54 +325,53 @@ def get_printer() -> Callable[..., None]:
     Callable[..., None]
         The printer function.
     """
-    with warnings.catch_warnings():
-        warnings.filterwarnings(
-            "ignore",
-            module="flaml",
-            message="^.*flaml.automl is not available.*$",
-        )
-        from autogen.io import IOStream  # type: ignore
+    from autogen.io import IOStream  # type: ignore
 
+    # noinspection PyUnboundLocalVariable
     printer = IOStream.get_default().print
 
-    def safe_printer(*args: object, **kwargs: object) -> None:
+    def safe_printer(*args: Any, **kwargs: Any) -> None:
         try:
             printer(*args, **kwargs)
         except UnicodeEncodeError:
-            # pylint: disable=too-many-try-statements
             try:
-                msg, flush = get_what_to_print(*args, **kwargs)
-                printer(msg, end="", flush=flush)
+                # Use the helper to get safely encoded message
+                safe_msg, flush = get_what_to_print(*args, **kwargs)
+                # Try printing the safe message
+                # (without end since it's already included)
+                printer(safe_msg, end="", flush=flush)
             except UnicodeEncodeError:
-                sys.stdout = io.TextIOWrapper(
-                    sys.stdout.buffer, encoding="utf-8"
-                )
-                sys.stderr = io.TextIOWrapper(
-                    sys.stderr.buffer, encoding="utf-8"
-                )
+                # pylint: disable=too-many-try-statements
                 try:
-                    printer(*args, **kwargs)
-                except UnicodeEncodeError:
-                    sys.stderr.write(
-                        "Could not print the message due to encoding issues.\n"
+                    # If that still fails, write directly to buffer
+                    msg, flush = get_what_to_print(*args, **kwargs)
+                    safe_msg_bytes = msg.encode("utf-8", errors="replace")
+                    sys.stdout.buffer.write(safe_msg_bytes)
+                    if flush:
+                        sys.stdout.buffer.flush()
+                except Exception:  # pylint: disable=broad-exception-caught
+                    error_msg = (
+                        b"Could not print message due to encoding issues.\n"
                     )
+                    sys.stderr.buffer.write(error_msg)
+                    sys.stderr.buffer.flush()
 
     return safe_printer
 
 
-def get_what_to_print(*args: object, **kwargs: object) -> Tuple[str, bool]:
+def get_what_to_print(*args: object, **kwargs: object) -> tuple[str, bool]:
     """Get what to print.
 
     Parameters
     ----------
     args : object
-        The arguments.
+        The print arguments.
     kwargs : object
         The keyword arguments.
 
     Returns
     -------
-    Tuple[str, bool]
+    tuple[str, bool]
         The message and whether to flush.
     """
     sep = kwargs.get("sep", " ")

waldiez/utils/__init__.py

@@ -5,13 +5,9 @@
 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/cli_extras/jupyter.py

@@ -11,12 +11,14 @@ import typer
 from typer.models import CommandInfo
 import subprocess  # nosemgrep # nosec
 
-HAVE_JUPYTER = False
+_have_jupyter = False
 
+# noinspection PyBroadException
+# pylint: disable=broad-exception-caught
 try:
     import waldiez_jupyter  # type: ignore[unused-ignore, unused-import, import-not-found, import-untyped]  # noqa
 
-    HAVE_JUPYTER = True
+    _have_jupyter = True
 except BaseException:
     pass
 
@@ -34,7 +36,7 @@ def add_jupyter_cli(app: typer.Typer) -> None:
     typer.Typer
         The app with the extra command added
     """
-    if HAVE_JUPYTER:
+    if _have_jupyter:
         jupyter_app = get_jupyter_app()
         app.registered_commands.append(
             CommandInfo(name="lab", callback=jupyter_app)

waldiez/utils/cli_extras/runner.py

@@ -10,15 +10,17 @@ from typing import Any, Callable
 import typer
 from typer.models import CommandInfo
 
-HAVE_RUNNER = False
+_have_runner = False
 runner_app: Callable[..., Any] | None = None
 
+# noinspection PyBroadException
+# pylint: disable=broad-exception-caught
 try:
     from waldiez_runner.cli import run  # type: ignore[unused-ignore, import-not-found, import-untyped]
 
-    runner_app = run
+    runner_app = run  # pyright: ignore
 
-    HAVE_RUNNER = True
+    _have_runner = True
 except BaseException:
     pass
 
@@ -31,7 +33,7 @@ def add_runner_cli(app: typer.Typer) -> None:
     app : typer.Typer
         The Typer app to add the runner command to.
     """
-    if HAVE_RUNNER:
+    if _have_runner:
         app.registered_commands.append(
             CommandInfo(name="serve", callback=runner_app)
         )

waldiez/utils/cli_extras/studio.py

@@ -10,15 +10,17 @@ from typing import Any, Callable
 import typer
 from typer.models import CommandInfo
 
-HAVE_STUDIO = False
+_have_studio = False
 studio_app: Callable[..., Any] | None = None
 
+# noinspection PyBroadException
+# pylint: disable=broad-exception-caught
 try:
     from waldiez_studio.cli import run  # type: ignore[unused-ignore, import-not-found, import-untyped]
 
-    studio_app = run
+    studio_app = run  # pyright: ignore
 
-    HAVE_STUDIO = True
+    _have_studio = True
 except BaseException:
     pass
 
@@ -31,7 +33,7 @@ def add_studio_cli(app: typer.Typer) -> None:
     app : typer.Typer
         The Typer app to add the studio command to.
     """
-    if HAVE_STUDIO:
+    if _have_studio:
         app.registered_commands.append(
             CommandInfo(name="studio", callback=studio_app)
         )

waldiez/utils/conflict_checker.py

@@ -1,17 +1,18 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
-# pylint: disable=line-too-long
-"""Check for conflicts with 'autogen-agentchat' package."""
+# pylint: disable=line-too-long, broad-exception-caught,invalid-name
+# pylint: disable=too-many-try-statements
+"""Check for conflicts between Waldiez and other packages."""
 
 import sys
 from importlib.metadata import PackageNotFoundError, version
 
-__WALDIEZ_CHECKED_FOR_CONFLICTS = False
+# Global variable to track if conflicts have been checked
+__waldiez_checked_conflicts = False
 
 
 # fmt: off
-def _check_conflicts() -> None:  # pragma: no cover
-    """Check for conflicts with 'autogen-agentchat' package."""
+def _check_autogen_agentchat() -> None:  # pragma: no cover
     try:
         version("autogen-agentchat")
         print(
@@ -30,10 +31,15 @@ def _check_conflicts() -> None:  # pragma: no cover
 # fmt: on
 
 
+def _check_conflicts() -> None:  # pragma: no cover
+    """Check for conflicts."""
+    _check_autogen_agentchat()
+
+
 def check_conflicts() -> None:  # pragma: no cover
-    """Check for conflicts with 'autogen-agentchat' package."""
+    """Check for conflicts."""
     # pylint: disable=global-statement
-    global __WALDIEZ_CHECKED_FOR_CONFLICTS
-    if __WALDIEZ_CHECKED_FOR_CONFLICTS is False:
+    global __waldiez_checked_conflicts
+    if __waldiez_checked_conflicts is False:
+        __waldiez_checked_conflicts = True
         _check_conflicts()
-        __WALDIEZ_CHECKED_FOR_CONFLICTS = True

waldiez/utils/flaml_warnings.py

@@ -1,17 +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."""
+"""Try to suppress the warning about flaml.automl not being available."""
 
 import logging
 
-__WALDIEZ_CHECKED_FLAML_WARNINGS = False
+__waldiez_checked_flaml_warnings = False  # pylint: disable=invalid-name
 
 
 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:
+    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_checked_flaml_warnings = True