flwr-nightly 1.19.0.dev20250601__py3-none-any.whl → 1.19.0.dev20250603__py3-none-any.whl

flwr/client/clientapp/__init__.py

@@ -13,10 +13,3 @@
 # limitations under the License.
 # ==============================================================================
 """Flower AppIO service."""
-
-
-from .app import flwr_clientapp as flwr_clientapp
-
-__all__ = [
-    "flwr_clientapp",
-]

flwr/client/grpc_rere_client/connection.py

@@ -33,7 +33,7 @@ from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.heartbeat import HeartbeatSender
 from flwr.common.logger import log
 from flwr.common.message import Message
-from flwr.common.retry_invoker import RetryInvoker
+from flwr.common.retry_invoker import RetryInvoker, _wrap_stub
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     generate_key_pairs,
 )
@@ -159,6 +159,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 +205,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 +226,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 +240,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 = (
@@ -289,7 +286,7 @@ 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)
+        _ = stub.PushMessages(request)
 
         # Cleanup
         metadata = None
@@ -297,10 +294,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 +302,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/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/common/inflatable_grpc_utils.py

@@ -17,6 +17,7 @@
 
 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,8 +49,9 @@ 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,
 ) -> set[str]:
     """Recursively deflate an object and push it to the servicer.
@@ -63,7 +65,7 @@ def push_object_to_servicer(
     if children := obj.children:
         for child in children.values():
             pushed_object_ids |= push_object_to_servicer(
-                child, stub, node, object_ids_to_push
+                child, stub, node, run_id, object_ids_to_push
             )
 
     # Deflate object and push
@@ -74,6 +76,7 @@ def push_object_to_servicer(
         _: PushObjectResponse = stub.PushObject(
             PushObjectRequest(
                 node=node,
+                run_id=run_id,
                 object_id=object_id,
                 object_content=object_content,
             )
@@ -85,13 +88,14 @@ 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, object_id=object_id)
+        PullObjectRequest(node=node, run_id=run_id, object_id=object_id)
     )
     object_content = object_proto.object_content
 
@@ -106,7 +110,7 @@ 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
+            child_object_id, stub, node, run_id
         )
 
     # Inflate object passing its children

flwr/common/record/configrecord.py

@@ -175,13 +175,14 @@ class ConfigRecord(TypedDict[str, ConfigRecordValues], InflatableObject):
 
     def deflate(self) -> bytes:
         """Deflate object."""
+        protos = record_value_dict_to_proto(
+            self,
+            [bool, int, float, str, bytes],
+            ProtoConfigRecordValue,
+        )
         obj_body = ProtoConfigRecord(
-            data=record_value_dict_to_proto(
-                self,
-                [bool, int, float, str, bytes],
-                ProtoConfigRecordValue,
-            )
-        ).SerializeToString(deterministic=True)
+            items=[ProtoConfigRecord.Item(key=k, value=v) for k, v in protos.items()]
+        ).SerializeToString()
         return add_header_to_object_body(object_body=obj_body, obj=self)
 
     @classmethod
@@ -209,11 +210,11 @@ class ConfigRecord(TypedDict[str, ConfigRecordValues], InflatableObject):
 
         obj_body = get_object_body(object_content, cls)
         config_record_proto = ProtoConfigRecord.FromString(obj_body)
-
+        protos = {item.key: item.value for item in config_record_proto.items}
         return ConfigRecord(
             config_dict=cast(
                 dict[str, ConfigRecordValues],
-                record_value_dict_from_proto(config_record_proto.data),
+                record_value_dict_from_proto(protos),
             ),
             keep_input=False,
         )

flwr/common/record/metricrecord.py

@@ -154,9 +154,10 @@ class MetricRecord(TypedDict[str, MetricRecordValues], InflatableObject):
 
     def deflate(self) -> bytes:
         """Deflate object."""
+        protos = record_value_dict_to_proto(self, [float, int], ProtoMetricRecordValue)
         obj_body = ProtoMetricRecord(
-            data=record_value_dict_to_proto(self, [float, int], ProtoMetricRecordValue)
-        ).SerializeToString(deterministic=True)
+            items=[ProtoMetricRecord.Item(key=k, value=v) for k, v in protos.items()]
+        ).SerializeToString()
         return add_header_to_object_body(object_body=obj_body, obj=self)
 
     @classmethod
@@ -179,16 +180,16 @@ 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)
         metric_record_proto = ProtoMetricRecord.FromString(obj_body)
-
+        protos = {item.key: item.value for item in metric_record_proto.items}
         return cls(
             metric_dict=cast(
                 dict[str, MetricRecordValues],
-                record_value_dict_from_proto(metric_record_proto.data),
+                record_value_dict_from_proto(protos),
             ),
             keep_input=False,
         )

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/common/serde.py

@@ -399,8 +399,10 @@ def array_from_proto(array_proto: ProtoArray) -> Array:
 def array_record_to_proto(record: ArrayRecord) -> ProtoArrayRecord:
     """Serialize ArrayRecord to ProtoBuf."""
     return ProtoArrayRecord(
-        data_keys=record.keys(),
-        data_values=map(array_to_proto, record.values()),
+        items=[
+            ProtoArrayRecord.Item(key=k, value=array_to_proto(v))
+            for k, v in record.items()
+        ]
     )
 
 
@@ -410,7 +412,7 @@ def array_record_from_proto(
     """Deserialize ArrayRecord from ProtoBuf."""
     return ArrayRecord(
         array_dict=OrderedDict(
-            zip(record_proto.data_keys, map(array_from_proto, record_proto.data_values))
+            {item.key: array_from_proto(item.value) for item in record_proto.items}
         ),
         keep_input=False,
     )
@@ -418,17 +420,19 @@ def array_record_from_proto(
 
 def metric_record_to_proto(record: MetricRecord) -> ProtoMetricRecord:
     """Serialize MetricRecord to ProtoBuf."""
+    protos = record_value_dict_to_proto(record, [float, int], ProtoMetricRecordValue)
     return ProtoMetricRecord(
-        data=record_value_dict_to_proto(record, [float, int], ProtoMetricRecordValue)
+        items=[ProtoMetricRecord.Item(key=k, value=v) for k, v in protos.items()]
     )
 
 
 def metric_record_from_proto(record_proto: ProtoMetricRecord) -> MetricRecord:
     """Deserialize MetricRecord from ProtoBuf."""
+    protos = {item.key: item.value for item in record_proto.items}
     return MetricRecord(
         metric_dict=cast(
             dict[str, typing.MetricRecordValues],
-            record_value_dict_from_proto(record_proto.data),
+            record_value_dict_from_proto(protos),
         ),
         keep_input=False,
     )
@@ -436,21 +440,23 @@ def metric_record_from_proto(record_proto: ProtoMetricRecord) -> MetricRecord:
 
 def config_record_to_proto(record: ConfigRecord) -> ProtoConfigRecord:
     """Serialize ConfigRecord to ProtoBuf."""
+    protos = record_value_dict_to_proto(
+        record,
+        [bool, int, float, str, bytes],
+        ProtoConfigRecordValue,
+    )
     return ProtoConfigRecord(
-        data=record_value_dict_to_proto(
-            record,
-            [bool, int, float, str, bytes],
-            ProtoConfigRecordValue,
-        )
+        items=[ProtoConfigRecord.Item(key=k, value=v) for k, v in protos.items()]
     )
 
 
 def config_record_from_proto(record_proto: ProtoConfigRecord) -> ConfigRecord:
     """Deserialize ConfigRecord from ProtoBuf."""
+    protos = {item.key: item.value for item in record_proto.items}
     return ConfigRecord(
         config_dict=cast(
             dict[str, typing.ConfigRecordValues],
-            record_value_dict_from_proto(record_proto.data),
+            record_value_dict_from_proto(protos),
         ),
         keep_input=False,
     )
@@ -461,28 +467,33 @@ def config_record_from_proto(record_proto: ProtoConfigRecord) -> ConfigRecord:
 
 def recorddict_to_proto(recorddict: RecordDict) -> ProtoRecordDict:
     """Serialize RecordDict to ProtoBuf."""
-    return ProtoRecordDict(
-        arrays={
-            k: array_record_to_proto(v) for k, v in recorddict.array_records.items()
-        },
-        metrics={
-            k: metric_record_to_proto(v) for k, v in recorddict.metric_records.items()
-        },
-        configs={
-            k: config_record_to_proto(v) for k, v in recorddict.config_records.items()
-        },
-    )
+    item_cls = ProtoRecordDict.Item
+    items: list[ProtoRecordDict.Item] = []
+    for k, v in recorddict.items():
+        if isinstance(v, ArrayRecord):
+            items += [item_cls(key=k, array_record=array_record_to_proto(v))]
+        elif isinstance(v, MetricRecord):
+            items += [item_cls(key=k, metric_record=metric_record_to_proto(v))]
+        elif isinstance(v, ConfigRecord):
+            items += [item_cls(key=k, config_record=config_record_to_proto(v))]
+        else:
+            raise ValueError(f"Unsupported record type: {type(v)}")
+    return ProtoRecordDict(items=items)
 
 
 def recorddict_from_proto(recorddict_proto: ProtoRecordDict) -> RecordDict:
     """Deserialize RecordDict from ProtoBuf."""
     ret = RecordDict()
-    for k, arr_record_proto in recorddict_proto.arrays.items():
-        ret[k] = array_record_from_proto(arr_record_proto)
-    for k, m_record_proto in recorddict_proto.metrics.items():
-        ret[k] = metric_record_from_proto(m_record_proto)
-    for k, c_record_proto in recorddict_proto.configs.items():
-        ret[k] = config_record_from_proto(c_record_proto)
+    for item in recorddict_proto.items:
+        field = item.WhichOneof("value")
+        if field == "array_record":
+            ret[item.key] = array_record_from_proto(item.array_record)
+        elif field == "metric_record":
+            ret[item.key] = metric_record_from_proto(item.metric_record)
+        elif field == "config_record":
+            ret[item.key] = config_record_from_proto(item.config_record)
+        else:
+            raise ValueError(f"Unsupported record type: {field}")
     return ret
 
 

flwr/common/serde_utils.py

@@ -109,6 +109,8 @@ def record_value_dict_to_proto(
 ) -> dict[str, T]:
     """Serialize the record value dict to ProtoBuf.
 
