flwr-nightly 1.20.0.dev20250715__tar.gz → 1.20.0.dev20250716__tar.gz

{flwr_nightly-1.20.0.dev20250715 → flwr_nightly-1.20.0.dev20250716}/PKG-INFO

@@ -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 → flwr_nightly-1.20.0.dev20250716}/py/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_nightly-1.20.0.dev20250715 → flwr_nightly-1.20.0.dev20250716}/py/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_nightly-1.20.0.dev20250715/py/flwr/common/inflatable_grpc_utils.py → flwr_nightly-1.20.0.dev20250716/py/flwr/common/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_nightly-1.20.0.dev20250715 → flwr_nightly-1.20.0.dev20250716}/py/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 → flwr_nightly-1.20.0.dev20250716}/pyproject.toml

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

flwr_nightly-1.20.0.dev20250715/py/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