From 69d73ae56f3edb929899d6e43b12b6570e9343ee Mon Sep 17 00:00:00 2001 From: "Daniel J. Beutel" Date: Sat, 18 Jan 2025 19:28:06 +0100 Subject: [PATCH] fix(framework:skip) Bump gRPC-related dependencies (#4836) --- pyproject.toml | 6 +- src/py/flwr/proto/clientappio_pb2.py | 16 +- src/py/flwr/proto/clientappio_pb2_grpc.py | 75 +++++-- src/py/flwr/proto/error_pb2.py | 16 +- src/py/flwr/proto/error_pb2_grpc.py | 20 ++ src/py/flwr/proto/exec_pb2.py | 20 +- src/py/flwr/proto/exec_pb2_grpc.py | 129 +++++++++--- src/py/flwr/proto/fab_pb2.py | 16 +- src/py/flwr/proto/fab_pb2_grpc.py | 20 ++ src/py/flwr/proto/fleet_pb2.py | 20 +- src/py/flwr/proto/fleet_pb2_grpc.py | 183 +++++++++++++---- src/py/flwr/proto/grpcadapter_pb2.py | 18 +- src/py/flwr/proto/grpcadapter_pb2_grpc.py | 39 +++- src/py/flwr/proto/log_pb2.py | 16 +- src/py/flwr/proto/log_pb2_grpc.py | 20 ++ src/py/flwr/proto/message_pb2.py | 20 +- src/py/flwr/proto/message_pb2_grpc.py | 20 ++ src/py/flwr/proto/node_pb2.py | 16 +- src/py/flwr/proto/node_pb2_grpc.py | 20 ++ src/py/flwr/proto/recordset_pb2.py | 26 ++- src/py/flwr/proto/recordset_pb2_grpc.py | 20 ++ src/py/flwr/proto/run_pb2.py | 22 ++- src/py/flwr/proto/run_pb2_grpc.py | 20 ++ src/py/flwr/proto/serverappio_pb2.py | 16 +- src/py/flwr/proto/serverappio_pb2_grpc.py | 219 ++++++++++++++++----- src/py/flwr/proto/simulationio_pb2.py | 16 +- src/py/flwr/proto/simulationio_pb2_grpc.py | 129 +++++++++--- src/py/flwr/proto/task_pb2.py | 16 +- src/py/flwr/proto/task_pb2_grpc.py | 20 ++ src/py/flwr/proto/transport_pb2.py | 30 ++- src/py/flwr/proto/transport_pb2_grpc.py | 39 +++- 31 files changed, 1045 insertions(+), 218 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 59a77520c512..2fa229e2be70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -69,7 +69,7 @@ python = "^3.9" # Mandatory dependencies numpy = ">=1.26.0,<3.0.0" grpcio = "^1.69.0" -protobuf = "^4.25.2" +protobuf = "^5.29.3" cryptography = "^43.0.1" pycryptodome = "^3.18.0" iterators = "^0.0.2" @@ -92,7 +92,7 @@ rest = ["starlette", "uvicorn"] [tool.poetry.group.dev.dependencies] types-dataclasses = "==0.6.6" -types-protobuf = "==3.19.18" +types-protobuf = "==5.29.1.20241207" types-requests = "==2.31.0.20240125" types-setuptools = "==69.0.0.20240125" clang-format = "==17.0.6" @@ -107,7 +107,7 @@ parameterized = "==0.9.0" pytest = "==7.4.4" pytest-cov = "==4.1.0" pytest-watcher = "==0.4.3" -grpcio-tools = "==1.60.0" +grpcio-tools = "==1.69.0" mypy-protobuf = "==3.2.0" jupyterlab = "==4.0.12" rope = "==1.13.0" diff --git a/src/py/flwr/proto/clientappio_pb2.py b/src/py/flwr/proto/clientappio_pb2.py index 3fdc9f8a6ece..75ce8a32d931 100644 --- a/src/py/flwr/proto/clientappio_pb2.py +++ b/src/py/flwr/proto/clientappio_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/clientappio.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/clientappio.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -22,8 +32,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.clientappio_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=675 _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=751 _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_start=114 diff --git a/src/py/flwr/proto/clientappio_pb2_grpc.py b/src/py/flwr/proto/clientappio_pb2_grpc.py index 653d49fc1ead..de8ef1297929 100644 --- a/src/py/flwr/proto/clientappio_pb2_grpc.py +++ b/src/py/flwr/proto/clientappio_pb2_grpc.py @@ -1,9 +1,29 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import clientappio_pb2 as flwr_dot_proto_dot_clientappio__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/clientappio_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class ClientAppIoStub(object): """Missing associated documentation comment in .proto file.""" @@ -18,17 +38,17 @@ def __init__(self, channel): '/flwr.proto.ClientAppIo/GetToken', request_serializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString, - ) + _registered_method=True) self.PullClientAppInputs = channel.unary_unary( '/flwr.proto.ClientAppIo/PullClientAppInputs', request_serializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsResponse.FromString, - ) + _registered_method=True) self.PushClientAppOutputs = channel.unary_unary( '/flwr.proto.ClientAppIo/PushClientAppOutputs', request_serializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.FromString, - ) + _registered_method=True) class ClientAppIoServicer(object): @@ -77,6 +97,7 @@ def add_ClientAppIoServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.ClientAppIo', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.ClientAppIo', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -94,11 +115,21 @@ def GetToken(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/GetToken', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ClientAppIo/GetToken', flwr_dot_proto_dot_clientappio__pb2.GetTokenRequest.SerializeToString, flwr_dot_proto_dot_clientappio__pb2.GetTokenResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PullClientAppInputs(request, @@ -111,11 +142,21 @@ def PullClientAppInputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PullClientAppInputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ClientAppIo/PullClientAppInputs', flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.SerializeToString, flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushClientAppOutputs(request, @@ -128,8 +169,18 @@ def PushClientAppOutputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PushClientAppOutputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ClientAppIo/PushClientAppOutputs', flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsRequest.SerializeToString, flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/error_pb2.py b/src/py/flwr/proto/error_pb2.py index 41721ae08804..bddfcb622f5d 100644 --- a/src/py/flwr/proto/error_pb2.py +++ b/src/py/flwr/proto/error_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/error.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/error.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,8 +29,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.error_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_ERROR']._serialized_start=38 _globals['_ERROR']._serialized_end=75 # @@protoc_insertion_point(module_scope) diff --git a/src/py/flwr/proto/error_pb2_grpc.py b/src/py/flwr/proto/error_pb2_grpc.py index 2daafffebfc8..d8c8502ce857 100644 --- a/src/py/flwr/proto/error_pb2_grpc.py +++ b/src/py/flwr/proto/error_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/error_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/exec_pb2.py b/src/py/flwr/proto/exec_pb2.py index 1e4bcc498d39..59af79699113 100644 --- a/src/py/flwr/proto/exec_pb2.py +++ b/src/py/flwr/proto/exec_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/exec.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/exec.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -23,11 +33,11 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.exec_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._loaded_options = None _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001' - _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._options = None + _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._loaded_options = None _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_options = b'8\001' _globals['_STARTRUNREQUEST']._serialized_start=138 _globals['_STARTRUNREQUEST']._serialized_end=389 diff --git a/src/py/flwr/proto/exec_pb2_grpc.py b/src/py/flwr/proto/exec_pb2_grpc.py index d3b670206520..553b1ea5b20e 100644 --- a/src/py/flwr/proto/exec_pb2_grpc.py +++ b/src/py/flwr/proto/exec_pb2_grpc.py @@ -1,9 +1,29 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import exec_pb2 as flwr_dot_proto_dot_exec__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/exec_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class ExecStub(object): """Missing associated documentation comment in .proto file.""" @@ -18,32 +38,32 @@ def __init__(self, channel): '/flwr.proto.Exec/StartRun', request_serializer=flwr_dot_proto_dot_exec__pb2.StartRunRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.StartRunResponse.FromString, - ) + _registered_method=True) self.StopRun = channel.unary_unary( '/flwr.proto.Exec/StopRun', request_serializer=flwr_dot_proto_dot_exec__pb2.StopRunRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.StopRunResponse.FromString, - ) + _registered_method=True) self.StreamLogs = channel.unary_stream( '/flwr.proto.Exec/StreamLogs', request_serializer=flwr_dot_proto_dot_exec__pb2.StreamLogsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.StreamLogsResponse.FromString, - ) + _registered_method=True) self.ListRuns = channel.unary_unary( '/flwr.proto.Exec/ListRuns', request_serializer=flwr_dot_proto_dot_exec__pb2.ListRunsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.ListRunsResponse.FromString, - ) + _registered_method=True) self.GetLoginDetails = channel.unary_unary( '/flwr.proto.Exec/GetLoginDetails', request_serializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsResponse.FromString, - ) + _registered_method=True) self.GetAuthTokens = channel.unary_unary( '/flwr.proto.Exec/GetAuthTokens', request_serializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensResponse.FromString, - ) + _registered_method=True) class ExecServicer(object): @@ -128,6 +148,7 @@ def add_ExecServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.Exec', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.Exec', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -145,11 +166,21 @@ def StartRun(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/StartRun', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Exec/StartRun', flwr_dot_proto_dot_exec__pb2.StartRunRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.StartRunResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def StopRun(request, @@ -162,11 +193,21 @@ def StopRun(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/StopRun', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Exec/StopRun', flwr_dot_proto_dot_exec__pb2.StopRunRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.StopRunResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def StreamLogs(request, @@ -179,11 +220,21 @@ def StreamLogs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream(request, target, '/flwr.proto.Exec/StreamLogs', + return grpc.experimental.unary_stream( + request, + target, + '/flwr.proto.Exec/StreamLogs', flwr_dot_proto_dot_exec__pb2.StreamLogsRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.StreamLogsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def ListRuns(request, @@ -196,11 +247,21 @@ def ListRuns(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/ListRuns', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Exec/ListRuns', flwr_dot_proto_dot_exec__pb2.ListRunsRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.ListRunsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetLoginDetails(request, @@ -213,11 +274,21 @@ def GetLoginDetails(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/GetLoginDetails', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Exec/GetLoginDetails', flwr_dot_proto_dot_exec__pb2.GetLoginDetailsRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.GetLoginDetailsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetAuthTokens(request, @@ -230,8 +301,18 @@ def GetAuthTokens(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/GetAuthTokens', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Exec/GetAuthTokens', flwr_dot_proto_dot_exec__pb2.GetAuthTokensRequest.SerializeToString, flwr_dot_proto_dot_exec__pb2.GetAuthTokensResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/fab_pb2.py b/src/py/flwr/proto/fab_pb2.py index 1c79d624031a..84b6cb9b6f2b 100644 --- a/src/py/flwr/proto/fab_pb2.py +++ b/src/py/flwr/proto/fab_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/fab.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/fab.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -20,8 +30,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.fab_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_FAB']._serialized_start=59 _globals['_FAB']._serialized_end=99 _globals['_GETFABREQUEST']._serialized_start=101 diff --git a/src/py/flwr/proto/fab_pb2_grpc.py b/src/py/flwr/proto/fab_pb2_grpc.py index 2daafffebfc8..72698c8e85c4 100644 --- a/src/py/flwr/proto/fab_pb2_grpc.py +++ b/src/py/flwr/proto/fab_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/fab_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/fleet_pb2.py b/src/py/flwr/proto/fleet_pb2.py index a6a7ed501739..69b0e3a7b3c0 100644 --- a/src/py/flwr/proto/fleet_pb2.py +++ b/src/py/flwr/proto/fleet_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/fleet.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/fleet.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -24,11 +34,11 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.fleet_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._loaded_options = None _globals['_PUSHTASKRESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001' - _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._options = None + _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._loaded_options = None _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001' _globals['_CREATENODEREQUEST']._serialized_start=154 _globals['_CREATENODEREQUEST']._serialized_end=196 diff --git a/src/py/flwr/proto/fleet_pb2_grpc.py b/src/py/flwr/proto/fleet_pb2_grpc.py index 5a17d2f21c14..e4e00b4a33bf 100644 --- a/src/py/flwr/proto/fleet_pb2_grpc.py +++ b/src/py/flwr/proto/fleet_pb2_grpc.py @@ -1,11 +1,31 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2 from flwr.proto import fleet_pb2 as flwr_dot_proto_dot_fleet__pb2 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/fleet_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class FleetStub(object): """Missing associated documentation comment in .proto file.""" @@ -20,47 +40,47 @@ def __init__(self, channel): '/flwr.proto.Fleet/CreateNode', request_serializer=flwr_dot_proto_dot_fleet__pb2.CreateNodeRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.CreateNodeResponse.FromString, - ) + _registered_method=True) self.DeleteNode = channel.unary_unary( '/flwr.proto.Fleet/DeleteNode', request_serializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.DeleteNodeResponse.FromString, - ) + _registered_method=True) self.Ping = channel.unary_unary( '/flwr.proto.Fleet/Ping', request_serializer=flwr_dot_proto_dot_fleet__pb2.PingRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.PingResponse.FromString, - ) + _registered_method=True) self.PullTaskIns = channel.unary_unary( '/flwr.proto.Fleet/PullTaskIns', request_serializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.PullTaskInsResponse.FromString, - ) + _registered_method=True) self.PullMessages = channel.unary_unary( '/flwr.proto.Fleet/PullMessages', request_serializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.PullMessagesResponse.FromString, - ) + _registered_method=True) self.PushTaskRes = channel.unary_unary( '/flwr.proto.Fleet/PushTaskRes', request_serializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.PushTaskResResponse.FromString, - ) + _registered_method=True) self.PushMessages = channel.unary_unary( '/flwr.proto.Fleet/PushMessages', request_serializer=flwr_dot_proto_dot_fleet__pb2.PushMessagesRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fleet__pb2.PushMessagesResponse.FromString, - ) + _registered_method=True) self.GetRun = channel.unary_unary( '/flwr.proto.Fleet/GetRun', request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString, - ) + _registered_method=True) self.GetFab = channel.unary_unary( '/flwr.proto.Fleet/GetFab', request_serializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString, - ) + _registered_method=True) class FleetServicer(object): @@ -181,6 +201,7 @@ def add_FleetServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.Fleet', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.Fleet', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -198,11 +219,21 @@ def CreateNode(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/CreateNode', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/CreateNode', flwr_dot_proto_dot_fleet__pb2.CreateNodeRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.CreateNodeResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def DeleteNode(request, @@ -215,11 +246,21 @@ def DeleteNode(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/DeleteNode', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/DeleteNode', flwr_dot_proto_dot_fleet__pb2.DeleteNodeRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.DeleteNodeResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def Ping(request, @@ -232,11 +273,21 @@ def Ping(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/Ping', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/Ping', flwr_dot_proto_dot_fleet__pb2.PingRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.PingResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PullTaskIns(request, @@ -249,11 +300,21 @@ def PullTaskIns(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/PullTaskIns', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/PullTaskIns', flwr_dot_proto_dot_fleet__pb2.PullTaskInsRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.PullTaskInsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PullMessages(request, @@ -266,11 +327,21 @@ def PullMessages(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/PullMessages', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/PullMessages', flwr_dot_proto_dot_fleet__pb2.PullMessagesRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.PullMessagesResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushTaskRes(request, @@ -283,11 +354,21 @@ def PushTaskRes(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/PushTaskRes', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/PushTaskRes', flwr_dot_proto_dot_fleet__pb2.PushTaskResRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.PushTaskResResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushMessages(request, @@ -300,11 +381,21 @@ def PushMessages(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/PushMessages', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/PushMessages', flwr_dot_proto_dot_fleet__pb2.PushMessagesRequest.SerializeToString, flwr_dot_proto_dot_fleet__pb2.PushMessagesResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetRun(request, @@ -317,11 +408,21 @@ def GetRun(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/GetRun', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/GetRun', flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetFab(request, @@ -334,8 +435,18 @@ def GetFab(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.Fleet/GetFab', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.Fleet/GetFab', flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString, flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/grpcadapter_pb2.py b/src/py/flwr/proto/grpcadapter_pb2.py index 2eff4bb78e47..9f2dd31486d3 100644 --- a/src/py/flwr/proto/grpcadapter_pb2.py +++ b/src/py/flwr/proto/grpcadapter_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/grpcadapter.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/grpcadapter.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,9 +29,9 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.grpcadapter_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_MESSAGECONTAINER_METADATAENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_MESSAGECONTAINER_METADATAENTRY']._loaded_options = None _globals['_MESSAGECONTAINER_METADATAENTRY']._serialized_options = b'8\001' _globals['_MESSAGECONTAINER']._serialized_start=45 _globals['_MESSAGECONTAINER']._serialized_end=231 diff --git a/src/py/flwr/proto/grpcadapter_pb2_grpc.py b/src/py/flwr/proto/grpcadapter_pb2_grpc.py index 831f99d7b237..4e3f38cda0dd 100644 --- a/src/py/flwr/proto/grpcadapter_pb2_grpc.py +++ b/src/py/flwr/proto/grpcadapter_pb2_grpc.py @@ -1,9 +1,29 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import grpcadapter_pb2 as flwr_dot_proto_dot_grpcadapter__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/grpcadapter_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class GrpcAdapterStub(object): """Missing associated documentation comment in .proto file.""" @@ -18,7 +38,7 @@ def __init__(self, channel): '/flwr.proto.GrpcAdapter/SendReceive', request_serializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.SerializeToString, response_deserializer=flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.FromString, - ) + _registered_method=True) class GrpcAdapterServicer(object): @@ -42,6 +62,7 @@ def add_GrpcAdapterServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.GrpcAdapter', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.GrpcAdapter', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -59,8 +80,18 @@ def SendReceive(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.GrpcAdapter/SendReceive', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.GrpcAdapter/SendReceive', flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.SerializeToString, flwr_dot_proto_dot_grpcadapter__pb2.MessageContainer.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/log_pb2.py b/src/py/flwr/proto/log_pb2.py index 99aaf26f2217..96af43493cc6 100644 --- a/src/py/flwr/proto/log_pb2.py +++ b/src/py/flwr/proto/log_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/log.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/log.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -20,8 +30,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.log_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_PUSHLOGSREQUEST']._serialized_start=59 _globals['_PUSHLOGSREQUEST']._serialized_end=138 _globals['_PUSHLOGSRESPONSE']._serialized_start=140 diff --git a/src/py/flwr/proto/log_pb2_grpc.py b/src/py/flwr/proto/log_pb2_grpc.py index 2daafffebfc8..8f2b25f9a1ec 100644 --- a/src/py/flwr/proto/log_pb2_grpc.py +++ b/src/py/flwr/proto/log_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/log_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/message_pb2.py b/src/py/flwr/proto/message_pb2.py index 92e37d3b7ed4..7fa6b581cc20 100644 --- a/src/py/flwr/proto/message_pb2.py +++ b/src/py/flwr/proto/message_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/message.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/message.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -22,11 +32,11 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.message_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_CONTEXT_NODECONFIGENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_CONTEXT_NODECONFIGENTRY']._loaded_options = None _globals['_CONTEXT_NODECONFIGENTRY']._serialized_options = b'8\001' - _globals['_CONTEXT_RUNCONFIGENTRY']._options = None + _globals['_CONTEXT_RUNCONFIGENTRY']._loaded_options = None _globals['_CONTEXT_RUNCONFIGENTRY']._serialized_options = b'8\001' _globals['_MESSAGE']._serialized_start=120 _globals['_MESSAGE']._serialized_end=243 diff --git a/src/py/flwr/proto/message_pb2_grpc.py b/src/py/flwr/proto/message_pb2_grpc.py index 2daafffebfc8..c3e50141d32b 100644 --- a/src/py/flwr/proto/message_pb2_grpc.py +++ b/src/py/flwr/proto/message_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/message_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/node_pb2.py b/src/py/flwr/proto/node_pb2.py index 896f72b583c4..f249ca22a65f 100644 --- a/src/py/flwr/proto/node_pb2.py +++ b/src/py/flwr/proto/node_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/node.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/node.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,8 +29,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.node_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_NODE']._serialized_start=37 _globals['_NODE']._serialized_end=60 # @@protoc_insertion_point(module_scope) diff --git a/src/py/flwr/proto/node_pb2_grpc.py b/src/py/flwr/proto/node_pb2_grpc.py index 2daafffebfc8..f8220567c4b3 100644 --- a/src/py/flwr/proto/node_pb2_grpc.py +++ b/src/py/flwr/proto/node_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/node_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/recordset_pb2.py b/src/py/flwr/proto/recordset_pb2.py index 6b169f869ab4..990c17941453 100644 --- a/src/py/flwr/proto/recordset_pb2.py +++ b/src/py/flwr/proto/recordset_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/recordset.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/recordset.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,17 +29,17 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.recordset_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_METRICSRECORD_DATAENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_METRICSRECORD_DATAENTRY']._loaded_options = None _globals['_METRICSRECORD_DATAENTRY']._serialized_options = b'8\001' - _globals['_CONFIGSRECORD_DATAENTRY']._options = None + _globals['_CONFIGSRECORD_DATAENTRY']._loaded_options = None _globals['_CONFIGSRECORD_DATAENTRY']._serialized_options = b'8\001' - _globals['_RECORDSET_PARAMETERSENTRY']._options = None + _globals['_RECORDSET_PARAMETERSENTRY']._loaded_options = None _globals['_RECORDSET_PARAMETERSENTRY']._serialized_options = b'8\001' - _globals['_RECORDSET_METRICSENTRY']._options = None + _globals['_RECORDSET_METRICSENTRY']._loaded_options = None _globals['_RECORDSET_METRICSENTRY']._serialized_options = b'8\001' - _globals['_RECORDSET_CONFIGSENTRY']._options = None + _globals['_RECORDSET_CONFIGSENTRY']._loaded_options = None _globals['_RECORDSET_CONFIGSENTRY']._serialized_options = b'8\001' _globals['_DOUBLELIST']._serialized_start=42 _globals['_DOUBLELIST']._serialized_end=68 diff --git a/src/py/flwr/proto/recordset_pb2_grpc.py b/src/py/flwr/proto/recordset_pb2_grpc.py index 2daafffebfc8..15cf08a73d91 100644 --- a/src/py/flwr/proto/recordset_pb2_grpc.py +++ b/src/py/flwr/proto/recordset_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/recordset_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/run_pb2.py b/src/py/flwr/proto/run_pb2.py index a3aac417f9a9..26fde1ed865e 100644 --- a/src/py/flwr/proto/run_pb2.py +++ b/src/py/flwr/proto/run_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/run.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/run.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -23,13 +33,13 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.run_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_RUN_OVERRIDECONFIGENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_RUN_OVERRIDECONFIGENTRY']._loaded_options = None _globals['_RUN_OVERRIDECONFIGENTRY']._serialized_options = b'8\001' - _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._options = None + _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._loaded_options = None _globals['_CREATERUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001' - _globals['_GETRUNSTATUSRESPONSE_RUNSTATUSDICTENTRY']._options = None + _globals['_GETRUNSTATUSRESPONSE_RUNSTATUSDICTENTRY']._loaded_options = None _globals['_GETRUNSTATUSRESPONSE_RUNSTATUSDICTENTRY']._serialized_options = b'8\001' _globals['_RUN']._serialized_start=138 _globals['_RUN']._serialized_end=472 diff --git a/src/py/flwr/proto/run_pb2_grpc.py b/src/py/flwr/proto/run_pb2_grpc.py index 2daafffebfc8..2165cf80e43c 100644 --- a/src/py/flwr/proto/run_pb2_grpc.py +++ b/src/py/flwr/proto/run_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/run_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/serverappio_pb2.py b/src/py/flwr/proto/serverappio_pb2.py index f97d8362e8df..74b4d4286cdc 100644 --- a/src/py/flwr/proto/serverappio_pb2.py +++ b/src/py/flwr/proto/serverappio_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/serverappio.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/serverappio.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -25,8 +35,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.serverappio_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_GETNODESREQUEST']._serialized_start=182 _globals['_GETNODESREQUEST']._serialized_end=215 _globals['_GETNODESRESPONSE']._serialized_start=217 diff --git a/src/py/flwr/proto/serverappio_pb2_grpc.py b/src/py/flwr/proto/serverappio_pb2_grpc.py index ede888543883..30aa4f75dcab 100644 --- a/src/py/flwr/proto/serverappio_pb2_grpc.py +++ b/src/py/flwr/proto/serverappio_pb2_grpc.py @@ -1,12 +1,32 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2 from flwr.proto import log_pb2 as flwr_dot_proto_dot_log__pb2 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2 from flwr.proto import serverappio_pb2 as flwr_dot_proto_dot_serverappio__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/serverappio_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class ServerAppIoStub(object): """Missing associated documentation comment in .proto file.""" @@ -21,57 +41,57 @@ def __init__(self, channel): '/flwr.proto.ServerAppIo/CreateRun', request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString, - ) + _registered_method=True) self.GetNodes = channel.unary_unary( '/flwr.proto.ServerAppIo/GetNodes', request_serializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesResponse.FromString, - ) + _registered_method=True) self.PushTaskIns = channel.unary_unary( '/flwr.proto.ServerAppIo/PushTaskIns', request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.FromString, - ) + _registered_method=True) self.PullTaskRes = channel.unary_unary( '/flwr.proto.ServerAppIo/PullTaskRes', request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.FromString, - ) + _registered_method=True) self.GetRun = channel.unary_unary( '/flwr.proto.ServerAppIo/GetRun', request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString, - ) + _registered_method=True) self.GetFab = channel.unary_unary( '/flwr.proto.ServerAppIo/GetFab', request_serializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString, - ) + _registered_method=True) self.PullServerAppInputs = channel.unary_unary( '/flwr.proto.ServerAppIo/PullServerAppInputs', request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsResponse.FromString, - ) + _registered_method=True) self.PushServerAppOutputs = channel.unary_unary( '/flwr.proto.ServerAppIo/PushServerAppOutputs', request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsResponse.FromString, - ) + _registered_method=True) self.UpdateRunStatus = channel.unary_unary( '/flwr.proto.ServerAppIo/UpdateRunStatus', request_serializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString, - ) + _registered_method=True) self.GetRunStatus = channel.unary_unary( '/flwr.proto.ServerAppIo/GetRunStatus', request_serializer=flwr_dot_proto_dot_run__pb2.GetRunStatusRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunStatusResponse.FromString, - ) + _registered_method=True) self.PushLogs = channel.unary_unary( '/flwr.proto.ServerAppIo/PushLogs', request_serializer=flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString, - ) + _registered_method=True) class ServerAppIoServicer(object): @@ -216,6 +236,7 @@ def add_ServerAppIoServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.ServerAppIo', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.ServerAppIo', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -233,11 +254,21 @@ def CreateRun(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/CreateRun', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/CreateRun', flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetNodes(request, @@ -250,11 +281,21 @@ def GetNodes(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetNodes', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/GetNodes', flwr_dot_proto_dot_serverappio__pb2.GetNodesRequest.SerializeToString, flwr_dot_proto_dot_serverappio__pb2.GetNodesResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushTaskIns(request, @@ -267,11 +308,21 @@ def PushTaskIns(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushTaskIns', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/PushTaskIns', flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.SerializeToString, flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PullTaskRes(request, @@ -284,11 +335,21 @@ def PullTaskRes(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PullTaskRes', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/PullTaskRes', flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.SerializeToString, flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetRun(request, @@ -301,11 +362,21 @@ def GetRun(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetRun', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/GetRun', flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetFab(request, @@ -318,11 +389,21 @@ def GetFab(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetFab', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/GetFab', flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString, flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PullServerAppInputs(request, @@ -335,11 +416,21 @@ def PullServerAppInputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PullServerAppInputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/PullServerAppInputs', flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsRequest.SerializeToString, flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushServerAppOutputs(request, @@ -352,11 +443,21 @@ def PushServerAppOutputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushServerAppOutputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/PushServerAppOutputs', flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsRequest.SerializeToString, flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def UpdateRunStatus(request, @@ -369,11 +470,21 @@ def UpdateRunStatus(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/UpdateRunStatus', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/UpdateRunStatus', flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetRunStatus(request, @@ -386,11 +497,21 @@ def GetRunStatus(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetRunStatus', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/GetRunStatus', flwr_dot_proto_dot_run__pb2.GetRunStatusRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.GetRunStatusResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushLogs(request, @@ -403,8 +524,18 @@ def PushLogs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushLogs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.ServerAppIo/PushLogs', flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString, flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/simulationio_pb2.py b/src/py/flwr/proto/simulationio_pb2.py index 03d96ecaf597..e6c876cc2085 100644 --- a/src/py/flwr/proto/simulationio_pb2.py +++ b/src/py/flwr/proto/simulationio_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/simulationio.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/simulationio.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -23,8 +33,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.simulationio_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_PULLSIMULATIONINPUTSREQUEST']._serialized_start=137 _globals['_PULLSIMULATIONINPUTSREQUEST']._serialized_end=166 _globals['_PULLSIMULATIONINPUTSRESPONSE']._serialized_start=169 diff --git a/src/py/flwr/proto/simulationio_pb2_grpc.py b/src/py/flwr/proto/simulationio_pb2_grpc.py index f771bd818bf5..75857680d66e 100644 --- a/src/py/flwr/proto/simulationio_pb2_grpc.py +++ b/src/py/flwr/proto/simulationio_pb2_grpc.py @@ -1,11 +1,31 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import log_pb2 as flwr_dot_proto_dot_log__pb2 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2 from flwr.proto import simulationio_pb2 as flwr_dot_proto_dot_simulationio__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/simulationio_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class SimulationIoStub(object): """Missing associated documentation comment in .proto file.""" @@ -20,32 +40,32 @@ def __init__(self, channel): '/flwr.proto.SimulationIo/PullSimulationInputs', request_serializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsResponse.FromString, - ) + _registered_method=True) self.PushSimulationOutputs = channel.unary_unary( '/flwr.proto.SimulationIo/PushSimulationOutputs', request_serializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsResponse.FromString, - ) + _registered_method=True) self.UpdateRunStatus = channel.unary_unary( '/flwr.proto.SimulationIo/UpdateRunStatus', request_serializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString, - ) + _registered_method=True) self.PushLogs = channel.unary_unary( '/flwr.proto.SimulationIo/PushLogs', request_serializer=flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString, - ) + _registered_method=True) self.GetFederationOptions = channel.unary_unary( '/flwr.proto.SimulationIo/GetFederationOptions', request_serializer=flwr_dot_proto_dot_run__pb2.GetFederationOptionsRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.GetFederationOptionsResponse.FromString, - ) + _registered_method=True) self.GetRunStatus = channel.unary_unary( '/flwr.proto.SimulationIo/GetRunStatus', request_serializer=flwr_dot_proto_dot_run__pb2.GetRunStatusRequest.SerializeToString, response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunStatusResponse.FromString, - ) + _registered_method=True) class SimulationIoServicer(object): @@ -130,6 +150,7 @@ def add_SimulationIoServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.SimulationIo', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.SimulationIo', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -147,11 +168,21 @@ def PullSimulationInputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PullSimulationInputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/PullSimulationInputs', flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsRequest.SerializeToString, flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushSimulationOutputs(request, @@ -164,11 +195,21 @@ def PushSimulationOutputs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PushSimulationOutputs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/PushSimulationOutputs', flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsRequest.SerializeToString, flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def UpdateRunStatus(request, @@ -181,11 +222,21 @@ def UpdateRunStatus(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/UpdateRunStatus', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/UpdateRunStatus', flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def PushLogs(request, @@ -198,11 +249,21 @@ def PushLogs(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PushLogs', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/PushLogs', flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString, flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetFederationOptions(request, @@ -215,11 +276,21 @@ def GetFederationOptions(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/GetFederationOptions', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/GetFederationOptions', flwr_dot_proto_dot_run__pb2.GetFederationOptionsRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.GetFederationOptionsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetRunStatus(request, @@ -232,8 +303,18 @@ def GetRunStatus(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/GetRunStatus', + return grpc.experimental.unary_unary( + request, + target, + '/flwr.proto.SimulationIo/GetRunStatus', flwr_dot_proto_dot_run__pb2.GetRunStatusRequest.SerializeToString, flwr_dot_proto_dot_run__pb2.GetRunStatusResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/py/flwr/proto/task_pb2.py b/src/py/flwr/proto/task_pb2.py index 75b022dc65ea..666bebf0d4ad 100644 --- a/src/py/flwr/proto/task_pb2.py +++ b/src/py/flwr/proto/task_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/task.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/task.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -22,8 +32,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.task_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None _globals['_TASK']._serialized_start=113 _globals['_TASK']._serialized_end=378 _globals['_TASKINS']._serialized_start=380 diff --git a/src/py/flwr/proto/task_pb2_grpc.py b/src/py/flwr/proto/task_pb2_grpc.py index 2daafffebfc8..d2a34b33baec 100644 --- a/src/py/flwr/proto/task_pb2_grpc.py +++ b/src/py/flwr/proto/task_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/task_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/py/flwr/proto/transport_pb2.py b/src/py/flwr/proto/transport_pb2.py index b457463f99ca..e2f062facbe1 100644 --- a/src/py/flwr/proto/transport_pb2.py +++ b/src/py/flwr/proto/transport_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: flwr/proto/transport.proto -# Protobuf Python Version: 4.25.0 +# Protobuf Python Version: 5.29.0 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 5, + 29, + 0, + '', + 'flwr/proto/transport.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,21 +29,21 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.transport_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _globals['_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + DESCRIPTOR._loaded_options = None + _globals['_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY']._loaded_options = None _globals['_SERVERMESSAGE_GETPROPERTIESINS_CONFIGENTRY']._serialized_options = b'8\001' - _globals['_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY']._options = None + _globals['_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY']._loaded_options = None _globals['_SERVERMESSAGE_GETPARAMETERSINS_CONFIGENTRY']._serialized_options = b'8\001' - _globals['_SERVERMESSAGE_FITINS_CONFIGENTRY']._options = None + _globals['_SERVERMESSAGE_FITINS_CONFIGENTRY']._loaded_options = None _globals['_SERVERMESSAGE_FITINS_CONFIGENTRY']._serialized_options = b'8\001' - _globals['_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY']._options = None + _globals['_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY']._loaded_options = None _globals['_SERVERMESSAGE_EVALUATEINS_CONFIGENTRY']._serialized_options = b'8\001' - _globals['_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY']._options = None + _globals['_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY']._loaded_options = None _globals['_CLIENTMESSAGE_GETPROPERTIESRES_PROPERTIESENTRY']._serialized_options = b'8\001' - _globals['_CLIENTMESSAGE_FITRES_METRICSENTRY']._options = None + _globals['_CLIENTMESSAGE_FITRES_METRICSENTRY']._loaded_options = None _globals['_CLIENTMESSAGE_FITRES_METRICSENTRY']._serialized_options = b'8\001' - _globals['_CLIENTMESSAGE_EVALUATERES_METRICSENTRY']._options = None + _globals['_CLIENTMESSAGE_EVALUATERES_METRICSENTRY']._loaded_options = None _globals['_CLIENTMESSAGE_EVALUATERES_METRICSENTRY']._serialized_options = b'8\001' _globals['_CODE']._serialized_start=2551 _globals['_CODE']._serialized_end=2692 diff --git a/src/py/flwr/proto/transport_pb2_grpc.py b/src/py/flwr/proto/transport_pb2_grpc.py index 05f47fefddea..8b0b264e7952 100644 --- a/src/py/flwr/proto/transport_pb2_grpc.py +++ b/src/py/flwr/proto/transport_pb2_grpc.py @@ -1,9 +1,29 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2 +GRPC_GENERATED_VERSION = '1.69.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + f' but the generated code in flwr/proto/transport_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class FlowerServiceStub(object): """Missing associated documentation comment in .proto file.""" @@ -18,7 +38,7 @@ def __init__(self, channel): '/flwr.proto.FlowerService/Join', request_serializer=flwr_dot_proto_dot_transport__pb2.ClientMessage.SerializeToString, response_deserializer=flwr_dot_proto_dot_transport__pb2.ServerMessage.FromString, - ) + _registered_method=True) class FlowerServiceServicer(object): @@ -42,6 +62,7 @@ def add_FlowerServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'flwr.proto.FlowerService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('flwr.proto.FlowerService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -59,8 +80,18 @@ def Join(request_iterator, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.stream_stream(request_iterator, target, '/flwr.proto.FlowerService/Join', + return grpc.experimental.stream_stream( + request_iterator, + target, + '/flwr.proto.FlowerService/Join', flwr_dot_proto_dot_transport__pb2.ClientMessage.SerializeToString, flwr_dot_proto_dot_transport__pb2.ServerMessage.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True)