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

flwr/client/grpc_rere_client/connection.py

@@ -31,6 +31,8 @@ from flwr.common.constant import HEARTBEAT_CALL_TIMEOUT, HEARTBEAT_DEFAULT_INTER
 from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.heartbeat import HeartbeatSender
 from flwr.common.inflatable_grpc_utils import (
+    make_pull_object_fn_grpc,
+    make_push_object_fn_grpc,
     pull_object_from_servicer,
     push_object_to_servicer,
 )
@@ -269,9 +271,11 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 Message,
                 pull_object_from_servicer(
                     object_id=message_proto.metadata.message_id,
-                    stub=stub,
-                    node=node,
-                    run_id=message_proto.metadata.run_id,
+                    pull_object_fn=make_pull_object_fn_grpc(
+                        pull_object_grpc=stub.PullObject,
+                        node=node,
+                        run_id=message_proto.metadata.run_id,
+                    ),
                 ),
             )
 
@@ -322,9 +326,11 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             objs_to_push = set(response.objects_to_push[message.object_id].object_ids)
             push_object_to_servicer(
                 message,
-                stub,
-                node,
-                run_id=message.metadata.run_id,
+                push_object_fn=make_push_object_fn_grpc(
+                    push_object_grpc=stub.PushObject,
+                    node=node,
+                    run_id=message.metadata.run_id,
+                ),
                 object_ids_to_push=objs_to_push,
             )
             log(DEBUG, "Pushed %s objects to servicer.", len(objs_to_push))

flwr/common/inflatable_grpc_utils.py

@@ -16,10 +16,8 @@
 
 
 from time import sleep
-from typing import Optional, Union
+from typing import Callable, Optional
 
-from flwr.client.grpc_rere_client.grpc_adapter import GrpcAdapter
-from flwr.proto.fleet_pb2_grpc import FleetStub  # pylint: disable=E0611
 from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PullObjectRequest,
     PullObjectResponse,
