flwr-nightly 1.11.0.dev20240817__py3-none-any.whl → 1.11.0.dev20240819__py3-none-any.whl

flwr/cli/install.py

@@ -173,7 +173,9 @@ def validate_and_install(
         / project_name
         / version
     )
-    if install_dir.exists() and not skip_prompt:
+    if install_dir.exists():
+        if skip_prompt:
+            return install_dir
         if not typer.confirm(
             typer.style(
                 f"\n💬 {project_name} version {version} is already installed, "

flwr/client/app.py

@@ -21,7 +21,7 @@ import time
 from dataclasses import dataclass
 from logging import ERROR, INFO, WARN
 from pathlib import Path
-from typing import Callable, ContextManager, Dict, Optional, Tuple, Type, Union
+from typing import Callable, ContextManager, Dict, Optional, Tuple, Type, Union, cast
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -52,7 +52,7 @@ from flwr.proto.clientappio_pb2_grpc import add_ClientAppIoServicer_to_server
 from flwr.server.superlink.fleet.grpc_bidi.grpc_server import generic_create_grpc_server
 from flwr.server.superlink.state.utils import generate_rand_int_from_bytes
 
-from .clientapp.clientappio_servicer import ClientAppIoInputs, ClientAppIoServicer
+from .clientapp.clientappio_servicer import ClientAppInputs, ClientAppIoServicer
 from .grpc_adapter_client.connection import grpc_adapter
 from .grpc_client.connection import grpc_connection
 from .grpc_rere_client.connection import grpc_request_response
@@ -62,6 +62,9 @@ from .numpy_client import NumPyClient
 
 ADDRESS_CLIENTAPPIO_API_GRPC_RERE = "0.0.0.0:9094"
 
+ISOLATION_MODE_SUBPROCESS = "subprocess"
+ISOLATION_MODE_PROCESS = "process"
+
 
 def _check_actionable_client(
     client: Optional[Client], client_fn: Optional[ClientFnExt]
@@ -207,7 +210,7 @@ def start_client_internal(
     max_retries: Optional[int] = None,
     max_wait_time: Optional[float] = None,
     flwr_path: Optional[Path] = None,
-    isolate: Optional[bool] = False,
+    isolation: Optional[str] = None,
     supernode_address: Optional[str] = ADDRESS_CLIENTAPPIO_API_GRPC_RERE,
 ) -> None:
     """Start a Flower client node which connects to a Flower server.
@@ -256,11 +259,13 @@ def start_client_internal(
         If set to None, there is no limit to the total time.
     flwr_path: Optional[Path] (default: None)
         The fully resolved path containing installed Flower Apps.
-    isolate : Optional[bool] (default: False)
-        Whether to run `ClientApp` in a separate process. By default, this value is
-        `False`, and the `ClientApp` runs in the same process as the SuperNode. If
-        `True`, the `ClientApp` runs in an isolated process and communicates using
-        gRPC at the address `supernode_address`.
+    isolation : Optional[str] (default: None)
+        Isolation mode for `ClientApp`. Possible values are `subprocess` and
+        `process`. Defaults to `None`, which runs the `ClientApp` in the same process
+        as the SuperNode. If `subprocess`, the `ClientApp` runs in a subprocess started
+        by the SueprNode and communicates using gRPC at the address
+        `supernode_address`. If `process`, the `ClientApp` runs in a separate isolated
+        process and communicates using gRPC at the address `supernode_address`.
     supernode_address : Optional[str] (default: `ADDRESS_CLIENTAPPIO_API_GRPC_RERE`)
         The SuperNode gRPC server address.
     """
@@ -288,12 +293,16 @@ def start_client_internal(
 
         load_client_app_fn = _load_client_app
 
-    if isolate:
+    if isolation:
         if supernode_address is None:
-            raise ValueError("`supernode_address` required when `isolate` is set")
+            raise ValueError(
+                f"`supernode_address` required when `isolation` is "
+                f"{ISOLATION_MODE_SUBPROCESS} or {ISOLATION_MODE_PROCESS}",
+            )
         _clientappio_grpc_server, clientappio_servicer = run_clientappio_api_grpc(
             address=supernode_address
         )
+    supernode_address = cast(str, supernode_address)
 
     # At this point, only `load_client_app_fn` should be used
     # Both `client` and `client_fn` must not be used directly
@@ -389,6 +398,7 @@ def start_client_internal(
                     )
 
             app_state_tracker.register_signal_handler()
+            # pylint: disable=too-many-nested-blocks
             while not app_state_tracker.interrupt:
                 try:
                     # Receive
@@ -430,7 +440,9 @@ def start_client_internal(
                     run: Run = runs[run_id]
                     if get_fab is not None and run.fab_hash:
                         fab = get_fab(run.fab_hash)
-                        install_from_fab(fab.content, flwr_path, True)
+                        if not isolation:
+                            # If `ClientApp` runs in the same process, install the FAB
+                            install_from_fab(fab.content, flwr_path, True)
                         fab_id, fab_version = get_fab_metadata(fab.content)
                     else:
                         fab = None
@@ -454,35 +466,52 @@ def start_client_internal(
 
                     # Handle app loading and task message
                     try:
-                        if isolate and supernode_address is not None:
+                        if isolation:
+                            # Two isolation modes:
+                            # 1. `subprocess`: SuperNode is starting the ClientApp
+                            #    process as a subprocess.
+                            # 2. `process`: ClientApp process gets started separately
+                            #    (via `flwr-clientapp`), for example, in a separate
+                            #    Docker container.
+
                             # Generate SuperNode token
                             token: int = generate_rand_int_from_bytes(RUN_ID_NUM_BYTES)
 
+                            # Mode 1: SuperNode starts ClientApp as subprocess
+                            start_subprocess = isolation == ISOLATION_MODE_SUBPROCESS
+
                             # Share Message and Context with servicer
                             clientappio_servicer.set_inputs(
-                                clientapp_input=ClientAppIoInputs(
+                                clientapp_input=ClientAppInputs(
                                     message=message,
                                     context=context,
                                     run=run,
+                                    fab=fab,
                                     token=token,
                                 ),
-                                token_returned=True,
+                                token_returned=start_subprocess,
                             )
 
-                            # Run `ClientApp` in subprocess
-                            command = [
-                                "flwr-clientapp",
-                                "--supernode",
-                                supernode_address,
-                                "--token",
-                                str(token),
-                            ]
-                            subprocess.run(
-                                command,
-                                stdout=None,
-                                stderr=None,
-                                check=True,
-                            )
+                            if start_subprocess:
+                                # Start ClientApp subprocess
+                                command = [
+                                    "flwr-clientapp",
+                                    "--supernode",
+                                    supernode_address,
+                                    "--token",
+                                    str(token),
+                                ]
+                                subprocess.run(
+                                    command,
+                                    stdout=None,
+                                    stderr=None,
+                                    check=True,
+                                )
+                            else:
+                                # Wait for output to become available
+                                while not clientappio_servicer.has_outputs():
+                                    time.sleep(0.1)
+
                             outputs = clientappio_servicer.get_outputs()
                             reply_message, context = outputs.message, outputs.context
                         else:
@@ -538,6 +567,7 @@ def start_client_internal(
                 except StopIteration:
                     sleep_duration = 0
                     break
+            # pylint: enable=too-many-nested-blocks
 
             # Unregister node
             if delete_node is not None and app_state_tracker.is_connected:

flwr/client/clientapp/app.py

@@ -15,11 +15,13 @@
 """Flower ClientApp process."""
 
 import argparse
+import time
 from logging import DEBUG, ERROR, INFO
 from typing import Optional, Tuple
 
 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.constant import ErrorCode
@@ -29,11 +31,12 @@ from flwr.common.message import Error
 from flwr.common.serde import (
     context_from_proto,
     context_to_proto,
+    fab_from_proto,
     message_from_proto,
     message_to_proto,
     run_from_proto,
 )
-from flwr.common.typing import Run
+from flwr.common.typing import Fab, Run
 
 # pylint: disable=E0611
 from flwr.proto.clientappio_pb2 import (
@@ -58,21 +61,25 @@ def flwr_clientapp() -> None:
     )
     parser.add_argument(
         "--supernode",
+        type=str,
         help="Address of SuperNode ClientAppIo gRPC servicer",
     )
     parser.add_argument(
         "--token",
+        type=int,
+        required=False,
         help="Unique token generated by SuperNode for each ClientApp execution",
     )
     args = parser.parse_args()
+
     log(
         DEBUG,
         "Staring isolated `ClientApp` connected to SuperNode ClientAppIo at %s "
-        "with the token %s",
+        "with token %s",
         args.supernode,
         args.token,
     )
-    run_clientapp(supernode=args.supernode, token=int(args.token))
+    run_clientapp(supernode=args.supernode, token=args.token)
 
 
 def on_channel_state_change(channel_connectivity: str) -> None:
@@ -82,7 +89,7 @@ def on_channel_state_change(channel_connectivity: str) -> None:
 
 def run_clientapp(  # pylint: disable=R0914
     supernode: str,
-    token: int,
+    token: Optional[int] = None,
 ) -> None:
     """Run Flower ClientApp process.
 
@@ -90,7 +97,7 @@ def run_clientapp(  # pylint: disable=R0914
     ----------
     supernode : str
         Address of SuperNode
-    token : int
+    token : Optional[int] (default: None)
         Unique SuperNode token for ClientApp-SuperNode authentication
     """
     channel = create_channel(
@@ -102,42 +109,67 @@ def run_clientapp(  # pylint: disable=R0914
     try:
         stub = ClientAppIoStub(channel)
 
-        # Pull Message, Context, and Run from SuperNode
-        message, context, run = pull_message(stub=stub, token=token)
-
-        load_client_app_fn = get_load_client_app_fn(
-            default_app_ref="",
-            app_path=None,
-            multi_app=True,
-            flwr_dir=None,
-        )
-
-        try:
-            # Load ClientApp
-            client_app: ClientApp = load_client_app_fn(run.fab_id, run.fab_version)
-
-            # Execute ClientApp
-            reply_message = client_app(message=message, context=context)
-        except Exception as ex:  # pylint: disable=broad-exception-caught
-            # Don't update/change NodeState
-
-            e_code = ErrorCode.CLIENT_APP_RAISED_EXCEPTION
-            # Ex fmt: "<class 'ZeroDivisionError'>:<'division by zero'>"
-            reason = str(type(ex)) + ":<'" + str(ex) + "'>"
-            exc_entity = "ClientApp"
-            if isinstance(ex, LoadClientAppError):
-                reason = "An exception was raised when attempting to load `ClientApp`"
-                e_code = ErrorCode.LOAD_CLIENT_APP_EXCEPTION
-
-            log(ERROR, "%s raised an exception", exc_entity, exc_info=ex)
+        only_once = token is not None
+        while True:
+            # If token is not set, loop until token is received from SuperNode
+            while token is None:
+                token = get_token(stub)
+                time.sleep(1)
+
+            # Pull Message, Context, Run and (optional) FAB from SuperNode
+            message, context, run, fab = pull_message(stub=stub, token=token)
+
+            # Install FAB, if provided
+            if fab:
+                log(DEBUG, "Flower ClientApp starts FAB installation.")
+                install_from_fab(fab.content, flwr_dir=None, skip_prompt=True)
+
+            load_client_app_fn = get_load_client_app_fn(
+                default_app_ref="",
+                app_path=None,
+                multi_app=True,
+                flwr_dir=None,
+            )
 
-            # Create error message
-            reply_message = message.create_error_reply(
-                error=Error(code=e_code, reason=reason)
+            try:
+                # Load ClientApp
+                client_app: ClientApp = load_client_app_fn(run.fab_id, run.fab_version)
+
+                # Execute ClientApp
+                reply_message = client_app(message=message, context=context)
+            except Exception as ex:  # pylint: disable=broad-exception-caught
+                # Don't update/change NodeState
+
+                e_code = ErrorCode.CLIENT_APP_RAISED_EXCEPTION
+                # Ex fmt: "<class 'ZeroDivisionError'>:<'division by zero'>"
+                reason = str(type(ex)) + ":<'" + str(ex) + "'>"
+                exc_entity = "ClientApp"
+                if isinstance(ex, LoadClientAppError):
+                    reason = (
+                        "An exception was raised when attempting to load `ClientApp`"
+                    )
+                    e_code = ErrorCode.LOAD_CLIENT_APP_EXCEPTION
+
+                log(ERROR, "%s raised an exception", exc_entity, exc_info=ex)
+
+                # Create error message
+                reply_message = message.create_error_reply(
+                    error=Error(code=e_code, reason=reason)
+                )
+
+            # Push Message and Context to SuperNode
+            _ = push_message(
+                stub=stub, token=token, message=reply_message, context=context
             )
 
-        # Push Message and Context to SuperNode
-        _ = push_message(stub=stub, token=token, message=reply_message, context=context)
+            # Reset token to `None` to prevent flwr-clientapp from trying to pull the
+            # same inputs again
+            token = None
+
+            # Stop the loop if `flwr-clientapp` is expected to process only a single
+            # message
+            if only_once:
+                break
 
     except KeyboardInterrupt:
         log(INFO, "Closing connection")
@@ -149,30 +181,53 @@ def run_clientapp(  # pylint: disable=R0914
 
 def get_token(stub: grpc.Channel) -> Optional[int]:
     """Get a token from SuperNode."""
-    res: GetTokenResponse = stub.GetToken(GetTokenRequest())
-    return res.token
+    log(DEBUG, "Flower ClientApp process requests token")
+    try:
+        res: GetTokenResponse = stub.GetToken(GetTokenRequest())
+        log(DEBUG, "[GetToken] Received token: %s", res.token)
+        return res.token
+    except grpc.RpcError as e:
+        if e.code() == grpc.StatusCode.FAILED_PRECONDITION:  # pylint: disable=no-member
+            log(DEBUG, "[GetToken] No token available yet")
+        else:
+            log(ERROR, "[GetToken] gRPC error occurred: %s", str(e))
+        return None
 
 
-def pull_message(stub: grpc.Channel, token: int) -> Tuple[Message, Context, Run]:
+def pull_message(
+    stub: grpc.Channel, token: int
+) -> Tuple[Message, Context, Run, Optional[Fab]]:
     """Pull message from SuperNode to ClientApp."""
-    res: PullClientAppInputsResponse = stub.PullClientAppInputs(
-        PullClientAppInputsRequest(token=token)
-    )
-    message = message_from_proto(res.message)
-    context = context_from_proto(res.context)
-    run = run_from_proto(res.run)
-    return message, context, run
+    log(INFO, "Pulling ClientAppInputs for token %s", token)
+    try:
+        res: PullClientAppInputsResponse = stub.PullClientAppInputs(
+            PullClientAppInputsRequest(token=token)
+        )
+        message = message_from_proto(res.message)
+        context = context_from_proto(res.context)
+        run = run_from_proto(res.run)
+        fab = fab_from_proto(res.fab) if res.fab else None
+        return message, context, run, fab
+    except grpc.RpcError as e:
+        log(ERROR, "[PullClientAppInputs] gRPC error occurred: %s", str(e))
+        raise e
 
 
 def push_message(
     stub: grpc.Channel, token: int, message: Message, context: Context
 ) -> PushClientAppOutputsResponse:
     """Push message to SuperNode from ClientApp."""
+    log(INFO, "Pushing ClientAppOutputs for token %s", token)
     proto_message = message_to_proto(message)
     proto_context = context_to_proto(context)
-    res: PushClientAppOutputsResponse = stub.PushClientAppOutputs(
-        PushClientAppOutputsRequest(
-            token=token, message=proto_message, context=proto_context
+
+    try:
+        res: PushClientAppOutputsResponse = stub.PushClientAppOutputs(
+            PushClientAppOutputsRequest(
+                token=token, message=proto_message, context=proto_context
+            )
         )
-    )
-    return res
+        return res
+    except grpc.RpcError as e:
+        log(ERROR, "[PushClientAppOutputs] gRPC error occurred: %s", str(e))
+        raise e

flwr/client/clientapp/clientappio_servicer.py

@@ -27,11 +27,12 @@ from flwr.common.serde import (
     clientappstatus_to_proto,
     context_from_proto,
     context_to_proto,
+    fab_to_proto,
     message_from_proto,
     message_to_proto,
     run_to_proto,
 )
-from flwr.common.typing import Run
+from flwr.common.typing import Fab, Run
 
 # pylint: disable=E0611
 from flwr.proto import clientappio_pb2_grpc
@@ -46,17 +47,18 @@ from flwr.proto.clientappio_pb2 import (  # pylint: disable=E0401
 
 
 @dataclass
-class ClientAppIoInputs:
+class ClientAppInputs:
     """Specify the inputs to the ClientApp."""
 
     message: Message
     context: Context
     run: Run
+    fab: Optional[Fab]
     token: int
 
 
 @dataclass
-class ClientAppIoOutputs:
+class ClientAppOutputs:
     """Specify the outputs from the ClientApp."""
 
     message: Message
@@ -68,8 +70,8 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
     """ClientAppIo API servicer."""
 
     def __init__(self) -> None:
-        self.clientapp_input: Optional[ClientAppIoInputs] = None
-        self.clientapp_output: Optional[ClientAppIoOutputs] = None
+        self.clientapp_input: Optional[ClientAppInputs] = None
+        self.clientapp_output: Optional[ClientAppOutputs] = None
         self.token_returned: bool = False
         self.inputs_returned: bool = False
 
@@ -79,13 +81,13 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         """Get token."""
         log(DEBUG, "ClientAppIo.GetToken")
 
-        # Fail if no ClientAppIoInputs are available
+        # Fail if no ClientAppInputs are available
         if self.clientapp_input is None:
             context.abort(
                 grpc.StatusCode.FAILED_PRECONDITION,
                 "No inputs available.",
             )
-        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+        clientapp_input = cast(ClientAppInputs, self.clientapp_input)
 
         # Fail if token was already returned in a previous call
         if self.token_returned:
@@ -95,7 +97,7 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             )
 
         # If
-        # - ClientAppIoInputs is set, and
+        # - ClientAppInputs is set, and
         # - token hasn't been returned before,
         # return token
         self.token_returned = True
@@ -107,13 +109,13 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         """Pull Message, Context, and Run."""
         log(DEBUG, "ClientAppIo.PullClientAppInputs")
 
-        # Fail if no ClientAppIoInputs are available
+        # Fail if no ClientAppInputs are available
         if self.clientapp_input is None:
             context.abort(
                 grpc.StatusCode.FAILED_PRECONDITION,
                 "No inputs available.",
             )
-        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+        clientapp_input = cast(ClientAppInputs, self.clientapp_input)
 
         # Fail if token wasn't returned in a previous call
         if not self.token_returned:
@@ -136,6 +138,7 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             message=message_to_proto(clientapp_input.message),
             context=context_to_proto(clientapp_input.context),
             run=run_to_proto(clientapp_input.run),
+            fab=fab_to_proto(clientapp_input.fab) if clientapp_input.fab else None,
         )
 
     def PushClientAppOutputs(
@@ -144,13 +147,13 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         """Push Message and Context."""
         log(DEBUG, "ClientAppIo.PushClientAppOutputs")
 
-        # Fail if no ClientAppIoInputs are available
+        # Fail if no ClientAppInputs are available
         if not self.clientapp_input:
             context.abort(
                 grpc.StatusCode.FAILED_PRECONDITION,
                 "No inputs available.",
             )
-        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+        clientapp_input = cast(ClientAppInputs, self.clientapp_input)
 
         # Fail if token wasn't returned in a previous call
         if not self.token_returned:
@@ -178,7 +181,7 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         # Preconditions met
         try:
             # Update Message and Context
-            self.clientapp_output = ClientAppIoOutputs(
+            self.clientapp_output = ClientAppOutputs(
                 message=message_from_proto(request.message),
                 context=context_from_proto(request.context),
             )
@@ -196,40 +199,43 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         return PushClientAppOutputsResponse(status=proto_status)
 
     def set_inputs(
-        self, clientapp_input: ClientAppIoInputs, token_returned: bool
+        self, clientapp_input: ClientAppInputs, token_returned: bool
     ) -> None:
         """Set ClientApp inputs.
 
         Parameters
         ----------
-        clientapp_input : ClientAppIoInputs
+        clientapp_input : ClientAppInputs
             The inputs to the ClientApp.
         token_returned : bool
             A boolean indicating if the token has been returned.
             Set to `True` when passing the token to `flwr-clientap`
             and `False` otherwise.
         """
-        log(DEBUG, "ClientAppIo.SetInputs")
         if (
             self.clientapp_input is not None
             or self.clientapp_output is not None
             or self.token_returned
         ):
             raise ValueError(
-                "ClientAppIoInputs and ClientAppIoOutputs must not be set before "
+                "ClientAppInputs and ClientAppOutputs must not be set before "
                 "calling `set_inputs`."
             )
+        log(DEBUG, "ClientAppInputs set (token: %s)", clientapp_input.token)
         self.clientapp_input = clientapp_input
         self.token_returned = token_returned
 
-    def get_outputs(self) -> ClientAppIoOutputs:
+    def has_outputs(self) -> bool:
+        """Check if ClientAppOutputs are available."""
+        return self.clientapp_output is not None
+
+    def get_outputs(self) -> ClientAppOutputs:
         """Get ClientApp outputs."""
-        log(DEBUG, "ClientAppIo.GetOutputs")
         if self.clientapp_output is None:
-            raise ValueError("ClientAppIoOutputs not set before calling `get_outputs`.")
+            raise ValueError("ClientAppOutputs not set before calling `get_outputs`.")
 
         # Set outputs to a local variable and clear state
-        output: ClientAppIoOutputs = self.clientapp_output
+        output: ClientAppOutputs = self.clientapp_output
         self.clientapp_input = None
         self.clientapp_output = None
         self.token_returned = False

flwr/client/supernode/app.py

@@ -37,7 +37,11 @@ from flwr.common.constant import (
 from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.logger import log, warn_deprecated_feature
 
-from ..app import start_client_internal
+from ..app import (
+    ISOLATION_MODE_PROCESS,
+    ISOLATION_MODE_SUBPROCESS,
+    start_client_internal,
+)
 from ..clientapp.utils import get_load_client_app_fn
 
 ADDRESS_FLEET_API_GRPC_RERE = "0.0.0.0:9092"
@@ -62,6 +66,8 @@ def run_supernode() -> None:
     )
     authentication_keys = _try_setup_client_authentication(args)
 
+    log(DEBUG, "Isolation mode: %s", args.isolation)
+
     start_client_internal(
         server_address=args.superlink,
         load_client_app_fn=load_fn,
@@ -72,7 +78,7 @@ def run_supernode() -> None:
         max_retries=args.max_retries,
         max_wait_time=args.max_wait_time,
         node_config=parse_config_args([args.node_config]),
-        isolate=args.isolate,
+        isolation=args.isolation,
         supernode_address=args.supernode_address,
     )
 
@@ -199,10 +205,18 @@ def _parse_args_run_supernode() -> argparse.ArgumentParser:
     """,
     )
     parser.add_argument(
-        "--isolate",
-        action="store_true",
-        help="Run `ClientApp` in an isolated subprocess. By default, `ClientApp` "
-        "runs in the same process that executes the SuperNode.",
+        "--isolation",
+        default=None,
+        required=False,
+        choices=[
+            ISOLATION_MODE_SUBPROCESS,
+            ISOLATION_MODE_PROCESS,
+        ],
+        help="Isolation mode when running `ClientApp` (optional, possible values: "
+        "`subprocess`, `process`). By default, `ClientApp` runs in the same process "
+        "that executes the SuperNode. Use `subprocess` to configure SuperNode to run "
+        "`ClientApp` in a subprocess. Use `process` to indicate that a separate "
+        "independent process gets created outside of SuperNode.",
     )
     parser.add_argument(
         "--supernode-address",

flwr/proto/clientappio_pb2.py

@@ -17,15 +17,15 @@ from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\"W\n\x15\x43lientAppOutputStatus\x12-\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1f.flwr.proto.ClientAppOutputCode\x12\x0f\n\x07message\x18\x02 \x01(\t\"\x11\n\x0fGetTokenRequest\"!\n\x10GetTokenResponse\x12\r\n\x05token\x18\x01 \x01(\x12\"+\n\x1aPullClientAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\x12\"\x87\x01\n\x1bPullClientAppInputsResponse\x12$\n\x07message\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Run\"x\n\x1bPushClientAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\x12\x12$\n\x07message\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"Q\n\x1cPushClientAppOutputsResponse\x12\x31\n\x06status\x18\x01 \x01(\x0b\x32!.flwr.proto.ClientAppOutputStatus*L\n\x13\x43lientAppOutputCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x32\xad\x02\n\x0b\x43lientAppIo\x12G\n\x08GetToken\x12\x1b.flwr.proto.GetTokenRequest\x1a\x1c.flwr.proto.GetTokenResponse\"\x00\x12h\n\x13PullClientAppInputs\x12&.flwr.proto.PullClientAppInputsRequest\x1a\'.flwr.proto.PullClientAppInputsResponse\"\x00\x12k\n\x14PushClientAppOutputs\x12\'.flwr.proto.PushClientAppOutputsRequest\x1a(.flwr.proto.PushClientAppOutputsResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\"W\n\x15\x43lientAppOutputStatus\x12-\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1f.flwr.proto.ClientAppOutputCode\x12\x0f\n\x07message\x18\x02 \x01(\t\"\x11\n\x0fGetTokenRequest\"!\n\x10GetTokenResponse\x12\r\n\x05token\x18\x01 \x01(\x12\"+\n\x1aPullClientAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\x12\"\xa5\x01\n\x1bPullClientAppInputsResponse\x12$\n\x07message\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x04 \x01(\x0b\x32\x0f.flwr.proto.Fab\"x\n\x1bPushClientAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\x12\x12$\n\x07message\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"Q\n\x1cPushClientAppOutputsResponse\x12\x31\n\x06status\x18\x01 \x01(\x0b\x32!.flwr.proto.ClientAppOutputStatus*L\n\x13\x43lientAppOutputCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x32\xad\x02\n\x0b\x43lientAppIo\x12G\n\x08GetToken\x12\x1b.flwr.proto.GetTokenRequest\x1a\x1c.flwr.proto.GetTokenResponse\"\x00\x12h\n\x13PullClientAppInputs\x12&.flwr.proto.PullClientAppInputsRequest\x1a\'.flwr.proto.PullClientAppInputsResponse\"\x00\x12k\n\x14PushClientAppOutputs\x12\'.flwr.proto.PushClientAppOutputsRequest\x1a(.flwr.proto.PushClientAppOutputsResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.clientappio_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=645
-  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=721
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=675
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=751
   _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_start=114
   _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_end=201
   _globals['_GETTOKENREQUEST']._serialized_start=203
@@ -35,11 +35,11 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_start=257
   _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_end=300
   _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_start=303
-  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=438
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=440
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=560
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=562
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=643
-  _globals['_CLIENTAPPIO']._serialized_start=724
-  _globals['_CLIENTAPPIO']._serialized_end=1025
+  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=468
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=470
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=590
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=592
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=673
+  _globals['_CLIENTAPPIO']._serialized_start=754
+  _globals['_CLIENTAPPIO']._serialized_end=1055
 # @@protoc_insertion_point(module_scope)

flwr/proto/clientappio_pb2.pyi

@@ -3,6 +3,7 @@
 isort:skip_file
 """
 import builtins
+import flwr.proto.fab_pb2
 import flwr.proto.message_pb2
 import flwr.proto.run_pb2
 import google.protobuf.descriptor
@@ -77,20 +78,24 @@ class PullClientAppInputsResponse(google.protobuf.message.Message):
     MESSAGE_FIELD_NUMBER: builtins.int
     CONTEXT_FIELD_NUMBER: builtins.int
     RUN_FIELD_NUMBER: builtins.int
+    FAB_FIELD_NUMBER: builtins.int
     @property
     def message(self) -> flwr.proto.message_pb2.Message: ...
     @property
     def context(self) -> flwr.proto.message_pb2.Context: ...
     @property
     def run(self) -> flwr.proto.run_pb2.Run: ...
+    @property
+    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
     def __init__(self,
         *,
         message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
         context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
         run: typing.Optional[flwr.proto.run_pb2.Run] = ...,
+        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
         ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message","run",b"run"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message","run",b"run"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> None: ...
 global___PullClientAppInputsResponse = PullClientAppInputsResponse
 
 class PushClientAppOutputsRequest(google.protobuf.message.Message):

flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -52,10 +52,12 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
     ) -> CreateNodeResponse:
         """."""
         log(INFO, "FleetServicer.CreateNode")
-        return message_handler.create_node(
+        response = message_handler.create_node(
             request=request,
             state=self.state_factory.state(),
         )
+        log(INFO, "FleetServicer: Created node_id=%s", response.node.node_id)
+        return response
 
     def DeleteNode(
         self, request: DeleteNodeRequest, context: grpc.ServicerContext

flwr/server/superlink/fleet/grpc_rere/server_interceptor.py

@@ -16,7 +16,7 @@
 
 
 import base64
-from logging import WARNING
+from logging import INFO, WARNING
 from typing import Any, Callable, Optional, Sequence, Tuple, Union
 
 import grpc
@@ -128,9 +128,15 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
                 context.abort(grpc.StatusCode.UNAUTHENTICATED, "Access denied")
 
             if isinstance(request, CreateNodeRequest):
-                return self._create_authenticated_node(
+                response = self._create_authenticated_node(
                     client_public_key_bytes, request, context
                 )
+                log(
+                    INFO,
+                    "AuthenticateServerInterceptor: Created node_id=%s",
+                    response.node.node_id,
+                )
+                return response
 
             # Verify hmac value
             hmac_value = base64.urlsafe_b64decode(

{flwr_nightly-1.11.0.dev20240817.dist-info → flwr_nightly-1.11.0.dev20240819.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.11.0.dev20240817
+Version: 1.11.0.dev20240819
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -212,7 +212,7 @@ Other [examples](https://github.com/adap/flower/tree/main/examples):
 Flower is built by a wonderful community of researchers and engineers. [Join Slack](https://flower.ai/join-slack) to meet them, [contributions](#contributing-to-flower) are welcome.
 
 <a href="https://github.com/adap/flower/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=adap/flower" />
+  <img src="https://contrib.rocks/image?repo=adap/flower&columns=10" />
 </a>
 
 ## Citation

{flwr_nightly-1.11.0.dev20240817.dist-info → flwr_nightly-1.11.0.dev20240819.dist-info}/RECORD

@@ -4,7 +4,7 @@ flwr/cli/app.py,sha256=FBcSrE35ll88VE11ib67qgsJe2GYDN25UswV9-cYcX8,1267
 flwr/cli/build.py,sha256=gIR-nTgmLJY5ZtJFLN5ebFBCN3_hoqaioFT77AHojNU,5159
 flwr/cli/config_utils.py,sha256=mDGXbcIxG14UpkUplILBYUkSk5M1LeTzZYDGNx-pFpU,7540
 flwr/cli/example.py,sha256=1bGDYll3BXQY2kRqSN-oICqS5n1b9m0g0RvXTopXHl4,2215
-flwr/cli/install.py,sha256=AI6Zv2dQVDHpLDX1Z_vX5XHVxmZo1OU3ndCSrD2stzQ,7059
+flwr/cli/install.py,sha256=tUncrbZYRbC9QEcWSeTER16plPEoU-ERP0-nMgWiSPo,7094
 flwr/cli/new/__init__.py,sha256=cQzK1WH4JP2awef1t2UQ2xjl1agVEz9rwutV18SWV1k,789
 flwr/cli/new/new.py,sha256=VNb31-NLedm-_OK_D0aed0QxHO-tVlXjnf9UWVhC_Jk,9612
 flwr/cli/new/templates/__init__.py,sha256=4luU8RL-CK8JJCstQ_ON809W9bNTkY1l9zSaPKBkgwY,725
@@ -53,12 +53,12 @@ flwr/cli/run/__init__.py,sha256=oCd6HmQDx-sqver1gecgx-uMA38BLTSiiKpl7RGNceg,789
 flwr/cli/run/run.py,sha256=Ero4hxwZqx5ztFWvaJqslYCUBgp-AmImkomRosdGXyc,7661
 flwr/cli/utils.py,sha256=l65Ul0YsSBPuypk0uorAtEDmLEYiUrzpCXi6zCg9mJ4,4506
 flwr/client/__init__.py,sha256=wzJZsYJIHf_8-PMzvfbinyzzjgh1UP1vLrAw2_yEbKI,1345
-flwr/client/app.py,sha256=dtdgmm4xVFhkQvymf2vAjbawE9hIFkflzLBxWcYOJjA,30268
+flwr/client/app.py,sha256=_nRrzltWI3_aAMaU3UbloPUkm08hgwr2LB7cGv4C-m4,31875
 flwr/client/client.py,sha256=Vp9UkOkoHdNfn6iMYZsj_5m_GICiFfUlKEVaLad-YhM,8183
 flwr/client/client_app.py,sha256=WcO4r6wrdfaus__3s22D2sYjfcptdgmVujUAYdNE6HU,10393
 flwr/client/clientapp/__init__.py,sha256=kZqChGnTChQ1WGSUkIlW2S5bc0d0mzDubCAmZUGRpEY,800
-flwr/client/clientapp/app.py,sha256=SVzkUAzaHWSH1Sbe2GzLMF-OnrbZ-iKg-QphuEHl8QE,5706
-flwr/client/clientapp/clientappio_servicer.py,sha256=lIH92rHuRQZUaEf9u8fNuiLIQIVYdAp4C1wPok62adQ,8302
+flwr/client/clientapp/app.py,sha256=4QtblvJsZ0-V-QBbzyNqWV13ugrgJmkZnsHpBCuqgi8,7797
+flwr/client/clientapp/clientappio_servicer.py,sha256=5L6bjw_j3Mnx9kRFwYwxDNABKurBO5q1jZOWE_X11wQ,8522
 flwr/client/clientapp/utils.py,sha256=2fYKY1LfZPalG5Cm5FbSuNMIDtouQg17GbrzPINyM_A,3990
 flwr/client/dpfedavg_numpy_client.py,sha256=ylZ-LpBIKmL1HCiS8kq4pkp2QGalc8rYEzDHdRG3VRQ,7435
 flwr/client/grpc_adapter_client/__init__.py,sha256=QyNWIbsq9DpyMk7oemiO1P3TBFfkfkctnJ1JoAkTl3s,742
@@ -87,7 +87,7 @@ flwr/client/numpy_client.py,sha256=u76GWAdHmJM88Agm2EgLQSvO8Jnk225mJTk-_TmPjFE,1
 flwr/client/rest_client/__init__.py,sha256=5KGlp7pjc1dhNRkKlaNtUfQmg8wrRFh9lS3P3uRS-7Q,735
 flwr/client/rest_client/connection.py,sha256=SglZC4jpqc_0-VBo9cBHa1_2RO9TfPUULQ49DnYeFS0,12767
 flwr/client/supernode/__init__.py,sha256=SUhWOzcgXRNXk1V9UgB5-FaWukqqrOEajVUHEcPkwyQ,865
-flwr/client/supernode/app.py,sha256=CrZG1AM19dgubuGOP0rWYnLwpCkt9F30v137BETSP30,12595
+flwr/client/supernode/app.py,sha256=_hIbD2pyXQmtRw7D_qKOnkD-Zi5SiLcOLzIuEDlrlNA,13101
 flwr/client/typing.py,sha256=dxoTBnTMfqXr5J7G3y-uNjqxYCddvxhu89spfj4Lm2U,1048
 flwr/common/__init__.py,sha256=4cBLNNnNTwHDnL_HCxhU5ILCSZ6fYh3A_aMBtlvHTVw,3721
 flwr/common/address.py,sha256=wRu1Luezx1PWadwV9OA_KNko01oVvbRnPqfzaDn8QOk,1882
@@ -127,8 +127,8 @@ flwr/common/telemetry.py,sha256=nSjJHDitPhzB2qUl6LeSMT9Zld5lIk9uW98RpxQwiZw,8366
 flwr/common/typing.py,sha256=rGabiSkjFvGIHwmhDqtuu-LBvz7LVSj1vyMlNtA7VA0,5004
 flwr/common/version.py,sha256=W1ntylR04xkCP6zeSet6sRtBn7P1cje2lOqBJgYBjJY,1349
 flwr/proto/__init__.py,sha256=hbY7JYakwZwCkYgCNlmHdc8rtvfoJbAZLalMdc--CGc,683
-flwr/proto/clientappio_pb2.py,sha256=oGaTBdHuO4pL5oj2zIXG6kOdOdzZ8qaoP6I_oMOEnAY,3636
-flwr/proto/clientappio_pb2.pyi,sha256=7QUU3731Cin-fS-MYwfyU3GDndV_gMwnwOiU0jezHpY,5460
+flwr/proto/clientappio_pb2.py,sha256=3qT-IbcGPFGh9WKpa9ZRKCYzUtwrDf-ziEY9uBhd_gU,3703
+flwr/proto/clientappio_pb2.pyi,sha256=iL6pOPmnot5wP3aXGiDfiUpp-eJIkysyju0ebPehS8Y,5670
 flwr/proto/clientappio_pb2_grpc.py,sha256=G35GhZ3iEOL8N6tu7Kn_ip4QUx4O2HveXngHAuU2YEM,6112
 flwr/proto/clientappio_pb2_grpc.pyi,sha256=cybktpMPaIMwrItd8hQaQDnRv4zNu_wgRddSqR9REyI,1822
 flwr/proto/common_pb2.py,sha256=uzSmq0FJdC-MriN9UGPFs7QVIFTKJmX5lyLnzcyZ5WE,2405
@@ -245,8 +245,8 @@ flwr/server/superlink/fleet/grpc_bidi/grpc_bridge.py,sha256=hh7ykcLMA_ymmD72eWFM
 flwr/server/superlink/fleet/grpc_bidi/grpc_client_proxy.py,sha256=h3EhqgelegVC4EjOXH5birmAnMoCBJcP7jpHYCnHZPk,4887
 flwr/server/superlink/fleet/grpc_bidi/grpc_server.py,sha256=ROH-dr7TQZ9nVXjkKOzMhxidJguX2li8--nDnXRi-dU,12095
 flwr/server/superlink/fleet/grpc_rere/__init__.py,sha256=j2hyC342am-_Hgp1g80Y3fGDzfTI6n8QOOn2PyWf4eg,758
-flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py,sha256=nqLILs_LV8T-x0BCLmgHy56ml7abjmHyRgc7xTnVbnw,3941
-flwr/server/superlink/fleet/grpc_rere/server_interceptor.py,sha256=v54f7yEX0Xwqh9KRDPzKgJdSBsosus4RzUyzTl-_u5Q,7738
+flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py,sha256=9vZPmdNuRcXsCJQUv9hrzQvdvUJO4-gvxxCHJJTFvGE,4047
+flwr/server/superlink/fleet/grpc_rere/server_interceptor.py,sha256=DsHj6XaE0pBSWLYFsUYE44NPqx6IWWTJ9sqbh3GpmvY,7961
 flwr/server/superlink/fleet/message_handler/__init__.py,sha256=h8oLD7uo5lKICPy0rRdKRjTYe62u8PKkT_fA4xF5JPA,731
 flwr/server/superlink/fleet/message_handler/message_handler.py,sha256=9qDDPwj3txHPo2dNaWQiO3UpGno5Zm9IMhJXnAPZbqg,4439
 flwr/server/superlink/fleet/rest_rere/__init__.py,sha256=5jbYbAn75sGv-gBwOPDySE0kz96F6dTYLeMrGqNi4lM,735
@@ -286,8 +286,8 @@ flwr/superexec/exec_grpc.py,sha256=PhqGoZEpTMxSQmUSV8Wgtzb1Za_pHJ-adZqo5RYnDyE,1
 flwr/superexec/exec_servicer.py,sha256=jl0aKVjm0PLQABcTL5c3jdSIzb0Z6hpVOtrAn4Ob7ts,2323
 flwr/superexec/executor.py,sha256=k_adivto6R2U82DADOHNvdtobehBYreRek1gOEBIQnQ,2318
 flwr/superexec/simulation.py,sha256=lfdClQYSAIMHe43aJ0Pk-kBw_xoV09LsIMfHo2eo-Ck,6775
-flwr_nightly-1.11.0.dev20240817.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.11.0.dev20240817.dist-info/METADATA,sha256=AVTluXtc1QOLgptn-tnp6VC_4E4-pjGvwHOiVLNjVA4,15690
-flwr_nightly-1.11.0.dev20240817.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.11.0.dev20240817.dist-info/entry_points.txt,sha256=3cDQVJEBRCSLzJrVYAgjXpoCjuQ74I3A9NZ61DOHdVo,388
-flwr_nightly-1.11.0.dev20240817.dist-info/RECORD,,
+flwr_nightly-1.11.0.dev20240819.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.11.0.dev20240819.dist-info/METADATA,sha256=1TgmV-BxAz7GtNVJuJ9Ov1zrQl6dQwiZvsanz-EbQLM,15701
+flwr_nightly-1.11.0.dev20240819.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.11.0.dev20240819.dist-info/entry_points.txt,sha256=3cDQVJEBRCSLzJrVYAgjXpoCjuQ74I3A9NZ61DOHdVo,388
+flwr_nightly-1.11.0.dev20240819.dist-info/RECORD,,