flwr-nightly 1.10.0.dev20240717__tar.gz → 1.10.0.dev20240721__tar.gz

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.10.0.dev20240717
+Version: 1.10.0.dev20240721
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -33,7 +33,7 @@ Classifier: Typing :: Typed
 Provides-Extra: rest
 Provides-Extra: simulation
 Requires-Dist: cryptography (>=42.0.4,<43.0.0)
-Requires-Dist: grpcio (>=1.60.0,<2.0.0,!=1.64.2,!=1.65.0)
+Requires-Dist: grpcio (>=1.60.0,<2.0.0,!=1.64.2,!=1.65.1)
 Requires-Dist: iterators (>=0.0.2,<0.0.3)
 Requires-Dist: numpy (>=1.21.0,<2.0.0)
 Requires-Dist: pathspec (>=0.12.1,<0.13.0)

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.10.0.dev20240717"
+version = "1.10.0.dev20240721"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -64,7 +64,7 @@ flower-simulation = "flwr.simulation.run_simulation:run_simulation_from_cli"
 python = "^3.8"
 # Mandatory dependencies
 numpy = "^1.21.0"
-grpcio = "^1.60.0,!=1.64.2,!=1.65.0"
+grpcio = "^1.60.0,!=1.64.2,!=1.65.1"
 protobuf = "^4.25.2"
 cryptography = "^42.0.4"
 pycryptodome = "^3.18.0"

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/new.py

@@ -14,9 +14,9 @@
 # ==============================================================================
 """Flower command line interface `new` command."""
 
-import os
 import re
 from enum import Enum
+from pathlib import Path
 from string import Template
 from typing import Dict, Optional
 
@@ -59,10 +59,10 @@ class TemplateNotFound(Exception):
 
 def load_template(name: str) -> str:
     """Load template from template directory and return as text."""
-    tpl_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "templates"))
-    tpl_file_path = os.path.join(tpl_dir, name)
+    tpl_dir = (Path(__file__).parent / "templates").absolute()
+    tpl_file_path = tpl_dir / name
 
-    if not os.path.isfile(tpl_file_path):
+    if not tpl_file_path.is_file():
         raise TemplateNotFound(f"Template '{name}' not found")
 
     with open(tpl_file_path, encoding="utf-8") as tpl_file:
@@ -78,14 +78,13 @@ def render_template(template: str, data: Dict[str, str]) -> str:
     return tpl.template
 
 
-def create_file(file_path: str, content: str) -> None:
+def create_file(file_path: Path, content: str) -> None:
     """Create file including all nessecary directories and write content into file."""
-    os.makedirs(os.path.dirname(file_path), exist_ok=True)
-    with open(file_path, "w", encoding="utf-8") as f:
-        f.write(content)
+    file_path.parent.mkdir(exist_ok=True)
+    file_path.write_text(content)
 
 
-def render_and_create(file_path: str, template: str, context: Dict[str, str]) -> None:
+def render_and_create(file_path: Path, template: str, context: Dict[str, str]) -> None:
     """Render template and write to file."""
     content = render_template(template, context)
     create_file(file_path, content)
@@ -117,6 +116,21 @@ def new(
             default=sanitize_project_name(project_name),
         )
 
+    # Set project directory path
+    package_name = re.sub(r"[-_.]+", "-", project_name).lower()
+    import_name = package_name.replace("-", "_")
+    project_dir = Path.cwd() / package_name
+
+    if project_dir.exists():
+        if not typer.confirm(
+            typer.style(
+                f"\n💬 {project_name} already exists, do you want to override it?",
+                fg=typer.colors.MAGENTA,
+                bold=True,
+            )
+        ):
+            return
+
     if username is None:
         username = prompt_text("Please provide your Flower username")
 
@@ -158,12 +172,6 @@ def new(
         )
     )
 
