flwr-nightly 1.26.0.dev20260122__py3-none-any.whl → 1.26.0.dev20260126__py3-none-any.whl

flwr/cli/app_cmd/publish.py

@@ -19,6 +19,7 @@ from contextlib import ExitStack
 from pathlib import Path
 from typing import IO, Annotated
 
+import click
 import requests
 import typer
 from requests import Response
@@ -62,12 +63,7 @@ def publish(
     auth_plugin = load_cli_auth_plugin_from_connection(SUPERGRID_ADDRESS)
     auth_plugin.load_tokens()
     if not isinstance(auth_plugin, OidcCliPlugin) or not auth_plugin.access_token:
-        typer.secho(
-            "❌ Please log in before publishing app.",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1)
+        raise click.ClickException("Please log in before publishing app.")
 
     # Load token from the plugin
     token = auth_plugin.access_token
@@ -82,19 +78,17 @@ def publish(
         try:
             resp = _post_files(files_param, token)
         except requests.RequestException as err:
-            typer.secho(f"❌ Network error: {err}", fg=typer.colors.RED, err=True)
-            raise typer.Exit(code=1) from err
+            raise click.ClickException(f"Network error: {err}") from err
 
     if resp.ok:
         typer.secho("🎊 Upload successful", fg=typer.colors.GREEN, bold=True)
         return  # success
 
     # Error path:
-    msg = f"❌ Upload failed with status {resp.status_code}"
+    msg = f"Upload failed with status {resp.status_code}"
     if resp.text:
         msg += f": {resp.text}"
-    typer.secho(msg, fg=typer.colors.RED, err=True)
-    raise typer.Exit(code=1)
+    raise click.ClickException(msg)
 
 
 def _depth_of(relative_path_to_root: Path) -> int:
@@ -138,14 +132,9 @@ def _collect_file_paths(root: Path) -> list[Path]:
 
         # Check max depth
         if _depth_of(relative_path) > MAX_DIR_DEPTH:
-            typer.secho(
-                f"Error: '{path}' "
-                f"exceeds the maximum directory depth "
-                f"of {MAX_DIR_DEPTH}.",
-                fg=typer.colors.RED,
-                err=True,
+            raise click.ClickException(
+                f"'{path}' exceeds the maximum directory depth of {MAX_DIR_DEPTH}."
             )
-            raise typer.Exit(code=2)
 
         file_paths.append(path)
 
@@ -160,21 +149,15 @@ def _validate_files(file_paths: list[Path]) -> None:
     Checks file count, individual file size, total size, and UTF-8 encoding.
     """
     if len(file_paths) == 0:
-        typer.secho(
+        raise click.ClickException(
             "Nothing to upload: no files matched after applying .gitignore and "
-            "allowed extensions.",
-            fg=typer.colors.RED,
-            err=True,
+            "allowed extensions."
         )
-        raise typer.Exit(code=2)
 
     if len(file_paths) > MAX_FILE_COUNT:
-        typer.secho(
-            f"Too many files: {len(file_paths)} > allowed maximum of {MAX_FILE_COUNT}.",
-            fg=typer.colors.RED,
-            err=True,
+        raise click.ClickException(
+            f"Too many files: {len(file_paths)} > allowed maximum of {MAX_FILE_COUNT}."
         )
-        raise typer.Exit(code=2)
 
     # Calculate files size
     total_size = 0
@@ -184,34 +167,25 @@ def _validate_files(file_paths: list[Path]) -> None:
 
         # Check single file size
         if file_size > MAX_FILE_BYTES:
-            typer.secho(
+            raise click.ClickException(
                 f"File too large: '{path.as_posix()}' is {file_size:,} bytes, "
-                f"exceeding the per-file limit of {MAX_FILE_BYTES:,} bytes.",
-                fg=typer.colors.RED,
-                err=True,
+                f"exceeding the per-file limit of {MAX_FILE_BYTES:,} bytes."
             )
-            raise typer.Exit(code=2)
 
         # Ensure we can decode as UTF-8.
         try:
             path.read_text(encoding=UTF8)
         except UnicodeDecodeError as err:
-            typer.secho(
-                f"Encoding error: '{path}' is not UTF-8 encoded.",
-                fg=typer.colors.RED,
-                err=True,
-            )
-            raise typer.Exit(code=2) from err
+            raise click.ClickException(
+                f"Encoding error: '{path}' is not UTF-8 encoded."
+            ) from err
 
     # Check total files size
     if total_size > MAX_TOTAL_BYTES:
-        typer.secho(
+        raise click.ClickException(
             "Total size of all files is too large: "
-            f"{total_size:,} bytes > {MAX_TOTAL_BYTES:,} bytes.",
-            fg=typer.colors.RED,
-            err=True,
+            f"{total_size:,} bytes > {MAX_TOTAL_BYTES:,} bytes."
         )
-        raise typer.Exit(code=2)
 
     # Print validation passed prompt
     typer.echo(typer.style("✅ Validation passed", fg=typer.colors.GREEN, bold=True))

flwr/cli/app_cmd/review.py

@@ -21,6 +21,7 @@ import re
 from pathlib import Path
 from typing import Annotated
 
+import click
 import requests
 import typer
 from cryptography.exceptions import UnsupportedAlgorithm
@@ -60,12 +61,7 @@ def review(
 
     auth_plugin.load_tokens()
     if not isinstance(auth_plugin, OidcCliPlugin) or not auth_plugin.access_token:
-        typer.secho(
-            "❌ Please log in before reviewing app.",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1)
+        raise click.ClickException("Please log in before reviewing app.")
 
     # Load token from the plugin
     token = auth_plugin.access_token
@@ -74,8 +70,7 @@ def review(
     try:
         app_id, app_version = parse_app_spec(app_spec)
     except ValueError as e:
-        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(str(e)) from e
 
     # Download FAB
     typer.secho("Downloading FAB... ", fg=typer.colors.BLUE)
@@ -83,8 +78,7 @@ def review(
     try:
         presigned_url, _ = request_download_link(app_id, app_version, url, "fab_url")
     except ValueError as e:
-        typer.secho(f"❌ {e}", fg=typer.colors.RED, err=True)
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(str(e)) from e
 
     fab_bytes = _download_fab(presigned_url)
 
@@ -170,12 +164,7 @@ def _download_fab(url: str) -> bytes:
         r = requests.get(url, timeout=60)
         r.raise_for_status()
     except requests.RequestException as e:
-        typer.secho(
-            f"❌ FAB download failed: {e}",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(f"FAB download failed: {e}") from e
     return r.content
 
 
@@ -209,20 +198,14 @@ def _submit_review(
     try:
         resp = requests.post(url, headers=headers, json=payload, timeout=120)
     except requests.RequestException as e:
-        typer.secho(
-            f"❌ Network error while submitting review: {e}",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(f"Network error while submitting review: {e}") from e
 
     if resp.ok:
         typer.secho("🎊 Review submitted", fg=typer.colors.GREEN, bold=True)
         return
 
     # Error path:
-    msg = f"❌ Review submission failed (HTTP {resp.status_code})"
+    msg = f"Review submission failed (HTTP {resp.status_code})"
     if resp.text:
         msg += f": {resp.text}"
-    typer.secho(msg, fg=typer.colors.RED, err=True)
-    raise typer.Exit(code=1)
+    raise click.ClickException(msg)

flwr/cli/auth_plugin/oidc_cli_plugin.py

@@ -19,6 +19,7 @@ import time
 import webbrowser
 from collections.abc import Sequence
 
+import click
 import typer
 
 from flwr.cli.constant import (
@@ -137,13 +138,9 @@ class OidcCliPlugin(CliAuthPlugin):
     ) -> Sequence[tuple[str, str | bytes]]:
         """Write authentication tokens to the provided metadata."""
         if self.access_token is None or self.refresh_token is None:
-            typer.secho(
-                "❌ Missing authentication tokens. Please login first.",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
+            raise click.ClickException(
+                "Missing authentication tokens. Please login first."
             )
-            raise typer.Exit(code=1)
 
         return list(metadata) + [
             (ACCESS_TOKEN_KEY, self.access_token),

flwr/cli/build.py

@@ -21,6 +21,7 @@ from io import BytesIO
 from pathlib import Path
 from typing import Annotated, Any
 
+import click
 import pathspec
 import tomli
 import tomli_w
@@ -107,35 +108,23 @@ def build(
 
     app = app.resolve()
     if not app.is_dir():
-        typer.secho(
-            f"❌ The path {app} is not a valid path to a Flower app.",
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
+        raise click.ClickException(
+            f"The path {app} is not a valid path to a Flower app."
         )
-        raise typer.Exit(code=1)
 
     if not is_valid_project_name(app.name):
-        typer.secho(
-            f"❌ The project name {app.name} is invalid, "
+        raise click.ClickException(
+            f"The project name {app.name} is invalid, "
             "a valid project name must start with a letter, "
-            "and can only contain letters, digits, and hyphens.",
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
+            "and can only contain letters, digits, and hyphens."
         )
-        raise typer.Exit(code=1)
 
     config, errors, warnings = load_and_validate(app / "pyproject.toml")
     if config is None:
-        typer.secho(
+        raise click.ClickException(
             "Project configuration could not be loaded.\npyproject.toml is invalid:\n"
-            + "\n".join([f"- {line}" for line in errors]),
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
+            + "\n".join([f"- {line}" for line in errors])
         )
-        raise typer.Exit(code=1)
 
     if warnings:
         typer.secho(

flwr/cli/config/ls.py

@@ -19,6 +19,7 @@ import io
 import json
 from typing import Annotated
 
+import click
 import typer
 from rich.console import Console
 
@@ -66,6 +67,8 @@ def ls(
             }
             Console().print_json(json.dumps(conn))
         else:
+            typer.secho("Flower Config file: ", fg=typer.colors.BLUE, nl=False)
+            typer.secho(f"{config_path}", fg=typer.colors.GREEN)
             typer.secho("SuperLink connections:", fg=typer.colors.BLUE)
             # List SuperLink connections and highlight default
             for k in connection_names:
@@ -77,26 +80,18 @@ def ls(
                         nl=False,
                     )
                 typer.echo()
-    except typer.Exit as err:
-        # log the error if json format requested
-        # else do nothing since it will be logged by typer
-        if suppress_output:
-            restore_output()
-            e_message = captured_output.getvalue()
-            print_json_error(e_message, err)
 
     except Exception as err:  # pylint: disable=broad-except
+        # log the error if json format requested
         if suppress_output:
             restore_output()
             e_message = captured_output.getvalue()
             print_json_error(e_message, err)
         else:
-            typer.secho(
-                f"❌ An unexpected error occurred while listing the SuperLink "
-                f"connections in the Flower configuration file ({config_path}): {err}",
-                fg=typer.colors.RED,
-                err=True,
-            )
+            raise click.ClickException(
+                f"An unexpected error occurred while listing the SuperLink "
+                f"connections in the Flower configuration file ({config_path}): {err}"
+            ) from err
 
     finally:
         if suppress_output:

flwr/cli/config_utils.py

@@ -18,8 +18,8 @@
 from pathlib import Path
 from typing import Any
 
+import click
 import tomli
-import typer
 
 from flwr.cli.typing import SuperLinkConnection
 from flwr.common.config import (
@@ -114,57 +114,6 @@ def load(toml_path: Path) -> dict[str, Any] | None:
             return None
 
 
-def process_loaded_project_config(
-    config: dict[str, Any] | None, errors: list[str], warnings: list[str]
-) -> dict[str, Any]:
-    """Process and return the loaded project configuration.
-
-    This function handles errors and warnings from the `load_and_validate` function,
-    exits on critical issues, and returns the validated configuration.
-
-    Parameters
-    ----------
-    config : dict[str, Any] | None
-        The loaded configuration dictionary, or None if loading failed.
-    errors : list[str]
-        List of error messages from validation.
-    warnings : list[str]
-        List of warning messages from validation.
-
-    Returns
-    -------
-    dict[str, Any]
-        The validated configuration dictionary.
-
-    Raises
-    ------
-    typer.Exit
-        If config is None or contains critical errors.
-    """
-    if config is None:
-        typer.secho(
-            "Project configuration could not be loaded.\n"
-            "pyproject.toml is invalid:\n"
-            + "\n".join([f"- {line}" for line in errors]),
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
-        )
-        raise typer.Exit(code=1)
-
-    if warnings:
-        typer.secho(
-            "Project configuration is missing the following "
-            "recommended properties:\n" + "\n".join([f"- {line}" for line in warnings]),
-            fg=typer.colors.RED,
-            bold=True,
-        )
-
-    typer.secho("Success", fg=typer.colors.GREEN)
-
-    return config
-
-
 def validate_federation_in_project_config(
     federation: str | None,
     config: dict[str, Any],
@@ -188,22 +137,18 @@ def validate_federation_in_project_config(
 
     Raises
     ------
-    typer.Exit
+    click.ClickException
         If no federation name provided and no default found, or if federation
         doesn't exist in config.
     """
     federation = federation or config["tool"]["flwr"]["federations"].get("default")
 
     if federation is None:
-        typer.secho(
-            "❌ No federation name was provided and the project's `pyproject.toml` "
+        raise click.ClickException(
+            "No federation name was provided and the project's `pyproject.toml` "
             "doesn't declare a default federation (with an Control API address or an "
-            "`options.num-supernodes` value).",
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
+            "`options.num-supernodes` value)."
         )
-        raise typer.Exit(code=1)
 
     # Validate the federation exists in the configuration
     federation_config = config["tool"]["flwr"]["federations"].get(federation)
@@ -211,15 +156,11 @@ def validate_federation_in_project_config(
         available_feds = {
             fed for fed in config["tool"]["flwr"]["federations"] if fed != "default"
         }
-        typer.secho(
-            f"❌ There is no `{federation}` federation declared in the "
+        raise click.ClickException(
+            f"There is no `{federation}` federation declared in the "
             "`pyproject.toml`.\n The following federations were found:\n\n"
-            + "\n".join(available_feds),
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
+            + "\n".join(available_feds)
         )
-        raise typer.Exit(code=1)
 
     # Override the federation configuration if provided
     if overrides:
@@ -229,61 +170,6 @@ def validate_federation_in_project_config(
     return federation, federation_config
 
 
-def validate_certificate_in_federation_config(
-    app: Path, federation_config: dict[str, Any]
-) -> tuple[bool, bytes | None]:
-    """Validate the certificates in the Flower project configuration.
-
-    Accepted configurations:
-      1. TLS enabled and gRPC will load(*) the trusted certificate bundle:
-         - Only `address` is provided. `root-certificates` and `insecure` not set.
-         - `address` is provided and `insecure` set to `false`. `root-certificates` not
-           set.
-         (*)gRPC uses a multi-step fallback mechanism to load the trusted certificate
-            bundle in the following sequence:
-            a. A configured file path (if set via configuration or environment),
-            b. An override callback (if registered via
-               `grpc_set_ssl_roots_override_callback`),
-            c. The OS trust store (if available),
-            d. A bundled default certificate file.
-      2. TLS enabled with self-signed certificates:
-         - `address` and `root-certificates` are provided. `insecure` not set.
-         - `address` and `root-certificates` are provided. `insecure` set to `false`.
-      3. TLS disabled. This is not recommended and should only be used for prototyping:
-         - `address` is provided and `insecure = true`. If `root-certificates` is
-           set, exit with an error.
-    """
-    insecure = get_insecure_flag(federation_config)
-
-    # Process root certificates
-    if root_certificates := federation_config.get("root-certificates"):
-        if insecure:
-            typer.secho(
-                "❌ `root-certificates` were provided but the `insecure` parameter "
-                "is set to `True`.",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
-            )
-            raise typer.Exit(code=1)
-
-        # TLS is enabled with self-signed certificates: attempt to read the file
-        try:
-            root_certificates_bytes = (app / root_certificates).read_bytes()
-        except Exception as e:
-            typer.secho(
-                f"❌ Failed to read certificate file `{root_certificates}`: {e}",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
-            )
-            raise typer.Exit(code=1) from e
-    else:
-        root_certificates_bytes = None
-
-    return insecure, root_certificates_bytes
-
-
 def load_certificate_in_connection(
     connection: SuperLinkConnection,
 ) -> bytes | None:
@@ -304,64 +190,30 @@ def load_certificate_in_connection(
     ------
     ValueError
         If required TLS settings are missing.
-    typer.Exit
+    click.ClickException
         If the configuration is invalid or the certificate file cannot be read.
     """
     # Process root certificates
     if root_certificates := connection.root_certificates:
         if connection.insecure:
-            typer.secho(
-                "❌ `root-certificates` were provided but the `insecure` parameter "
-                "is set to `True`.",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
+            raise click.ClickException(
+                "`root-certificates` were provided but the `insecure` parameter "
+                "is set to `True`."
             )
-            raise typer.Exit(code=1)
 
         # TLS is enabled with self-signed certificates: attempt to read the file
         try:
             root_certificates_bytes = Path(root_certificates).read_bytes()
         except Exception as e:
-            typer.secho(
-                f"❌ Failed to read certificate file `{root_certificates}`: {e}",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
-            )
-            raise typer.Exit(code=1) from e
+            raise click.ClickException(
+                f"Failed to read certificate file `{root_certificates}`: {e}"
+            ) from e
     else:
         root_certificates_bytes = None
 
     return root_certificates_bytes
 
 
-def exit_if_no_address(federation_config: dict[str, Any], cmd: str) -> None:
-    """Exit if the provided federation_config has no "address" key.
-
-    Parameters
-    ----------
-    federation_config : dict[str, Any]
-        The federation configuration dictionary to check.
-    cmd : str
-        The command name to display in the error message.
-
-    Raises
-    ------
-    typer.Exit
-        If 'address' key is not present in federation_config.
-    """
-    if "address" not in federation_config:
-        typer.secho(
-            f"❌ `flwr {cmd}` currently works with a SuperLink. Ensure that the "
-            "correct SuperLink (Control API) address is provided in `pyproject.toml`.",
-            fg=typer.colors.RED,
-            bold=True,
-            err=True,
-        )
-        raise typer.Exit(code=1)
-
-
 def get_insecure_flag(federation_config: dict[str, Any]) -> bool:
     """Extract and validate the `insecure` flag from the federation configuration.
 
@@ -377,7 +229,7 @@ def get_insecure_flag(federation_config: dict[str, Any]) -> bool:
 
     Raises
     ------
-    typer.Exit
+    click.ClickException
         If insecure value is not a boolean type.
     """
     insecure_value = federation_config.get("insecure")
@@ -387,11 +239,7 @@ def get_insecure_flag(federation_config: dict[str, Any]) -> bool:
         return False
     if isinstance(insecure_value, bool):
         return insecure_value
-    typer.secho(
-        "❌ Invalid type for `insecure`: expected a boolean if provided. "
-        "(`insecure = true` or `insecure = false`)",
-        fg=typer.colors.RED,
-        bold=True,
-        err=True,
+    raise click.ClickException(
+        "Invalid type for `insecure`: expected a boolean if provided. "
+        "(`insecure = true` or `insecure = false`)"
     )
-    raise typer.Exit(code=1)

flwr/cli/federation/ls.py

@@ -18,6 +18,7 @@
 import io
 from typing import Annotated, Any
 
+import click
 import typer
 from rich.console import Console
 from rich.table import Table
@@ -112,18 +113,13 @@ def ls(  # pylint: disable=R0914, R0913, R0917, R0912
         finally:
             if channel:
                 channel.close()
-    except (typer.Exit, Exception) as err:  # pylint: disable=broad-except
+    except Exception as err:  # pylint: disable=broad-except
         if suppress_output:
             restore_output()
             e_message = captured_output.getvalue()
             print_json_error(e_message, err)
         else:
-            typer.secho(
-                f"{err}",
-                fg=typer.colors.RED,
-                bold=True,
-                err=True,
-            )
+            raise click.ClickException(str(err)) from None
     finally:
         if suppress_output:
             restore_output()