+    This function will preserve the order of the keys in the input dictionary.
+
     Note: `bool` MUST be put in the front of allowd_types if it exists.
     """
     # Move bool to the front

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\x11PushObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \x01(\t\x12\x16\n\x0eobject_content\x18\x03 \x01(\x0c\"\x14\n\x12PushObjectResponse\"F\n\x11PullObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \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)
@@ -42,11 +42,11 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_OBJECTIDS']._serialized_start=802
   _globals['_OBJECTIDS']._serialized_end=833
   _globals['_PUSHOBJECTREQUEST']._serialized_start=835
-  _globals['_PUSHOBJECTREQUEST']._serialized_end=929
-  _globals['_PUSHOBJECTRESPONSE']._serialized_start=931
-  _globals['_PUSHOBJECTRESPONSE']._serialized_end=951
-  _globals['_PULLOBJECTREQUEST']._serialized_start=953
-  _globals['_PULLOBJECTREQUEST']._serialized_end=1023
-  _globals['_PULLOBJECTRESPONSE']._serialized_start=1025
-  _globals['_PULLOBJECTRESPONSE']._serialized_end=1069
+  _globals['_PUSHOBJECTREQUEST']._serialized_end=945
+  _globals['_PUSHOBJECTRESPONSE']._serialized_start=947
+  _globals['_PUSHOBJECTRESPONSE']._serialized_end=983
+  _globals['_PULLOBJECTREQUEST']._serialized_start=985
+  _globals['_PULLOBJECTREQUEST']._serialized_end=1071
+  _globals['_PULLOBJECTRESPONSE']._serialized_start=1073
+  _globals['_PULLOBJECTRESPONSE']._serialized_end=1165
 # @@protoc_insertion_point(module_scope)

flwr/proto/message_pb2.pyi

@@ -144,52 +144,69 @@ class PushObjectRequest(google.protobuf.message.Message):
     """PushObject messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODE_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
     OBJECT_ID_FIELD_NUMBER: builtins.int
     OBJECT_CONTENT_FIELD_NUMBER: builtins.int
     @property
     def node(self) -> flwr.proto.node_pb2.Node: ...
