flwr-nightly 1.11.0.dev20240817__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
@@ -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/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/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`.")
 

{flwr_nightly-1.11.0.dev20240817.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.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.dist-info → flwr_nightly-1.11.0.dev20240818.dist-info}/RECORD

@@ -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=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=SVzkUAzaHWSH1Sbe2GzLMF-OnrbZ-iKg-QphuEHl8QE,5706
-flwr/client/clientapp/clientappio_servicer.py,sha256=lIH92rHuRQZUaEf9u8fNuiLIQIVYdAp4C1wPok62adQ,8302
+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
@@ -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.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,,