flwr-nightly 1.19.0.dev20250604__tar.gz → 1.19.0.dev20250605__tar.gz

{flwr_nightly-1.19.0.dev20250604 → flwr_nightly-1.19.0.dev20250605}/PKG-INFO

@@ -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 → flwr_nightly-1.19.0.dev20250605}/py/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_nightly-1.19.0.dev20250604 → flwr_nightly-1.19.0.dev20250605}/py/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_nightly-1.19.0.dev20250604 → flwr_nightly-1.19.0.dev20250605}/py/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_nightly-1.19.0.dev20250604 → flwr_nightly-1.19.0.dev20250605}/py/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 → flwr_nightly-1.19.0.dev20250605}/pyproject.toml

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