From 51df990ac683d1a46b0a9a579408149a8dba3d6d Mon Sep 17 00:00:00 2001 From: "Daniel J. Beutel" Date: Sat, 18 Jun 2022 13:31:01 +0200 Subject: [PATCH 1/2] Rename status code value, improve consistency --- src/proto/flwr/proto/transport.proto | 28 +++++++++---------- .../client/grpc_client/message_handler.py | 2 +- .../grpc_client/message_handler_test.py | 2 +- src/py/flwr/common/serde.py | 8 +++--- src/py/flwr/common/typing.py | 2 +- src/py/flwr/proto/transport_pb2.py | 6 ++-- src/py/flwr/proto/transport_pb2.pyi | 4 +-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/proto/flwr/proto/transport.proto b/src/proto/flwr/proto/transport.proto index 83d9645d54fb..732dce8e2cc9 100644 --- a/src/proto/flwr/proto/transport.proto +++ b/src/proto/flwr/proto/transport.proto @@ -23,7 +23,7 @@ service FlowerService { enum Code { OK = 0; - GET_PARAMETERS_NOT_IMPLEMENTED = 1; + GET_PROPERTIES_NOT_IMPLEMENTED = 1; } message Status { Code code = 1; @@ -43,6 +43,7 @@ enum Reason { message ServerMessage { message Reconnect { int64 seconds = 1; } + message GetPropertiesIns { map config = 1; } message GetParametersIns { map config = 1; } message FitIns { Parameters parameters = 1; @@ -52,18 +53,21 @@ message ServerMessage { Parameters parameters = 1; map config = 2; } - message GetPropertiesIns { map config = 1; } oneof msg { Reconnect reconnect = 1; - GetParametersIns get_parameters_ins = 2; - FitIns fit_ins = 3; - EvaluateIns evaluate_ins = 4; - GetPropertiesIns get_properties_ins = 5; + GetPropertiesIns get_properties_ins = 2; + GetParametersIns get_parameters_ins = 3; + FitIns fit_ins = 4; + EvaluateIns evaluate_ins = 5; } } message ClientMessage { message Disconnect { Reason reason = 1; } + message GetPropertiesRes { + Status status = 1; + map properties = 2; + } message GetParametersRes { Parameters parameters = 1; } message FitRes { Parameters parameters = 1; @@ -75,16 +79,12 @@ message ClientMessage { float loss = 2; map metrics = 4; } - message GetPropertiesRes { - Status status = 1; - map properties = 2; - } oneof msg { Disconnect disconnect = 1; - GetParametersRes get_parameters_res = 2; - FitRes fit_res = 3; - EvaluateRes evaluate_res = 4; - GetPropertiesRes get_properties_res = 5; + GetPropertiesRes get_properties_res = 2; + GetParametersRes get_parameters_res = 3; + FitRes fit_res = 4; + EvaluateRes evaluate_res = 5; } } diff --git a/src/py/flwr/client/grpc_client/message_handler.py b/src/py/flwr/client/grpc_client/message_handler.py index 7e340f0d881f..eb45bdf7654b 100644 --- a/src/py/flwr/client/grpc_client/message_handler.py +++ b/src/py/flwr/client/grpc_client/message_handler.py @@ -86,7 +86,7 @@ def _get_properties( # If client does not override get_properties, don't call it get_properties_res = typing.GetPropertiesRes( status=typing.Status( - code=typing.Code.GET_PARAMETERS_NOT_IMPLEMENTED, + code=typing.Code.GET_PROPERTIES_NOT_IMPLEMENTED, message="Client does not implement get_properties", ), properties={}, diff --git a/src/py/flwr/client/grpc_client/message_handler_test.py b/src/py/flwr/client/grpc_client/message_handler_test.py index 25830008eb90..d99e7ccfb168 100644 --- a/src/py/flwr/client/grpc_client/message_handler_test.py +++ b/src/py/flwr/client/grpc_client/message_handler_test.py @@ -80,7 +80,7 @@ def test_client_without_get_properties() -> None: # Assert expected_get_properties_res = ClientMessage.GetPropertiesRes( status=Status( - code=Code.GET_PARAMETERS_NOT_IMPLEMENTED, + code=Code.GET_PROPERTIES_NOT_IMPLEMENTED, message="Client does not implement get_properties", ) ) diff --git a/src/py/flwr/common/serde.py b/src/py/flwr/common/serde.py index 4813456c004f..38c9e7b4ac12 100644 --- a/src/py/flwr/common/serde.py +++ b/src/py/flwr/common/serde.py @@ -198,16 +198,16 @@ def get_properties_res_from_proto( def status_to_proto(status: typing.Status) -> Status: """Serialize Code to ProtoBuf message.""" code = Code.OK - if status.code == typing.Code.GET_PARAMETERS_NOT_IMPLEMENTED: - code = Code.GET_PARAMETERS_NOT_IMPLEMENTED + if status.code == typing.Code.GET_PROPERTIES_NOT_IMPLEMENTED: + code = Code.GET_PROPERTIES_NOT_IMPLEMENTED return Status(code=code, message=status.message) def status_from_proto(msg: Status) -> typing.Status: """Deserialize Code from ProtoBuf message.""" code = typing.Code.OK - if msg.code == Code.GET_PARAMETERS_NOT_IMPLEMENTED: - code = typing.Code.GET_PARAMETERS_NOT_IMPLEMENTED + if msg.code == Code.GET_PROPERTIES_NOT_IMPLEMENTED: + code = typing.Code.GET_PROPERTIES_NOT_IMPLEMENTED return typing.Status(code=code, message=msg.message) diff --git a/src/py/flwr/common/typing.py b/src/py/flwr/common/typing.py index 950be6e95df6..74e2e781b969 100644 --- a/src/py/flwr/common/typing.py +++ b/src/py/flwr/common/typing.py @@ -40,7 +40,7 @@ class Code(Enum): """Client status codes.""" OK = 0 - GET_PARAMETERS_NOT_IMPLEMENTED = 1 + GET_PROPERTIES_NOT_IMPLEMENTED = 1 @dataclass diff --git a/src/py/flwr/proto/transport_pb2.py b/src/py/flwr/proto/transport_pb2.py index 51634528eed5..f18204100563 100644 --- a/src/py/flwr/proto/transport_pb2.py +++ b/src/py/flwr/proto/transport_pb2.py @@ -20,7 +20,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x1a\x66lwr/proto/transport.proto\x12\nflwr.proto\"9\n\x06Status\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.flwr.proto.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\"2\n\nParameters\x12\x0f\n\x07tensors\x18\x01 \x03(\x0c\x12\x13\n\x0btensor_type\x18\x02 \x01(\t\"\xb0\x08\n\rServerMessage\x12\x38\n\treconnect\x18\x01 \x01(\x0b\x32#.flwr.proto.ServerMessage.ReconnectH\x00\x12H\n\x12get_parameters_ins\x18\x02 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetParametersInsH\x00\x12\x33\n\x07\x66it_ins\x18\x03 \x01(\x0b\x32 .flwr.proto.ServerMessage.FitInsH\x00\x12=\n\x0c\x65valuate_ins\x18\x04 \x01(\x0b\x32%.flwr.proto.ServerMessage.EvaluateInsH\x00\x12H\n\x12get_properties_ins\x18\x05 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetPropertiesInsH\x00\x1a\x1c\n\tReconnect\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x1a\x9d\x01\n\x10GetParametersIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetParametersIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xb5\x01\n\x06\x46itIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12<\n\x06\x63onfig\x18\x02 \x03(\x0b\x32,.flwr.proto.ServerMessage.FitIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xbf\x01\n\x0b\x45valuateIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x41\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x31.flwr.proto.ServerMessage.EvaluateIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x9d\x01\n\x10GetPropertiesIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"\xaa\x08\n\rClientMessage\x12:\n\ndisconnect\x18\x01 \x01(\x0b\x32$.flwr.proto.ClientMessage.DisconnectH\x00\x12H\n\x12get_parameters_res\x18\x02 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetParametersResH\x00\x12\x33\n\x07\x66it_res\x18\x03 \x01(\x0b\x32 .flwr.proto.ClientMessage.FitResH\x00\x12=\n\x0c\x65valuate_res\x18\x04 \x01(\x0b\x32%.flwr.proto.ClientMessage.EvaluateResH\x00\x12H\n\x12get_properties_res\x18\x05 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetPropertiesResH\x00\x1a\x30\n\nDisconnect\x12\"\n\x06reason\x18\x01 \x01(\x0e\x32\x12.flwr.proto.Reason\x1a>\n\x10GetParametersRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x1a\xce\x01\n\x06\x46itRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x14\n\x0cnum_examples\x18\x02 \x01(\x03\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.flwr.proto.ClientMessage.FitRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xba\x01\n\x0b\x45valuateRes\x12\x14\n\x0cnum_examples\x18\x01 \x01(\x03\x12\x0c\n\x04loss\x18\x02 \x01(\x02\x12\x43\n\x07metrics\x18\x04 \x03(\x0b\x32\x32.flwr.proto.ClientMessage.EvaluateRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xcd\x01\n\x10GetPropertiesRes\x12\"\n\x06status\x18\x01 \x01(\x0b\x32\x12.flwr.proto.Status\x12N\n\nproperties\x18\x02 \x03(\x0b\x32:.flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry\x1a\x45\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"i\n\x06Scalar\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x08 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\r \x01(\x08H\x00\x12\x10\n\x06string\x18\x0e \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x0f \x01(\x0cH\x00\x42\x08\n\x06scalar*2\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\"\n\x1eGET_PARAMETERS_NOT_IMPLEMENTED\x10\x01*[\n\x06Reason\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tRECONNECT\x10\x01\x12\x16\n\x12POWER_DISCONNECTED\x10\x02\x12\x14\n\x10WIFI_UNAVAILABLE\x10\x03\x12\x07\n\x03\x41\x43K\x10\x04\x32S\n\rFlowerService\x12\x42\n\x04Join\x12\x19.flwr.proto.ClientMessage\x1a\x19.flwr.proto.ServerMessage\"\x00(\x01\x30\x01\x62\x06proto3' + serialized_pb=b'\n\x1a\x66lwr/proto/transport.proto\x12\nflwr.proto\"9\n\x06Status\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.flwr.proto.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\"2\n\nParameters\x12\x0f\n\x07tensors\x18\x01 \x03(\x0c\x12\x13\n\x0btensor_type\x18\x02 \x01(\t\"\xb0\x08\n\rServerMessage\x12\x38\n\treconnect\x18\x01 \x01(\x0b\x32#.flwr.proto.ServerMessage.ReconnectH\x00\x12H\n\x12get_parameters_ins\x18\x02 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetParametersInsH\x00\x12\x33\n\x07\x66it_ins\x18\x03 \x01(\x0b\x32 .flwr.proto.ServerMessage.FitInsH\x00\x12=\n\x0c\x65valuate_ins\x18\x04 \x01(\x0b\x32%.flwr.proto.ServerMessage.EvaluateInsH\x00\x12H\n\x12get_properties_ins\x18\x05 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetPropertiesInsH\x00\x1a\x1c\n\tReconnect\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x1a\x9d\x01\n\x10GetParametersIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetParametersIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xb5\x01\n\x06\x46itIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12<\n\x06\x63onfig\x18\x02 \x03(\x0b\x32,.flwr.proto.ServerMessage.FitIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xbf\x01\n\x0b\x45valuateIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x41\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x31.flwr.proto.ServerMessage.EvaluateIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x9d\x01\n\x10GetPropertiesIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"\xaa\x08\n\rClientMessage\x12:\n\ndisconnect\x18\x01 \x01(\x0b\x32$.flwr.proto.ClientMessage.DisconnectH\x00\x12H\n\x12get_parameters_res\x18\x02 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetParametersResH\x00\x12\x33\n\x07\x66it_res\x18\x03 \x01(\x0b\x32 .flwr.proto.ClientMessage.FitResH\x00\x12=\n\x0c\x65valuate_res\x18\x04 \x01(\x0b\x32%.flwr.proto.ClientMessage.EvaluateResH\x00\x12H\n\x12get_properties_res\x18\x05 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetPropertiesResH\x00\x1a\x30\n\nDisconnect\x12\"\n\x06reason\x18\x01 \x01(\x0e\x32\x12.flwr.proto.Reason\x1a>\n\x10GetParametersRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x1a\xce\x01\n\x06\x46itRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x14\n\x0cnum_examples\x18\x02 \x01(\x03\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.flwr.proto.ClientMessage.FitRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xba\x01\n\x0b\x45valuateRes\x12\x14\n\x0cnum_examples\x18\x01 \x01(\x03\x12\x0c\n\x04loss\x18\x02 \x01(\x02\x12\x43\n\x07metrics\x18\x04 \x03(\x0b\x32\x32.flwr.proto.ClientMessage.EvaluateRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xcd\x01\n\x10GetPropertiesRes\x12\"\n\x06status\x18\x01 \x01(\x0b\x32\x12.flwr.proto.Status\x12N\n\nproperties\x18\x02 \x03(\x0b\x32:.flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry\x1a\x45\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"i\n\x06Scalar\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x08 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\r \x01(\x08H\x00\x12\x10\n\x06string\x18\x0e \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x0f \x01(\x0cH\x00\x42\x08\n\x06scalar*2\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\"\n\x1eGET_PROPERTIES_NOT_IMPLEMENTED\x10\x01*[\n\x06Reason\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tRECONNECT\x10\x01\x12\x16\n\x12POWER_DISCONNECTED\x10\x02\x12\x14\n\x10WIFI_UNAVAILABLE\x10\x03\x12\x07\n\x03\x41\x43K\x10\x04\x32S\n\rFlowerService\x12\x42\n\x04Join\x12\x19.flwr.proto.ClientMessage\x1a\x19.flwr.proto.ServerMessage\"\x00(\x01\x30\x01\x62\x06proto3' ) _CODE = _descriptor.EnumDescriptor( @@ -36,7 +36,7 @@ type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor( - name='GET_PARAMETERS_NOT_IMPLEMENTED', index=1, number=1, + name='GET_PROPERTIES_NOT_IMPLEMENTED', index=1, number=1, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), @@ -91,7 +91,7 @@ Reason = enum_type_wrapper.EnumTypeWrapper(_REASON) OK = 0 -GET_PARAMETERS_NOT_IMPLEMENTED = 1 +GET_PROPERTIES_NOT_IMPLEMENTED = 1 UNKNOWN = 0 RECONNECT = 1 POWER_DISCONNECTED = 2 diff --git a/src/py/flwr/proto/transport_pb2.pyi b/src/py/flwr/proto/transport_pb2.pyi index f6ebda0cbe58..5e47a84e9efe 100644 --- a/src/py/flwr/proto/transport_pb2.pyi +++ b/src/py/flwr/proto/transport_pb2.pyi @@ -19,7 +19,7 @@ class _CodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeW DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor OK: _Code.ValueType # 0 GET_PARAMETERS_NOT_IMPLEMENTED: _Code.ValueType # 1 -class Code(_Code, metaclass=_CodeEnumTypeWrapper): +clasGET_PROPERTIES_NOT_IMPLEMENTEDnumTypeWrapper): pass OK: Code.ValueType # 0 @@ -27,7 +27,7 @@ GET_PARAMETERS_NOT_IMPLEMENTED: Code.ValueType # 1 global___Code = Code -class _Reason: +GET_PROPERTIES_NOT_IMPLEMENTED ValueType = typing.NewType('ValueType', builtins.int) V: typing_extensions.TypeAlias = ValueType class _ReasonEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Reason.ValueType], builtins.type): From 4cbcba6c3be25e4c52e665925195fc8e16e3cb0b Mon Sep 17 00:00:00 2001 From: "Daniel J. Beutel" Date: Sat, 18 Jun 2022 13:41:12 +0200 Subject: [PATCH 2/2] Update compiled transport.proto --- src/py/flwr/proto/transport_pb2.py | 382 ++++++++++++++-------------- src/py/flwr/proto/transport_pb2.pyi | 112 ++++---- 2 files changed, 247 insertions(+), 247 deletions(-) diff --git a/src/py/flwr/proto/transport_pb2.py b/src/py/flwr/proto/transport_pb2.py index f18204100563..c5f5a20dabb1 100644 --- a/src/py/flwr/proto/transport_pb2.py +++ b/src/py/flwr/proto/transport_pb2.py @@ -20,7 +20,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x1a\x66lwr/proto/transport.proto\x12\nflwr.proto\"9\n\x06Status\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.flwr.proto.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\"2\n\nParameters\x12\x0f\n\x07tensors\x18\x01 \x03(\x0c\x12\x13\n\x0btensor_type\x18\x02 \x01(\t\"\xb0\x08\n\rServerMessage\x12\x38\n\treconnect\x18\x01 \x01(\x0b\x32#.flwr.proto.ServerMessage.ReconnectH\x00\x12H\n\x12get_parameters_ins\x18\x02 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetParametersInsH\x00\x12\x33\n\x07\x66it_ins\x18\x03 \x01(\x0b\x32 .flwr.proto.ServerMessage.FitInsH\x00\x12=\n\x0c\x65valuate_ins\x18\x04 \x01(\x0b\x32%.flwr.proto.ServerMessage.EvaluateInsH\x00\x12H\n\x12get_properties_ins\x18\x05 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetPropertiesInsH\x00\x1a\x1c\n\tReconnect\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x1a\x9d\x01\n\x10GetParametersIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetParametersIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xb5\x01\n\x06\x46itIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12<\n\x06\x63onfig\x18\x02 \x03(\x0b\x32,.flwr.proto.ServerMessage.FitIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xbf\x01\n\x0b\x45valuateIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x41\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x31.flwr.proto.ServerMessage.EvaluateIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x9d\x01\n\x10GetPropertiesIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"\xaa\x08\n\rClientMessage\x12:\n\ndisconnect\x18\x01 \x01(\x0b\x32$.flwr.proto.ClientMessage.DisconnectH\x00\x12H\n\x12get_parameters_res\x18\x02 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetParametersResH\x00\x12\x33\n\x07\x66it_res\x18\x03 \x01(\x0b\x32 .flwr.proto.ClientMessage.FitResH\x00\x12=\n\x0c\x65valuate_res\x18\x04 \x01(\x0b\x32%.flwr.proto.ClientMessage.EvaluateResH\x00\x12H\n\x12get_properties_res\x18\x05 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetPropertiesResH\x00\x1a\x30\n\nDisconnect\x12\"\n\x06reason\x18\x01 \x01(\x0e\x32\x12.flwr.proto.Reason\x1a>\n\x10GetParametersRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x1a\xce\x01\n\x06\x46itRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x14\n\x0cnum_examples\x18\x02 \x01(\x03\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.flwr.proto.ClientMessage.FitRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xba\x01\n\x0b\x45valuateRes\x12\x14\n\x0cnum_examples\x18\x01 \x01(\x03\x12\x0c\n\x04loss\x18\x02 \x01(\x02\x12\x43\n\x07metrics\x18\x04 \x03(\x0b\x32\x32.flwr.proto.ClientMessage.EvaluateRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xcd\x01\n\x10GetPropertiesRes\x12\"\n\x06status\x18\x01 \x01(\x0b\x32\x12.flwr.proto.Status\x12N\n\nproperties\x18\x02 \x03(\x0b\x32:.flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry\x1a\x45\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"i\n\x06Scalar\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x08 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\r \x01(\x08H\x00\x12\x10\n\x06string\x18\x0e \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x0f \x01(\x0cH\x00\x42\x08\n\x06scalar*2\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\"\n\x1eGET_PROPERTIES_NOT_IMPLEMENTED\x10\x01*[\n\x06Reason\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tRECONNECT\x10\x01\x12\x16\n\x12POWER_DISCONNECTED\x10\x02\x12\x14\n\x10WIFI_UNAVAILABLE\x10\x03\x12\x07\n\x03\x41\x43K\x10\x04\x32S\n\rFlowerService\x12\x42\n\x04Join\x12\x19.flwr.proto.ClientMessage\x1a\x19.flwr.proto.ServerMessage\"\x00(\x01\x30\x01\x62\x06proto3' + serialized_pb=b'\n\x1a\x66lwr/proto/transport.proto\x12\nflwr.proto\"9\n\x06Status\x12\x1e\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x10.flwr.proto.Code\x12\x0f\n\x07message\x18\x02 \x01(\t\"2\n\nParameters\x12\x0f\n\x07tensors\x18\x01 \x03(\x0c\x12\x13\n\x0btensor_type\x18\x02 \x01(\t\"\xb0\x08\n\rServerMessage\x12\x38\n\treconnect\x18\x01 \x01(\x0b\x32#.flwr.proto.ServerMessage.ReconnectH\x00\x12H\n\x12get_properties_ins\x18\x02 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetPropertiesInsH\x00\x12H\n\x12get_parameters_ins\x18\x03 \x01(\x0b\x32*.flwr.proto.ServerMessage.GetParametersInsH\x00\x12\x33\n\x07\x66it_ins\x18\x04 \x01(\x0b\x32 .flwr.proto.ServerMessage.FitInsH\x00\x12=\n\x0c\x65valuate_ins\x18\x05 \x01(\x0b\x32%.flwr.proto.ServerMessage.EvaluateInsH\x00\x1a\x1c\n\tReconnect\x12\x0f\n\x07seconds\x18\x01 \x01(\x03\x1a\x9d\x01\n\x10GetPropertiesIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x9d\x01\n\x10GetParametersIns\x12\x46\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\x36.flwr.proto.ServerMessage.GetParametersIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xb5\x01\n\x06\x46itIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12<\n\x06\x63onfig\x18\x02 \x03(\x0b\x32,.flwr.proto.ServerMessage.FitIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xbf\x01\n\x0b\x45valuateIns\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x41\n\x06\x63onfig\x18\x02 \x03(\x0b\x32\x31.flwr.proto.ServerMessage.EvaluateIns.ConfigEntry\x1a\x41\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"\xaa\x08\n\rClientMessage\x12:\n\ndisconnect\x18\x01 \x01(\x0b\x32$.flwr.proto.ClientMessage.DisconnectH\x00\x12H\n\x12get_properties_res\x18\x02 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetPropertiesResH\x00\x12H\n\x12get_parameters_res\x18\x03 \x01(\x0b\x32*.flwr.proto.ClientMessage.GetParametersResH\x00\x12\x33\n\x07\x66it_res\x18\x04 \x01(\x0b\x32 .flwr.proto.ClientMessage.FitResH\x00\x12=\n\x0c\x65valuate_res\x18\x05 \x01(\x0b\x32%.flwr.proto.ClientMessage.EvaluateResH\x00\x1a\x30\n\nDisconnect\x12\"\n\x06reason\x18\x01 \x01(\x0e\x32\x12.flwr.proto.Reason\x1a\xcd\x01\n\x10GetPropertiesRes\x12\"\n\x06status\x18\x01 \x01(\x0b\x32\x12.flwr.proto.Status\x12N\n\nproperties\x18\x02 \x03(\x0b\x32:.flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry\x1a\x45\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a>\n\x10GetParametersRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x1a\xce\x01\n\x06\x46itRes\x12*\n\nparameters\x18\x01 \x01(\x0b\x32\x16.flwr.proto.Parameters\x12\x14\n\x0cnum_examples\x18\x02 \x01(\x03\x12>\n\x07metrics\x18\x05 \x03(\x0b\x32-.flwr.proto.ClientMessage.FitRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\xba\x01\n\x0b\x45valuateRes\x12\x14\n\x0cnum_examples\x18\x01 \x01(\x03\x12\x0c\n\x04loss\x18\x02 \x01(\x02\x12\x43\n\x07metrics\x18\x04 \x03(\x0b\x32\x32.flwr.proto.ClientMessage.EvaluateRes.MetricsEntry\x1a\x42\n\x0cMetricsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x42\x05\n\x03msg\"i\n\x06Scalar\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x08 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\r \x01(\x08H\x00\x12\x10\n\x06string\x18\x0e \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x0f \x01(\x0cH\x00\x42\x08\n\x06scalar*2\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\"\n\x1eGET_PROPERTIES_NOT_IMPLEMENTED\x10\x01*[\n\x06Reason\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tRECONNECT\x10\x01\x12\x16\n\x12POWER_DISCONNECTED\x10\x02\x12\x14\n\x10WIFI_UNAVAILABLE\x10\x03\x12\x07\n\x03\x41\x43K\x10\x04\x32S\n\rFlowerService\x12\x42\n\x04Join\x12\x19.flwr.proto.ClientMessage\x1a\x19.flwr.proto.ServerMessage\"\x00(\x01\x30\x01\x62\x06proto3' ) _CODE = _descriptor.EnumDescriptor( @@ -209,23 +209,23 @@ serialized_end=521, ) -_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY = _descriptor.Descriptor( +_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY = _descriptor.Descriptor( name='ConfigEntry', - full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry', + full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry.key', index=0, + name='key', full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry.value', index=1, + name='value', full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -247,16 +247,16 @@ serialized_end=681, ) -_SERVERMESSAGE_GETPARAMETERSINS = _descriptor.Descriptor( - name='GetParametersIns', - full_name='flwr.proto.ServerMessage.GetParametersIns', +_SERVERMESSAGE_GETPROPERTIESINS = _descriptor.Descriptor( + name='GetPropertiesIns', + full_name='flwr.proto.ServerMessage.GetPropertiesIns', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='config', full_name='flwr.proto.ServerMessage.GetParametersIns.config', index=0, + name='config', full_name='flwr.proto.ServerMessage.GetPropertiesIns.config', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -265,7 +265,7 @@ ], extensions=[ ], - nested_types=[_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY, ], + nested_types=[_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY, ], enum_types=[ ], serialized_options=None, @@ -278,23 +278,23 @@ serialized_end=681, ) -_SERVERMESSAGE_FITINS_CONFIGENTRY = _descriptor.Descriptor( +_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY = _descriptor.Descriptor( name='ConfigEntry', - full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry', + full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry.key', index=0, + name='key', full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry.value', index=1, + name='value', full_name='flwr.proto.ServerMessage.GetParametersIns.ConfigEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -316,24 +316,17 @@ serialized_end=681, ) -_SERVERMESSAGE_FITINS = _descriptor.Descriptor( - name='FitIns', - full_name='flwr.proto.ServerMessage.FitIns', +_SERVERMESSAGE_GETPARAMETERSINS = _descriptor.Descriptor( + name='GetParametersIns', + full_name='flwr.proto.ServerMessage.GetParametersIns', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='parameters', full_name='flwr.proto.ServerMessage.FitIns.parameters', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='config', full_name='flwr.proto.ServerMessage.FitIns.config', index=1, - number=2, type=11, cpp_type=10, label=3, + name='config', full_name='flwr.proto.ServerMessage.GetParametersIns.config', index=0, + number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -341,7 +334,7 @@ ], extensions=[ ], - nested_types=[_SERVERMESSAGE_FITINS_CONFIGENTRY, ], + nested_types=[_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY, ], enum_types=[ ], serialized_options=None, @@ -351,26 +344,26 @@ oneofs=[ ], serialized_start=684, - serialized_end=865, + serialized_end=841, ) -_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY = _descriptor.Descriptor( +_SERVERMESSAGE_FITINS_CONFIGENTRY = _descriptor.Descriptor( name='ConfigEntry', - full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry', + full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry.key', index=0, + name='key', full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry.value', index=1, + name='value', full_name='flwr.proto.ServerMessage.FitIns.ConfigEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -392,23 +385,23 @@ serialized_end=681, ) -_SERVERMESSAGE_EVALUATEINS = _descriptor.Descriptor( - name='EvaluateIns', - full_name='flwr.proto.ServerMessage.EvaluateIns', +_SERVERMESSAGE_FITINS = _descriptor.Descriptor( + name='FitIns', + full_name='flwr.proto.ServerMessage.FitIns', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='parameters', full_name='flwr.proto.ServerMessage.EvaluateIns.parameters', index=0, + name='parameters', full_name='flwr.proto.ServerMessage.FitIns.parameters', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='config', full_name='flwr.proto.ServerMessage.EvaluateIns.config', index=1, + name='config', full_name='flwr.proto.ServerMessage.FitIns.config', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -417,7 +410,7 @@ ], extensions=[ ], - nested_types=[_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY, ], + nested_types=[_SERVERMESSAGE_FITINS_CONFIGENTRY, ], enum_types=[ ], serialized_options=None, @@ -426,27 +419,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=868, - serialized_end=1059, + serialized_start=844, + serialized_end=1025, ) -_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY = _descriptor.Descriptor( +_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY = _descriptor.Descriptor( name='ConfigEntry', - full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry', + full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry.key', index=0, + name='key', full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry.value', index=1, + name='value', full_name='flwr.proto.ServerMessage.EvaluateIns.ConfigEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -468,17 +461,24 @@ serialized_end=681, ) -_SERVERMESSAGE_GETPROPERTIESINS = _descriptor.Descriptor( - name='GetPropertiesIns', - full_name='flwr.proto.ServerMessage.GetPropertiesIns', +_SERVERMESSAGE_EVALUATEINS = _descriptor.Descriptor( + name='EvaluateIns', + full_name='flwr.proto.ServerMessage.EvaluateIns', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='config', full_name='flwr.proto.ServerMessage.GetPropertiesIns.config', index=0, - number=1, type=11, cpp_type=10, label=3, + name='parameters', full_name='flwr.proto.ServerMessage.EvaluateIns.parameters', index=0, + number=1, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='config', full_name='flwr.proto.ServerMessage.EvaluateIns.config', index=1, + number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -486,7 +486,7 @@ ], extensions=[ ], - nested_types=[_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY, ], + nested_types=[_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY, ], enum_types=[ ], serialized_options=None, @@ -495,7 +495,7 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1062, + serialized_start=1028, serialized_end=1219, ) @@ -515,28 +515,28 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='get_parameters_ins', full_name='flwr.proto.ServerMessage.get_parameters_ins', index=1, + name='get_properties_ins', full_name='flwr.proto.ServerMessage.get_properties_ins', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='fit_ins', full_name='flwr.proto.ServerMessage.fit_ins', index=2, + name='get_parameters_ins', full_name='flwr.proto.ServerMessage.get_parameters_ins', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='evaluate_ins', full_name='flwr.proto.ServerMessage.evaluate_ins', index=3, + name='fit_ins', full_name='flwr.proto.ServerMessage.fit_ins', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='get_properties_ins', full_name='flwr.proto.ServerMessage.get_properties_ins', index=4, + name='evaluate_ins', full_name='flwr.proto.ServerMessage.evaluate_ins', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -545,7 +545,7 @@ ], extensions=[ ], - nested_types=[_SERVERMESSAGE_RECONNECT, _SERVERMESSAGE_GETPARAMETERSINS, _SERVERMESSAGE_FITINS, _SERVERMESSAGE_EVALUATEINS, _SERVERMESSAGE_GETPROPERTIESINS, ], + nested_types=[_SERVERMESSAGE_RECONNECT, _SERVERMESSAGE_GETPROPERTIESINS, _SERVERMESSAGE_GETPARAMETERSINS, _SERVERMESSAGE_FITINS, _SERVERMESSAGE_EVALUATEINS, ], enum_types=[ ], serialized_options=None, @@ -595,17 +595,24 @@ serialized_end=1618, ) -_CLIENTMESSAGE_GETPARAMETERSRES = _descriptor.Descriptor( - name='GetParametersRes', - full_name='flwr.proto.ClientMessage.GetParametersRes', +_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY = _descriptor.Descriptor( + name='PropertiesEntry', + full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='parameters', full_name='flwr.proto.ClientMessage.GetParametersRes.parameters', index=0, - number=1, type=11, cpp_type=10, label=1, + name='key', full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry.key', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='value', full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry.value', index=1, + number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -616,87 +623,73 @@ nested_types=[], enum_types=[ ], - serialized_options=None, + serialized_options=b'8\001', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1620, - serialized_end=1682, + serialized_start=1757, + serialized_end=1826, ) -_CLIENTMESSAGE_FITRES_METRICSENTRY = _descriptor.Descriptor( - name='MetricsEntry', - full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry', +_CLIENTMESSAGE_GETPROPERTIESRES = _descriptor.Descriptor( + name='GetPropertiesRes', + full_name='flwr.proto.ClientMessage.GetPropertiesRes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry.key', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), + name='status', full_name='flwr.proto.ClientMessage.GetPropertiesRes.status', index=0, + number=1, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry.value', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + name='properties', full_name='flwr.proto.ClientMessage.GetPropertiesRes.properties', index=1, + number=2, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], - nested_types=[], + nested_types=[_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY, ], enum_types=[ ], - serialized_options=b'8\001', + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[ ], - serialized_start=1825, - serialized_end=1891, + serialized_start=1621, + serialized_end=1826, ) -_CLIENTMESSAGE_FITRES = _descriptor.Descriptor( - name='FitRes', - full_name='flwr.proto.ClientMessage.FitRes', +_CLIENTMESSAGE_GETPARAMETERSRES = _descriptor.Descriptor( + name='GetParametersRes', + full_name='flwr.proto.ClientMessage.GetParametersRes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='parameters', full_name='flwr.proto.ClientMessage.FitRes.parameters', index=0, + name='parameters', full_name='flwr.proto.ClientMessage.GetParametersRes.parameters', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='num_examples', full_name='flwr.proto.ClientMessage.FitRes.num_examples', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='metrics', full_name='flwr.proto.ClientMessage.FitRes.metrics', index=2, - number=5, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], - nested_types=[_CLIENTMESSAGE_FITRES_METRICSENTRY, ], + nested_types=[], enum_types=[ ], serialized_options=None, @@ -705,27 +698,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1685, - serialized_end=1891, + serialized_start=1828, + serialized_end=1890, ) -_CLIENTMESSAGE_EVALUATERES_METRICSENTRY = _descriptor.Descriptor( +_CLIENTMESSAGE_FITRES_METRICSENTRY = _descriptor.Descriptor( name='MetricsEntry', - full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry', + full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry.key', index=0, + name='key', full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry.value', index=1, + name='value', full_name='flwr.proto.ClientMessage.FitRes.MetricsEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -743,35 +736,35 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1825, - serialized_end=1891, + serialized_start=2033, + serialized_end=2099, ) -_CLIENTMESSAGE_EVALUATERES = _descriptor.Descriptor( - name='EvaluateRes', - full_name='flwr.proto.ClientMessage.EvaluateRes', +_CLIENTMESSAGE_FITRES = _descriptor.Descriptor( + name='FitRes', + full_name='flwr.proto.ClientMessage.FitRes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='num_examples', full_name='flwr.proto.ClientMessage.EvaluateRes.num_examples', index=0, - number=1, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, + name='parameters', full_name='flwr.proto.ClientMessage.FitRes.parameters', index=0, + number=1, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='loss', full_name='flwr.proto.ClientMessage.EvaluateRes.loss', index=1, - number=2, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), + name='num_examples', full_name='flwr.proto.ClientMessage.FitRes.num_examples', index=1, + number=2, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='metrics', full_name='flwr.proto.ClientMessage.EvaluateRes.metrics', index=2, - number=4, type=11, cpp_type=10, label=3, + name='metrics', full_name='flwr.proto.ClientMessage.FitRes.metrics', index=2, + number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -779,7 +772,7 @@ ], extensions=[ ], - nested_types=[_CLIENTMESSAGE_EVALUATERES_METRICSENTRY, ], + nested_types=[_CLIENTMESSAGE_FITRES_METRICSENTRY, ], enum_types=[ ], serialized_options=None, @@ -788,27 +781,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1894, - serialized_end=2080, + serialized_start=1893, + serialized_end=2099, ) -_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY = _descriptor.Descriptor( - name='PropertiesEntry', - full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry', +_CLIENTMESSAGE_EVALUATERES_METRICSENTRY = _descriptor.Descriptor( + name='MetricsEntry', + full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry.key', index=0, + name='key', full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='value', full_name='flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry.value', index=1, + name='value', full_name='flwr.proto.ClientMessage.EvaluateRes.MetricsEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -826,28 +819,35 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2219, - serialized_end=2288, + serialized_start=2033, + serialized_end=2099, ) -_CLIENTMESSAGE_GETPROPERTIESRES = _descriptor.Descriptor( - name='GetPropertiesRes', - full_name='flwr.proto.ClientMessage.GetPropertiesRes', +_CLIENTMESSAGE_EVALUATERES = _descriptor.Descriptor( + name='EvaluateRes', + full_name='flwr.proto.ClientMessage.EvaluateRes', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='status', full_name='flwr.proto.ClientMessage.GetPropertiesRes.status', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + name='num_examples', full_name='flwr.proto.ClientMessage.EvaluateRes.num_examples', index=0, + number=1, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='properties', full_name='flwr.proto.ClientMessage.GetPropertiesRes.properties', index=1, - number=2, type=11, cpp_type=10, label=3, + name='loss', full_name='flwr.proto.ClientMessage.EvaluateRes.loss', index=1, + number=2, type=2, cpp_type=6, label=1, + has_default_value=False, default_value=float(0), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='metrics', full_name='flwr.proto.ClientMessage.EvaluateRes.metrics', index=2, + number=4, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, @@ -855,7 +855,7 @@ ], extensions=[ ], - nested_types=[_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY, ], + nested_types=[_CLIENTMESSAGE_EVALUATERES_METRICSENTRY, ], enum_types=[ ], serialized_options=None, @@ -864,7 +864,7 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2083, + serialized_start=2102, serialized_end=2288, ) @@ -884,28 +884,28 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='get_parameters_res', full_name='flwr.proto.ClientMessage.get_parameters_res', index=1, + name='get_properties_res', full_name='flwr.proto.ClientMessage.get_properties_res', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='fit_res', full_name='flwr.proto.ClientMessage.fit_res', index=2, + name='get_parameters_res', full_name='flwr.proto.ClientMessage.get_parameters_res', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='evaluate_res', full_name='flwr.proto.ClientMessage.evaluate_res', index=3, + name='fit_res', full_name='flwr.proto.ClientMessage.fit_res', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='get_properties_res', full_name='flwr.proto.ClientMessage.get_properties_res', index=4, + name='evaluate_res', full_name='flwr.proto.ClientMessage.evaluate_res', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -914,7 +914,7 @@ ], extensions=[ ], - nested_types=[_CLIENTMESSAGE_DISCONNECT, _CLIENTMESSAGE_GETPARAMETERSRES, _CLIENTMESSAGE_FITRES, _CLIENTMESSAGE_EVALUATERES, _CLIENTMESSAGE_GETPROPERTIESRES, ], + nested_types=[_CLIENTMESSAGE_DISCONNECT, _CLIENTMESSAGE_GETPROPERTIESRES, _CLIENTMESSAGE_GETPARAMETERSRES, _CLIENTMESSAGE_FITRES, _CLIENTMESSAGE_EVALUATERES, ], enum_types=[ ], serialized_options=None, @@ -999,6 +999,10 @@ _STATUS.fields_by_name['code'].enum_type = _CODE _SERVERMESSAGE_RECONNECT.containing_type = _SERVERMESSAGE +_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY.fields_by_name['value'].message_type = _SCALAR +_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY.containing_type = _SERVERMESSAGE_GETPROPERTIESINS +_SERVERMESSAGE_GETPROPERTIESINS.fields_by_name['config'].message_type = _SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY +_SERVERMESSAGE_GETPROPERTIESINS.containing_type = _SERVERMESSAGE _SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY.fields_by_name['value'].message_type = _SCALAR _SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY.containing_type = _SERVERMESSAGE_GETPARAMETERSINS _SERVERMESSAGE_GETPARAMETERSINS.fields_by_name['config'].message_type = _SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY @@ -1013,18 +1017,17 @@ _SERVERMESSAGE_EVALUATEINS.fields_by_name['parameters'].message_type = _PARAMETERS _SERVERMESSAGE_EVALUATEINS.fields_by_name['config'].message_type = _SERVERMESSAGE_EVALUATEINS_CONFIGENTRY _SERVERMESSAGE_EVALUATEINS.containing_type = _SERVERMESSAGE -_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY.fields_by_name['value'].message_type = _SCALAR -_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY.containing_type = _SERVERMESSAGE_GETPROPERTIESINS -_SERVERMESSAGE_GETPROPERTIESINS.fields_by_name['config'].message_type = _SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY -_SERVERMESSAGE_GETPROPERTIESINS.containing_type = _SERVERMESSAGE _SERVERMESSAGE.fields_by_name['reconnect'].message_type = _SERVERMESSAGE_RECONNECT +_SERVERMESSAGE.fields_by_name['get_properties_ins'].message_type = _SERVERMESSAGE_GETPROPERTIESINS _SERVERMESSAGE.fields_by_name['get_parameters_ins'].message_type = _SERVERMESSAGE_GETPARAMETERSINS _SERVERMESSAGE.fields_by_name['fit_ins'].message_type = _SERVERMESSAGE_FITINS _SERVERMESSAGE.fields_by_name['evaluate_ins'].message_type = _SERVERMESSAGE_EVALUATEINS -_SERVERMESSAGE.fields_by_name['get_properties_ins'].message_type = _SERVERMESSAGE_GETPROPERTIESINS _SERVERMESSAGE.oneofs_by_name['msg'].fields.append( _SERVERMESSAGE.fields_by_name['reconnect']) _SERVERMESSAGE.fields_by_name['reconnect'].containing_oneof = _SERVERMESSAGE.oneofs_by_name['msg'] +_SERVERMESSAGE.oneofs_by_name['msg'].fields.append( + _SERVERMESSAGE.fields_by_name['get_properties_ins']) +_SERVERMESSAGE.fields_by_name['get_properties_ins'].containing_oneof = _SERVERMESSAGE.oneofs_by_name['msg'] _SERVERMESSAGE.oneofs_by_name['msg'].fields.append( _SERVERMESSAGE.fields_by_name['get_parameters_ins']) _SERVERMESSAGE.fields_by_name['get_parameters_ins'].containing_oneof = _SERVERMESSAGE.oneofs_by_name['msg'] @@ -1034,11 +1037,13 @@ _SERVERMESSAGE.oneofs_by_name['msg'].fields.append( _SERVERMESSAGE.fields_by_name['evaluate_ins']) _SERVERMESSAGE.fields_by_name['evaluate_ins'].containing_oneof = _SERVERMESSAGE.oneofs_by_name['msg'] -_SERVERMESSAGE.oneofs_by_name['msg'].fields.append( - _SERVERMESSAGE.fields_by_name['get_properties_ins']) -_SERVERMESSAGE.fields_by_name['get_properties_ins'].containing_oneof = _SERVERMESSAGE.oneofs_by_name['msg'] _CLIENTMESSAGE_DISCONNECT.fields_by_name['reason'].enum_type = _REASON _CLIENTMESSAGE_DISCONNECT.containing_type = _CLIENTMESSAGE +_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY.fields_by_name['value'].message_type = _SCALAR +_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY.containing_type = _CLIENTMESSAGE_GETPROPERTIESRES +_CLIENTMESSAGE_GETPROPERTIESRES.fields_by_name['status'].message_type = _STATUS +_CLIENTMESSAGE_GETPROPERTIESRES.fields_by_name['properties'].message_type = _CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY +_CLIENTMESSAGE_GETPROPERTIESRES.containing_type = _CLIENTMESSAGE _CLIENTMESSAGE_GETPARAMETERSRES.fields_by_name['parameters'].message_type = _PARAMETERS _CLIENTMESSAGE_GETPARAMETERSRES.containing_type = _CLIENTMESSAGE _CLIENTMESSAGE_FITRES_METRICSENTRY.fields_by_name['value'].message_type = _SCALAR @@ -1050,19 +1055,17 @@ _CLIENTMESSAGE_EVALUATERES_METRICSENTRY.containing_type = _CLIENTMESSAGE_EVALUATERES _CLIENTMESSAGE_EVALUATERES.fields_by_name['metrics'].message_type = _CLIENTMESSAGE_EVALUATERES_METRICSENTRY _CLIENTMESSAGE_EVALUATERES.containing_type = _CLIENTMESSAGE -_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY.fields_by_name['value'].message_type = _SCALAR -_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY.containing_type = _CLIENTMESSAGE_GETPROPERTIESRES -_CLIENTMESSAGE_GETPROPERTIESRES.fields_by_name['status'].message_type = _STATUS -_CLIENTMESSAGE_GETPROPERTIESRES.fields_by_name['properties'].message_type = _CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY -_CLIENTMESSAGE_GETPROPERTIESRES.containing_type = _CLIENTMESSAGE _CLIENTMESSAGE.fields_by_name['disconnect'].message_type = _CLIENTMESSAGE_DISCONNECT +_CLIENTMESSAGE.fields_by_name['get_properties_res'].message_type = _CLIENTMESSAGE_GETPROPERTIESRES _CLIENTMESSAGE.fields_by_name['get_parameters_res'].message_type = _CLIENTMESSAGE_GETPARAMETERSRES _CLIENTMESSAGE.fields_by_name['fit_res'].message_type = _CLIENTMESSAGE_FITRES _CLIENTMESSAGE.fields_by_name['evaluate_res'].message_type = _CLIENTMESSAGE_EVALUATERES -_CLIENTMESSAGE.fields_by_name['get_properties_res'].message_type = _CLIENTMESSAGE_GETPROPERTIESRES _CLIENTMESSAGE.oneofs_by_name['msg'].fields.append( _CLIENTMESSAGE.fields_by_name['disconnect']) _CLIENTMESSAGE.fields_by_name['disconnect'].containing_oneof = _CLIENTMESSAGE.oneofs_by_name['msg'] +_CLIENTMESSAGE.oneofs_by_name['msg'].fields.append( + _CLIENTMESSAGE.fields_by_name['get_properties_res']) +_CLIENTMESSAGE.fields_by_name['get_properties_res'].containing_oneof = _CLIENTMESSAGE.oneofs_by_name['msg'] _CLIENTMESSAGE.oneofs_by_name['msg'].fields.append( _CLIENTMESSAGE.fields_by_name['get_parameters_res']) _CLIENTMESSAGE.fields_by_name['get_parameters_res'].containing_oneof = _CLIENTMESSAGE.oneofs_by_name['msg'] @@ -1072,9 +1075,6 @@ _CLIENTMESSAGE.oneofs_by_name['msg'].fields.append( _CLIENTMESSAGE.fields_by_name['evaluate_res']) _CLIENTMESSAGE.fields_by_name['evaluate_res'].containing_oneof = _CLIENTMESSAGE.oneofs_by_name['msg'] -_CLIENTMESSAGE.oneofs_by_name['msg'].fields.append( - _CLIENTMESSAGE.fields_by_name['get_properties_res']) -_CLIENTMESSAGE.fields_by_name['get_properties_res'].containing_oneof = _CLIENTMESSAGE.oneofs_by_name['msg'] _SCALAR.oneofs_by_name['scalar'].fields.append( _SCALAR.fields_by_name['double']) _SCALAR.fields_by_name['double'].containing_oneof = _SCALAR.oneofs_by_name['scalar'] @@ -1122,6 +1122,20 @@ }) , + 'GetPropertiesIns' : _reflection.GeneratedProtocolMessageType('GetPropertiesIns', (_message.Message,), { + + 'ConfigEntry' : _reflection.GeneratedProtocolMessageType('ConfigEntry', (_message.Message,), { + 'DESCRIPTOR' : _SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY, + '__module__' : 'flwr.proto.transport_pb2' + # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry) + }) + , + 'DESCRIPTOR' : _SERVERMESSAGE_GETPROPERTIESINS, + '__module__' : 'flwr.proto.transport_pb2' + # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage.GetPropertiesIns) + }) + , + 'GetParametersIns' : _reflection.GeneratedProtocolMessageType('GetParametersIns', (_message.Message,), { 'ConfigEntry' : _reflection.GeneratedProtocolMessageType('ConfigEntry', (_message.Message,), { @@ -1163,34 +1177,20 @@ # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage.EvaluateIns) }) , - - 'GetPropertiesIns' : _reflection.GeneratedProtocolMessageType('GetPropertiesIns', (_message.Message,), { - - 'ConfigEntry' : _reflection.GeneratedProtocolMessageType('ConfigEntry', (_message.Message,), { - 'DESCRIPTOR' : _SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY, - '__module__' : 'flwr.proto.transport_pb2' - # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage.GetPropertiesIns.ConfigEntry) - }) - , - 'DESCRIPTOR' : _SERVERMESSAGE_GETPROPERTIESINS, - '__module__' : 'flwr.proto.transport_pb2' - # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage.GetPropertiesIns) - }) - , 'DESCRIPTOR' : _SERVERMESSAGE, '__module__' : 'flwr.proto.transport_pb2' # @@protoc_insertion_point(class_scope:flwr.proto.ServerMessage) }) _sym_db.RegisterMessage(ServerMessage) _sym_db.RegisterMessage(ServerMessage.Reconnect) +_sym_db.RegisterMessage(ServerMessage.GetPropertiesIns) +_sym_db.RegisterMessage(ServerMessage.GetPropertiesIns.ConfigEntry) _sym_db.RegisterMessage(ServerMessage.GetParametersIns) _sym_db.RegisterMessage(ServerMessage.GetParametersIns.ConfigEntry) _sym_db.RegisterMessage(ServerMessage.FitIns) _sym_db.RegisterMessage(ServerMessage.FitIns.ConfigEntry) _sym_db.RegisterMessage(ServerMessage.EvaluateIns) _sym_db.RegisterMessage(ServerMessage.EvaluateIns.ConfigEntry) -_sym_db.RegisterMessage(ServerMessage.GetPropertiesIns) -_sym_db.RegisterMessage(ServerMessage.GetPropertiesIns.ConfigEntry) ClientMessage = _reflection.GeneratedProtocolMessageType('ClientMessage', (_message.Message,), { @@ -1201,6 +1201,20 @@ }) , + 'GetPropertiesRes' : _reflection.GeneratedProtocolMessageType('GetPropertiesRes', (_message.Message,), { + + 'PropertiesEntry' : _reflection.GeneratedProtocolMessageType('PropertiesEntry', (_message.Message,), { + 'DESCRIPTOR' : _CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY, + '__module__' : 'flwr.proto.transport_pb2' + # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry) + }) + , + 'DESCRIPTOR' : _CLIENTMESSAGE_GETPROPERTIESRES, + '__module__' : 'flwr.proto.transport_pb2' + # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage.GetPropertiesRes) + }) + , + 'GetParametersRes' : _reflection.GeneratedProtocolMessageType('GetParametersRes', (_message.Message,), { 'DESCRIPTOR' : _CLIENTMESSAGE_GETPARAMETERSRES, '__module__' : 'flwr.proto.transport_pb2' @@ -1235,33 +1249,19 @@ # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage.EvaluateRes) }) , - - 'GetPropertiesRes' : _reflection.GeneratedProtocolMessageType('GetPropertiesRes', (_message.Message,), { - - 'PropertiesEntry' : _reflection.GeneratedProtocolMessageType('PropertiesEntry', (_message.Message,), { - 'DESCRIPTOR' : _CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY, - '__module__' : 'flwr.proto.transport_pb2' - # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage.GetPropertiesRes.PropertiesEntry) - }) - , - 'DESCRIPTOR' : _CLIENTMESSAGE_GETPROPERTIESRES, - '__module__' : 'flwr.proto.transport_pb2' - # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage.GetPropertiesRes) - }) - , 'DESCRIPTOR' : _CLIENTMESSAGE, '__module__' : 'flwr.proto.transport_pb2' # @@protoc_insertion_point(class_scope:flwr.proto.ClientMessage) }) _sym_db.RegisterMessage(ClientMessage) _sym_db.RegisterMessage(ClientMessage.Disconnect) +_sym_db.RegisterMessage(ClientMessage.GetPropertiesRes) +_sym_db.RegisterMessage(ClientMessage.GetPropertiesRes.PropertiesEntry) _sym_db.RegisterMessage(ClientMessage.GetParametersRes) _sym_db.RegisterMessage(ClientMessage.FitRes) _sym_db.RegisterMessage(ClientMessage.FitRes.MetricsEntry) _sym_db.RegisterMessage(ClientMessage.EvaluateRes) _sym_db.RegisterMessage(ClientMessage.EvaluateRes.MetricsEntry) -_sym_db.RegisterMessage(ClientMessage.GetPropertiesRes) -_sym_db.RegisterMessage(ClientMessage.GetPropertiesRes.PropertiesEntry) Scalar = _reflection.GeneratedProtocolMessageType('Scalar', (_message.Message,), { 'DESCRIPTOR' : _SCALAR, @@ -1271,13 +1271,13 @@ _sym_db.RegisterMessage(Scalar) +_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY._options = None _SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY._options = None _SERVERMESSAGE_FITINS_CONFIGENTRY._options = None _SERVERMESSAGE_EVALUATEINS_CONFIGENTRY._options = None -_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY._options = None +_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY._options = None _CLIENTMESSAGE_FITRES_METRICSENTRY._options = None _CLIENTMESSAGE_EVALUATERES_METRICSENTRY._options = None -_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY._options = None _FLOWERSERVICE = _descriptor.ServiceDescriptor( name='FlowerService', diff --git a/src/py/flwr/proto/transport_pb2.pyi b/src/py/flwr/proto/transport_pb2.pyi index 5e47a84e9efe..deeb8fae9a69 100644 --- a/src/py/flwr/proto/transport_pb2.pyi +++ b/src/py/flwr/proto/transport_pb2.pyi @@ -18,16 +18,16 @@ class _Code: class _CodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Code.ValueType], builtins.type): DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor OK: _Code.ValueType # 0 - GET_PARAMETERS_NOT_IMPLEMENTED: _Code.ValueType # 1 -clasGET_PROPERTIES_NOT_IMPLEMENTEDnumTypeWrapper): + GET_PROPERTIES_NOT_IMPLEMENTED: _Code.ValueType # 1 +class Code(_Code, metaclass=_CodeEnumTypeWrapper): pass OK: Code.ValueType # 0 -GET_PARAMETERS_NOT_IMPLEMENTED: Code.ValueType # 1 +GET_PROPERTIES_NOT_IMPLEMENTED: Code.ValueType # 1 global___Code = Code -GET_PROPERTIES_NOT_IMPLEMENTED +class _Reason: ValueType = typing.NewType('ValueType', builtins.int) V: typing_extensions.TypeAlias = ValueType class _ReasonEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Reason.ValueType], builtins.type): @@ -89,7 +89,7 @@ class ServerMessage(google.protobuf.message.Message): ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal["seconds",b"seconds"]) -> None: ... - class GetParametersIns(google.protobuf.message.Message): + class GetPropertiesIns(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor class ConfigEntry(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -115,7 +115,7 @@ class ServerMessage(google.protobuf.message.Message): ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal["config",b"config"]) -> None: ... - class FitIns(google.protobuf.message.Message): + class GetParametersIns(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor class ConfigEntry(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -132,21 +132,16 @@ class ServerMessage(google.protobuf.message.Message): def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ... def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ... - PARAMETERS_FIELD_NUMBER: builtins.int CONFIG_FIELD_NUMBER: builtins.int @property - def parameters(self) -> global___Parameters: ... - @property def config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, global___Scalar]: ... def __init__(self, *, - parameters: typing.Optional[global___Parameters] = ..., config: typing.Optional[typing.Mapping[typing.Text, global___Scalar]] = ..., ) -> None: ... - def HasField(self, field_name: typing_extensions.Literal["parameters",b"parameters"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal["config",b"config","parameters",b"parameters"]) -> None: ... + def ClearField(self, field_name: typing_extensions.Literal["config",b"config"]) -> None: ... - class EvaluateIns(google.protobuf.message.Message): + class FitIns(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor class ConfigEntry(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -177,7 +172,7 @@ class ServerMessage(google.protobuf.message.Message): def HasField(self, field_name: typing_extensions.Literal["parameters",b"parameters"]) -> builtins.bool: ... def ClearField(self, field_name: typing_extensions.Literal["config",b"config","parameters",b"parameters"]) -> None: ... - class GetPropertiesIns(google.protobuf.message.Message): + class EvaluateIns(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor class ConfigEntry(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor @@ -194,41 +189,46 @@ class ServerMessage(google.protobuf.message.Message): def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ... def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ... + PARAMETERS_FIELD_NUMBER: builtins.int CONFIG_FIELD_NUMBER: builtins.int @property + def parameters(self) -> global___Parameters: ... + @property def config(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, global___Scalar]: ... def __init__(self, *, + parameters: typing.Optional[global___Parameters] = ..., config: typing.Optional[typing.Mapping[typing.Text, global___Scalar]] = ..., ) -> None: ... - def ClearField(self, field_name: typing_extensions.Literal["config",b"config"]) -> None: ... + def HasField(self, field_name: typing_extensions.Literal["parameters",b"parameters"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal["config",b"config","parameters",b"parameters"]) -> None: ... RECONNECT_FIELD_NUMBER: builtins.int + GET_PROPERTIES_INS_FIELD_NUMBER: builtins.int GET_PARAMETERS_INS_FIELD_NUMBER: builtins.int FIT_INS_FIELD_NUMBER: builtins.int EVALUATE_INS_FIELD_NUMBER: builtins.int - GET_PROPERTIES_INS_FIELD_NUMBER: builtins.int @property def reconnect(self) -> global___ServerMessage.Reconnect: ... @property + def get_properties_ins(self) -> global___ServerMessage.GetPropertiesIns: ... + @property def get_parameters_ins(self) -> global___ServerMessage.GetParametersIns: ... @property def fit_ins(self) -> global___ServerMessage.FitIns: ... @property def evaluate_ins(self) -> global___ServerMessage.EvaluateIns: ... - @property - def get_properties_ins(self) -> global___ServerMessage.GetPropertiesIns: ... def __init__(self, *, reconnect: typing.Optional[global___ServerMessage.Reconnect] = ..., + get_properties_ins: typing.Optional[global___ServerMessage.GetPropertiesIns] = ..., get_parameters_ins: typing.Optional[global___ServerMessage.GetParametersIns] = ..., fit_ins: typing.Optional[global___ServerMessage.FitIns] = ..., evaluate_ins: typing.Optional[global___ServerMessage.EvaluateIns] = ..., - get_properties_ins: typing.Optional[global___ServerMessage.GetPropertiesIns] = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal["evaluate_ins",b"evaluate_ins","fit_ins",b"fit_ins","get_parameters_ins",b"get_parameters_ins","get_properties_ins",b"get_properties_ins","msg",b"msg","reconnect",b"reconnect"]) -> builtins.bool: ... def ClearField(self, field_name: typing_extensions.Literal["evaluate_ins",b"evaluate_ins","fit_ins",b"fit_ins","get_parameters_ins",b"get_parameters_ins","get_properties_ins",b"get_properties_ins","msg",b"msg","reconnect",b"reconnect"]) -> None: ... - def WhichOneof(self, oneof_group: typing_extensions.Literal["msg",b"msg"]) -> typing.Optional[typing_extensions.Literal["reconnect","get_parameters_ins","fit_ins","evaluate_ins","get_properties_ins"]]: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal["msg",b"msg"]) -> typing.Optional[typing_extensions.Literal["reconnect","get_properties_ins","get_parameters_ins","fit_ins","evaluate_ins"]]: ... global___ServerMessage = ServerMessage class ClientMessage(google.protobuf.message.Message): @@ -243,6 +243,37 @@ class ClientMessage(google.protobuf.message.Message): ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal["reason",b"reason"]) -> None: ... + class GetPropertiesRes(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + class PropertiesEntry(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + KEY_FIELD_NUMBER: builtins.int + VALUE_FIELD_NUMBER: builtins.int + key: typing.Text + @property + def value(self) -> global___Scalar: ... + def __init__(self, + *, + key: typing.Text = ..., + value: typing.Optional[global___Scalar] = ..., + ) -> None: ... + def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ... + + STATUS_FIELD_NUMBER: builtins.int + PROPERTIES_FIELD_NUMBER: builtins.int + @property + def status(self) -> global___Status: ... + @property + def properties(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, global___Scalar]: ... + def __init__(self, + *, + status: typing.Optional[global___Status] = ..., + properties: typing.Optional[typing.Mapping[typing.Text, global___Scalar]] = ..., + ) -> None: ... + def HasField(self, field_name: typing_extensions.Literal["status",b"status"]) -> builtins.bool: ... + def ClearField(self, field_name: typing_extensions.Literal["properties",b"properties","status",b"status"]) -> None: ... + class GetParametersRes(google.protobuf.message.Message): DESCRIPTOR: google.protobuf.descriptor.Descriptor PARAMETERS_FIELD_NUMBER: builtins.int @@ -321,63 +352,32 @@ class ClientMessage(google.protobuf.message.Message): ) -> None: ... def ClearField(self, field_name: typing_extensions.Literal["loss",b"loss","metrics",b"metrics","num_examples",b"num_examples"]) -> None: ... - class GetPropertiesRes(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - class PropertiesEntry(google.protobuf.message.Message): - DESCRIPTOR: google.protobuf.descriptor.Descriptor - KEY_FIELD_NUMBER: builtins.int - VALUE_FIELD_NUMBER: builtins.int - key: typing.Text - @property - def value(self) -> global___Scalar: ... - def __init__(self, - *, - key: typing.Text = ..., - value: typing.Optional[global___Scalar] = ..., - ) -> None: ... - def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ... - - STATUS_FIELD_NUMBER: builtins.int - PROPERTIES_FIELD_NUMBER: builtins.int - @property - def status(self) -> global___Status: ... - @property - def properties(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, global___Scalar]: ... - def __init__(self, - *, - status: typing.Optional[global___Status] = ..., - properties: typing.Optional[typing.Mapping[typing.Text, global___Scalar]] = ..., - ) -> None: ... - def HasField(self, field_name: typing_extensions.Literal["status",b"status"]) -> builtins.bool: ... - def ClearField(self, field_name: typing_extensions.Literal["properties",b"properties","status",b"status"]) -> None: ... - DISCONNECT_FIELD_NUMBER: builtins.int + GET_PROPERTIES_RES_FIELD_NUMBER: builtins.int GET_PARAMETERS_RES_FIELD_NUMBER: builtins.int FIT_RES_FIELD_NUMBER: builtins.int EVALUATE_RES_FIELD_NUMBER: builtins.int - GET_PROPERTIES_RES_FIELD_NUMBER: builtins.int @property def disconnect(self) -> global___ClientMessage.Disconnect: ... @property + def get_properties_res(self) -> global___ClientMessage.GetPropertiesRes: ... + @property def get_parameters_res(self) -> global___ClientMessage.GetParametersRes: ... @property def fit_res(self) -> global___ClientMessage.FitRes: ... @property def evaluate_res(self) -> global___ClientMessage.EvaluateRes: ... - @property - def get_properties_res(self) -> global___ClientMessage.GetPropertiesRes: ... def __init__(self, *, disconnect: typing.Optional[global___ClientMessage.Disconnect] = ..., + get_properties_res: typing.Optional[global___ClientMessage.GetPropertiesRes] = ..., get_parameters_res: typing.Optional[global___ClientMessage.GetParametersRes] = ..., fit_res: typing.Optional[global___ClientMessage.FitRes] = ..., evaluate_res: typing.Optional[global___ClientMessage.EvaluateRes] = ..., - get_properties_res: typing.Optional[global___ClientMessage.GetPropertiesRes] = ..., ) -> None: ... def HasField(self, field_name: typing_extensions.Literal["disconnect",b"disconnect","evaluate_res",b"evaluate_res","fit_res",b"fit_res","get_parameters_res",b"get_parameters_res","get_properties_res",b"get_properties_res","msg",b"msg"]) -> builtins.bool: ... def ClearField(self, field_name: typing_extensions.Literal["disconnect",b"disconnect","evaluate_res",b"evaluate_res","fit_res",b"fit_res","get_parameters_res",b"get_parameters_res","get_properties_res",b"get_properties_res","msg",b"msg"]) -> None: ... - def WhichOneof(self, oneof_group: typing_extensions.Literal["msg",b"msg"]) -> typing.Optional[typing_extensions.Literal["disconnect","get_parameters_res","fit_res","evaluate_res","get_properties_res"]]: ... + def WhichOneof(self, oneof_group: typing_extensions.Literal["msg",b"msg"]) -> typing.Optional[typing_extensions.Literal["disconnect","get_properties_res","get_parameters_res","fit_res","evaluate_res"]]: ... global___ClientMessage = ClientMessage class Scalar(google.protobuf.message.Message):