flwr-nightly 1.17.0.dev20250319__py3-none-any.whl → 1.17.0.dev20250321__py3-none-any.whl

flwr/common/secure_aggregation/secaggplus_constants.py

@@ -42,7 +42,7 @@ class Stage:
 
 
 class Key:
-    """Keys for the configs in the ConfigsRecord."""
+    """Keys for the configs in the ConfigRecord."""
 
     STAGE = "stage"
     SAMPLE_NUMBER = "sample_num"

flwr/common/serde.py

@@ -28,16 +28,16 @@ from flwr.proto.fab_pb2 import Fab as ProtoFab
 from flwr.proto.message_pb2 import Context as ProtoContext
 from flwr.proto.message_pb2 import Message as ProtoMessage
 from flwr.proto.message_pb2 import Metadata as ProtoMetadata
-from flwr.proto.recordset_pb2 import Array as ProtoArray
-from flwr.proto.recordset_pb2 import BoolList, BytesList
-from flwr.proto.recordset_pb2 import ConfigsRecord as ProtoConfigsRecord
-from flwr.proto.recordset_pb2 import ConfigsRecordValue as ProtoConfigsRecordValue
-from flwr.proto.recordset_pb2 import DoubleList
-from flwr.proto.recordset_pb2 import MetricsRecord as ProtoMetricsRecord
-from flwr.proto.recordset_pb2 import MetricsRecordValue as ProtoMetricsRecordValue
-from flwr.proto.recordset_pb2 import ParametersRecord as ProtoParametersRecord
-from flwr.proto.recordset_pb2 import RecordSet as ProtoRecordSet
-from flwr.proto.recordset_pb2 import SintList, StringList, UintList
+from flwr.proto.recorddict_pb2 import Array as ProtoArray
+from flwr.proto.recorddict_pb2 import ArrayRecord as ProtoArrayRecord
+from flwr.proto.recorddict_pb2 import BoolList, BytesList
+from flwr.proto.recorddict_pb2 import ConfigRecord as ProtoConfigRecord
+from flwr.proto.recorddict_pb2 import ConfigRecordValue as ProtoConfigRecordValue
+from flwr.proto.recorddict_pb2 import DoubleList
+from flwr.proto.recorddict_pb2 import MetricRecord as ProtoMetricRecord
+from flwr.proto.recorddict_pb2 import MetricRecordValue as ProtoMetricRecordValue
+from flwr.proto.recorddict_pb2 import RecordDict as ProtoRecordDict
+from flwr.proto.recorddict_pb2 import SintList, StringList, UintList
 from flwr.proto.run_pb2 import Run as ProtoRun
 from flwr.proto.run_pb2 import RunStatus as ProtoRunStatus
 from flwr.proto.transport_pb2 import (
@@ -53,14 +53,14 @@ from flwr.proto.transport_pb2 import (
 # pylint: enable=E0611
 from . import (
     Array,
-    ConfigsRecord,
+    ArrayRecord,
+    ConfigRecord,
     Context,
-    MetricsRecord,
-    ParametersRecord,
-    RecordSet,
+    MetricRecord,
+    RecordDict,
     typing,
 )
-from .message import Error, Message, Metadata
+from .message import Error, Message, Metadata, make_message
 from .record.typeddict import TypedDict
 
 #  === Parameters message ===
@@ -483,19 +483,19 @@ def array_from_proto(array_proto: ProtoArray) -> Array:
     )
 
 
-def parameters_record_to_proto(record: ParametersRecord) -> ProtoParametersRecord:
-    """Serialize ParametersRecord to ProtoBuf."""
-    return ProtoParametersRecord(
+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()),
     )
 
 
