flwr-nightly 1.11.0.dev20240816__py3-none-any.whl → 1.11.0.dev20240818__py3-none-any.whl

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,13 +52,13 @@ 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 .grpc_adapter_client.connection import grpc_adapter
 from .grpc_client.connection import grpc_connection
 from .grpc_rere_client.connection import grpc_request_response
 from .message_handler.message_handler import handle_control_message
 from .node_state import NodeState
 from .numpy_client import NumPyClient
-from .process.clientappio_servicer import ClientAppIoInputs, ClientAppIoServicer
 
 ADDRESS_CLIENTAPPIO_API_GRPC_RERE = "0.0.0.0:9094"
 
@@ -294,6 +294,7 @@ def start_client_internal(
         _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
@@ -454,18 +455,19 @@ def start_client_internal(
 
                     # Handle app loading and task message
                     try:
-                        if isolate and supernode_address is not None:
+                        if isolate:
                             # Generate SuperNode token
                             token: int = generate_rand_int_from_bytes(RUN_ID_NUM_BYTES)
 
                             # Share Message and Context with servicer
                             clientappio_servicer.set_inputs(
-                                ClientAppIoInputs(
+                                clientapp_input=ClientAppIoInputs(
                                     message=message,
                                     context=context,
                                     run=run,
                                     token=token,
-                                )
+                                ),
+                                token_returned=True,
                             )
 
                             # Run `ClientApp` in subprocess
@@ -482,6 +484,11 @@ def start_client_internal(
                                 stderr=None,
                                 check=True,
                             )
+
+                            # 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:

flwr/client/{process → clientapp}/__init__.py

@@ -13,3 +13,10 @@
 # limitations under the License.
 # ==============================================================================
 """Flower AppIO service."""
+
+
+from .app import flwr_clientapp as flwr_clientapp
+
+__all__ = [
+    "flwr_clientapp",
+]

flwr/client/{process/process.py → clientapp/app.py}

@@ -14,8 +14,9 @@
 # ==============================================================================
 """Flower ClientApp process."""
 
+import argparse
 from logging import DEBUG, ERROR, INFO
-from typing import Tuple
+from typing import Optional, Tuple
 
 import grpc
 
@@ -36,6 +37,8 @@ from flwr.common.typing import Run
 
 # pylint: disable=E0611
 from flwr.proto.clientappio_pb2 import (
+    GetTokenRequest,
+    GetTokenResponse,
     PullClientAppInputsRequest,
     PullClientAppInputsResponse,
     PushClientAppOutputsRequest,
@@ -46,6 +49,35 @@ from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
 from .utils import get_load_client_app_fn
 
 
+def flwr_clientapp() -> None:
+    """Run process-isolated Flower ClientApp."""
+    log(INFO, "Starting Flower ClientApp")
+
+    parser = argparse.ArgumentParser(
+        description="Run a Flower ClientApp",
+    )
+    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",
+        args.supernode,
+        args.token,
+    )
+    run_clientapp(supernode=args.supernode, token=args.token)
+
+
 def on_channel_state_change(channel_connectivity: str) -> None:
     """Log channel connectivity."""
     log(DEBUG, channel_connectivity)
@@ -53,7 +85,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.
 
@@ -61,7 +93,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(
@@ -73,6 +105,10 @@ def run_clientapp(  # pylint: disable=R0914
     try:
         stub = ClientAppIoStub(channel)
 
+        # If token is not set, loop until token is received from SuperNode
+        while token is None:
+            token = get_token(stub)
+
         # Pull Message, Context, and Run from SuperNode
         message, context, run = pull_message(stub=stub, token=token)
 
@@ -118,6 +154,13 @@ def run_clientapp(  # pylint: disable=R0914
         channel.close()
 
 
+def get_token(stub: grpc.Channel) -> Optional[int]:
+    """Get a token from SuperNode."""
+    log(DEBUG, "Flower ClientApp process requests token")
+    res: GetTokenResponse = stub.GetToken(GetTokenRequest())
+    return res.token
+
+
 def pull_message(stub: grpc.Channel, token: int) -> Tuple[Message, Context, Run]:
     """Pull message from SuperNode to ClientApp."""
     res: PullClientAppInputsResponse = stub.PullClientAppInputs(

flwr/client/{process → clientapp}/clientappio_servicer.py

@@ -17,7 +17,7 @@
 
 from dataclasses import dataclass
 from logging import DEBUG, ERROR
-from typing import Optional
+from typing import Optional, cast
 
 import grpc
 
@@ -36,6 +36,8 @@ from flwr.common.typing import Run
 # pylint: disable=E0611
 from flwr.proto import clientappio_pb2_grpc
 from flwr.proto.clientappio_pb2 import (  # pylint: disable=E0401
+    GetTokenRequest,
+    GetTokenResponse,
     PullClientAppInputsRequest,
     PullClientAppInputsResponse,
     PushClientAppOutputsRequest,
@@ -68,25 +70,72 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
     def __init__(self) -> None:
         self.clientapp_input: Optional[ClientAppIoInputs] = None
         self.clientapp_output: Optional[ClientAppIoOutputs] = None
+        self.token_returned: bool = False
+        self.inputs_returned: bool = False
+
+    def GetToken(
+        self, request: GetTokenRequest, context: grpc.ServicerContext
+    ) -> GetTokenResponse:
+        """Get token."""
+        log(DEBUG, "ClientAppIo.GetToken")
+
+        # Fail if no ClientAppIoInputs are available
+        if self.clientapp_input is None:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "No inputs available.",
+            )
+        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+
+        # Fail if token was already returned in a previous call
+        if self.token_returned:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "Token already returned. A token can be returned only once.",
+            )
+
+        # If
+        # - ClientAppIoInputs is set, and
+        # - token hasn't been returned before,
+        # return token
+        self.token_returned = True
+        return GetTokenResponse(token=clientapp_input.token)
 
     def PullClientAppInputs(
         self, request: PullClientAppInputsRequest, context: grpc.ServicerContext
     ) -> PullClientAppInputsResponse:
         """Pull Message, Context, and Run."""
         log(DEBUG, "ClientAppIo.PullClientAppInputs")
+
+        # Fail if no ClientAppIoInputs are available
         if self.clientapp_input is None:
-            raise ValueError(
-                "ClientAppIoInputs not set before calling `PullClientAppInputs`."
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "No inputs available.",
             )
-        if request.token != self.clientapp_input.token:
+        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+
+        # Fail if token wasn't returned in a previous call
+        if not self.token_returned:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "Token hasn't been returned."
+                "Token must be returned before can be returned only once.",
+            )
+
+        # Fail if token isn't matching
+        if request.token != clientapp_input.token:
             context.abort(
                 grpc.StatusCode.INVALID_ARGUMENT,
                 "Mismatch between ClientApp and SuperNode token",
             )
+
+        # Success
+        self.inputs_returned = True
         return PullClientAppInputsResponse(
-            message=message_to_proto(self.clientapp_input.message),
-            context=context_to_proto(self.clientapp_input.context),
-            run=run_to_proto(self.clientapp_input.run),
+            message=message_to_proto(clientapp_input.message),
+            context=context_to_proto(clientapp_input.context),
+            run=run_to_proto(clientapp_input.run),
         )
 
     def PushClientAppOutputs(
@@ -94,15 +143,39 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
     ) -> PushClientAppOutputsResponse:
         """Push Message and Context."""
         log(DEBUG, "ClientAppIo.PushClientAppOutputs")
-        if self.clientapp_input is None:
-            raise ValueError(
-                "ClientAppIoInputs not set before calling `PushClientAppOutputs`."
+
+        # Fail if no ClientAppIoInputs are available
+        if not self.clientapp_input:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "No inputs available.",
+            )
+        clientapp_input = cast(ClientAppIoInputs, self.clientapp_input)
+
+        # Fail if token wasn't returned in a previous call
+        if not self.token_returned:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "Token hasn't been returned."
+                "Token must be returned before can be returned only once.",
             )
-        if request.token != self.clientapp_input.token:
+
+        # Fail if inputs weren't delivered in a previous call
+        if not self.inputs_returned:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION,
+                "Inputs haven't been delivered."
+                "Inputs must be delivered before can be returned only once.",
+            )
+
+        # Fail if token isn't matching
+        if request.token != clientapp_input.token:
             context.abort(
                 grpc.StatusCode.INVALID_ARGUMENT,
                 "Mismatch between ClientApp and SuperNode token",
             )
+
+        # Preconditions met
         try:
             # Update Message and Context
             self.clientapp_output = ClientAppIoOutputs(
@@ -113,32 +186,55 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             # Set status
             code = typing.ClientAppOutputCode.SUCCESS
             status = typing.ClientAppOutputStatus(code=code, message="Success")
-            proto_status = clientappstatus_to_proto(status=status)
-            return PushClientAppOutputsResponse(status=proto_status)
         except Exception as e:  # pylint: disable=broad-exception-caught
             log(ERROR, "ClientApp failed to push message to SuperNode, %s", e)
             code = typing.ClientAppOutputCode.UNKNOWN_ERROR
-            status = typing.ClientAppOutputStatus(code=code, message="Push failed")
-            proto_status = clientappstatus_to_proto(status=status)
-            return PushClientAppOutputsResponse(status=proto_status)
-
-    def set_inputs(self, clientapp_input: ClientAppIoInputs) -> None:
-        """Set ClientApp inputs."""
-        log(DEBUG, "ClientAppIo.SetInputs")
-        if self.clientapp_input is not None or self.clientapp_output is not None:
+            status = typing.ClientAppOutputStatus(code=code, message="Unkonwn error")
+
+        # Return status to ClientApp process
+        proto_status = clientappstatus_to_proto(status=status)
+        return PushClientAppOutputsResponse(status=proto_status)
+
+    def set_inputs(
+        self, clientapp_input: ClientAppIoInputs, token_returned: bool
+    ) -> None:
+        """Set ClientApp inputs.
+
+        Parameters
+        ----------
+        clientapp_input : ClientAppIoInputs
+            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.
+        """
+        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 "
                 "calling `set_inputs`."
             )
         self.clientapp_input = clientapp_input
+        self.token_returned = token_returned
+
+    def has_outputs(self) -> bool:
+        """Check if ClientAppOutputs are available."""
+        return self.clientapp_output is not None
 
     def get_outputs(self) -> ClientAppIoOutputs:
         """Get ClientApp outputs."""
-        log(DEBUG, "ClientAppIo.GetOutputs")
         if self.clientapp_output is None:
             raise ValueError("ClientAppIoOutputs not set before calling `get_outputs`.")
-        # Set outputs to a local variable and clear self.clientapp_output
+
+        # Set outputs to a local variable and clear state
         output: ClientAppIoOutputs = self.clientapp_output
         self.clientapp_input = None
         self.clientapp_output = None
+        self.token_returned = False
+        self.inputs_returned = False
+
         return output

flwr/client/supernode/__init__.py

@@ -15,12 +15,10 @@
 """Flower SuperNode."""
 
 
-from .app import flwr_clientapp as flwr_clientapp
 from .app import run_client_app as run_client_app
 from .app import run_supernode as run_supernode
 
 __all__ = [
-    "flwr_clientapp",
     "run_client_app",
     "run_supernode",
 ]

flwr/client/supernode/app.py

@@ -38,8 +38,7 @@ 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 ..process.process import run_clientapp
-from ..process.utils import get_load_client_app_fn
+from ..clientapp.utils import get_load_client_app_fn
 
 ADDRESS_FLEET_API_GRPC_RERE = "0.0.0.0:9092"
 
@@ -115,32 +114,6 @@ def run_client_app() -> None:
     register_exit_handlers(event_type=EventType.RUN_CLIENT_APP_LEAVE)
 
 
-def flwr_clientapp() -> None:
-    """Run process-isolated Flower ClientApp."""
-    log(INFO, "Starting Flower ClientApp")
-
-    parser = argparse.ArgumentParser(
-        description="Run a Flower ClientApp",
-    )
-    parser.add_argument(
-        "--supernode",
-        help="Address of SuperNode ClientAppIo gRPC servicer",
-    )
-    parser.add_argument(
-        "--token",
-        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",
-        args.supernode,
-        args.token,
-    )
-    run_clientapp(supernode=args.supernode, token=int(args.token))
-
-
 def _warn_deprecated_server_arg(args: argparse.Namespace) -> None:
     """Warn about the deprecated argument `--server`."""
     if args.server != ADDRESS_FLEET_API_GRPC_RERE:

flwr/proto/clientappio_pb2.py

@@ -17,25 +17,29 @@ 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\"+\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\xe4\x01\n\x0b\x43lientAppIo\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\"\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')
 
 _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=591
-  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=667
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=645
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=721
   _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_start=114
   _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_end=201
-  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_start=203
-  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_end=246
-  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_start=249
-  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=384
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=386
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=506
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=508
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=589
-  _globals['_CLIENTAPPIO']._serialized_start=670
-  _globals['_CLIENTAPPIO']._serialized_end=898
+  _globals['_GETTOKENREQUEST']._serialized_start=203
+  _globals['_GETTOKENREQUEST']._serialized_end=220
+  _globals['_GETTOKENRESPONSE']._serialized_start=222
+  _globals['_GETTOKENRESPONSE']._serialized_end=255
+  _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
 # @@protoc_insertion_point(module_scope)

flwr/proto/clientappio_pb2.pyi

@@ -44,6 +44,23 @@ class ClientAppOutputStatus(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["code",b"code","message",b"message"]) -> None: ...
 global___ClientAppOutputStatus = ClientAppOutputStatus
 
+class GetTokenRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___GetTokenRequest = GetTokenRequest
+
+class GetTokenResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    TOKEN_FIELD_NUMBER: builtins.int
+    token: builtins.int
+    def __init__(self,
+        *,
+        token: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
+global___GetTokenResponse = GetTokenResponse
+
 class PullClientAppInputsRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TOKEN_FIELD_NUMBER: builtins.int

flwr/proto/clientappio_pb2_grpc.py

@@ -14,6 +14,11 @@ class ClientAppIoStub(object):
         Args:
             channel: A grpc.Channel.
         """
+        self.GetToken = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/GetToken',
+                request_serializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString,
+                )
         self.PullClientAppInputs = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PullClientAppInputs',
                 request_serializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.SerializeToString,
@@ -29,6 +34,13 @@ class ClientAppIoStub(object):
 class ClientAppIoServicer(object):
     """Missing associated documentation comment in .proto file."""
 
+    def GetToken(self, request, context):
+        """Get token
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def PullClientAppInputs(self, request, context):
         """Get Message, Context, and Run
         """
@@ -46,6 +58,11 @@ class ClientAppIoServicer(object):
 
 def add_ClientAppIoServicer_to_server(servicer, server):
     rpc_method_handlers = {
+            'GetToken': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetToken,
+                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.SerializeToString,
+            ),
             'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullClientAppInputs,
                     request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.FromString,
@@ -66,6 +83,23 @@ def add_ClientAppIoServicer_to_server(servicer, server):
 class ClientAppIo(object):
     """Missing associated documentation comment in .proto file."""
 
+    @staticmethod
+    def GetToken(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/GetToken',
+            flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString,
+            flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def PullClientAppInputs(request,
             target,

flwr/proto/clientappio_pb2_grpc.pyi

@@ -8,6 +8,11 @@ import grpc
 
 class ClientAppIoStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
+    GetToken: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.clientappio_pb2.GetTokenRequest,
+        flwr.proto.clientappio_pb2.GetTokenResponse]
+    """Get token"""
+
     PullClientAppInputs: grpc.UnaryUnaryMultiCallable[
         flwr.proto.clientappio_pb2.PullClientAppInputsRequest,
         flwr.proto.clientappio_pb2.PullClientAppInputsResponse]
@@ -20,6 +25,14 @@ class ClientAppIoStub:
 
 
 class ClientAppIoServicer(metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def GetToken(self,
+        request: flwr.proto.clientappio_pb2.GetTokenRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.clientappio_pb2.GetTokenResponse:
+        """Get token"""
+        pass
+
     @abc.abstractmethod
     def PullClientAppInputs(self,
         request: flwr.proto.clientappio_pb2.PullClientAppInputsRequest,

flwr/server/superlink/fleet/vce/vce_api.py

@@ -27,8 +27,8 @@ from time import sleep
 from typing import Callable, Dict, Optional
 
 from flwr.client.client_app import ClientApp, ClientAppException, LoadClientAppError
+from flwr.client.clientapp.utils import get_load_client_app_fn
 from flwr.client.node_state import NodeState
-from flwr.client.process.utils import get_load_client_app_fn
 from flwr.common.constant import (
     NUM_PARTITIONS_KEY,
     PARTITION_ID_KEY,

{flwr_nightly-1.11.0.dev20240816.dist-info → flwr_nightly-1.11.0.dev20240818.dist-info}/METADATA

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

{flwr_nightly-1.11.0.dev20240816.dist-info → flwr_nightly-1.11.0.dev20240818.dist-info}/RECORD

@@ -53,9 +53,13 @@ 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=_SN2b2gPMF83jN0lO6j8zA1n3XmOSAOgK2DbjKGktGw,30196
+flwr/client/app.py,sha256=tB-bl3pcUhn-bUgGxRVUaZiS-AlZjf-zfxWdZA-r50Q,30483
 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=Ae5dNoLbLsaKKRUZHRnZ7povobk6DdA0C7e06gPiJLc,6003
+flwr/client/clientapp/clientappio_servicer.py,sha256=ysCgLY4oV2FmyltPQH2ZobbQ5e_TYd9BAuR1MdQrtXA,8353
+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
 flwr/client/grpc_adapter_client/connection.py,sha256=aOlCYasl8f2CrfcN-WrVEmvjAZFfEGWFOLwD6K9R0ZQ,3951
@@ -80,14 +84,10 @@ flwr/client/mod/utils.py,sha256=UAJXiB0wwVyLkCkpW_i5BXikdBR65p8sNFr7VNHm2nk,1226
 flwr/client/node_state.py,sha256=Z0ZUPL5BWde9nfAPwR7cSV9YiNQeiEHbuMKDxqpy6-M,3492
 flwr/client/node_state_tests.py,sha256=-4fVsn7y-z9NYBuhq-cjepgxgVuPqqQgDOL4SofrdIo,2239
 flwr/client/numpy_client.py,sha256=u76GWAdHmJM88Agm2EgLQSvO8Jnk225mJTk-_TmPjFE,10283
-flwr/client/process/__init__.py,sha256=s3hTr2dOWHkSnwivaL7YbXur38bEDgSPKKvwFLa1204,711
-flwr/client/process/clientappio_servicer.py,sha256=TMOo1EwqLfz3tgKcom7mQcHBh4GQXzVQicW0XYpkh9g,5399
-flwr/client/process/process.py,sha256=giQIjWHIzxKfXwiIrWDw-HZGElAf9Rbj-794TXgvE-o,4718
-flwr/client/process/utils.py,sha256=2fYKY1LfZPalG5Cm5FbSuNMIDtouQg17GbrzPINyM_A,3990
 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=8JuFMx5B06SymNWZ9ndvUimD0mopq0Yp2RdQaUANsw8,937
-flwr/client/supernode/app.py,sha256=FJsFD9YpzXfoLV2BjsUGe05LU98Viqo0VHmn23AdcdI,13382
+flwr/client/supernode/__init__.py,sha256=SUhWOzcgXRNXk1V9UgB5-FaWukqqrOEajVUHEcPkwyQ,865
+flwr/client/supernode/app.py,sha256=CrZG1AM19dgubuGOP0rWYnLwpCkt9F30v137BETSP30,12595
 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,10 +127,10 @@ 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=018Lj2HBXmEeq6KsmqFVVx2DGO2nDQqTA6YHEPjCTbc,3242
-flwr/proto/clientappio_pb2.pyi,sha256=M0-zbx5cNMUtGY7orsSQWwXo5EbN0CvwQPTuQFwXaCg,4855
-flwr/proto/clientappio_pb2_grpc.py,sha256=7WjUVfUUKctIloX3bkKjDprhtkqj2d9Xj3UlYxKzp1s,4513
-flwr/proto/clientappio_pb2_grpc.pyi,sha256=30X6jhMIjy5w3iZsDCBGDDwNwj3vj3RslZVWkRvzTn0,1413
+flwr/proto/clientappio_pb2.py,sha256=oGaTBdHuO4pL5oj2zIXG6kOdOdzZ8qaoP6I_oMOEnAY,3636
+flwr/proto/clientappio_pb2.pyi,sha256=7QUU3731Cin-fS-MYwfyU3GDndV_gMwnwOiU0jezHpY,5460
+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
 flwr/proto/common_pb2.pyi,sha256=0ylFO7G79qqLuRg9IQUCBdgyIIFv4m8VzrfoWad4xXU,5394
 flwr/proto/common_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
@@ -255,7 +255,7 @@ flwr/server/superlink/fleet/vce/__init__.py,sha256=36MHKiefnJeyjwMQzVUK4m06Ojon3
 flwr/server/superlink/fleet/vce/backend/__init__.py,sha256=psQjI1DQHOM5uWVXM27l_wPHjfEkMUTP-_8-lEFH1JA,1466
 flwr/server/superlink/fleet/vce/backend/backend.py,sha256=KL0eHScWr_YfP2eY3VP8_OOMgZwnRNW7qpu5J-ISpXI,2212
 flwr/server/superlink/fleet/vce/backend/raybackend.py,sha256=6-CjUTv1cFnAb53cZzEYCuVLrVu60tPczTo8meqeqbk,6289
-flwr/server/superlink/fleet/vce/vce_api.py,sha256=z59_IEeWBv0dsdHzQ0Vck_2zuGyC-U6dWjWJE3KjY9M,12748
+flwr/server/superlink/fleet/vce/vce_api.py,sha256=n9SfUaLDgiPVvGVudSC4dZ37vytEDlPn1WA0iUDWJ1I,12750
 flwr/server/superlink/state/__init__.py,sha256=Gj2OTFLXvA-mAjBvwuKDM3rDrVaQPcIoybSa2uskMTE,1003
 flwr/server/superlink/state/in_memory_state.py,sha256=XMcT5WvKPOrFOuKcByr5BRFacX4aR2n9bRkABUuPg-M,13206
 flwr/server/superlink/state/sqlite_state.py,sha256=N8eOLZUveJOzdzL31-hXRYOMqV_-w75S1InyDenaDWU,29420
@@ -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.dev20240816.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.11.0.dev20240816.dist-info/METADATA,sha256=qRqnoDNkm9COyePE7Hu_RfMX2yJ_id0R-LGAytr9iK0,15690
-flwr_nightly-1.11.0.dev20240816.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.11.0.dev20240816.dist-info/entry_points.txt,sha256=KqQQGNjnr-2IT-bheOkO9yM4Gv5BtjaBgYKRkp-NhVg,388
-flwr_nightly-1.11.0.dev20240816.dist-info/RECORD,,
+flwr_nightly-1.11.0.dev20240818.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.11.0.dev20240818.dist-info/METADATA,sha256=9h_o6Y1-M5y5_TUc0stYWb0E1GPhBo0uN_yCLAMqgNs,15690
+flwr_nightly-1.11.0.dev20240818.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.11.0.dev20240818.dist-info/entry_points.txt,sha256=3cDQVJEBRCSLzJrVYAgjXpoCjuQ74I3A9NZ61DOHdVo,388
+flwr_nightly-1.11.0.dev20240818.dist-info/RECORD,,

{flwr_nightly-1.11.0.dev20240816.dist-info → flwr_nightly-1.11.0.dev20240818.dist-info}/entry_points.txt

@@ -6,5 +6,5 @@ flower-superexec=flwr.superexec:run_superexec
 flower-superlink=flwr.server:run_superlink
 flower-supernode=flwr.client:run_supernode
 flwr=flwr.cli.app:app
-flwr-clientapp=flwr.client.supernode:flwr_clientapp
+flwr-clientapp=flwr.client.clientapp:flwr_clientapp