flwr-nightly 1.18.0.dev20250414__tar.gz → 1.18.0.dev20250415__tar.gz

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.18.0.dev20250414
+Version: 1.18.0.dev20250415
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/py/flwr/cli/app.py

@@ -14,10 +14,11 @@
 # ==============================================================================
 """Flower command line interface."""
 
-
 import typer
 from typer.main import get_command
 
+from flwr.common.version import package_version
+
 from .build import build
 from .install import install
 from .log import log
@@ -34,6 +35,7 @@ app = typer.Typer(
         bold=True,
     ),
     no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
 )
 
 app.command()(new)
@@ -47,5 +49,22 @@ app.command()(login)
 
 typer_click_object = get_command(app)
 
+
+@app.callback(invoke_without_command=True)
+def version_callback(
+    ver: bool = typer.Option(
+        None,
+        "-V",
+        "--version",
+        is_eager=True,
+        help="Show the version and exit.",
+    ),
+) -> None:
+    """Print version."""
+    if ver:
+        typer.secho(f"Flower version: {package_version}", fg="blue")
+        raise typer.Exit()
+
+
 if __name__ == "__main__":
     app()

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/py/flwr/cli/config_utils.py

@@ -176,11 +176,46 @@ def validate_federation_in_project_config(
 def validate_certificate_in_federation_config(
     app: Path, federation_config: dict[str, Any]
 ) -> tuple[bool, Optional[bytes]]:
-    """Validate the certificates in the Flower project configuration."""
-    insecure_str = federation_config.get("insecure")
+    """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_value = federation_config.get("insecure")
+    # Determine the insecure flag
+    if insecure_value is None:
+        # Not provided, default to False (TLS enabled)
+        insecure = False
+    elif isinstance(insecure_value, bool):
+        insecure = insecure_value
+    else:
+        typer.secho(
+            "❌ Invalid type for `insecure`: expected a boolean if provided. "
+            "(`insecure = true` or `insecure = false`)",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
+
+    # Process root certificates
     if root_certificates := federation_config.get("root-certificates"):
-        root_certificates_bytes = (app / root_certificates).read_bytes()
-        if insecure := bool(insecure_str):
+        if insecure:
             typer.secho(
                 "❌ `root-certificates` were provided but the `insecure` parameter "
                 "is set to `True`.",
@@ -188,22 +223,19 @@ def validate_certificate_in_federation_config(
                 bold=True,
             )
             raise typer.Exit(code=1)
-    else:
-        root_certificates_bytes = None
-        if insecure_str is None:
-            typer.secho(
-                "❌ To disable TLS, set `insecure = true` in `pyproject.toml`.",
-                fg=typer.colors.RED,
-                bold=True,
-            )
-            raise typer.Exit(code=1)
-        if not (insecure := bool(insecure_str)):
+
+        # 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(
-                "❌ No certificate were given yet `insecure` is set to `False`.",
+                f"❌ Failed to read certificate file `{root_certificates}`: {e}",
                 fg=typer.colors.RED,
                 bold=True,
             )
-            raise typer.Exit(code=1)
+            raise typer.Exit(code=1) from e
+    else:
+        root_certificates_bytes = None
 
     return insecure, root_certificates_bytes
 

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/py/flwr/common/telemetry.py

@@ -124,7 +124,7 @@ class EventType(str, Enum):
     # This method combined with auto() will set the property value to
     # the property name e.g.
     # `START_CLIENT = auto()` becomes `START_CLIENT = "START_CLIENT"`
-    # The type signature is not compatible with mypy, pylint and flake8
+    # The type signature is not compatible with mypy and pylint
     # so each of those needs to be disabled for this line.
     # pylint: disable-next=no-self-argument,arguments-differ,line-too-long
     def _generate_next_value_(name: str, start: int, count: int, last_values: list[Any]) -> Any:  # type: ignore # noqa: E501

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/py/flwr/server/strategy/bulyan.py

@@ -37,7 +37,7 @@ from .aggregate import aggregate_bulyan, aggregate_krum
 from .fedavg import FedAvg
 
 
-# flake8: noqa: E501
+# noqa: E501
 # pylint: disable=line-too-long
 class Bulyan(FedAvg):
     """Bulyan strategy.

{flwr_nightly-1.18.0.dev20250414 → flwr_nightly-1.18.0.dev20250415}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.18.0.dev20250414"
+version = "1.18.0.dev20250415"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -98,7 +98,6 @@ taplo = "==0.9.3"
 docformatter = "==1.7.5"
 mypy = "==1.8.0"
 pylint = "==3.3.1"
-flake8 = "==5.0.4"
 parameterized = "==0.9.0"
 pytest = "==7.4.4"
 pytest-cov = "==4.1.0"