-    # Set project directory path
-    cwd = os.getcwd()
-    package_name = re.sub(r"[-_.]+", "-", project_name).lower()
-    import_name = package_name.replace("-", "_")
-    project_dir = os.path.join(cwd, package_name)
-
     context = {
         "project_name": project_name,
         "package_name": package_name,
@@ -252,7 +260,7 @@ def new(
 
     for file_path, value in files.items():
         render_and_create(
-            file_path=os.path.join(project_dir, file_path),
+            file_path=project_dir / file_path,
             template=value["template"],
             context=context,
         )

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/code/client.hf.py.tpl

@@ -30,7 +30,11 @@ class FlowerClient(NumPyClient):
 
     def fit(self, parameters, config):
         self.set_parameters(parameters)
-        train(self.net, self.trainloader, epochs=1)
+        train(
+            self.net,
+            self.trainloader,
+            epochs=int(self.context.run_config["local-epochs"]),
+        )
         return self.get_parameters(config={}), len(self.trainloader), {}
 
     def evaluate(self, parameters, config):
@@ -45,8 +49,8 @@ def client_fn(context: Context):
         CHECKPOINT, num_labels=2
     ).to(DEVICE)
 
-    partition_id = int(context.node_config['partition-id'])
-    num_partitions = int(context.node_config['num-partitions])
+    partition_id = int(context.node_config["partition-id"])
+    num_partitions = int(context.node_config["num-partitions"])
     trainloader, valloader = load_data(partition_id, num_partitions)
 
     # Return Client instance

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/code/client.mlx.py.tpl

@@ -20,17 +20,19 @@ from $import_name.task import (
 # Define Flower Client and client_fn
 class FlowerClient(NumPyClient):
     def __init__(self, data):
-        num_layers = 2
-        hidden_dim = 32
+        num_layers = int(self.context.run_config["num-layers"])
+        hidden_dim = int(self.context.run_config["hidden-dim"])
         num_classes = 10
-        batch_size = 256
-        num_epochs = 1
-        learning_rate = 1e-1
+        batch_size = int(self.context.run_config["batch-size"])
+        learning_rate = float(self.context.run_config["lr"])
+        num_epochs = int(self.context.run_config["local-epochs"])
 
         self.train_images, self.train_labels, self.test_images, self.test_labels = data
-        self.model = MLP(num_layers, self.train_images.shape[-1], hidden_dim, num_classes) 
-        self.optimizer = optim.SGD(learning_rate=learning_rate) 
-        self.loss_and_grad_fn = nn.value_and_grad(self.model, loss_fn) 
+        self.model = MLP(
+            num_layers, self.train_images.shape[-1], hidden_dim, num_classes
+        )
+        self.optimizer = optim.SGD(learning_rate=learning_rate)
+        self.loss_and_grad_fn = nn.value_and_grad(self.model, loss_fn)
         self.num_epochs = num_epochs
         self.batch_size = batch_size
 

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/code/client.pytorch.py.tpl

@@ -23,7 +23,13 @@ class FlowerClient(NumPyClient):
 
     def fit(self, parameters, config):
         set_weights(self.net, parameters)
-        results = train(self.net, self.trainloader, self.valloader, 1, DEVICE)
+        results = train(
+            self.net,
+            self.trainloader,
+            self.valloader,
+            int(self.context.run_config["local-epochs"]),
+            DEVICE,
+        )
         return get_weights(self.net), len(self.trainloader.dataset), results
 
     def evaluate(self, parameters, config):

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/code/client.sklearn.py.tpl

@@ -67,10 +67,11 @@ class FlowerClient(NumPyClient):
 
         return loss, len(self.X_test), {"accuracy": accuracy}
 
-fds = FederatedDataset(dataset="mnist", partitioners={"train": 2})
 
 def client_fn(context: Context):
     partition_id = int(context.node_config["partition-id"])
+    num_partitions = int(context.node_config["num-partitions"])
+    fds = FederatedDataset(dataset="mnist", partitioners={"train": num_partitions})
     dataset = fds.load_partition(partition_id, "train").with_format("numpy")
 
     X, y = dataset["image"].reshape((len(dataset), -1)), dataset["label"]

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/code/client.tensorflow.py.tpl

@@ -20,7 +20,13 @@ class FlowerClient(NumPyClient):
 
     def fit(self, parameters, config):
         self.model.set_weights(parameters)
-        self.model.fit(self.x_train, self.y_train, epochs=1, batch_size=32, verbose=0)
+        self.model.fit(
+            self.x_train,
+            self.y_train,
+            epochs=int(self.context.run_config["local-epochs"]),
+            batch_size=int(self.context.run_config["batch-size"]),
+            verbose=bool(self.context.run_config.get("verbose")),
+        )
         return self.model.get_weights(), len(self.x_train), {}
 
     def evaluate(self, parameters, config):
@@ -34,7 +40,8 @@ def client_fn(context: Context):
     net = load_model()
 
     partition_id = int(context.node_config["partition-id"])
-    x_train, y_train, x_test, y_test = load_data(partition_id, 2)
+    num_partitions = int(context.node_config["num-partitions"])
+    x_train, y_train, x_test, y_test = load_data(partition_id, num_partitions)
 
     # Return Client instance
     return FlowerClient(net, x_train, y_train, x_test, y_test).to_client()

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/pyproject.hf.toml.tpl

@@ -11,10 +11,10 @@ dependencies = [
     "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets>=0.0.2,<1.0.0",
     "torch==2.2.1",
-    "transformers>=4.30.0,<5.0"
-    "evaluate>=0.4.0,<1.0"
-    "datasets>=2.0.0, <3.0"
-    "scikit-learn>=1.3.1, <2.0"
+    "transformers>=4.30.0,<5.0",
+    "evaluate>=0.4.0,<1.0",
+    "datasets>=2.0.0, <3.0",
+    "scikit-learn>=1.3.1, <2.0",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -29,6 +29,7 @@ clientapp = "$import_name.client_app:app"
 
 [tool.flwr.app.config]
 num-server-rounds = "3"
+local-epochs = "1"
 
 [tool.flwr.federations]
 default = "localhost"

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -9,9 +9,9 @@ description = ""
 license = "Apache-2.0"
 dependencies = [
     "flwr[simulation]>=1.9.0,<2.0",
-    "jax==0.4.26",
-    "jaxlib==0.4.26",
-    "scikit-learn==1.4.2",
+    "jax==0.4.13",
+    "jaxlib==0.4.13",
+    "scikit-learn==1.3.2",
 ]
 
 [tool.hatch.build.targets.wheel]

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -26,6 +26,11 @@ clientapp = "$import_name.client_app:app"
 
 [tool.flwr.app.config]
 num-server-rounds = "3"
+local-epochs = "1"
+num-layers = "2"
+hidden-dim = "32"
+batch-size = "256"
+lr = "0.1"
 
 [tool.flwr.federations]
 default = "localhost"

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -26,6 +26,7 @@ clientapp = "$import_name.client_app:app"
 
 [tool.flwr.app.config]
 num-server-rounds = "3"
+local-epochs = "1"
 
 [tool.flwr.federations]
 default = "localhost"

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -25,6 +25,9 @@ clientapp = "$import_name.client_app:app"
 
 [tool.flwr.app.config]
 num-server-rounds = "3"
+local-epochs = "1"
+batch-size = "32"
+verbose = ""  # Empty string means False
 
 [tool.flwr.federations]
 default = "localhost"

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/cli/run/run.py

@@ -199,7 +199,7 @@ def _run_without_superexec(
     ]
 
     if config_overrides:
-        command.extend(["--run-config", f"{config_overrides}"])
+        command.extend(["--run-config", f"{','.join(config_overrides)}"])
 
     # Run the simulation
     subprocess.run(

{flwr_nightly-1.10.0.dev20240717 → flwr_nightly-1.10.0.dev20240721}/src/py/flwr/simulation/run_simulation.py

@@ -480,8 +480,12 @@ def _run_simulation(
     if verbose_logging:
         update_console_handler(level=DEBUG, timestamps=True, colored=True)
     else:
-        backend_config["init_args"]["logging_level"] = WARNING
-        backend_config["init_args"]["log_to_driver"] = True
+        backend_config["init_args"]["logging_level"] = backend_config["init_args"].get(
+            "logging_level", WARNING
+        )
+        backend_config["init_args"]["log_to_driver"] = backend_config["init_args"].get(
+            "log_to_driver", True
+        )
 
     if enable_tf_gpu_growth:
         # Check that Backend config has also enabled using GPU growth