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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250602
+Version: 1.19.0.dev20250604
 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.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/client/grpc_rere_client/connection.py

@@ -14,11 +14,10 @@
 # ==============================================================================
 """Contextmanager for a gRPC request-response channel to the Flower server."""
 
-
 from collections.abc import Iterator, Sequence
 from contextlib import contextmanager
 from copy import copy
-from logging import ERROR
+from logging import DEBUG, ERROR
 from pathlib import Path
 from typing import Callable, Optional, Union, cast
 
@@ -31,13 +30,17 @@ from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.constant import HEARTBEAT_CALL_TIMEOUT, HEARTBEAT_DEFAULT_INTERVAL
 from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.heartbeat import HeartbeatSender
+from flwr.common.inflatable_grpc_utils import (
+    pull_object_from_servicer,
+    push_object_to_servicer,
+)
 from flwr.common.logger import log
-from flwr.common.message import Message
-from flwr.common.retry_invoker import RetryInvoker
+from flwr.common.message import Message, get_message_to_descendant_id_mapping
+from flwr.common.retry_invoker import RetryInvoker, _wrap_stub
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     generate_key_pairs,
 )
-from flwr.common.serde import message_from_proto, message_to_proto, run_from_proto
+from flwr.common.serde import message_to_proto, run_from_proto
 from flwr.common.typing import Fab, Run, RunNotRunningException
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
@@ -46,6 +49,7 @@ from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     PullMessagesRequest,
     PullMessagesResponse,
     PushMessagesRequest,
