flwr-nightly 1.9.0.dev20240521__tar.gz → 1.9.0.dev20240522__tar.gz

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.9.0.dev20240521
+Version: 1.9.0.dev20240522
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.9.0.dev20240521"
+version = "1.9.0.dev20240522"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/build.py

@@ -24,7 +24,7 @@ import pathspec
 import typer
 from typing_extensions import Annotated
 
-from .config_utils import load_and_validate_with_defaults
+from .config_utils import load_and_validate
 from .utils import is_valid_project_name
 
 
@@ -67,9 +67,7 @@ def build(
         )
         raise typer.Exit(code=1)
 
-    conf, errors, warnings = load_and_validate_with_defaults(
-        directory / "pyproject.toml"
-    )
+    conf, errors, warnings = load_and_validate(directory / "pyproject.toml")
     if conf is None:
         typer.secho(
             "Project configuration could not be loaded.\npyproject.toml is invalid:\n"

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/config_utils.py

@@ -22,7 +22,7 @@ import tomli
 from flwr.common import object_ref
 
 
-def load_and_validate_with_defaults(
+def load_and_validate(
     path: Optional[Path] = None,
 ) -> Tuple[Optional[Dict[str, Any]], List[str], List[str]]:
     """Load and validate pyproject.toml as dict.
@@ -47,14 +47,6 @@ def load_and_validate_with_defaults(
     if not is_valid:
         return (None, errors, warnings)
 
-    # Apply defaults
-    defaults = {
-        "flower": {
-            "engine": {"name": "simulation", "simulation": {"supernode": {"num": 2}}}
-        }
-    }
-    config = apply_defaults(config, defaults)
-
     return (config, errors, warnings)
 
 
@@ -129,17 +121,3 @@ def validate(config: Dict[str, Any]) -> Tuple[bool, List[str], List[str]]:
         return False, [reason], []
 
     return True, [], []
-
-
-def apply_defaults(
-    config: Dict[str, Any],
-    defaults: Dict[str, Any],
-) -> Dict[str, Any]:
-    """Apply defaults to config."""
-    for key in defaults:
-        if key in config:
-            if isinstance(config[key], dict) and isinstance(defaults[key], dict):
-                apply_defaults(config[key], defaults[key])
-        else:
-            config[key] = defaults[key]
-    return config

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.hf.toml.tpl

@@ -29,3 +29,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -26,3 +26,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -24,3 +24,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -26,3 +26,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -25,3 +25,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -25,3 +25,9 @@ publisher = "$username"
 [flower.components]
 serverapp = "$import_name.server:app"
 clientapp = "$import_name.client:app"
+
+[flower.engine]
+name = "simulation"
+
+[flower.engine.simulation.supernode]
+num = 2

{flwr_nightly-1.9.0.dev20240521 → flwr_nightly-1.9.0.dev20240522}/src/py/flwr/cli/run/run.py

@@ -15,18 +15,32 @@
 """Flower command line interface `run` command."""
 
 import sys
+from enum import Enum
+from typing import Optional
 
 import typer
+from typing_extensions import Annotated
 
 from flwr.cli import config_utils
 from flwr.simulation.run_simulation import _run_simulation
 
 
-def run() -> None:
+class Engine(str, Enum):
+    """Enum defining the engine to run on."""
+
+    SIMULATION = "simulation"
+
+
+def run(
+    engine: Annotated[
+        Optional[Engine],
+        typer.Option(case_sensitive=False, help="The ML framework to use"),
+    ] = None,
+) -> None:
     """Run Flower project."""
     typer.secho("Loading project configuration... ", fg=typer.colors.BLUE)
 
-    config, errors, warnings = config_utils.load_and_validate_with_defaults()
+    config, errors, warnings = config_utils.load_and_validate()
 
     if config is None:
         typer.secho(
@@ -49,9 +63,11 @@ def run() -> None:
 
     server_app_ref = config["flower"]["components"]["serverapp"]
     client_app_ref = config["flower"]["components"]["clientapp"]
-    engine = config["flower"]["engine"]["name"]
 
-    if engine == "simulation":
+    if engine is None:
+        engine = config["flower"]["engine"]["name"]
+
+    if engine == Engine.SIMULATION:
         num_supernodes = config["flower"]["engine"]["simulation"]["supernode"]["num"]
 
         typer.secho("Starting run... ", fg=typer.colors.BLUE)