flwr-nightly 1.19.0.dev20250604__py3-none-any.whl → 1.19.0.dev20250605__py3-none-any.whl

flwr/client/grpc_rere_client/connection.py

@@ -35,7 +35,11 @@ from flwr.common.inflatable_grpc_utils import (
     push_object_to_servicer,
 )
 from flwr.common.logger import log
-from flwr.common.message import Message, get_message_to_descendant_id_mapping
+from flwr.common.message import (
+    Message,
+    get_message_to_descendant_id_mapping,
+    remove_content_from_message,
+)
 from flwr.common.retry_invoker import RetryInvoker, _wrap_stub
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     generate_key_pairs,
@@ -305,7 +309,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             return
 
         # Serialize Message
-        message_proto = message_to_proto(message=message)
+        message_proto = message_to_proto(message=remove_content_from_message(message))
         descendants_mapping = get_message_to_descendant_id_mapping(message)
         request = PushMessagesRequest(
             node=node,

flwr/common/message.py

@@ -426,6 +426,17 @@ def make_message(
     return Message(metadata=metadata, content=content, error=error)  # type: ignore
 
 
+def remove_content_from_message(message: Message) -> Message:
+    """Return a copy of the Message but with an empty RecordDict as content.
+
+    If message has no content, it returns itself.
+    """
+    if message.has_error():
+        return message
+
+    return make_message(metadata=message.metadata, content=RecordDict())
+
+
 def _limit_reply_ttl(
     current: float, reply_ttl: float | None, reply_to: Message
 ) -> float:

flwr/server/compat/app_utils.py

@@ -16,6 +16,7 @@
 
 
 import threading
+from typing import Any, Callable
 
 from flwr.common.typing import RunNotRunningException
 
@@ -80,36 +81,57 @@ def _update_client_manager(
     """Update the nodes list in the client manager."""
     # Loop until the grid is disconnected
     registered_nodes: dict[int, GridClientProxy] = {}
+    lock = threading.RLock()
+
+    def update_registered_nodes() -> None:
+        with lock:
+            all_node_ids = set(grid.get_node_ids())
+            dead_nodes = set(registered_nodes).difference(all_node_ids)
+            new_nodes = all_node_ids.difference(registered_nodes)
+
+            # Unregister dead nodes
+            for node_id in dead_nodes:
+                client_proxy = registered_nodes[node_id]
+                client_manager.unregister(client_proxy)
+                del registered_nodes[node_id]
+
+            # Register new nodes
+            for node_id in new_nodes:
+                client_proxy = GridClientProxy(
+                    node_id=node_id,
+                    grid=grid,
+                    run_id=grid.run.run_id,
+                )
+                if client_manager.register(client_proxy):
+                    registered_nodes[node_id] = client_proxy
+                else:
+                    raise RuntimeError("Could not register node.")
+
+    # Get the wrapped method of ClientManager instance
+    def get_wrapped_method(method_name: str) -> Callable[..., Any]:
+        original_method = getattr(client_manager, method_name)
+
+        def wrapped_method(*args: Any, **kwargs: Any) -> Any:
+            # Update registered nodes before calling the original method
+            update_registered_nodes()
+            return original_method(*args, **kwargs)
+
+        return wrapped_method
+
+    # Wrap the ClientManager
+    for method_name in ["num_available", "all", "sample"]:
+        setattr(client_manager, method_name, get_wrapped_method(method_name))
+
+    c_done.set()
+
     while not f_stop.is_set():
+        # Sleep for 5 seconds
+        if not f_stop.is_set():
+            f_stop.wait(5)
+
         try:
-            all_node_ids = set(grid.get_node_ids())
+            # Update registered nodes
+            update_registered_nodes()
         except RunNotRunningException:
             f_stop.set()
             break
-        dead_nodes = set(registered_nodes).difference(all_node_ids)
-        new_nodes = all_node_ids.difference(registered_nodes)
-
-        # Unregister dead nodes
-        for node_id in dead_nodes:
-            client_proxy = registered_nodes[node_id]
-            client_manager.unregister(client_proxy)
-            del registered_nodes[node_id]
-
-        # Register new nodes
-        for node_id in new_nodes:
-            client_proxy = GridClientProxy(
-                node_id=node_id,
-                grid=grid,
-                run_id=grid.run.run_id,
-            )
-            if client_manager.register(client_proxy):
-                registered_nodes[node_id] = client_proxy
-            else:
-                raise RuntimeError("Could not register node.")
-
-        # Flag first pass for nodes registration is completed
-        c_done.set()
-
-        # Sleep for 3 seconds
-        if not f_stop.is_set():
-            f_stop.wait(3)

flwr/server/grid/grpc_grid.py

@@ -33,7 +33,10 @@ from flwr.common.inflatable_grpc_utils import (
     push_object_to_servicer,
 )
 from flwr.common.logger import log, warn_deprecated_feature
-from flwr.common.message import get_message_to_descendant_id_mapping
+from flwr.common.message import (
+    get_message_to_descendant_id_mapping,
+    remove_content_from_message,
+)
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.common.serde import message_to_proto, run_from_proto
 from flwr.common.typing import Run
@@ -210,7 +213,7 @@ class GrpcGrid(Grid):
         # Call GrpcServerAppIoStub method
         res: PushInsMessagesResponse = self._stub.PushMessages(
             PushInsMessagesRequest(
-                messages_list=[message_to_proto(message)],
+                messages_list=[message_to_proto(remove_content_from_message(message))],
                 run_id=run_id,
                 msg_to_descendant_mapping=descendants_mapping,
             )

{flwr_nightly-1.19.0.dev20250604.dist-info → flwr_nightly-1.19.0.dev20250605.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250604
+Version: 1.19.0.dev20250605
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.19.0.dev20250604.dist-info → flwr_nightly-1.19.0.dev20250605.dist-info}/RECORD

@@ -84,7 +84,7 @@ flwr/client/grpc_adapter_client/__init__.py,sha256=RQWP5mFPROLHKgombiRvPXVWSoVrQ
 flwr/client/grpc_adapter_client/connection.py,sha256=aj5tTYyE8z2hQLXPPydsJiz8gBDIWLUhfWvqYkAL1L4,3966
 flwr/client/grpc_rere_client/__init__.py,sha256=i7iS0Lt8B7q0E2L72e4F_YrKm6ClRKnd71PNA6PW2O0,752
 flwr/client/grpc_rere_client/client_interceptor.py,sha256=zFaVHw6AxeNO-7eCKKb-RxrPa7zbM5Z-2-1Efc4adQY,2451
-flwr/client/grpc_rere_client/connection.py,sha256=kjnbUNLNz3fn-79fOQ-EDPIkzK8W0GckYIUkvWCXDD0,13283
+flwr/client/grpc_rere_client/connection.py,sha256=XwhT-yrWLHHegXpiAu1YuICLQ1t-KkOh6pNYJ9R4FEE,13358
 flwr/client/grpc_rere_client/grpc_adapter.py,sha256=JvMZ7vCFTaTEo6AzKYh3zDmeQAU7VSjdysbC6t3ufWg,6351
 flwr/client/message_handler/__init__.py,sha256=0lyljDVqre3WljiZbPcwCCf8GiIaSVI_yo_ylEyPwSE,719
 flwr/client/message_handler/message_handler.py,sha256=X9SXX6et97Lw9_DGD93HKsEBGNjXClcFgc_5aLK0oiU,6541
@@ -125,7 +125,7 @@ flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
 flwr/common/inflatable.py,sha256=9yPsSFOfNM2OIb15JQ6-wY5kblwXiC5zNX-tsp2ZwW0,7017
 flwr/common/inflatable_grpc_utils.py,sha256=YGP8oJRfnkwvY6segWH1DUf_ljDIkku7-2zH66tv3HA,4337
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
-flwr/common/message.py,sha256=HfSeqxwXgf90ilbMlM0vrF4cJWqJVx3jJ0gNmTfgdFw,19628
+flwr/common/message.py,sha256=ZdH35PznYhIzfNKPzHTL1YS5z-flTpHnjdNpQR6B8x0,19953
 flwr/common/object_ref.py,sha256=p3SfTeqo3Aj16SkB-vsnNn01zswOPdGNBitcbRnqmUk,9134
 flwr/common/parameter.py,sha256=UVw6sOgehEFhFs4uUCMl2kfVq1PD6ncmWgPLMsZPKPE,2095
 flwr/common/pyproject.py,sha256=2SU6yJW7059SbMXgzjOdK1GZRWO6AixDH7BmdxbMvHI,1386
@@ -229,14 +229,14 @@ flwr/server/client_manager.py,sha256=5jCGavVli7XdupvWWo7ru3PdFTlRU8IGvHFSSoUVLRs
 flwr/server/client_proxy.py,sha256=sv0E9AldBYOvc3pusqFh-GnyreeMfsXQ1cuTtxTq_wY,2399
 flwr/server/compat/__init__.py,sha256=0IsttWvY15qO98_1GyzVC-vR1e_ZPXOdu2qUlOkYMPE,886
 flwr/server/compat/app.py,sha256=N18vG9fF6rnDQqzPGH53sdAi2P72QNAM1chtq9KQweQ,3323
-flwr/server/compat/app_utils.py,sha256=99VccCr-OH6kCoD8399P5WQmdnjIIEFU_8Kpo04kJpk,3772
+flwr/server/compat/app_utils.py,sha256=Uz6m-NV90cQ6k-gW6wlWQuhoFoK78qlMr0CEmALKXqY,4591
 flwr/server/compat/grid_client_proxy.py,sha256=FxMgGtrzBoBAPby2ZjTWzpCJsCht8FwMm4PzqW80dmQ,4956
 flwr/server/compat/legacy_context.py,sha256=94JsRQxyOdLI6lZZkFjS3-TMd0YJGAgSBBO0M_s_9ts,1804
 flwr/server/criterion.py,sha256=G4e-6B48Pc7d5rmGVUpIzNKb6UF88O3VmTRuUltgjzM,1061
 flwr/server/fleet_event_log_interceptor.py,sha256=AkL7Y5d3xm2vRhL3ahmEVVoOvAP7PA7dRgB-je4v-Ys,3774
 flwr/server/grid/__init__.py,sha256=aWZHezoR2UGMJISB_gPMCm2N_2GSbm97A3lAp7ruhRQ,888
 flwr/server/grid/grid.py,sha256=naGCYt5J6dnmUvrcGkdNyKPe3MBd-0awGm1ALmgahqY,6625
-flwr/server/grid/grpc_grid.py,sha256=MWESNIUbBp8ownNE1JvWW-xQ7Hb7AyxcorVsOZIkI18,12321
+flwr/server/grid/grpc_grid.py,sha256=ymLaqWYYkv0uWrYvxavMKEyB0TVRMSPi1tJhmvhe7_g,12392
 flwr/server/grid/inmemory_grid.py,sha256=RjejYT-d-hHuTs1KSs_5wvOdAWKLus8w5_UAcnGt4iw,6168
 flwr/server/history.py,sha256=cCkFhBN4GoHsYYNk5GG1Y089eKJh2DH_ZJbYPwLaGyk,5026
 flwr/server/run_serverapp.py,sha256=v0p6jXj2dFxlRUdoEeF1mnaFd9XRQi6dZCflPY6d3qI,2063
@@ -357,7 +357,7 @@ flwr/supernode/servicer/__init__.py,sha256=lucTzre5WPK7G1YLCfaqg3rbFWdNSb7ZTt-ca
 flwr/supernode/servicer/clientappio/__init__.py,sha256=vJyOjO2FXZ2URbnthmdsgs6948wbYfdq1L1V8Um-Lr8,895
 flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=LmzkxtNQBn5vVrHc0Bhq2WqaK6-LM2v4kfLBN0PiNNM,8522
 flwr/supernode/start_client_internal.py,sha256=5CwTNV-XmIhwR1jv3G7aQAXGhf6OFWS6U-vmxY1iKGA,16984
-flwr_nightly-1.19.0.dev20250604.dist-info/METADATA,sha256=xUqCj0YV0Yt1jAVWil6lHAaQkDUMpQqRIFL5tX2yUQo,15910
-flwr_nightly-1.19.0.dev20250604.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.19.0.dev20250604.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.19.0.dev20250604.dist-info/RECORD,,
+flwr_nightly-1.19.0.dev20250605.dist-info/METADATA,sha256=gsyzTuVl8GpQD7gk1RPBCbNvdugpyl08gCr1sC0kUHc,15910
+flwr_nightly-1.19.0.dev20250605.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.19.0.dev20250605.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.19.0.dev20250605.dist-info/RECORD,,