-def parameters_record_from_proto(
-    record_proto: ProtoParametersRecord,
-) -> ParametersRecord:
-    """Deserialize ParametersRecord from ProtoBuf."""
-    return ParametersRecord(
+def array_record_from_proto(
+    record_proto: ProtoArrayRecord,
+) -> ArrayRecord:
+    """Deserialize ArrayRecord from ProtoBuf."""
+    return ArrayRecord(
         array_dict=OrderedDict(
             zip(record_proto.data_keys, map(array_from_proto, record_proto.data_values))
         ),
@@ -503,40 +503,40 @@ def parameters_record_from_proto(
     )
 
 
-def metrics_record_to_proto(record: MetricsRecord) -> ProtoMetricsRecord:
-    """Serialize MetricsRecord to ProtoBuf."""
-    return ProtoMetricsRecord(
-        data=_record_value_dict_to_proto(record, [float, int], ProtoMetricsRecordValue)
+def metric_record_to_proto(record: MetricRecord) -> ProtoMetricRecord:
+    """Serialize MetricRecord to ProtoBuf."""
+    return ProtoMetricRecord(
+        data=_record_value_dict_to_proto(record, [float, int], ProtoMetricRecordValue)
     )
 
 
-def metrics_record_from_proto(record_proto: ProtoMetricsRecord) -> MetricsRecord:
-    """Deserialize MetricsRecord from ProtoBuf."""
-    return MetricsRecord(
-        metrics_dict=cast(
-            dict[str, typing.MetricsRecordValues],
+def metric_record_from_proto(record_proto: ProtoMetricRecord) -> MetricRecord:
+    """Deserialize MetricRecord from ProtoBuf."""
+    return MetricRecord(
+        metric_dict=cast(
+            dict[str, typing.MetricRecordValues],
             _record_value_dict_from_proto(record_proto.data),
         ),
         keep_input=False,
     )
 
 
-def configs_record_to_proto(record: ConfigsRecord) -> ProtoConfigsRecord:
-    """Serialize ConfigsRecord to ProtoBuf."""
-    return ProtoConfigsRecord(
+def config_record_to_proto(record: ConfigRecord) -> ProtoConfigRecord:
+    """Serialize ConfigRecord to ProtoBuf."""
+    return ProtoConfigRecord(
         data=_record_value_dict_to_proto(
             record,
             [bool, int, float, str, bytes],
-            ProtoConfigsRecordValue,
+            ProtoConfigRecordValue,
         )
     )
 
 
-def configs_record_from_proto(record_proto: ProtoConfigsRecord) -> ConfigsRecord:
-    """Deserialize ConfigsRecord from ProtoBuf."""
-    return ConfigsRecord(
-        configs_dict=cast(
-            dict[str, typing.ConfigsRecordValues],
+def config_record_from_proto(record_proto: ProtoConfigRecord) -> ConfigRecord:
+    """Deserialize ConfigRecord from ProtoBuf."""
+    return ConfigRecord(
+        config_dict=cast(
+            dict[str, typing.ConfigRecordValues],
             _record_value_dict_from_proto(record_proto.data),
         ),
         keep_input=False,
@@ -558,34 +558,33 @@ def error_from_proto(error_proto: ProtoError) -> Error:
     return Error(code=error_proto.code, reason=reason)
 
 
-# === RecordSet message ===
+# === RecordDict message ===
 
 
-def recordset_to_proto(recordset: RecordSet) -> ProtoRecordSet:
-    """Serialize RecordSet to ProtoBuf."""
-    return ProtoRecordSet(
-        parameters={
-            k: parameters_record_to_proto(v)
-            for k, v in recordset.parameters_records.items()
+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: metrics_record_to_proto(v) for k, v in recordset.metrics_records.items()
+            k: metric_record_to_proto(v) for k, v in recorddict.metric_records.items()
         },
         configs={
-            k: configs_record_to_proto(v) for k, v in recordset.configs_records.items()
+            k: config_record_to_proto(v) for k, v in recorddict.config_records.items()
         },
     )
 
 
-def recordset_from_proto(recordset_proto: ProtoRecordSet) -> RecordSet:
-    """Deserialize RecordSet from ProtoBuf."""
-    ret = RecordSet()
-    for k, p_record_proto in recordset_proto.parameters.items():
-        ret[k] = parameters_record_from_proto(p_record_proto)
-    for k, m_record_proto in recordset_proto.metrics.items():
-        ret[k] = metrics_record_from_proto(m_record_proto)
-    for k, c_record_proto in recordset_proto.configs.items():
-        ret[k] = configs_record_from_proto(c_record_proto)
+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)
     return ret
 
 
@@ -657,7 +656,7 @@ def metadata_to_proto(metadata: Metadata) -> ProtoMetadata:
         message_id=metadata.message_id,
         src_node_id=metadata.src_node_id,
         dst_node_id=metadata.dst_node_id,
-        reply_to_message=metadata.reply_to_message,
+        reply_to_message_id=metadata.reply_to_message_id,
         group_id=metadata.group_id,
         ttl=metadata.ttl,
         message_type=metadata.message_type,
@@ -673,8 +672,9 @@ def metadata_from_proto(metadata_proto: ProtoMetadata) -> Metadata:
         message_id=metadata_proto.message_id,
         src_node_id=metadata_proto.src_node_id,
         dst_node_id=metadata_proto.dst_node_id,
-        reply_to_message=metadata_proto.reply_to_message,
+        reply_to_message_id=metadata_proto.reply_to_message_id,
         group_id=metadata_proto.group_id,
+        created_at=metadata_proto.created_at,
         ttl=metadata_proto.ttl,
         message_type=metadata_proto.message_type,
     )
@@ -689,7 +689,7 @@ def message_to_proto(message: Message) -> ProtoMessage:
     proto = ProtoMessage(
         metadata=metadata_to_proto(message.metadata),
         content=(
-            recordset_to_proto(message.content) if message.has_content() else None
+            recorddict_to_proto(message.content) if message.has_content() else None
         ),
         error=error_to_proto(message.error) if message.has_error() else None,
     )
@@ -698,11 +698,10 @@ def message_to_proto(message: Message) -> ProtoMessage:
 
 def message_from_proto(message_proto: ProtoMessage) -> Message:
     """Deserialize `Message` from ProtoBuf."""
-    created_at = message_proto.metadata.created_at
-    message = Message(
+    return make_message(
         metadata=metadata_from_proto(message_proto.metadata),
         content=(
-            recordset_from_proto(message_proto.content)
+            recorddict_from_proto(message_proto.content)
             if message_proto.HasField("content")
             else None
         ),
@@ -712,10 +711,6 @@ def message_from_proto(message_proto: ProtoMessage) -> Message:
             else None
         ),
     )
-    # `.created_at` is set upon Message object construction
-    # we need to manually set it to the original value
-    message.metadata.created_at = created_at
-    return message
 
 
 # === Context messages ===
@@ -727,7 +722,7 @@ def context_to_proto(context: Context) -> ProtoContext:
         run_id=context.run_id,
         node_id=context.node_id,
         node_config=user_config_to_proto(context.node_config),
-        state=recordset_to_proto(context.state),
+        state=recorddict_to_proto(context.state),
         run_config=user_config_to_proto(context.run_config),
     )
     return proto
@@ -739,7 +734,7 @@ def context_from_proto(context_proto: ProtoContext) -> Context:
         run_id=context_proto.run_id,
         node_id=context_proto.node_id,
         node_config=user_config_from_proto(context_proto.node_config),
-        state=recordset_from_proto(context_proto.state),
+        state=recorddict_from_proto(context_proto.state),
         run_config=user_config_from_proto(context_proto.run_config),
     )
     return context

flwr/common/typing.py

@@ -45,14 +45,14 @@ Value = Union[
     list[str],
 ]
 
-# Value types for common.MetricsRecord
-MetricsScalar = Union[int, float]
-MetricsScalarList = Union[list[int], list[float]]
-MetricsRecordValues = Union[MetricsScalar, MetricsScalarList]
-# Value types for common.ConfigsRecord
-ConfigsScalar = Union[MetricsScalar, str, bytes, bool]
-ConfigsScalarList = Union[MetricsScalarList, list[str], list[bytes], list[bool]]
-ConfigsRecordValues = Union[ConfigsScalar, ConfigsScalarList]
+# Value types for common.MetricRecord
+MetricScalar = Union[int, float]
+MetricScalarList = Union[list[int], list[float]]
+MetricRecordValues = Union[MetricScalar, MetricScalarList]
+# Value types for common.ConfigRecord
+ConfigScalar = Union[MetricScalar, str, bytes, bool]
+ConfigScalarList = Union[MetricScalarList, list[str], list[bytes], list[bool]]
+ConfigRecordValues = Union[ConfigScalar, ConfigScalarList]
 
 Metrics = dict[str, Scalar]
 MetricsAggregationFn = Callable[[list[tuple[int, Metrics]]], Metrics]

flwr/proto/exec_pb2.py

@@ -14,11 +14,11 @@ _sym_db = _symbol_database.Default()
 
 from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
-from flwr.proto import recordset_pb2 as flwr_dot_proto_dot_recordset__pb2
+from flwr.proto import recorddict_pb2 as flwr_dot_proto_dot_recorddict__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/exec.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1a\x66lwr/proto/recordset.proto\x1a\x14\x66lwr/proto/run.proto\"\xfb\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x35\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x19.flwr.proto.ConfigsRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\x32\xe5\x03\n\x04\x45xec\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/exec.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\"\xfa\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\x32\xe5\x03\n\x04\x45xec\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -29,7 +29,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._options = None
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_options = b'8\001'
-  _globals['_STARTRUNREQUEST']._serialized_start=138
+  _globals['_STARTRUNREQUEST']._serialized_start=139
   _globals['_STARTRUNREQUEST']._serialized_end=389
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=316
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=389

flwr/proto/exec_pb2.pyi

@@ -4,7 +4,7 @@ isort:skip_file
 """
 import builtins
 import flwr.proto.fab_pb2
-import flwr.proto.recordset_pb2
+import flwr.proto.recorddict_pb2
 import flwr.proto.run_pb2
 import flwr.proto.transport_pb2
 import google.protobuf.descriptor
@@ -40,12 +40,12 @@ class StartRunRequest(google.protobuf.message.Message):
     @property
     def override_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
     @property
-    def federation_options(self) -> flwr.proto.recordset_pb2.ConfigsRecord: ...
+    def federation_options(self) -> flwr.proto.recorddict_pb2.ConfigRecord: ...
     def __init__(self,
         *,
         fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
         override_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
-        federation_options: typing.Optional[flwr.proto.recordset_pb2.ConfigsRecord] = ...,
+        federation_options: typing.Optional[flwr.proto.recorddict_pb2.ConfigRecord] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["fab",b"fab","federation_options",b"federation_options"]) -> builtins.bool: ...
     def ClearField(self, field_name: typing_extensions.Literal["fab",b"fab","federation_options",b"federation_options","override_config",b"override_config"]) -> None: ...

flwr/proto/message_pb2.py

@@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default()
 
 
 from flwr.proto import error_pb2 as flwr_dot_proto_dot_error__pb2
-from flwr.proto import recordset_pb2 as flwr_dot_proto_dot_recordset__pb2
+from flwr.proto import recorddict_pb2 as flwr_dot_proto_dot_recorddict__pb2
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/message.proto\x12\nflwr.proto\x1a\x16\x66lwr/proto/error.proto\x1a\x1a\x66lwr/proto/recordset.proto\x1a\x1a\x66lwr/proto/transport.proto\"{\n\x07Message\x12&\n\x08metadata\x18\x01 \x01(\x0b\x32\x14.flwr.proto.Metadata\x12&\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x15.flwr.proto.RecordSet\x12 \n\x05\x65rror\x18\x03 \x01(\x0b\x32\x11.flwr.proto.Error\"\xcf\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\x15.flwr.proto.RecordSet\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\"\xbb\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\x18\n\x10reply_to_message\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\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\"|\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\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -28,14 +28,14 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_CONTEXT_NODECONFIGENTRY']._serialized_options = b'8\001'
   _globals['_CONTEXT_RUNCONFIGENTRY']._options = None
   _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_options = b'8\001'
-  _globals['_MESSAGE']._serialized_start=120
-  _globals['_MESSAGE']._serialized_end=243
-  _globals['_CONTEXT']._serialized_start=246
-  _globals['_CONTEXT']._serialized_end=581
-  _globals['_CONTEXT_NODECONFIGENTRY']._serialized_start=442
-  _globals['_CONTEXT_NODECONFIGENTRY']._serialized_end=511
-  _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_start=513
-  _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_end=581
-  _globals['_METADATA']._serialized_start=584
-  _globals['_METADATA']._serialized_end=771
+  _globals['_MESSAGE']._serialized_start=121
+  _globals['_MESSAGE']._serialized_end=245
+  _globals['_CONTEXT']._serialized_start=248
+  _globals['_CONTEXT']._serialized_end=584
+  _globals['_CONTEXT_NODECONFIGENTRY']._serialized_start=445
+  _globals['_CONTEXT_NODECONFIGENTRY']._serialized_end=514
+  _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_start=516
+  _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_end=584
+  _globals['_METADATA']._serialized_start=587
+  _globals['_METADATA']._serialized_end=777
 # @@protoc_insertion_point(module_scope)

flwr/proto/message_pb2.pyi

@@ -4,7 +4,7 @@ isort:skip_file
 """
 import builtins
 import flwr.proto.error_pb2
-import flwr.proto.recordset_pb2
+import flwr.proto.recorddict_pb2
 import flwr.proto.transport_pb2
 import google.protobuf.descriptor
 import google.protobuf.internal.containers
@@ -22,13 +22,13 @@ class Message(google.protobuf.message.Message):
     @property
     def metadata(self) -> global___Metadata: ...
     @property
-    def content(self) -> flwr.proto.recordset_pb2.RecordSet: ...
+    def content(self) -> flwr.proto.recorddict_pb2.RecordDict: ...
     @property
     def error(self) -> flwr.proto.error_pb2.Error: ...
     def __init__(self,
         *,
         metadata: typing.Optional[global___Metadata] = ...,
-        content: typing.Optional[flwr.proto.recordset_pb2.RecordSet] = ...,
+        content: typing.Optional[flwr.proto.recorddict_pb2.RecordDict] = ...,
         error: typing.Optional[flwr.proto.error_pb2.Error] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["content",b"content","error",b"error","metadata",b"metadata"]) -> builtins.bool: ...
@@ -77,7 +77,7 @@ class Context(google.protobuf.message.Message):
     @property
     def node_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
     @property
-    def state(self) -> flwr.proto.recordset_pb2.RecordSet: ...
+    def state(self) -> flwr.proto.recorddict_pb2.RecordDict: ...
     @property
     def run_config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.transport_pb2.Scalar]: ...
     def __init__(self,
@@ -85,7 +85,7 @@ class Context(google.protobuf.message.Message):
         run_id: builtins.int = ...,
         node_id: builtins.int = ...,
         node_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
-        state: typing.Optional[flwr.proto.recordset_pb2.RecordSet] = ...,
+        state: typing.Optional[flwr.proto.recorddict_pb2.RecordDict] = ...,
         run_config: typing.Optional[typing.Mapping[typing.Text, flwr.proto.transport_pb2.Scalar]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["state",b"state"]) -> builtins.bool: ...
@@ -98,7 +98,7 @@ class Metadata(google.protobuf.message.Message):
     MESSAGE_ID_FIELD_NUMBER: builtins.int
     SRC_NODE_ID_FIELD_NUMBER: builtins.int
     DST_NODE_ID_FIELD_NUMBER: builtins.int
-    REPLY_TO_MESSAGE_FIELD_NUMBER: builtins.int
+    REPLY_TO_MESSAGE_ID_FIELD_NUMBER: builtins.int
     GROUP_ID_FIELD_NUMBER: builtins.int
     TTL_FIELD_NUMBER: builtins.int
     MESSAGE_TYPE_FIELD_NUMBER: builtins.int
@@ -107,7 +107,7 @@ class Metadata(google.protobuf.message.Message):
     message_id: typing.Text
     src_node_id: builtins.int
     dst_node_id: builtins.int
-    reply_to_message: typing.Text
+    reply_to_message_id: typing.Text
     group_id: typing.Text
     ttl: builtins.float
     message_type: typing.Text
@@ -118,11 +118,11 @@ class Metadata(google.protobuf.message.Message):
         message_id: typing.Text = ...,
         src_node_id: builtins.int = ...,
         dst_node_id: builtins.int = ...,
-        reply_to_message: typing.Text = ...,
+        reply_to_message_id: typing.Text = ...,
         group_id: typing.Text = ...,
         ttl: builtins.float = ...,
         message_type: typing.Text = ...,
         created_at: builtins.float = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["created_at",b"created_at","dst_node_id",b"dst_node_id","group_id",b"group_id","message_id",b"message_id","message_type",b"message_type","reply_to_message",b"reply_to_message","run_id",b"run_id","src_node_id",b"src_node_id","ttl",b"ttl"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["created_at",b"created_at","dst_node_id",b"dst_node_id","group_id",b"group_id","message_id",b"message_id","message_type",b"message_type","reply_to_message_id",b"reply_to_message_id","run_id",b"run_id","src_node_id",b"src_node_id","ttl",b"ttl"]) -> None: ...
 global___Metadata = Metadata

flwr/proto/recorddict_pb2.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/recorddict.proto
+# Protobuf Python Version: 4.25.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_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')
+
+_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
+  _globals['_SINTLIST']._serialized_end=95
+  _globals['_UINTLIST']._serialized_start=97
+  _globals['_UINTLIST']._serialized_end=121
+  _globals['_BOOLLIST']._serialized_start=123
+  _globals['_BOOLLIST']._serialized_end=147
+  _globals['_STRINGLIST']._serialized_start=149
+  _globals['_STRINGLIST']._serialized_end=175
+  _globals['_BYTESLIST']._serialized_start=177
+  _globals['_BYTESLIST']._serialized_end=202
+  _globals['_ARRAY']._serialized_start=204
+  _globals['_ARRAY']._serialized_end=270
+  _globals['_METRICRECORDVALUE']._serialized_start=273
+  _globals['_METRICRECORDVALUE']._serialized_end=488
+  _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
+# @@protoc_insertion_point(module_scope)