flwr 1.17.0__tar.gz → 1.18.0__tar.gz

{flwr-1.17.0 → flwr-1.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr
-Version: 1.17.0
+Version: 1.18.0
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -56,7 +56,7 @@ Description-Content-Type: text/markdown
 
 <p align="center">
   <a href="https://flower.ai/">
-    <img src="https://flower.ai/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflower_white_border.c2012e70.png&w=640&q=75" width="140px" alt="Flower Website" />
+    <img src="https://flower.ai/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflwr-head.4d68867a.png&w=384&q=75" width="140px" alt="Flower Website" />
   </a>
 </p>
 <p align="center">

{flwr-1.17.0 → flwr-1.18.0}/README.md

@@ -2,7 +2,7 @@
 
 <p align="center">
   <a href="https://flower.ai/">
-    <img src="https://flower.ai/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflower_white_border.c2012e70.png&w=640&q=75" width="140px" alt="Flower Website" />
+    <img src="https://flower.ai/_next/image/?url=%2F_next%2Fstatic%2Fmedia%2Fflwr-head.4d68867a.png&w=384&q=75" width="140px" alt="Flower Website" />
   </a>
 </p>
 <p align="center">

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/app.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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-1.17.0/src → flwr-1.18.0}/py/flwr/cli/build.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/cli_user_auth_interceptor.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/config_utils.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -176,11 +176,32 @@ 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 = get_insecure_flag(federation_config)
+
+    # 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 +209,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
 
@@ -218,3 +236,21 @@ def exit_if_no_address(federation_config: dict[str, Any], cmd: str) -> None:
             bold=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."""
+    insecure_value = federation_config.get("insecure")
+
+    if insecure_value is None:
+        # Not provided, default to False (TLS enabled)
+        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,
+    )
+    raise typer.Exit(code=1)

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/example.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/install.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/log.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/login/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/login/login.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import typer
 
 from flwr.cli.config_utils import (
     exit_if_no_address,
+    get_insecure_flag,
     load_and_validate,
     process_loaded_project_config,
     validate_federation_in_project_config,
@@ -80,6 +81,16 @@ def login(  # pylint: disable=R0914
             bold=True,
         )
         raise typer.Exit(code=1)
+    # Check if insecure flag is set to `True`
+    insecure = get_insecure_flag(federation_config)
+    if insecure:
+        typer.secho(
+            "❌ `flwr login` requires TLS to be enabled. `insecure` must NOT be set to "
+            "`true` in the federation configuration.",
+            fg=typer.colors.RED,
+            bold=True,
+        )
+        raise typer.Exit(code=1)
 
     channel = init_channel(app, federation_config, None)
     stub = ExecStub(channel)

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/ls.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/new.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -201,15 +201,15 @@ def new(
         if llm_challenge_str == "generalnlp":
             challenge_name = "General NLP"
             num_clients = "20"
-            dataset_name = "vicgalle/alpaca-gpt4"
+            dataset_name = "flwrlabs/alpaca-gpt4"
         elif llm_challenge_str == "finance":
             challenge_name = "Finance"
             num_clients = "50"
-            dataset_name = "FinGPT/fingpt-sentiment-train"
+            dataset_name = "flwrlabs/fingpt-sentiment-train"
         elif llm_challenge_str == "medical":
             challenge_name = "Medical"
             num_clients = "20"
-            dataset_name = "medalpaca/medical_meadow_medical_flashcards"
+            dataset_name = "flwrlabs/medical-meadow-medical-flashcards"
         else:
             challenge_name = "Code"
             num_clients = "10"

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/code/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/code/flwr_tune/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/code/flwr_tune/client_app.py.tpl

@@ -49,7 +49,7 @@ class FlowerClient(NumPyClient):
     ):  # pylint: disable=too-many-arguments
         self.device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu")
         self.train_cfg = train_cfg
-        self.training_argumnets = TrainingArguments(**train_cfg.training_arguments)
+        self.training_arguments = TrainingArguments(**train_cfg.training_arguments)
         self.tokenizer = tokenizer
         self.formatting_prompts_func = formatting_prompts_func
         self.data_collator = data_collator
@@ -72,14 +72,14 @@ class FlowerClient(NumPyClient):
             self.train_cfg.learning_rate_min,
         )
 
-        self.training_argumnets.learning_rate = new_lr
-        self.training_argumnets.output_dir = config["save_path"]
+        self.training_arguments.learning_rate = new_lr
+        self.training_arguments.output_dir = config["save_path"]
 
         # Construct trainer
         trainer = SFTTrainer(
             model=self.model,
             tokenizer=self.tokenizer,
-            args=self.training_argumnets,
+            args=self.training_arguments,
             max_seq_length=self.train_cfg.seq_length,
             train_dataset=self.trainset,
             formatting_func=self.formatting_prompts_func,

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/code/task.sklearn.py.tpl

@@ -15,7 +15,7 @@ def load_data(partition_id: int, num_partitions: int):
     if fds is None:
         partitioner = IidPartitioner(num_partitions=num_partitions)
         fds = FederatedDataset(
-            dataset="mnist",
+            dataset="ylecun/mnist",
             partitioners={"train": partitioner},
         )
 

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,14 +8,14 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets>=0.5.0",
-    "torch==2.3.1",
+    "torch==2.4.0",
     "trl==0.8.1",
-    "bitsandbytes==0.45.0",
+    "bitsandbytes==0.45.4",
     "scipy==1.13.0",
     "peft==0.6.2",
-    "transformers==4.47.0",
+    "transformers==4.50.3",
     "sentencepiece==0.2.0",
     "omegaconf==2.3.0",
     "hf_transfer==0.1.8",

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets>=0.5.0",
     "torch==2.5.1",
     "transformers>=4.30.0,<5.0",

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.21.1",
 ]

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "numpy>=2.0.2",
 ]
 

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.17.0",
+    "flwr[simulation]>=1.18.0",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/run/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/run/run.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/stop.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/cli/utils.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -220,17 +220,6 @@ def try_obtain_cli_auth_plugin(
     if not federation_config.get("enable-user-auth", False):
         return None
 
-    # Check if TLS is enabled. If not, raise an error
-    if federation_config.get("root-certificates") is None:
-        typer.secho(
-            "❌ User authentication requires TLS to be enabled. "
-            "Please provide 'root-certificates' in the federation"
-            " configuration.",
-            fg=typer.colors.RED,
-            bold=True,
-        )
-        raise typer.Exit(code=1)
-
     config_path = get_user_auth_config_path(root_dir, federation)
 
     # Get the auth type from the config if not provided
@@ -273,6 +262,16 @@ def init_channel(
     # Initialize the CLI-side user auth interceptor
     interceptors: list[grpc.UnaryUnaryClientInterceptor] = []
     if auth_plugin is not None:
+        # Check if TLS is enabled. If not, raise an error
+        if insecure:
+            typer.secho(
+                "❌ User authentication requires TLS to be enabled. "
+                "Remove `insecure = true` from the federation configuration.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1)
+
         auth_plugin.load_tokens()
         interceptors.append(CliUserAuthInterceptor(auth_plugin))
 

{flwr-1.17.0/src → flwr-1.18.0}/py/flwr/client/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2020 Flower Labs GmbH. All Rights Reserved.
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.