Merge branch 'main' into make-native-flwr-run-use-flower-simulation

src/py/flwr/cli/run/run.py

@@ -171,7 +171,6 @@ def on_channel_state_change(channel_connectivity: str) -> None:
 def _run_without_superexec(
     app_path: Optional[Path], federation: Dict[str, Any], federation_name: str
 ) -> None:
-
     try:
         num_supernodes = federation["options"]["num-supernodes"]
     except KeyError as err:

src/py/flwr/client/supernode/app.py

@@ -248,7 +248,7 @@ def _load(fab_id: str, fab_version: str) -> ClientApp:
             dir_path = Path(project_dir).absolute()
 
             # Set app reference
-            client_app_ref = config["tool"]["flwr"]["components"]["clientapp"]
+            client_app_ref = config["tool"]["flwr"]["app"]["components"]["clientapp"]
 
         # Set sys.path
         nonlocal inserted_path

src/py/flwr/server/run_serverapp.py

@@ -186,7 +186,7 @@ def run_server_app() -> None:  # pylint: disable=too-many-branches
         run_ = driver.run
         server_app_dir = str(get_project_dir(run_.fab_id, run_.fab_version, flwr_dir))
         config = get_project_config(server_app_dir)
-        server_app_attr = config["tool"]["flwr"]["components"]["serverapp"]
+        server_app_attr = config["tool"]["flwr"]["app"]["components"]["serverapp"]
         server_app_run_config = get_fused_config(run_, flwr_dir)
     else:
         # User provided `server-app`, but not `--run-id`

src/py/flwr/superexec/simulation.py

@@ -112,7 +112,7 @@ def start_run(
                 )
 
             # Get ClientApp and SeverApp components
-            flower_components = config["tool"]["flwr"]["components"]
+            flower_components = config["tool"]["flwr"]["app"]["components"]
             clientapp = flower_components["clientapp"]
             serverapp = flower_components["serverapp"]