flwr-nightly 1.20.0.dev20250715__py3-none-any.whl → 1.20.0.dev20250716__py3-none-any.whl

flwr/client/grpc_rere_client/connection.py

@@ -34,9 +34,9 @@ from flwr.common.inflatable import (
     iterate_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_grpc_utils import (
-    make_pull_object_fn_grpc,
-    make_push_object_fn_grpc,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -277,8 +277,8 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             object_tree = response.message_object_trees[0]
             all_object_contents = pull_objects(
                 [tree.object_id for tree in iterate_object_tree(object_tree)],
-                pull_object_fn=make_pull_object_fn_grpc(
-                    pull_object_grpc=stub.PullObject,
+                pull_object_fn=make_pull_object_fn_protobuf(
+                    pull_object_protobuf=stub.PullObject,
                     node=node,
                     run_id=run_id,
                 ),
@@ -330,8 +330,8 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 )
                 push_objects(
                     all_objects,
-                    push_object_fn=make_push_object_fn_grpc(
-                        push_object_grpc=stub.PushObject,
+                    push_object_fn=make_push_object_fn_protobuf(
+                        push_object_protobuf=stub.PushObject,
                         node=node,
                         run_id=message.metadata.run_id,
                     ),

flwr/client/rest_client/connection.py

@@ -14,6 +14,7 @@
 # ==============================================================================
 """Contextmanager for a REST request-response channel to the Flower server."""
 
+
 from collections.abc import Iterator
 from contextlib import contextmanager
 from logging import DEBUG, ERROR, INFO, WARN
@@ -33,9 +34,9 @@ from flwr.common.inflatable import (
     iterate_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_rest_utils import (
-    make_pull_object_fn_rest,
-    make_push_object_fn_rest,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -337,8 +338,8 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 object_tree = res.message_object_trees[0]
                 all_object_contents = pull_objects(
                     [tree.object_id for tree in iterate_object_tree(object_tree)],
-                    pull_object_fn=make_pull_object_fn_rest(
-                        pull_object_rest=fn,
+                    pull_object_fn=make_pull_object_fn_protobuf(
+                        pull_object_protobuf=fn,
                         node=node,
                         run_id=run_id,
                     ),
@@ -415,8 +416,8 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 try:
                     push_objects(
                         all_objects,
-                        push_object_fn=make_push_object_fn_rest(
-                            push_object_rest=fn,
+                        push_object_fn=make_push_object_fn_protobuf(
+                            push_object_protobuf=fn,
                             node=node,
                             run_id=message_proto.metadata.run_id,
                         ),

flwr/common/{inflatable_grpc_utils.py → inflatable_protobuf_utils.py}

@@ -28,8 +28,8 @@ from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from .inflatable_utils import ObjectIdNotPreregisteredError, ObjectUnavailableError
 
 
-def make_pull_object_fn_grpc(
-    pull_object_grpc: Callable[[PullObjectRequest], PullObjectResponse],
+def make_pull_object_fn_protobuf(
+    pull_object_protobuf: Callable[[PullObjectRequest], PullObjectResponse],
     node: Node,
     run_id: int,
 ) -> Callable[[str], bytes]:
@@ -37,8 +37,9 @@ def make_pull_object_fn_grpc(
 
     Parameters
     ----------
-    pull_object_grpc : Callable[[PullObjectRequest], PullObjectResponse]
-        The gRPC function to pull objects, e.g., `FleetStub.PullObject`.
+    pull_object_protobuf : Callable[[PullObjectRequest], PullObjectResponse]
+        A callable that takes a `PullObjectRequest` and returns a `PullObjectResponse`.
+        This function is typically backed by a gRPC client stub.
     node : Node
         The node making the request.
     run_id : int
@@ -54,7 +55,7 @@ def make_pull_object_fn_grpc(
 
     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)
+        response: PullObjectResponse = pull_object_protobuf(request)
         if not response.object_found:
             raise ObjectIdNotPreregisteredError(object_id)
         if not response.object_available:
@@ -64,8 +65,8 @@ def make_pull_object_fn_grpc(
     return pull_object_fn
 
 
-def make_push_object_fn_grpc(
-    push_object_grpc: Callable[[PushObjectRequest], PushObjectResponse],
+def make_push_object_fn_protobuf(
+    push_object_protobuf: Callable[[PushObjectRequest], PushObjectResponse],
     node: Node,
     run_id: int,
 ) -> Callable[[str, bytes], None]:
@@ -73,8 +74,9 @@ def make_push_object_fn_grpc(
 
     Parameters
     ----------
-    push_object_grpc : Callable[[PushObjectRequest], PushObjectResponse]
-        The gRPC function to push objects, e.g., `FleetStub.PushObject`.
+    push_object_protobuf : Callable[[PushObjectRequest], PushObjectResponse]
+        A callable that takes a `PushObjectRequest` and returns a `PushObjectResponse`.
+        This function is typically backed by a gRPC client stub.
     node : Node
         The node making the request.
     run_id : int
@@ -92,7 +94,7 @@ def make_push_object_fn_grpc(
         request = PushObjectRequest(
             node=node, run_id=run_id, object_id=object_id, object_content=object_content
         )
-        response: PushObjectResponse = push_object_grpc(request)
+        response: PushObjectResponse = push_object_protobuf(request)
         if not response.stored:
             raise ObjectIdNotPreregisteredError(object_id)
 

flwr/server/grid/grpc_grid.py

@@ -33,9 +33,9 @@ from flwr.common.inflatable import (
     get_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_grpc_utils import (
-    make_pull_object_fn_grpc,
-    make_push_object_fn_grpc,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -240,8 +240,8 @@ class GrpcGrid(Grid):
             # Push only object that are not in the store
             push_objects(
                 all_objects,
-                push_object_fn=make_push_object_fn_grpc(
-                    push_object_grpc=self._stub.PushObject,
+                push_object_fn=make_push_object_fn_protobuf(
+                    push_object_protobuf=self._stub.PushObject,
                     node=self.node,
                     run_id=run_id,
                 ),
@@ -308,8 +308,8 @@ class GrpcGrid(Grid):
                 msg_id = msg_proto.metadata.message_id
                 all_object_contents = pull_objects(
                     list(res.objects_to_pull[msg_id].object_ids) + [msg_id],
-                    pull_object_fn=make_pull_object_fn_grpc(
-                        pull_object_grpc=self._stub.PullObject,
+                    pull_object_fn=make_pull_object_fn_protobuf(
+                        pull_object_protobuf=self._stub.PullObject,
                         node=self.node,
                         run_id=run_id,
                     ),

{flwr_nightly-1.20.0.dev20250715.dist-info → flwr_nightly-1.20.0.dev20250716.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.20.0.dev20250715
+Version: 1.20.0.dev20250716
 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.20.0.dev20250715.dist-info → flwr_nightly-1.20.0.dev20250716.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=vPET7CQ0PD4I3arzdumtoHdLHodZ9UVnCkVjlnk_Mkc,13704
+flwr/client/grpc_rere_client/connection.py,sha256=jndP_Z8yNGHocJfucUspk2bcrjPeI3s-nOb1tEeDlT4,13732
 flwr/client/grpc_rere_client/grpc_adapter.py,sha256=dLGB5GriszAmtgvuFGuz_F7rIwpzLfDxhJ7T3Un-Ce0,6694
 flwr/client/message_handler/__init__.py,sha256=0lyljDVqre3WljiZbPcwCCf8GiIaSVI_yo_ylEyPwSE,719
 flwr/client/message_handler/message_handler.py,sha256=X9SXX6et97Lw9_DGD93HKsEBGNjXClcFgc_5aLK0oiU,6541
@@ -98,7 +98,7 @@ flwr/client/mod/secure_aggregation/secaggplus_mod.py,sha256=aKqjZCrikF73y3E-7h40
 flwr/client/mod/utils.py,sha256=FUgD2TfcWqSeF6jUKZ4i6Ke56U4Nrv85AeVb93s6R9g,1201
 flwr/client/numpy_client.py,sha256=Qq6ghsIAop2slKqAfgiI5NiHJ4LIxGmrik3Ror4_XVc,9581
 flwr/client/rest_client/__init__.py,sha256=MBiuK62hj439m9rtwSwI184Hth6Tt5GbmpNMyl3zkZY,735
-flwr/client/rest_client/connection.py,sha256=-YyLwCDm3n67ljDmoxYoP9fKZoV28Cb28HRjdZW6m4U,16359
+flwr/client/rest_client/connection.py,sha256=zZ-HYLPCQxKtTo1Sc-n8jkl_GB4bpfViuif8h9HFSqI,16388
 flwr/client/run_info_store.py,sha256=MaJ3UQ-07hWtK67wnWu0zR29jrk0fsfgJX506dvEOfE,4042
 flwr/client/typing.py,sha256=Jw3rawDzI_-ZDcRmEQcs5gZModY7oeQlEeltYsdOhlU,1048
 flwr/clientapp/__init__.py,sha256=zGW4z49Ojzoi1hDiRC7kyhLjijUilc6fqHhtM_ATRVA,719
@@ -123,8 +123,7 @@ flwr/common/exit_handlers.py,sha256=IaqJ60fXZuu7McaRYnoYKtlbH9t4Yl9goNExKqtmQbs,
 flwr/common/grpc.py,sha256=y70hUFvXkIf3l03xOhlb7qhS6W1UJZRSZqCdB0ir0v8,10381
 flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
 flwr/common/inflatable.py,sha256=GDL9oBKs16_yyVdlH6kBf493O5xll_h9V7XB5Mpx1Hc,9524
-flwr/common/inflatable_grpc_utils.py,sha256=ZpwtgF1tGD6NwQkCidbhbeBPDBZ1Nx9eGMHQ04eNEE8,3554
-flwr/common/inflatable_rest_utils.py,sha256=KiZd06XRiXcl_WewOrag0JTvUQt5kZ74UIsQ3FCAXGc,3580
+flwr/common/inflatable_protobuf_utils.py,sha256=lvKR5jD5P8AlpknD_1BlvUoTuT6Iyd8oodXfUQvjDRU,3746
 flwr/common/inflatable_utils.py,sha256=yew5VU8po8yZsmoTVxg-tB5vrvnb2mvBAE55qjiOAq8,12840
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
 flwr/common/message.py,sha256=xAL7iZN5-n-xPQpgoSFvxNrzs8fmiiPfoU0DjNQEhRw,19953
@@ -243,7 +242,7 @@ flwr/server/criterion.py,sha256=G4e-6B48Pc7d5rmGVUpIzNKb6UF88O3VmTRuUltgjzM,1061
 flwr/server/fleet_event_log_interceptor.py,sha256=ifV4gUB_hSg7QPLIrAyDpjciqZBOKb0L0abZno3GTwA,3780
 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=-SLS1VifRo1uxgjRWQJSshkTm5t0s8Wrj2ZZcbSu86I,13581
+flwr/server/grid/grpc_grid.py,sha256=6w-X6mRyAmaWyrUaBnRp3enM4e63iEMUUWPIRFqO1qw,13609
 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
@@ -370,7 +369,7 @@ flwr/supernode/servicer/__init__.py,sha256=lucTzre5WPK7G1YLCfaqg3rbFWdNSb7ZTt-ca
 flwr/supernode/servicer/clientappio/__init__.py,sha256=7Oy62Y_oijqF7Dxi6tpcUQyOpLc_QpIRZ83NvwmB0Yg,813
 flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=U-uAJ7Yd_BzEqhbpCSgEG9pxX5Zf4RuPVYKimYDvMbU,7176
 flwr/supernode/start_client_internal.py,sha256=_ZqSfL_j4qn6Cg-P6sv3k_n1ZG62J_teokBxnWrXrPE,18772
-flwr_nightly-1.20.0.dev20250715.dist-info/METADATA,sha256=iIDSwZNrjaPU5qYQBFP1TEFZVnJXdIw69KRx9MYSVcI,15966
-flwr_nightly-1.20.0.dev20250715.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.20.0.dev20250715.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.20.0.dev20250715.dist-info/RECORD,,
+flwr_nightly-1.20.0.dev20250716.dist-info/METADATA,sha256=bp6v4He7vTM-vNpn-EKkSH-QXj2VZN62mGjFq5yWl7g,15966
+flwr_nightly-1.20.0.dev20250716.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.20.0.dev20250716.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.20.0.dev20250716.dist-info/RECORD,,

flwr/common/inflatable_rest_utils.py

@@ -1,99 +0,0 @@
-# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-"""InflatableObject REST utils."""
-
-
-from typing import Callable
-
-from flwr.proto.message_pb2 import (  # pylint: disable=E0611
-    PullObjectRequest,
-    PullObjectResponse,
-    PushObjectRequest,
-    PushObjectResponse,
-)
-from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
-
-from .inflatable_utils import ObjectIdNotPreregisteredError, ObjectUnavailableError
-
-
-def make_pull_object_fn_rest(
-    pull_object_rest: Callable[[PullObjectRequest], PullObjectResponse],
-    node: Node,
-    run_id: int,
-) -> Callable[[str], bytes]:
-    """Create a pull object function that uses REST to pull objects.
-
-    Parameters
-    ----------
-    pull_object_rest : Callable[[PullObjectRequest], PullObjectResponse]
-        A function that makes a POST request against the `/push-object` REST endpoint
-    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_rest(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_rest(
-    push_object_rest: Callable[[PushObjectRequest], PushObjectResponse],
-    node: Node,
-    run_id: int,
-) -> Callable[[str, bytes], None]:
-    """Create a push object function that uses REST to push objects.
-
-    Parameters
-    ----------
-    push_object_rest : Callable[[PushObjectRequest], PushObjectResponse]
-        A function that makes a POST request against the `/pull-object` REST endpoint
-    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_rest(request)
-        if not response.stored:
-            raise ObjectIdNotPreregisteredError(object_id)
-
-    return push_object_fn