+    run_id: builtins.int
     object_id: typing.Text
     object_content: builtins.bytes
     def __init__(self,
         *,
         node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
+        run_id: builtins.int = ...,
         object_id: typing.Text = ...,
         object_content: builtins.bytes = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["node",b"node","object_content",b"object_content","object_id",b"object_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node",b"node","object_content",b"object_content","object_id",b"object_id","run_id",b"run_id"]) -> None: ...
 global___PushObjectRequest = PushObjectRequest
 
 class PushObjectResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    STORED_FIELD_NUMBER: builtins.int
+    stored: builtins.bool
     def __init__(self,
+        *,
+        stored: builtins.bool = ...,
         ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["stored",b"stored"]) -> None: ...
 global___PushObjectResponse = PushObjectResponse
 
 class PullObjectRequest(google.protobuf.message.Message):
     """PullObject messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODE_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
     OBJECT_ID_FIELD_NUMBER: builtins.int
     @property
     def node(self) -> flwr.proto.node_pb2.Node: ...
+    run_id: builtins.int
     object_id: typing.Text
     def __init__(self,
         *,
         node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
+        run_id: builtins.int = ...,
         object_id: typing.Text = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["node",b"node","object_id",b"object_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node",b"node","object_id",b"object_id","run_id",b"run_id"]) -> None: ...
 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/proto/recorddict_pb2.py

@@ -14,23 +14,13 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66lwr/proto/recorddict.proto\x12\nflwr.proto\"\x1a\n\nDoubleList\x12\x0c\n\x04vals\x18\x01 \x03(\x01\"\x18\n\x08SintList\x12\x0c\n\x04vals\x18\x01 \x03(\x12\"\x18\n\x08UintList\x12\x0c\n\x04vals\x18\x01 \x03(\x04\"\x18\n\x08\x42oolList\x12\x0c\n\x04vals\x18\x01 \x03(\x08\"\x1a\n\nStringList\x12\x0c\n\x04vals\x18\x01 \x03(\t\"\x19\n\tBytesList\x12\x0c\n\x04vals\x18\x01 \x03(\x0c\"B\n\x05\x41rray\x12\r\n\x05\x64type\x18\x01 \x01(\t\x12\r\n\x05shape\x18\x02 \x03(\x05\x12\r\n\x05stype\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\"\xd7\x01\n\x11MetricRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12)\n\tsint_list\x18\x16 \x01(\x0b\x32\x14.flwr.proto.SintListH\x00\x12)\n\tuint_list\x18\x17 \x01(\x0b\x32\x14.flwr.proto.UintListH\x00\x42\x07\n\x05value\"\x91\x03\n\x11\x43onfigRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12\x0e\n\x04\x62ool\x18\x04 \x01(\x08H\x00\x12\x10\n\x06string\x18\x05 \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x06 \x01(\x0cH\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12)\n\tsint_list\x18\x16 \x01(\x0b\x32\x14.flwr.proto.SintListH\x00\x12)\n\tuint_list\x18\x17 \x01(\x0b\x32\x14.flwr.proto.UintListH\x00\x12)\n\tbool_list\x18\x18 \x01(\x0b\x32\x14.flwr.proto.BoolListH\x00\x12-\n\x0bstring_list\x18\x19 \x01(\x0b\x32\x16.flwr.proto.StringListH\x00\x12+\n\nbytes_list\x18\x1a \x01(\x0b\x32\x15.flwr.proto.BytesListH\x00\x42\x07\n\x05value\"H\n\x0b\x41rrayRecord\x12\x11\n\tdata_keys\x18\x01 \x03(\t\x12&\n\x0b\x64\x61ta_values\x18\x02 \x03(\x0b\x32\x11.flwr.proto.Array\"\x8c\x01\n\x0cMetricRecord\x12\x30\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\".flwr.proto.MetricRecord.DataEntry\x1aJ\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.flwr.proto.MetricRecordValue:\x02\x38\x01\"\x8c\x01\n\x0c\x43onfigRecord\x12\x30\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\".flwr.proto.ConfigRecord.DataEntry\x1aJ\n\tDataEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.flwr.proto.ConfigRecordValue:\x02\x38\x01\"\x88\x03\n\nRecordDict\x12\x32\n\x06\x61rrays\x18\x01 \x03(\x0b\x32\".flwr.proto.RecordDict.ArraysEntry\x12\x34\n\x07metrics\x18\x02 \x03(\x0b\x32#.flwr.proto.RecordDict.MetricsEntry\x12\x34\n\x07\x63onfigs\x18\x03 \x03(\x0b\x32#.flwr.proto.RecordDict.ConfigsEntry\x1a\x46\n\x0b\x41rraysEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.flwr.proto.ArrayRecord:\x02\x38\x01\x1aH\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\'\n\x05value\x18\x02 \x01(\x0b\x32\x18.flwr.proto.MetricRecord:\x02\x38\x01\x1aH\n\x0c\x43onfigsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\'\n\x05value\x18\x02 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord:\x02\x38\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x66lwr/proto/recorddict.proto\x12\nflwr.proto\"\x1a\n\nDoubleList\x12\x0c\n\x04vals\x18\x01 \x03(\x01\"\x18\n\x08SintList\x12\x0c\n\x04vals\x18\x01 \x03(\x12\"\x18\n\x08UintList\x12\x0c\n\x04vals\x18\x01 \x03(\x04\"\x18\n\x08\x42oolList\x12\x0c\n\x04vals\x18\x01 \x03(\x08\"\x1a\n\nStringList\x12\x0c\n\x04vals\x18\x01 \x03(\t\"\x19\n\tBytesList\x12\x0c\n\x04vals\x18\x01 \x03(\x0c\"B\n\x05\x41rray\x12\r\n\x05\x64type\x18\x01 \x01(\t\x12\r\n\x05shape\x18\x02 \x03(\x05\x12\r\n\x05stype\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\"\xd7\x01\n\x11MetricRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12)\n\tsint_list\x18\x16 \x01(\x0b\x32\x14.flwr.proto.SintListH\x00\x12)\n\tuint_list\x18\x17 \x01(\x0b\x32\x14.flwr.proto.UintListH\x00\x42\x07\n\x05value\"\x91\x03\n\x11\x43onfigRecordValue\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x10\n\x06uint64\x18\x03 \x01(\x04H\x00\x12\x0e\n\x04\x62ool\x18\x04 \x01(\x08H\x00\x12\x10\n\x06string\x18\x05 \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x06 \x01(\x0cH\x00\x12-\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x16.flwr.proto.DoubleListH\x00\x12)\n\tsint_list\x18\x16 \x01(\x0b\x32\x14.flwr.proto.SintListH\x00\x12)\n\tuint_list\x18\x17 \x01(\x0b\x32\x14.flwr.proto.UintListH\x00\x12)\n\tbool_list\x18\x18 \x01(\x0b\x32\x14.flwr.proto.BoolListH\x00\x12-\n\x0bstring_list\x18\x19 \x01(\x0b\x32\x16.flwr.proto.StringListH\x00\x12+\n\nbytes_list\x18\x1a \x01(\x0b\x32\x15.flwr.proto.BytesListH\x00\x42\x07\n\x05value\"q\n\x0b\x41rrayRecord\x12+\n\x05items\x18\x01 \x03(\x0b\x32\x1c.flwr.proto.ArrayRecord.Item\x1a\x35\n\x04Item\x12\x0b\n\x03key\x18\x01 \x01(\t\x12 \n\x05value\x18\x02 \x01(\x0b\x32\x11.flwr.proto.Array\"\x7f\n\x0cMetricRecord\x12,\n\x05items\x18\x01 \x03(\x0b\x32\x1d.flwr.proto.MetricRecord.Item\x1a\x41\n\x04Item\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.flwr.proto.MetricRecordValue\"\x7f\n\x0c\x43onfigRecord\x12,\n\x05items\x18\x01 \x03(\x0b\x32\x1d.flwr.proto.ConfigRecord.Item\x1a\x41\n\x04Item\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.flwr.proto.ConfigRecordValue\"\xee\x01\n\nRecordDict\x12*\n\x05items\x18\x01 \x03(\x0b\x32\x1b.flwr.proto.RecordDict.Item\x1a\xb3\x01\n\x04Item\x12\x0b\n\x03key\x18\x01 \x01(\t\x12/\n\x0c\x61rray_record\x18\x02 \x01(\x0b\x32\x17.flwr.proto.ArrayRecordH\x00\x12\x31\n\rmetric_record\x18\x03 \x01(\x0b\x32\x18.flwr.proto.MetricRecordH\x00\x12\x31\n\rconfig_record\x18\x04 \x01(\x0b\x32\x18.flwr.proto.ConfigRecordH\x00\x42\x07\n\x05valueb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.recorddict_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  _globals['_METRICRECORD_DATAENTRY']._options = None
-  _globals['_METRICRECORD_DATAENTRY']._serialized_options = b'8\001'
-  _globals['_CONFIGRECORD_DATAENTRY']._options = None
-  _globals['_CONFIGRECORD_DATAENTRY']._serialized_options = b'8\001'
-  _globals['_RECORDDICT_ARRAYSENTRY']._options = None
-  _globals['_RECORDDICT_ARRAYSENTRY']._serialized_options = b'8\001'
-  _globals['_RECORDDICT_METRICSENTRY']._options = None
-  _globals['_RECORDDICT_METRICSENTRY']._serialized_options = b'8\001'
-  _globals['_RECORDDICT_CONFIGSENTRY']._options = None
-  _globals['_RECORDDICT_CONFIGSENTRY']._serialized_options = b'8\001'
   _globals['_DOUBLELIST']._serialized_start=43
   _globals['_DOUBLELIST']._serialized_end=69
   _globals['_SINTLIST']._serialized_start=71
@@ -50,21 +40,19 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_CONFIGRECORDVALUE']._serialized_start=491
   _globals['_CONFIGRECORDVALUE']._serialized_end=892
   _globals['_ARRAYRECORD']._serialized_start=894
-  _globals['_ARRAYRECORD']._serialized_end=966
-  _globals['_METRICRECORD']._serialized_start=969
-  _globals['_METRICRECORD']._serialized_end=1109
-  _globals['_METRICRECORD_DATAENTRY']._serialized_start=1035
-  _globals['_METRICRECORD_DATAENTRY']._serialized_end=1109
-  _globals['_CONFIGRECORD']._serialized_start=1112
-  _globals['_CONFIGRECORD']._serialized_end=1252
-  _globals['_CONFIGRECORD_DATAENTRY']._serialized_start=1178
-  _globals['_CONFIGRECORD_DATAENTRY']._serialized_end=1252
-  _globals['_RECORDDICT']._serialized_start=1255
-  _globals['_RECORDDICT']._serialized_end=1647
-  _globals['_RECORDDICT_ARRAYSENTRY']._serialized_start=1429
-  _globals['_RECORDDICT_ARRAYSENTRY']._serialized_end=1499
-  _globals['_RECORDDICT_METRICSENTRY']._serialized_start=1501
-  _globals['_RECORDDICT_METRICSENTRY']._serialized_end=1573
-  _globals['_RECORDDICT_CONFIGSENTRY']._serialized_start=1575
-  _globals['_RECORDDICT_CONFIGSENTRY']._serialized_end=1647
+  _globals['_ARRAYRECORD']._serialized_end=1007
+  _globals['_ARRAYRECORD_ITEM']._serialized_start=954
+  _globals['_ARRAYRECORD_ITEM']._serialized_end=1007
+  _globals['_METRICRECORD']._serialized_start=1009
+  _globals['_METRICRECORD']._serialized_end=1136
+  _globals['_METRICRECORD_ITEM']._serialized_start=1071
+  _globals['_METRICRECORD_ITEM']._serialized_end=1136
+  _globals['_CONFIGRECORD']._serialized_start=1138
+  _globals['_CONFIGRECORD']._serialized_end=1265
+  _globals['_CONFIGRECORD_ITEM']._serialized_start=1200
+  _globals['_CONFIGRECORD_ITEM']._serialized_end=1265
+  _globals['_RECORDDICT']._serialized_start=1268
+  _globals['_RECORDDICT']._serialized_end=1506
+  _globals['_RECORDDICT_ITEM']._serialized_start=1327
+  _globals['_RECORDDICT_ITEM']._serialized_end=1506
 # @@protoc_insertion_point(module_scope)