flwr-nightly 1.13.0.dev20241117__tar.gz → 1.14.0.dev20241120__tar.gz

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.13.0.dev20241117
+Version: 1.14.0.dev20241120
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.13.0.dev20241117"
+version = "1.14.0.dev20241120"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -127,6 +127,7 @@ nbstripout = "==0.6.1"
 ruff = "==0.1.9"
 sphinx-argparse = "==0.4.0"
 pipreqs = "==0.4.13"
+mdformat = "==0.7.18"
 mdformat-gfm = "==0.3.6"
 mdformat-frontmatter = "==2.0.1"
 mdformat-beautysh = "==0.1.1"

flwr_nightly-1.14.0.dev20241120/src/py/flwr/cli/new/templates/app/README.md.tpl

@@ -0,0 +1,31 @@
+# $project_name: A Flower / $framework_str app
+
+## Install dependencies and project
+
+```bash
+pip install -e .
+```
+
+## Run with the Simulation Engine
+
+In the `$project_name` directory, use `flwr run` to run a local simulation:
+
+```bash
+flwr run .
+```
+
+Refer to the [How to Run Simulations](https://flower.ai/docs/framework/how-to-run-simulations.html) guide in the documentation for advice on how to optimize your simulations.
+
+## Run with the Deployment Engine
+
+> \[!NOTE\]
+> An update to this example will show how to run this Flower application with the Deployment Engine and TLS certificates, or with Docker.
+
+## Resources
+
+- Flower website: [flower.ai](https://flower.ai/)
+- Check the documentation: [flower.ai/docs](https://flower.ai/docs/)
+- Give Flower a ⭐️ on GitHub: [GitHub](https://github.com/adap/flower)
+- Join the Flower community!
+  - [Flower Slack](https://flower.ai/join-slack/)
+  - [Flower Discuss](https://discuss.flower.ai/)

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets[vision]>=0.3.0",
     "torch==2.2.1",
     "torchvision==0.17.1",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets>=0.3.0",
     "torch==2.3.1",
     "trl==0.8.1",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets>=0.3.0",
     "torch==2.2.1",
     "transformers>=4.30.0,<5.0",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.3.2",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets[vision]>=0.3.0",
     "mlx==0.16.1",
     "numpy==1.24.4",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "numpy>=1.21.0",
 ]
 

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets[vision]>=0.3.0",
     "torch==2.2.1",
     "torchvision==0.17.1",

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets[vision]>=0.3.0",
     "scikit-learn>=1.1.1",
 ]

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/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.12.0",
+    "flwr[simulation]>=1.13.0",
     "flwr-datasets[vision]>=0.3.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/cli/run/run.py

@@ -125,6 +125,10 @@ def _run_with_exec_api(
 
     fab_path, fab_hash = build(app)
     content = Path(fab_path).read_bytes()
+
+    # Delete FAB file once the bytes is computed
+    Path(fab_path).unlink()
+
     fab = Fab(fab_hash, content)
 
     # Construct a `ConfigsRecord` out of a flattened `UserConfig`
@@ -138,8 +142,6 @@ def _run_with_exec_api(
     )
     res = stub.StartRun(req)
 
-    # Delete FAB file once it has been sent to the Exec API
-    Path(fab_path).unlink()
     typer.secho(f"🎊 Successfully started run {res.run_id}", fg=typer.colors.GREEN)
 
     if stream:

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/client/app.py

@@ -41,6 +41,7 @@ from flwr.common.constant import (
     CLIENTAPPIO_API_DEFAULT_SERVER_ADDRESS,
     ISOLATION_MODE_PROCESS,
     ISOLATION_MODE_SUBPROCESS,
+    MAX_RETRY_DELAY,
     MISSING_EXTRA_REST,
     RUN_ID_NUM_BYTES,
     SERVER_OCTET,
@@ -235,8 +236,6 @@ def start_client_internal(
     flwr_path: Optional[Path] = None,
     isolation: Optional[str] = None,
     clientappio_api_address: Optional[str] = CLIENTAPPIO_API_DEFAULT_SERVER_ADDRESS,
-    certificates: Optional[tuple[bytes, bytes, bytes]] = None,
-    ssl_ca_certfile: Optional[str] = None,
 ) -> None:
     """Start a Flower client node which connects to a Flower server.
 
@@ -300,10 +299,6 @@ def start_client_internal(
     clientappio_api_address : Optional[str]
         (default: `CLIENTAPPIO_API_DEFAULT_SERVER_ADDRESS`)
         The SuperNode gRPC server address.
-    certificates : Optional[Tuple[bytes, bytes, bytes]] (default: None)
-        Tuple containing the CA certificate, server certificate, and server private key.
-    ssl_ca_certfile : Optional[str] (default: None)
-        The path to the CA certificate file used by `flwr-clientapp` in subprocess mode.
     """
     if insecure is None:
         insecure = root_certificates is None
@@ -337,7 +332,7 @@ def start_client_internal(
             )
         _clientappio_grpc_server, clientappio_servicer = run_clientappio_api_grpc(
             address=clientappio_api_address,
-            certificates=certificates,
+            certificates=None,
         )
     clientappio_api_address = cast(str, clientappio_api_address)
 
@@ -373,7 +368,7 @@ def start_client_internal(
             )
 
     retry_invoker = RetryInvoker(
-        wait_gen_factory=exponential,
+        wait_gen_factory=lambda: exponential(max_delay=MAX_RETRY_DELAY),
         recoverable_exceptions=connection_error_type,
         max_tries=max_retries + 1 if max_retries is not None else None,
         max_time=max_wait_time,
@@ -551,11 +546,7 @@ def start_client_internal(
                                     "--token",
                                     str(token),
                                 ]
-                                if ssl_ca_certfile:
-                                    command.append("--root-certificates")
-                                    command.append(ssl_ca_certfile)
-                                else:
-                                    command.append("--insecure")
+                                command.append("--insecure")
 
                                 subprocess.run(
                                     command,

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/client/clientapp/app.py

@@ -15,6 +15,7 @@
 """Flower ClientApp process."""
 
 import argparse
+import sys
 import time
 from logging import DEBUG, ERROR, INFO
 from typing import Optional
@@ -24,7 +25,7 @@ import grpc
 from flwr.cli.install import install_from_fab
 from flwr.client.client_app import ClientApp, LoadClientAppError
 from flwr.common import Context, Message
-from flwr.common.args import add_args_flwr_app_common, try_obtain_root_certificates
+from flwr.common.args import add_args_flwr_app_common
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS, ErrorCode
 from flwr.common.grpc import create_channel
@@ -57,10 +58,15 @@ from .utils import get_load_client_app_fn
 def flwr_clientapp() -> None:
     """Run process-isolated Flower ClientApp."""
     args = _parse_args_run_flwr_clientapp().parse_args()
+    if not args.insecure:
+        log(
+            ERROR,
+            "flwr-clientapp does not support TLS yet. "
+            "Please use the '--insecure' flag.",
+        )
+        sys.exit(1)
 
     log(INFO, "Starting Flower ClientApp")
-    certificates = try_obtain_root_certificates(args, args.clientappio_api_address)
-
     log(
         DEBUG,
         "Starting isolated `ClientApp` connected to SuperNode's ClientAppIo API at %s "
@@ -73,7 +79,7 @@ def flwr_clientapp() -> None:
         run_once=(args.token is not None),
         token=args.token,
         flwr_dir=args.flwr_dir,
-        certificates=certificates,
+        certificates=None,
     )
 
 
@@ -246,5 +252,12 @@ def _parse_args_run_flwr_clientapp() -> argparse.ArgumentParser:
         required=False,
         help="Unique token generated by SuperNode for each ClientApp execution",
     )
+    parser.add_argument(
+        "--root-certificates",
+        metavar="ROOT_CERT",
+        type=str,
+        help="Specifies the path to the PEM-encoded root certificate file for "
+        "establishing secure HTTPS connections.",
+    )
     add_args_flwr_app_common(parser=parser)
     return parser

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/client/grpc_rere_client/connection.py

@@ -155,6 +155,11 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     ping_thread: Optional[threading.Thread] = None
     ping_stop_event = threading.Event()
 
+    # Restrict retries to cases where the status code is UNAVAILABLE
+    retry_invoker.should_giveup = (
+        lambda e: e.code() != grpc.StatusCode.UNAVAILABLE  # type: ignore
+    )
+
     ###########################################################################
     # ping/create_node/delete_node/receive/send/get_run functions
     ###########################################################################

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/client/supernode/app.py

@@ -28,10 +28,7 @@ from cryptography.hazmat.primitives.serialization import (
 )
 
 from flwr.common import EventType, event
-from flwr.common.args import (
-    try_obtain_root_certificates,
-    try_obtain_server_certificates,
-)
+from flwr.common.args import try_obtain_root_certificates
 from flwr.common.config import parse_config_args
 from flwr.common.constant import (
     CLIENTAPPIO_API_DEFAULT_SERVER_ADDRESS,
@@ -78,8 +75,6 @@ def run_supernode() -> None:
         sys.exit(1)
 
     root_certificates = try_obtain_root_certificates(args, args.superlink)
-    # Obtain certificates for ClientAppIo API server
-    server_certificates = try_obtain_server_certificates(args, TRANSPORT_TYPE_GRPC_RERE)
     load_fn = get_load_client_app_fn(
         default_app_ref="",
         app_path=None,
@@ -105,8 +100,6 @@ def run_supernode() -> None:
         flwr_path=args.flwr_dir,
         isolation=args.isolation,
         clientappio_api_address=args.clientappio_api_address,
-        certificates=server_certificates,
-        ssl_ca_certfile=args.ssl_ca_certfile,
     )
 
     # Graceful shutdown
@@ -235,25 +228,6 @@ def _parse_args_common(parser: argparse.ArgumentParser) -> None:
         help="Specifies the path to the PEM-encoded root certificate file for "
         "establishing secure HTTPS connections.",
     )
-    parser.add_argument(
-        "--ssl-certfile",
-        help="ClientAppIo API server SSL certificate file (as a path str) "
-        "to create a secure connection.",
-        type=str,
-        default=None,
-    )
-    parser.add_argument(
-        "--ssl-keyfile",
-        help="ClientAppIo API server SSL private key file (as a path str) "
-        "to create a secure connection.",
-        type=str,
-    )
-    parser.add_argument(
-        "--ssl-ca-certfile",
-        help="ClientAppIo API server SSL CA certificate file (as a path str) "
-        "to create a secure connection.",
-        type=str,
-    )
     parser.add_argument(
         "--server",
         default=FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/common/args.py

@@ -16,7 +16,7 @@
 
 import argparse
 import sys
-from logging import DEBUG, WARN
+from logging import DEBUG, ERROR, WARN
 from os.path import isfile
 from pathlib import Path
 from typing import Optional
@@ -49,13 +49,6 @@ def add_args_flwr_app_common(parser: argparse.ArgumentParser) -> None:
         "paths are provided. By default, the server runs with HTTPS enabled. "
         "Use this flag only if you understand the risks.",
     )
-    parser.add_argument(
-        "--root-certificates",
-        metavar="ROOT_CERT",
-        type=str,
-        help="Specifies the path to the PEM-encoded root certificate file for "
-        "establishing secure HTTPS connections.",
-    )
 
 
 def try_obtain_root_certificates(
@@ -80,9 +73,18 @@ def try_obtain_root_certificates(
         root_certificates = None
     else:
         # Load the certificates if provided, or load the system certificates
-        if not isfile(root_cert_path):
-            sys.exit("Path argument `--root-certificates` does not point to a file.")
-        root_certificates = Path(root_cert_path).read_bytes()
+        if root_cert_path is None:
+            log(
+                WARN,
+                "Both `--insecure` and `--root-certificates` were not set. "
+                "Using system certificates.",
+            )
+            root_certificates = None
+        elif not isfile(root_cert_path):
+            log(ERROR, "Path argument `--root-certificates` does not point to a file.")
+            sys.exit(1)
+        else:
+            root_certificates = Path(root_cert_path).read_bytes()
         log(
             DEBUG,
             "Starting secure HTTPS channel to %s "
@@ -140,9 +142,11 @@ def try_obtain_server_certificates(
                 "and `--ssl-keyfile` to create a secure connection "
                 "in Fleet API server (REST, experimental)."
             )
-    sys.exit(
+    log(
+        ERROR,
         "Certificates are required unless running in insecure mode. "
         "Please provide certificate paths to `--ssl-certfile`, "
         "`--ssl-keyfile`, and `—-ssl-ca-certfile` or run the server "
-        "in insecure mode using '--insecure' if you understand the risks."
+        "in insecure mode using '--insecure' if you understand the risks.",
     )
+    sys.exit(1)

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/common/constant.py

@@ -107,6 +107,9 @@ CONN_RECONNECT_INTERVAL = 0.5  # Reconnect interval between two stream connectio
 LOG_STREAM_INTERVAL = 0.5  # Log stream interval for `ExecServicer.StreamLogs`
 LOG_UPLOAD_INTERVAL = 0.2  # Minimum interval between two log uploads
 
+# Retry configurations
+MAX_RETRY_DELAY = 20  # Maximum delay duration between two consecutive retries.
+
 
 class MessageType:
     """Message type."""

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/common/grpc.py

@@ -53,7 +53,10 @@ def create_channel(
         channel = grpc.insecure_channel(server_address, options=channel_options)
         log(DEBUG, "Opened insecure gRPC connection (no certificates were passed)")
     else:
-        ssl_channel_credentials = grpc.ssl_channel_credentials(root_certificates)
+        try:
+            ssl_channel_credentials = grpc.ssl_channel_credentials(root_certificates)
+        except Exception as e:
+            raise ValueError(f"Failed to create SSL channel credentials: {e}") from e
         channel = grpc.secure_channel(
             server_address, ssl_channel_credentials, options=channel_options
         )

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/server/app.py

@@ -288,7 +288,7 @@ def run_superlink() -> None:
             address=serverappio_address,
             state_factory=state_factory,
             ffs_factory=ffs_factory,
-            certificates=certificates,
+            certificates=None,  # ServerAppIo API doesn't support SSL yet
         )
         grpc_servers.append(serverappio_server)
 
@@ -398,7 +398,6 @@ def run_superlink() -> None:
             args=(
                 state_factory,
                 address,
-                args.ssl_ca_certfile,
                 cmd,
             ),
         )
@@ -424,7 +423,6 @@ def run_superlink() -> None:
 def _flwr_scheduler(
     state_factory: LinkStateFactory,
     io_api_address: str,
-    ssl_ca_certfile: Optional[str],
     cmd: str,
 ) -> None:
     log(DEBUG, "Started %s scheduler thread.", cmd)
@@ -450,12 +448,8 @@ def _flwr_scheduler(
                 "--run-once",
                 "--serverappio-api-address",
                 io_api_address,
+                "--insecure",
             ]
-            if ssl_ca_certfile:
-                command.append("--root-certificates")
-                command.append(ssl_ca_certfile)
-            else:
-                command.append("--insecure")
 
             subprocess.Popen(  # pylint: disable=consider-using-with
                 command,

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/server/driver/grpc_driver.py

@@ -17,15 +17,16 @@
 import time
 import warnings
 from collections.abc import Iterable
-from logging import DEBUG, WARNING
-from typing import Optional, cast
+from logging import DEBUG, INFO, WARN, WARNING
+from typing import Any, Optional, cast
 
 import grpc
 
 from flwr.common import DEFAULT_TTL, Message, Metadata, RecordSet
-from flwr.common.constant import SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS
+from flwr.common.constant import MAX_RETRY_DELAY, SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS
 from flwr.common.grpc import create_channel
 from flwr.common.logger import log
+from flwr.common.retry_invoker import RetryInvoker, RetryState, exponential
 from flwr.common.serde import message_from_taskres, message_to_taskins, run_from_proto
 from flwr.common.typing import Run
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
@@ -75,6 +76,7 @@ class GrpcDriver(Driver):
         self._grpc_stub: Optional[ServerAppIoStub] = None
         self._channel: Optional[grpc.Channel] = None
         self.node = Node(node_id=0, anonymous=True)
+        self._retry_invoker = _make_simple_grpc_retry_invoker()
 
     @property
     def _is_connected(self) -> bool:
@@ -95,6 +97,7 @@ class GrpcDriver(Driver):
             root_certificates=self._cert,
         )
         self._grpc_stub = ServerAppIoStub(self._channel)
+        _wrap_stub(self._grpc_stub, self._retry_invoker)
         log(DEBUG, "[Driver] Connected to %s", self._addr)
 
     def _disconnect(self) -> None:
@@ -255,3 +258,60 @@ class GrpcDriver(Driver):
             return
         # Disconnect
         self._disconnect()
+
+
+def _make_simple_grpc_retry_invoker() -> RetryInvoker:
+    """Create a simple gRPC retry invoker."""
+
+    def _on_sucess(retry_state: RetryState) -> None:
+        if retry_state.tries > 1:
+            log(
+                INFO,
+                "Connection successful after %.2f seconds and %s tries.",
+                retry_state.elapsed_time,
+                retry_state.tries,
+            )
+
+    def _on_backoff(retry_state: RetryState) -> None:
+        if retry_state.tries == 1:
+            log(WARN, "Connection attempt failed, retrying...")
+        else:
+            log(
+                WARN,
+                "Connection attempt failed, retrying in %.2f seconds",
+                retry_state.actual_wait,
+            )
+
+    def _on_giveup(retry_state: RetryState) -> None:
+        if retry_state.tries > 1:
+            log(
+                WARN,
+                "Giving up reconnection after %.2f seconds and %s tries.",
+                retry_state.elapsed_time,
+                retry_state.tries,
+            )
+
+    return RetryInvoker(
+        wait_gen_factory=lambda: exponential(max_delay=MAX_RETRY_DELAY),
+        recoverable_exceptions=grpc.RpcError,
+        max_tries=None,
+        max_time=None,
+        on_success=_on_sucess,
+        on_backoff=_on_backoff,
+        on_giveup=_on_giveup,
+        should_giveup=lambda e: e.code() != grpc.StatusCode.UNAVAILABLE,  # type: ignore
+    )
+
+
+def _wrap_stub(stub: ServerAppIoStub, retry_invoker: RetryInvoker) -> None:
+    """Wrap the gRPC stub with a retry invoker."""
+
+    def make_lambda(original_method: Any) -> Any:
+        return lambda *args, **kwargs: retry_invoker.invoke(
+            original_method, *args, **kwargs
+        )
+
+    for method_name in vars(stub):
+        method = getattr(stub, method_name)
+        if callable(method):
+            setattr(stub, method_name, make_lambda(method))

{flwr_nightly-1.13.0.dev20241117 → flwr_nightly-1.14.0.dev20241120}/src/py/flwr/server/serverapp/app.py

@@ -15,6 +15,7 @@
 """Flower ServerApp process."""
 
 import argparse
+import sys
 from logging import DEBUG, ERROR, INFO
 from pathlib import Path
 from queue import Queue
@@ -23,7 +24,7 @@ from typing import Optional
 
 from flwr.cli.config_utils import get_fab_metadata
 from flwr.cli.install import install_from_fab
-from flwr.common.args import add_args_flwr_app_common, try_obtain_root_certificates
+from flwr.common.args import add_args_flwr_app_common
 from flwr.common.config import (
     get_flwr_dir,
     get_fused_config_from_dir,
@@ -69,7 +70,14 @@ def flwr_serverapp() -> None:
     args = _parse_args_run_flwr_serverapp().parse_args()
 
     log(INFO, "Starting Flower ServerApp")
-    certificates = try_obtain_root_certificates(args, args.serverappio_api_address)
+
+    if not args.insecure:
+        log(
+            ERROR,
+            "`flwr-serverapp` does not support TLS yet. "
+            "Please use the '--insecure' flag.",
+        )
+        sys.exit(1)
 
     log(
         DEBUG,
@@ -81,7 +89,7 @@ def flwr_serverapp() -> None:
         log_queue=log_queue,
         run_once=args.run_once,
         flwr_dir=args.flwr_dir,
-        certificates=certificates,
+        certificates=None,
     )
 
     # Restore stdout/stderr
@@ -185,6 +193,12 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212
             run_status = RunStatus(Status.FINISHED, SubStatus.FAILED, str(ex))
 
         finally:
+            # Stop log uploader for this run and upload final logs
+            if log_uploader:
+                stop_log_uploader(log_queue, log_uploader)
+                log_uploader = None
+
+            # Update run status
             if run_status:
                 run_status_proto = run_status_to_proto(run_status)
                 driver._stub.UpdateRunStatus(
@@ -193,11 +207,6 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212
                     )
                 )
 
-            # Stop log uploader for this run
-            if log_uploader:
-                stop_log_uploader(log_queue, log_uploader)
-                log_uploader = None
-
         # Stop the loop if `flwr-serverapp` is expected to process a single run
         if run_once:
             break
@@ -221,5 +230,12 @@ def _parse_args_run_flwr_serverapp() -> argparse.ArgumentParser:
         help="When set, this process will start a single ServerApp for a pending Run. "
         "If there is no pending Run, the process will exit.",
     )
+    parser.add_argument(
+        "--root-certificates",
+        metavar="ROOT_CERT",
+        type=str,
+        help="Specifies the path to the PEM-encoded root certificate file for "
+        "establishing secure HTTPS connections.",
+    )
     add_args_flwr_app_common(parser=parser)
     return parser