@@ -27,7 +25,6 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PushObjectResponse,
 )
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
-from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub  # pylint: disable=E0611
 
 from .inflatable import (
     InflatableObject,
@@ -48,11 +45,24 @@ inflatable_class_registry: dict[str, type[InflatableObject]] = {
 }
 
 
+class ObjectUnavailableError(Exception):
+    """Exception raised when an object has been pre-registered but is not yet
+    available."""
+
+    def __init__(self, object_id: str):
+        super().__init__(f"Object with ID '{object_id}' is not yet available.")
+
+
+class ObjectIdNotPreregisteredError(Exception):
+    """Exception raised when an object ID is not pre-registered."""
+
+    def __init__(self, object_id: str):
+        super().__init__(f"Object with ID '{object_id}' could not be found.")
+
+
 def push_object_to_servicer(
     obj: InflatableObject,
-    stub: Union[FleetStub, ServerAppIoStub, GrpcAdapter],
-    node: Node,
-    run_id: int,
+    push_object_fn: Callable[[str, bytes], None],
     object_ids_to_push: Optional[set[str]] = None,
 ) -> set[str]:
     """Recursively deflate an object and push it to the servicer.
@@ -60,13 +70,30 @@ def push_object_to_servicer(
     Objects with the same ID are not pushed twice. If `object_ids_to_push` is set,
     only objects with those IDs are pushed. It returns the set of pushed object
     IDs.
+
+    Parameters
+    ----------
+    obj : InflatableObject
+        The object to push.
+    push_object_fn : Callable[[str, bytes], None]
+        A function that takes an object ID and its content as bytes, and pushes
+        it to the servicer. This function should raise `ObjectIdNotPreregisteredError`
+        if the object ID is not pre-registered.
+    object_ids_to_push : Optional[set[str]] (default: None)
+        A set of object IDs to push. If object ID of the given object is not in this
+        set, the object will not be pushed.
+
+    Returns
+    -------
+    set[str]
+        A set of object IDs that were pushed to the servicer.
     """
     pushed_object_ids: set[str] = set()
     # Push children if it has any
     if children := obj.children:
         for child in children.values():
             pushed_object_ids |= push_object_to_servicer(
-                child, stub, node, run_id, object_ids_to_push
+                child, push_object_fn, object_ids_to_push
             )
 
     # Deflate object and push
@@ -74,14 +101,8 @@ def push_object_to_servicer(
     object_id = get_object_id(object_content)
     # Push always if no object set is specified, or if the object is in the set
     if object_ids_to_push is None or object_id in object_ids_to_push:
-        _: PushObjectResponse = stub.PushObject(
-            PushObjectRequest(
-                node=node,
-                run_id=run_id,
-                object_id=object_id,
-                object_content=object_content,
-            )
-        )
+        # The function may raise an error if the object ID is not pre-registered
+        push_object_fn(object_id, object_content)
         pushed_object_ids.add(object_id)
 
     return pushed_object_ids
@@ -89,20 +110,33 @@ def push_object_to_servicer(
 
 def pull_object_from_servicer(
     object_id: str,
-    stub: Union[FleetStub, ServerAppIoStub, GrpcAdapter],
-    node: Node,
-    run_id: int,
+    pull_object_fn: Callable[[str], bytes],
 ) -> InflatableObject:
-    """Recursively inflate an object by pulling it from the servicer."""
+    """Recursively inflate an object by pulling it from the servicer.
+
+    Parameters
+    ----------
+    object_id : str
+        The ID of the object to pull.
+    pull_object_fn : Callable[[str], bytes]
+        A function that takes an object ID and returns the object content as bytes.
+        The function should raise `ObjectUnavailableError` if the object is not yet
+        available, or `ObjectIdNotPreregisteredError` if the object ID is not
+        pre-registered.
+
+    Returns
+    -------
+    InflatableObject
+        The pulled object.
+    """
     # Pull object
-    object_available = False
-    while not object_available:
-        object_proto: PullObjectResponse = stub.PullObject(
-            PullObjectRequest(node=node, run_id=run_id, object_id=object_id)
-        )
-        object_available = object_proto.object_available
-        object_content = object_proto.object_content
-        sleep(0.1)
+    while True:
+        try:
+            # The function may raise an error if the object ID is not pre-registered
+            object_content: bytes = pull_object_fn(object_id)
+            break  # Exit loop if object is successfully pulled
+        except ObjectUnavailableError:
+            sleep(0.1)  # Retry after a short delay
 
     # Extract object class and object_ids of children
     obj_type, children_obj_ids, _ = get_object_head_values_from_object_content(
@@ -115,8 +149,79 @@ def pull_object_from_servicer(
     children: dict[str, InflatableObject] = {}
     for child_object_id in children_obj_ids:
         children[child_object_id] = pull_object_from_servicer(
-            child_object_id, stub, node, run_id
+            child_object_id, pull_object_fn
         )
 
     # Inflate object passing its children
     return cls_type.inflate(object_content, children=children)
+
+
+def make_pull_object_fn_grpc(
+    pull_object_grpc: Callable[[PullObjectRequest], PullObjectResponse],
+    node: Node,
+    run_id: int,
+) -> Callable[[str], bytes]:
+    """Create a pull object function that uses gRPC to pull objects.
+
+    Parameters
+    ----------
+    pull_object_grpc : Callable[[PullObjectRequest], PullObjectResponse]
+        The gRPC function to pull objects, e.g., `FleetStub.PullObject`.
+    node : Node
+        The node making the request.
+    run_id : int
+        The run ID for the current operation.
+
+    Returns
+    -------
+    Callable[[str], bytes]
+        A function that takes an object ID and returns the object content as bytes.
+        The function raises `ObjectIdNotPreregisteredError` if the object ID is not
+        pre-registered, or `ObjectUnavailableError` if the object is not yet available.
+    """
+
+    def pull_object_fn(object_id: str) -> bytes:
+        request = PullObjectRequest(node=node, run_id=run_id, object_id=object_id)
+        response: PullObjectResponse = pull_object_grpc(request)
+        if not response.object_found:
+            raise ObjectIdNotPreregisteredError(object_id)
+        if not response.object_available:
+            raise ObjectUnavailableError(object_id)
+        return response.object_content
+
+    return pull_object_fn
+
+
+def make_push_object_fn_grpc(
+    push_object_grpc: Callable[[PushObjectRequest], PushObjectResponse],
+    node: Node,
+    run_id: int,
+) -> Callable[[str, bytes], None]:
+    """Create a push object function that uses gRPC to push objects.
+
+    Parameters
+    ----------
+    push_object_grpc : Callable[[PushObjectRequest], PushObjectResponse]
+        The gRPC function to push objects, e.g., `FleetStub.PushObject`.
+    node : Node
+        The node making the request.
+    run_id : int
+        The run ID for the current operation.
+
+    Returns
+    -------
+    Callable[[str, bytes], None]
+        A function that takes an object ID and its content as bytes, and pushes it
+        to the servicer. The function raises `ObjectIdNotPreregisteredError` if
+        the object ID is not pre-registered.
+    """
+
+    def push_object_fn(object_id: str, object_content: bytes) -> None:
+        request = PushObjectRequest(
+            node=node, run_id=run_id, object_id=object_id, object_content=object_content
+        )
+        response: PushObjectResponse = push_object_grpc(request)
+        if not response.stored:
+            raise ObjectIdNotPreregisteredError(object_id)
+
+    return push_object_fn

flwr/server/grid/grpc_grid.py

@@ -29,6 +29,8 @@ from flwr.common.constant import (
 )
 from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.inflatable_grpc_utils import (
+    make_pull_object_fn_grpc,
+    make_push_object_fn_grpc,
     pull_object_from_servicer,
     push_object_to_servicer,
 )
@@ -227,9 +229,11 @@ class GrpcGrid(Grid):
             # Push only object that are not in the store
             push_object_to_servicer(
                 message,
-                self._stub,
-                node=self.node,
-                run_id=run_id,
+                push_object_fn=make_push_object_fn_grpc(
+                    push_object_grpc=self._stub.PushObject,
+                    node=self.node,
+                    run_id=run_id,
+                ),
                 object_ids_to_push=obj_ids_to_push,
             )
         return msg_id
@@ -292,9 +296,11 @@ class GrpcGrid(Grid):
 
                 message = pull_object_from_servicer(
                     msg_proto.metadata.message_id,
-                    self._stub,
-                    node=self.node,
-                    run_id=run_id,
+                    pull_object_fn=make_pull_object_fn_grpc(
+                        pull_object_grpc=self._stub.PullObject,
+                        node=self.node,
+                        run_id=run_id,
+                    ),
                 )
                 inflated_msgs.append(cast(Message, message))
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250605
+Version: 1.19.0.dev20250606
 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.dev20250605.dist-info → flwr_nightly-1.19.0.dev20250606.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=XwhT-yrWLHHegXpiAu1YuICLQ1t-KkOh6pNYJ9R4FEE,13358
+flwr/client/grpc_rere_client/connection.py,sha256=6LF9JuAhL4XDHVtPS6MzEYm-Nrer-5iM7fEjR5XaGzM,13658
 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
@@ -123,7 +123,7 @@ flwr/common/exit_handlers.py,sha256=IaqJ60fXZuu7McaRYnoYKtlbH9t4Yl9goNExKqtmQbs,
 flwr/common/grpc.py,sha256=manTaHaPiyYngUq1ErZvvV2B2GxlXUUUGRy3jc3TBIQ,9798
 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/inflatable_grpc_utils.py,sha256=3M3_334GM-BrjLysilPXEbkDAErh_dXVgkcmcFSQYWg,8017
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
 flwr/common/message.py,sha256=ZdH35PznYhIzfNKPzHTL1YS5z-flTpHnjdNpQR6B8x0,19953
 flwr/common/object_ref.py,sha256=p3SfTeqo3Aj16SkB-vsnNn01zswOPdGNBitcbRnqmUk,9134
@@ -236,7 +236,7 @@ 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=ymLaqWYYkv0uWrYvxavMKEyB0TVRMSPi1tJhmvhe7_g,12392
+flwr/server/grid/grpc_grid.py,sha256=o9oXBsAc9jp2RneY1AhOOyOO8B4sRJKP_l1UyC0j5_M,12692
 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.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,,
+flwr_nightly-1.19.0.dev20250606.dist-info/METADATA,sha256=OBd3qXqNO4F-2bqFuBUM8HZ1hKilS8QDmf0fH12imYs,15910
+flwr_nightly-1.19.0.dev20250606.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.19.0.dev20250606.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.19.0.dev20250606.dist-info/RECORD,,