From 4a2e03e17824dadd29025675a47a7b0d914885fc Mon Sep 17 00:00:00 2001 From: jafermarq Date: Sat, 12 Oct 2024 13:31:25 +0100 Subject: [PATCH 1/3] init --- src/py/flwr/client/supernode/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/py/flwr/client/supernode/app.py b/src/py/flwr/client/supernode/app.py index ea7613667baa..2605799fe026 100644 --- a/src/py/flwr/client/supernode/app.py +++ b/src/py/flwr/client/supernode/app.py @@ -183,6 +183,8 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser: - `$FLWR_HOME/` if `$FLWR_HOME` is defined - `$XDG_DATA_HOME/.flwr/` if `$XDG_DATA_HOME` is defined - `$HOME/.flwr/` in all other cases + . Note that if `--isolation` is used, setting a custom `flwr-dir` can only be done + via either `$FLWR_HOME` or `$XDG_DATA_HOME`. """, ) parser.add_argument( From 7ee52a8dfb9b5f93557861e2c40c37eb57a271e1 Mon Sep 17 00:00:00 2001 From: jafermarq Date: Sat, 12 Oct 2024 18:15:54 +0100 Subject: [PATCH 2/3] updated argparse help message; moved logging message after argparsing for supernode and superlink --- src/py/flwr/client/supernode/app.py | 14 ++++++-------- src/py/flwr/server/app.py | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/py/flwr/client/supernode/app.py b/src/py/flwr/client/supernode/app.py index 2605799fe026..2a3713666efb 100644 --- a/src/py/flwr/client/supernode/app.py +++ b/src/py/flwr/client/supernode/app.py @@ -48,14 +48,13 @@ def run_supernode() -> None: """Run Flower SuperNode.""" + args = _parse_args_run_supernode().parse_args() + _warn_deprecated_server_arg(args) + log(INFO, "Starting Flower SuperNode") event(EventType.RUN_SUPERNODE_ENTER) - args = _parse_args_run_supernode().parse_args() - - _warn_deprecated_server_arg(args) - root_certificates = _get_certificates(args) load_fn = get_load_client_app_fn( default_app_ref="", @@ -178,14 +177,13 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser: "--flwr-dir", default=None, help="""The path containing installed Flower Apps. - By default, this value is equal to: + If `--isolation` is set, use `$FLWR_HOME` or `$XDG_DATA_HOME` to specify the + directory instead. The default directory is: - `$FLWR_HOME/` if `$FLWR_HOME` is defined - `$XDG_DATA_HOME/.flwr/` if `$XDG_DATA_HOME` is defined - `$HOME/.flwr/` in all other cases - . Note that if `--isolation` is used, setting a custom `flwr-dir` can only be done - via either `$FLWR_HOME` or `$XDG_DATA_HOME`. - """, + """, ) parser.add_argument( "--isolation", diff --git a/src/py/flwr/server/app.py b/src/py/flwr/server/app.py index 047fdf8700ac..58918dbb79ab 100644 --- a/src/py/flwr/server/app.py +++ b/src/py/flwr/server/app.py @@ -199,12 +199,12 @@ def start_server( # pylint: disable=too-many-arguments,too-many-locals # pylint: disable=too-many-branches, too-many-locals, too-many-statements def run_superlink() -> None: """Run Flower SuperLink (Driver API and Fleet API).""" + args = _parse_args_run_superlink().parse_args() + log(INFO, "Starting Flower SuperLink") event(EventType.RUN_SUPERLINK_ENTER) - args = _parse_args_run_superlink().parse_args() - # Parse IP address driver_address, _, _ = _format_address(args.driver_api_address) From 52bdff35beeb5bff08fc3a7a835dae11a649c58e Mon Sep 17 00:00:00 2001 From: "Daniel J. Beutel" Date: Sun, 13 Oct 2024 20:56:05 +0200 Subject: [PATCH 3/3] Update app.py --- src/py/flwr/client/supernode/app.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/py/flwr/client/supernode/app.py b/src/py/flwr/client/supernode/app.py index 2a3713666efb..10a2e709fbe4 100644 --- a/src/py/flwr/client/supernode/app.py +++ b/src/py/flwr/client/supernode/app.py @@ -177,8 +177,7 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser: "--flwr-dir", default=None, help="""The path containing installed Flower Apps. - If `--isolation` is set, use `$FLWR_HOME` or `$XDG_DATA_HOME` to specify the - directory instead. The default directory is: + The default directory is: - `$FLWR_HOME/` if `$FLWR_HOME` is defined - `$XDG_DATA_HOME/.flwr/` if `$XDG_DATA_HOME` is defined