+    PushMessagesResponse,
 )
 from flwr.proto.fleet_pb2_grpc import FleetStub  # pylint: disable=E0611
 from flwr.proto.heartbeat_pb2 import (  # pylint: disable=E0611
@@ -159,6 +163,8 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     # If the status code is PERMISSION_DENIED, additionally raise RunNotRunningException
     retry_invoker.should_giveup = _should_giveup_fn
 
+    # Wrap stub
+    _wrap_stub(stub, retry_invoker)
     ###########################################################################
     # send_node_heartbeat/create_node/delete_node/receive/send/get_run functions
     ###########################################################################
@@ -203,10 +209,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         create_node_request = CreateNodeRequest(
             heartbeat_interval=HEARTBEAT_DEFAULT_INTERVAL
         )
-        create_node_response = retry_invoker.invoke(
-            stub.CreateNode,
-            request=create_node_request,
-        )
+        create_node_response = stub.CreateNode(request=create_node_request)
 
         # Remember the node and start the heartbeat sender
         nonlocal node
@@ -227,7 +230,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
 
         # Call FleetAPI
         delete_node_request = DeleteNodeRequest(node=node)
-        retry_invoker.invoke(stub.DeleteNode, request=delete_node_request)
+        stub.DeleteNode(request=delete_node_request)
 
         # Cleanup
         node = None
@@ -241,9 +244,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
 
         # Request instructions (message) from server
         request = PullMessagesRequest(node=node)
-        response: PullMessagesResponse = retry_invoker.invoke(
-            stub.PullMessages, request=request
-        )
+        response: PullMessagesResponse = stub.PullMessages(request=request)
 
         # Get the current Messages
         message_proto = (
@@ -257,7 +258,24 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             message_proto = None
 
         # Construct the Message
-        in_message = message_from_proto(message_proto) if message_proto else None
+        in_message: Optional[Message] = None
+
+        if message_proto:
+            in_message = cast(
+                Message,
+                pull_object_from_servicer(
+                    object_id=message_proto.metadata.message_id,
+                    stub=stub,
+                    node=node,
+                    run_id=message_proto.metadata.run_id,
+                ),
+            )
+
+        if in_message:
+            # The deflated message doesn't contain the message_id (its own object_id)
+            # Inject
+            # pylint: disable-next=W0212
+            in_message.metadata._message_id = message_proto.metadata.message_id  # type: ignore
 
         # Remember `metadata` of the in message
         nonlocal metadata
@@ -288,8 +306,24 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
 
         # Serialize Message
         message_proto = message_to_proto(message=message)
-        request = PushMessagesRequest(node=node, messages_list=[message_proto])
-        _ = retry_invoker.invoke(stub.PushMessages, request)
+        descendants_mapping = get_message_to_descendant_id_mapping(message)
+        request = PushMessagesRequest(
+            node=node,
+            messages_list=[message_proto],
+            msg_to_descendant_mapping=descendants_mapping,
+        )
+        response: PushMessagesResponse = stub.PushMessages(request=request)
+
+        if response.objects_to_push:
+            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,
+                object_ids_to_push=objs_to_push,
+            )
+            log(DEBUG, "Pushed %s objects to servicer.", len(objs_to_push))
 
         # Cleanup
         metadata = None
@@ -297,10 +331,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     def get_run(run_id: int) -> Run:
         # Call FleetAPI
         get_run_request = GetRunRequest(node=node, run_id=run_id)
-        get_run_response: GetRunResponse = retry_invoker.invoke(
-            stub.GetRun,
-            request=get_run_request,
-        )
+        get_run_response: GetRunResponse = stub.GetRun(request=get_run_request)
 
         # Return fab_id and fab_version
         return run_from_proto(get_run_response.run)
@@ -308,10 +339,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     def get_fab(fab_hash: str, run_id: int) -> Fab:
         # Call FleetAPI
         get_fab_request = GetFabRequest(node=node, hash_str=fab_hash, run_id=run_id)
-        get_fab_response: GetFabResponse = retry_invoker.invoke(
-            stub.GetFab,
-            request=get_fab_request,
-        )
+        get_fab_response: GetFabResponse = stub.GetFab(request=get_fab_request)
 
         return Fab(get_fab_response.fab.hash_str, get_fab_response.fab.content)
 

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/common/inflatable.py

@@ -18,9 +18,11 @@
 from __future__ import annotations
 
 import hashlib
+from logging import ERROR
 from typing import TypeVar, cast
 
 from .constant import HEAD_BODY_DIVIDER, HEAD_VALUE_DIVIDER
+from .logger import log
 
 
 class InflatableObject:
@@ -163,8 +165,12 @@ def get_object_body_len_from_object_content(object_content: bytes) -> int:
 
 def check_body_len_consistency(object_content: bytes) -> bool:
     """Check that the object body is of length as specified in the head."""
-    body_len = get_object_body_len_from_object_content(object_content)
-    return body_len == len(_get_object_body(object_content))
+    try:
+        body_len = get_object_body_len_from_object_content(object_content)
+        return body_len == len(_get_object_body(object_content))
+    except ValueError:
+        log(ERROR, "Object content does match the expected format.")
+        return False
 
 
 def get_object_head_values_from_object_content(

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/common/inflatable_grpc_utils.py

@@ -15,8 +15,10 @@
 """InflatableObject utils."""
 
 
+from time import sleep
 from typing import Optional, Union
 
+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,
@@ -48,7 +50,7 @@ inflatable_class_registry: dict[str, type[InflatableObject]] = {
 
 def push_object_to_servicer(
     obj: InflatableObject,
-    stub: Union[FleetStub, ServerAppIoStub],
+    stub: Union[FleetStub, ServerAppIoStub, GrpcAdapter],
     node: Node,
     run_id: int,
     object_ids_to_push: Optional[set[str]] = None,
@@ -87,16 +89,20 @@ def push_object_to_servicer(
 
 def pull_object_from_servicer(
     object_id: str,
-    stub: Union[FleetStub, ServerAppIoStub],
+    stub: Union[FleetStub, ServerAppIoStub, GrpcAdapter],
     node: Node,
     run_id: int,
 ) -> InflatableObject:
     """Recursively inflate an object by pulling it from the servicer."""
     # Pull object
-    object_proto: PullObjectResponse = stub.PullObject(
-        PullObjectRequest(node=node, run_id=run_id, object_id=object_id)
-    )
-    object_content = object_proto.object_content
+    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)
 
     # Extract object class and object_ids of children
     obj_type, children_obj_ids, _ = get_object_head_values_from_object_content(

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/common/record/metricrecord.py

@@ -180,7 +180,7 @@ class MetricRecord(TypedDict[str, MetricRecordValues], InflatableObject):
         MetricRecord
             The inflated MetricRecord.
         """
-        if children is not None:
+        if children:
             raise ValueError("`MetricRecord` objects do not have children.")
 
         obj_body = get_object_body(object_content, cls)

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/common/retry_invoker.py

@@ -25,10 +25,12 @@ from typing import Any, Callable, Optional, Union, cast
 
 import grpc
 
+from flwr.client.grpc_rere_client.grpc_adapter import GrpcAdapter
 from flwr.common.constant import MAX_RETRY_DELAY
 from flwr.common.logger import log
 from flwr.common.typing import RunNotRunningException
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
+from flwr.proto.fleet_pb2_grpc import FleetStub
 from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub
 from flwr.proto.simulationio_pb2_grpc import SimulationIoStub
 
@@ -366,7 +368,9 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
 
 
 def _wrap_stub(
-    stub: Union[ServerAppIoStub, ClientAppIoStub, SimulationIoStub],
+    stub: Union[
+        ServerAppIoStub, ClientAppIoStub, SimulationIoStub, FleetStub, GrpcAdapter
+    ],
     retry_invoker: RetryInvoker,
 ) -> None:
     """Wrap a gRPC stub with a retry invoker."""

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/proto/message_pb2.py

@@ -18,7 +18,7 @@ from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/message.proto\x12\nflwr.proto\x1a\x16\x66lwr/proto/error.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x15\x66lwr/proto/node.proto\"|\n\x07Message\x12&\n\x08metadata\x18\x01 \x01(\x0b\x32\x14.flwr.proto.Metadata\x12\'\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12 \n\x05\x65rror\x18\x03 \x01(\x0b\x32\x11.flwr.proto.Error\"\xd0\x02\n\x07\x43ontext\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x0f\n\x07node_id\x18\x02 \x01(\x04\x12\x38\n\x0bnode_config\x18\x03 \x03(\x0b\x32#.flwr.proto.Context.NodeConfigEntry\x12%\n\x05state\x18\x04 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12\x36\n\nrun_config\x18\x05 \x03(\x0b\x32\".flwr.proto.Context.RunConfigEntry\x1a\x45\n\x0fNodeConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x44\n\x0eRunConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\xbe\x01\n\x08Metadata\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x12\n\nmessage_id\x18\x02 \x01(\t\x12\x13\n\x0bsrc_node_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x64st_node_id\x18\x04 \x01(\x04\x12\x1b\n\x13reply_to_message_id\x18\x05 \x01(\t\x12\x10\n\x08group_id\x18\x06 \x01(\t\x12\x0b\n\x03ttl\x18\x07 \x01(\x01\x12\x14\n\x0cmessage_type\x18\x08 \x01(\t\x12\x12\n\ncreated_at\x18\t \x01(\x01\"\x1f\n\tObjectIDs\x12\x12\n\nobject_ids\x18\x01 \x03(\t\"n\n\x11PushObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12\x11\n\tobject_id\x18\x03 \x01(\t\x12\x16\n\x0eobject_content\x18\x04 \x01(\x0c\"$\n\x12PushObjectResponse\x12\x0e\n\x06stored\x18\x01 \x01(\x08\"V\n\x11PullObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12\x11\n\tobject_id\x18\x03 \x01(\t\",\n\x12PullObjectResponse\x12\x16\n\x0eobject_content\x18\x01 \x01(\x0c\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/message.proto\x12\nflwr.proto\x1a\x16\x66lwr/proto/error.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x15\x66lwr/proto/node.proto\"|\n\x07Message\x12&\n\x08metadata\x18\x01 \x01(\x0b\x32\x14.flwr.proto.Metadata\x12\'\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12 \n\x05\x65rror\x18\x03 \x01(\x0b\x32\x11.flwr.proto.Error\"\xd0\x02\n\x07\x43ontext\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x0f\n\x07node_id\x18\x02 \x01(\x04\x12\x38\n\x0bnode_config\x18\x03 \x03(\x0b\x32#.flwr.proto.Context.NodeConfigEntry\x12%\n\x05state\x18\x04 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12\x36\n\nrun_config\x18\x05 \x03(\x0b\x32\".flwr.proto.Context.RunConfigEntry\x1a\x45\n\x0fNodeConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x44\n\x0eRunConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\xbe\x01\n\x08Metadata\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x12\n\nmessage_id\x18\x02 \x01(\t\x12\x13\n\x0bsrc_node_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x64st_node_id\x18\x04 \x01(\x04\x12\x1b\n\x13reply_to_message_id\x18\x05 \x01(\t\x12\x10\n\x08group_id\x18\x06 \x01(\t\x12\x0b\n\x03ttl\x18\x07 \x01(\x01\x12\x14\n\x0cmessage_type\x18\x08 \x01(\t\x12\x12\n\ncreated_at\x18\t \x01(\x01\"\x1f\n\tObjectIDs\x12\x12\n\nobject_ids\x18\x01 \x03(\t\"n\n\x11PushObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12\x11\n\tobject_id\x18\x03 \x01(\t\x12\x16\n\x0eobject_content\x18\x04 \x01(\x0c\"$\n\x12PushObjectResponse\x12\x0e\n\x06stored\x18\x01 \x01(\x08\"V\n\x11PullObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12\x11\n\tobject_id\x18\x03 \x01(\t\"\\\n\x12PullObjectResponse\x12\x14\n\x0cobject_found\x18\x01 \x01(\x08\x12\x18\n\x10object_available\x18\x02 \x01(\x08\x12\x16\n\x0eobject_content\x18\x03 \x01(\x0c\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -48,5 +48,5 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PULLOBJECTREQUEST']._serialized_start=985
   _globals['_PULLOBJECTREQUEST']._serialized_end=1071
   _globals['_PULLOBJECTRESPONSE']._serialized_start=1073
-  _globals['_PULLOBJECTRESPONSE']._serialized_end=1117
+  _globals['_PULLOBJECTRESPONSE']._serialized_end=1165
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/proto/message_pb2.pyi

@@ -196,11 +196,17 @@ global___PullObjectRequest = PullObjectRequest
 
 class PullObjectResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    OBJECT_FOUND_FIELD_NUMBER: builtins.int
+    OBJECT_AVAILABLE_FIELD_NUMBER: builtins.int
     OBJECT_CONTENT_FIELD_NUMBER: builtins.int
+    object_found: builtins.bool
+    object_available: builtins.bool
     object_content: builtins.bytes
     def __init__(self,
         *,
+        object_found: builtins.bool = ...,
+        object_available: builtins.bool = ...,
         object_content: builtins.bytes = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["object_content",b"object_content"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["object_available",b"object_available","object_content",b"object_content","object_found",b"object_found"]) -> None: ...
 global___PullObjectResponse = PullObjectResponse

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/server/grid/grpc_grid.py

@@ -28,11 +28,15 @@ from flwr.common.constant import (
     SUPERLINK_NODE_ID,
 )
 from flwr.common.grpc import create_channel, on_channel_state_change
+from flwr.common.inflatable_grpc_utils import (
+    pull_object_from_servicer,
+    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.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
-from flwr.common.serde import message_from_proto, message_to_proto, run_from_proto
+from flwr.common.serde import message_to_proto, run_from_proto
 from flwr.common.typing import Run
-from flwr.proto.message_pb2 import Message as ProtoMessage  # pylint: disable=E0611
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 from flwr.proto.serverappio_pb2 import (  # pylint: disable=E0611
@@ -198,6 +202,35 @@ class GrpcGrid(Grid):
         )
         return [node.node_id for node in res.nodes]
 
+    def _try_push_message(self, run_id: int, message: Message) -> str:
+        """Push one message and its associated objects."""
+        # Compute mapping of message descendants
+        descendants_mapping = get_message_to_descendant_id_mapping(message)
+
+        # Call GrpcServerAppIoStub method
+        res: PushInsMessagesResponse = self._stub.PushMessages(
+            PushInsMessagesRequest(
+                messages_list=[message_to_proto(message)],
+                run_id=run_id,
+                msg_to_descendant_mapping=descendants_mapping,
+            )
+        )
+
+        # Push objects
+        msg_id = res.message_ids[0]
+        # If Message was added to the LinkState correctly
+        if msg_id is not None:
+            obj_ids_to_push = set(res.objects_to_push[msg_id].object_ids)
+            # Push only object that are not in the store
+            push_object_to_servicer(
+                message,
+                self._stub,
+                node=self.node,
+                run_id=run_id,
+                object_ids_to_push=obj_ids_to_push,
+            )
+        return msg_id
+
     def push_messages(self, messages: Iterable[Message]) -> Iterable[str]:
         """Push messages to specified node IDs.
 
@@ -206,58 +239,64 @@ class GrpcGrid(Grid):
         """
         # Construct Messages
         run_id = cast(Run, self._run).run_id
-        message_proto_list: list[ProtoMessage] = []
-        for msg in messages:
-            # Populate metadata
-            msg.metadata.__dict__["_run_id"] = run_id
-            msg.metadata.__dict__["_src_node_id"] = self.node.node_id
-            msg.metadata.__dict__["_message_id"] = msg.object_id
-            # Check message
-            self._check_message(msg)
-            # Convert to proto
-            msg_proto = message_to_proto(msg)
-            # Add to list
-            message_proto_list.append(msg_proto)
-
+        message_ids: list[str] = []
         try:
-            # Call GrpcServerAppIoStub method
-            res: PushInsMessagesResponse = self._stub.PushMessages(
-                PushInsMessagesRequest(messages_list=message_proto_list, run_id=run_id)
-            )
-            if len([msg_id for msg_id in res.message_ids if msg_id]) != len(
-                message_proto_list
-            ):
-                log(
-                    WARNING,
-                    "Not all messages could be pushed to the SuperLink. The returned "
-                    "list has `None` for those messages (the order is preserved as "
-                    "passed to `push_messages`). This could be due to a malformed "
-                    "message.",
-                )
-            return list(res.message_ids)
+            for msg in messages:
+                # Populate metadata
+                msg.metadata.__dict__["_run_id"] = run_id
+                msg.metadata.__dict__["_src_node_id"] = self.node.node_id
+                msg.metadata.__dict__["_message_id"] = msg.object_id
+                # Check message
+                self._check_message(msg)
+                # Try pushing message and its objects
+                message_ids.append(self._try_push_message(run_id, msg))
+
         except grpc.RpcError as e:
             if e.code() == grpc.StatusCode.RESOURCE_EXHAUSTED:  # pylint: disable=E1101
                 log(ERROR, ERROR_MESSAGE_PUSH_MESSAGES_RESOURCE_EXHAUSTED)
                 return []
             raise
 
+        if None in message_ids:
+            log(
+                WARNING,
+                "Not all messages could be pushed to the SuperLink. The returned "
+                "list has `None` for those messages (the order is preserved as "
+                "passed to `push_messages`). This could be due to a malformed "
+                "message.",
+            )
+
+        return message_ids
+
     def pull_messages(self, message_ids: Iterable[str]) -> Iterable[Message]:
         """Pull messages based on message IDs.
 
         This method is used to collect messages from the SuperLink that correspond to a
         set of given message IDs.
         """
+        run_id = cast(Run, self._run).run_id
         try:
             # Pull Messages
             res: PullResMessagesResponse = self._stub.PullMessages(
                 PullResMessagesRequest(
                     message_ids=message_ids,
-                    run_id=cast(Run, self._run).run_id,
+                    run_id=run_id,
                 )
             )
-            # Convert Message from Protobuf representation
-            msgs = [message_from_proto(msg_proto) for msg_proto in res.messages_list]
-            return msgs
+            # Pull Messages from store
+            inflated_msgs: list[Message] = []
+            for msg_proto in res.messages_list:
+
+                message = pull_object_from_servicer(
+                    msg_proto.metadata.message_id,
+                    self._stub,
+                    node=self.node,
+                    run_id=run_id,
+                )
+                inflated_msgs.append(cast(Message, message))
+
+            return inflated_msgs
+
         except grpc.RpcError as e:
             if e.code() == grpc.StatusCode.RESOURCE_EXHAUSTED:  # pylint: disable=E1101
                 log(ERROR, ERROR_MESSAGE_PULL_MESSAGES_RESOURCE_EXHAUSTED)

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/server/superlink/ffs/__init__.py

@@ -17,8 +17,10 @@
 
 from .disk_ffs import DiskFfs as DiskFfs
 from .ffs import Ffs as Ffs
+from .ffs_factory import FfsFactory as FfsFactory
 
 __all__ = [
     "DiskFfs",
     "Ffs",
+    "FfsFactory",
 ]

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -15,11 +15,12 @@
 """Fleet API gRPC request-response servicer."""
 
 
-from logging import DEBUG, INFO
+from logging import DEBUG, ERROR, INFO
 
 import grpc
 from google.protobuf.json_format import MessageToDict
 
+from flwr.common.constant import Status
 from flwr.common.inflatable import check_body_len_consistency
 from flwr.common.logger import log
 from flwr.common.typing import InvalidRunStatusException
@@ -49,8 +50,9 @@ from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=
 from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.fleet.message_handler import message_handler
 from flwr.server.superlink.linkstate import LinkStateFactory
-from flwr.server.superlink.utils import abort_grpc_context
+from flwr.server.superlink.utils import abort_grpc_context, check_abort
 from flwr.supercore.object_store import ObjectStoreFactory
+from flwr.supercore.object_store.object_store import NoObjectInStoreError
 
 
 class FleetServicer(fleet_pb2_grpc.FleetServicer):
@@ -183,11 +185,39 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
             request.object_id,
         )
 
+        state = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_msg = check_abort(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+        )
+        if abort_msg:
+            abort_grpc_context(abort_msg, context)
+
+        if request.node.node_id not in state.get_nodes(run_id=request.run_id):
+            # Cancel insertion in ObjectStore
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
+
         if not check_body_len_consistency(request.object_content):
             # Cancel insertion in ObjectStore
-            context.abort(grpc.StatusCode.PERMISSION_DENIED, "Unexpected object length")
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION, "Unexpected object length"
+            )
+
+        # Init store
+        store = self.objectstore_factory.store()
+
+        # Insert in store
+        stored = False
+        try:
+            store.put(request.object_id, request.object_content)
+            stored = True
+        except (NoObjectInStoreError, ValueError) as e:
+            log(ERROR, str(e))
 
-        return PushObjectResponse()
+        return PushObjectResponse(stored=stored)
 
     def PullObject(
         self, request: PullObjectRequest, context: grpc.ServicerContext
@@ -199,4 +229,31 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
             request.object_id,
         )
 
-        return PullObjectResponse()
+        state = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_msg = check_abort(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+        )
+        if abort_msg:
+            abort_grpc_context(abort_msg, context)
+
+        if request.node.node_id not in state.get_nodes(run_id=request.run_id):
+            # Cancel insertion in ObjectStore
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
+
+        # Init store
+        store = self.objectstore_factory.store()
+
+        # Fetch from store
+        content = store.get(request.object_id)
+        if content is not None:
+            object_available = content != b""
+            return PullObjectResponse(
+                object_found=True,
+                object_available=object_available,
+                object_content=content,
+            )
+        return PullObjectResponse(object_found=False, object_available=False)

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/server/superlink/serverappio/serverappio_servicer.py

@@ -409,11 +409,39 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         """Push an object to the ObjectStore."""
         log(DEBUG, "ServerAppIoServicer.PushObject")
 
+        # Init state
+        state: LinkState = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_if(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+            context,
+        )
+
+        if request.node.node_id != SUPERLINK_NODE_ID:
+            # Cancel insertion in ObjectStore
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
+
         if not check_body_len_consistency(request.object_content):
             # Cancel insertion in ObjectStore
-            context.abort(grpc.StatusCode.PERMISSION_DENIED, "Unexpected object length")
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION, "Unexpected object length."
+            )
+
+        # Init store
+        store = self.objectstore_factory.store()
+
+        # Insert in store
+        stored = False
+        try:
+            store.put(request.object_id, request.object_content)
+            stored = True
+        except (NoObjectInStoreError, ValueError) as e:
+            log(ERROR, str(e))
 
-        return PushObjectResponse()
+        return PushObjectResponse(stored=stored)
 
     def PullObject(
         self, request: PullObjectRequest, context: grpc.ServicerContext
@@ -421,7 +449,34 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         """Pull an object from the ObjectStore."""
         log(DEBUG, "ServerAppIoServicer.PullObject")
 
-        return PullObjectResponse()
+        # Init state
+        state: LinkState = self.state_factory.state()
+
+        # Abort if the run is not running
+        abort_if(
+            request.run_id,
+            [Status.PENDING, Status.STARTING, Status.FINISHED],
+            state,
+            context,
+        )
+
+        if request.node.node_id != SUPERLINK_NODE_ID:
+            # Cancel insertion in ObjectStore
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
+
+        # Init store
+        store = self.objectstore_factory.store()
+
+        # Fetch from store
+        content = store.get(request.object_id)
+        if content is not None:
+            object_available = content != b""
+            return PullObjectResponse(
+                object_found=True,
+                object_available=object_available,
+                object_content=content,
+            )
+        return PullObjectResponse(object_found=False, object_available=False)
 
 
 def _raise_if(validation_error: bool, request_name: str, detail: str) -> None:

{flwr_nightly-1.19.0.dev20250602 → flwr_nightly-1.19.0.dev20250604}/py/flwr/supernode/cli/flower_supernode.py

@@ -42,8 +42,7 @@ from flwr.common.constant import (
 from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.logger import log
-
-from ..start_client_internal import start_client_internal
+from flwr.supernode.start_client_internal import start_client_internal
 
 
 def flower_supernode() -> None: