flwr-nightly 1.18.0.dev20250414__py3-none-any.whl → 1.18.0.dev20250415__py3-none-any.whl

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/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/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/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.dist-info → flwr_nightly-1.18.0.dev20250415.dist-info}/METADATA

@@ -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.dist-info → flwr_nightly-1.18.0.dev20250415.dist-info}/RECORD

@@ -1,11 +1,11 @@
 flwr/__init__.py,sha256=5JdNd_I_ZxHJv2tbnM_Ug2_LQ4DkhZ2FiA7l23V13hU,937
 flwr/cli/__init__.py,sha256=EfMGmHoobET6P2blBt_eOByXL8299MgFfB7XNdaPQ6I,720
-flwr/cli/app.py,sha256=6ay_prkUbb0GmN0mvd-s-CCj8QAGAdHjiAFjZn5z7Yo,1382
+flwr/cli/app.py,sha256=AKCP45Dkbpvdil_4Ir9S93L3HP3iUOnHmcZjscoM8uU,1856
 flwr/cli/auth_plugin/__init__.py,sha256=FyaoqPzcxlBTFfJ2sBRC5USwQLmAhFr5KuBwfMO4bmo,1052
 flwr/cli/auth_plugin/oidc_cli_plugin.py,sha256=gIhW6Jg9QAo-jL43LYPpw_kn7pdUZZae0s0H8dEgjLM,5384
 flwr/cli/build.py,sha256=sPzCAZC0gDytpDqMO3aHBcdCzQVXqRhts4TJYSZNu1E,6375
 flwr/cli/cli_user_auth_interceptor.py,sha256=-JqDXpeZNQVwoSG7hMKsiS5qY5k5oklNSlQOVpM0-aY,3126
-flwr/cli/config_utils.py,sha256=dkUXjaRPXAUlj5tFbnQWIhZCV7y4BryCbV4su9WypS0,7518
+flwr/cli/config_utils.py,sha256=Si9nKXULxhk0qk5S-ocbu_Shh_EcIKtKrJ5zqb_Xwtg,8998
 flwr/cli/constant.py,sha256=g7Ad7o3DJDkJNrWS0T3SSJETWSTkkVJWGpLM8zlbpcY,1289
 flwr/cli/example.py,sha256=SNTorkKPrx1rOryGREUyZu8TcOc1-vFv1zEddaysdY0,2216
 flwr/cli/install.py,sha256=Jr883qR7qssVpUr3hEOEcLK-dfW67Rsve3lZchjA9RU,8180
@@ -152,7 +152,7 @@ flwr/common/secure_aggregation/quantization.py,sha256=ssFZpiRyj9ltIh0Ai3vGkDqWFO
 flwr/common/secure_aggregation/secaggplus_constants.py,sha256=dGYhWOBMMDJcQH4_tQNC8-Efqm-ecEUNN9ANz59UnCk,2182
 flwr/common/secure_aggregation/secaggplus_utils.py,sha256=E_xU-Zd45daO1em7M6C2wOjFXVtJf-6tl7fp-7xq1wo,3214
 flwr/common/serde.py,sha256=Paik5W4uAAfW1iVER8uKtxwc2Jdg7J86mnIdRbsZfrU,27082
-flwr/common/telemetry.py,sha256=pvrMSsjEHNglFBoVzH5TKcBrC9VtuaSwSIhifwy63-Y,8770
+flwr/common/telemetry.py,sha256=jF47v0SbnBd43XamHtl3wKxs3knFUY2p77cm_2lzZ8M,8762
 flwr/common/typing.py,sha256=97QRfRRS7sQnjkAI5FDZ01-38oQUSz4i1qqewQmBWRg,6886
 flwr/common/version.py,sha256=7GAGzPn73Mkh09qhrjbmjZQtcqVhBuzhFBaK4Mk4VRk,1325
 flwr/proto/__init__.py,sha256=S3VbQzVwNC1P-3_9EdrXuwgptO-BVuuAe20Z_OUc1cQ,683
@@ -238,7 +238,7 @@ flwr/server/serverapp/app.py,sha256=6qdcXfkieNUS_ot16zntJHaJ570IiiyxtcdCGSOGiSs,
 flwr/server/serverapp_components.py,sha256=dfSqmrsVy3arKXpl3ZIBQWdV8rehfIms8aJooyzdmEM,2118
 flwr/server/strategy/__init__.py,sha256=HhsSWMWaC7oCb2g7Kqn1MBKdrfvgi8VxACy9ZL706Q0,2836
 flwr/server/strategy/aggregate.py,sha256=smlKKy-uFUuuFR12vlclucnwSQWRz78R79-Km4RWqbw,13978
-flwr/server/strategy/bulyan.py,sha256=iFmkqkWiZ73GVCOTOXDMECj2M-VGq-KnlUlV0vIn01Y,6513
+flwr/server/strategy/bulyan.py,sha256=_QimaddzbAppHJHygKkzDQ_HmGEuZEs9wXtTl6NUWdg,6505
 flwr/server/strategy/dp_adaptive_clipping.py,sha256=txpJ8LmRRPe_exCeLkq2fKQmwSJDIyiJZ434b-exNXE,17453
 flwr/server/strategy/dp_fixed_clipping.py,sha256=dQrYm8kNnjZmNJUMjHCCHJGFOTmq9mxuaE04SptA8WM,12840
 flwr/server/strategy/dpfedavg_adaptive.py,sha256=VvZv2SzYP1S3Of-zA3XZY74P0BTP-Ag6ketspyZss3o,4888
@@ -326,7 +326,7 @@ flwr/superexec/exec_servicer.py,sha256=Z0YYfs6eNPhqn8rY0x_R04XgR2mKFpggt07IH0EhU
 flwr/superexec/exec_user_auth_interceptor.py,sha256=iqygALkOMBUu_s_R9G0mFThZA7HTUzuXCLgxLCefiwI,4440
 flwr/superexec/executor.py,sha256=M5ucqSE53jfRtuCNf59WFLqQvA1Mln4741TySeZE7qQ,3112
 flwr/superexec/simulation.py,sha256=j6YwUvBN7EQ09ID7MYOCVZ70PGbuyBy8f9bXU0EszEM,4088
-flwr_nightly-1.18.0.dev20250414.dist-info/METADATA,sha256=aNRSTNVVPc9dBDbsPtPtR9M7ABT0blPmoGT8MP2GpyA,15868
-flwr_nightly-1.18.0.dev20250414.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.18.0.dev20250414.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
-flwr_nightly-1.18.0.dev20250414.dist-info/RECORD,,
+flwr_nightly-1.18.0.dev20250415.dist-info/METADATA,sha256=M_-UYV8N42fp9WXUyTZUWUIOlKQlpZvNtaKjnb_2wDU,15868
+flwr_nightly-1.18.0.dev20250415.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.18.0.dev20250415.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
+flwr_nightly-1.18.0.dev20250415.dist-info/RECORD,,