flwr-nightly 1.11.0.dev20240817__tar.gz → 1.11.0.dev20240818__tar.gz

{flwr_nightly-1.11.0.dev20240817 → flwr_nightly-1.11.0.dev20240818}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.11.0.dev20240817
+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.dev20240817 → flwr_nightly-1.11.0.dev20240818}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.11.0.dev20240817"
+version = "1.11.0.dev20240818"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]

{flwr_nightly-1.11.0.dev20240817 → flwr_nightly-1.11.0.dev20240818}/src/py/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
@@ -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,7 +455,7 @@ 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)
 
@@ -483,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_nightly-1.11.0.dev20240817 → flwr_nightly-1.11.0.dev20240818}/src/py/flwr/client/clientapp/app.py

@@ -58,10 +58,13 @@ 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()
@@ -72,7 +75,7 @@ def flwr_clientapp() -> None:
         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 +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.
 
@@ -90,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(
@@ -102,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)
 
@@ -149,6 +156,7 @@ def run_clientapp(  # pylint: disable=R0914
 
 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
 

{flwr_nightly-1.11.0.dev20240817 → flwr_nightly-1.11.0.dev20240818}/src/py/flwr/client/clientapp/clientappio_servicer.py

@@ -209,7 +209,6 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             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
@@ -222,9 +221,12 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         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`.")