diff --git a/fedn/fedn/network/combiner/aggregators/aggregatorbase.py b/fedn/fedn/network/combiner/aggregators/aggregatorbase.py index e7cd38402..5cbfea846 100644 --- a/fedn/fedn/network/combiner/aggregators/aggregatorbase.py +++ b/fedn/fedn/network/combiner/aggregators/aggregatorbase.py @@ -116,11 +116,17 @@ def load_model_update(self, model_update, helper): model_id = model_update.model_update_id model = self.round_handler.load_model_update(helper, model_id) # Get relevant metadata - data = json.loads(model_update.meta)['training_metadata'] - config = json.loads(json.loads(model_update.meta)['config']) - data['round_id'] = config['round_id'] - - return model, data + metadata = json.loads(model_update.meta) + if 'config' in metadata.keys(): + # Used in Python client + config = json.loads(metadata['config']) + else: + # Used in C++ client + config = json.loads(model_update.config) + training_metadata = metadata['training_metadata'] + training_metadata['round_id'] = config['round_id'] + + return model, training_metadata def get_state(self): """ Get the state of the aggregator's queue, including the number of model updates.""" diff --git a/fedn/fedn/network/combiner/aggregators/fedavg.py b/fedn/fedn/network/combiner/aggregators/fedavg.py index 50d45e641..614d9f578 100644 --- a/fedn/fedn/network/combiner/aggregators/fedavg.py +++ b/fedn/fedn/network/combiner/aggregators/fedavg.py @@ -56,9 +56,11 @@ def combine_models(self, helper=None, delete_models=True): while not self.model_updates.empty(): try: # Get next model from queue + logger.info("AGGREGATOR({}): Getting next model update from queue.".format(self.name)) model_update = self.next_model_update() # Load model parameters and metadata + logger.info("AGGREGATOR({}): Loading model metadata {}.".format(self.name, model_update.model_update_id)) model_next, metadata = self.load_model_update(model_update, helper) logger.info( diff --git a/fedn/fedn/network/grpc/fedn.proto b/fedn/fedn/network/grpc/fedn.proto index e5022702d..fd2f1d5c5 100644 --- a/fedn/fedn/network/grpc/fedn.proto +++ b/fedn/fedn/network/grpc/fedn.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package grpc; +package fedn; import "google/protobuf/timestamp.proto"; @@ -49,6 +49,7 @@ message TaskRequest { Client sender = 1; Client receiver = 2; string model_id = 3; + // data is round_config when type is MODEL_UPDATE string data = 4; string correlation_id = 5; string timestamp = 6; @@ -65,6 +66,7 @@ message ModelUpdate { string correlation_id = 5; string timestamp = 6; string meta = 7; + string config = 8; } message ModelValidation { diff --git a/fedn/fedn/network/grpc/fedn_pb2.py b/fedn/fedn/network/grpc/fedn_pb2.py index 4cbb3c835..714bef0e5 100644 --- a/fedn/fedn/network/grpc/fedn_pb2.py +++ b/fedn/fedn/network/grpc/fedn_pb2.py @@ -14,7 +14,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66\x65\x64n/network/grpc/fedn.proto\x12\x04grpc\x1a\x1fgoogle/protobuf/timestamp.proto\":\n\x08Response\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x10\n\x08response\x18\x02 \x01(\t\"\xbc\x02\n\x06Status\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x0e\n\x06status\x18\x02 \x01(\t\x12(\n\tlog_level\x18\x03 \x01(\x0e\x32\x15.grpc.Status.LogLevel\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12-\n\ttimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x1e\n\x04type\x18\x07 \x01(\x0e\x32\x10.grpc.StatusType\x12\r\n\x05\x65xtra\x18\x08 \x01(\t\x12\x12\n\nsession_id\x18\t \x01(\t\"B\n\x08LogLevel\x12\x08\n\x04INFO\x10\x00\x12\t\n\x05\x44\x45\x42UG\x10\x01\x12\x0b\n\x07WARNING\x10\x02\x12\t\n\x05\x45RROR\x10\x03\x12\t\n\x05\x41UDIT\x10\x04\"\xd8\x01\n\x0bTaskRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x0c\n\x04meta\x18\x07 \x01(\t\x12\x12\n\nsession_id\x18\x08 \x01(\t\x12\x1e\n\x04type\x18\t \x01(\x0e\x32\x10.grpc.StatusType\"\xaf\x01\n\x0bModelUpdate\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x17\n\x0fmodel_update_id\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x0c\n\x04meta\x18\x07 \x01(\t\"\xd8\x01\n\x0fModelValidation\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12-\n\ttimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04meta\x18\x07 \x01(\t\x12\x12\n\nsession_id\x18\x08 \x01(\t\"\x89\x01\n\x0cModelRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\n\n\x02id\x18\x04 \x01(\t\x12!\n\x06status\x18\x05 \x01(\x0e\x32\x11.grpc.ModelStatus\"]\n\rModelResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\n\n\x02id\x18\x02 \x01(\t\x12!\n\x06status\x18\x03 \x01(\x0e\x32\x11.grpc.ModelStatus\x12\x0f\n\x07message\x18\x04 \x01(\t\"U\n\x15GetGlobalModelRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\"h\n\x16GetGlobalModelResponse\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\")\n\tHeartbeat\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\"W\n\x16\x43lientAvailableMessage\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\t\x12\x11\n\ttimestamp\x18\x03 \x01(\t\"P\n\x12ListClientsRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1c\n\x07\x63hannel\x18\x02 \x01(\x0e\x32\x0b.grpc.Queue\"*\n\nClientList\x12\x1c\n\x06\x63lient\x18\x01 \x03(\x0b\x32\x0c.grpc.Client\"0\n\x06\x43lient\x12\x18\n\x04role\x18\x01 \x01(\x0e\x32\n.grpc.Role\x12\x0c\n\x04name\x18\x02 \x01(\t\"m\n\x0fReassignRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x0e\n\x06server\x18\x03 \x01(\t\x12\x0c\n\x04port\x18\x04 \x01(\r\"c\n\x10ReconnectRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.grpc.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.grpc.Client\x12\x11\n\treconnect\x18\x03 \x01(\r\"\'\n\tParameter\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"T\n\x0e\x43ontrolRequest\x12\x1e\n\x07\x63ommand\x18\x01 \x01(\x0e\x32\r.grpc.Command\x12\"\n\tparameter\x18\x02 \x03(\x0b\x32\x0f.grpc.Parameter\"F\n\x0f\x43ontrolResponse\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\"\n\tparameter\x18\x02 \x03(\x0b\x32\x0f.grpc.Parameter\"\x13\n\x11\x43onnectionRequest\"<\n\x12\x43onnectionResponse\x12&\n\x06status\x18\x01 \x01(\x0e\x32\x16.grpc.ConnectionStatus*\x84\x01\n\nStatusType\x12\x07\n\x03LOG\x10\x00\x12\x18\n\x14MODEL_UPDATE_REQUEST\x10\x01\x12\x10\n\x0cMODEL_UPDATE\x10\x02\x12\x1c\n\x18MODEL_VALIDATION_REQUEST\x10\x03\x12\x14\n\x10MODEL_VALIDATION\x10\x04\x12\r\n\tINFERENCE\x10\x05*$\n\x05Queue\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0e\n\nTASK_QUEUE\x10\x01*S\n\x0bModelStatus\x12\x06\n\x02OK\x10\x00\x12\x0f\n\x0bIN_PROGRESS\x10\x01\x12\x12\n\x0eIN_PROGRESS_OK\x10\x02\x12\n\n\x06\x46\x41ILED\x10\x03\x12\x0b\n\x07UNKNOWN\x10\x04*8\n\x04Role\x12\n\n\x06WORKER\x10\x00\x12\x0c\n\x08\x43OMBINER\x10\x01\x12\x0b\n\x07REDUCER\x10\x02\x12\t\n\x05OTHER\x10\x03*J\n\x07\x43ommand\x12\x08\n\x04IDLE\x10\x00\x12\t\n\x05START\x10\x01\x12\t\n\x05PAUSE\x10\x02\x12\x08\n\x04STOP\x10\x03\x12\t\n\x05RESET\x10\x04\x12\n\n\x06REPORT\x10\x05*I\n\x10\x43onnectionStatus\x12\x11\n\rNOT_ACCEPTING\x10\x00\x12\r\n\tACCEPTING\x10\x01\x12\x13\n\x0fTRY_AGAIN_LATER\x10\x02\x32z\n\x0cModelService\x12\x33\n\x06Upload\x12\x12.grpc.ModelRequest\x1a\x13.grpc.ModelResponse(\x01\x12\x35\n\x08\x44ownload\x12\x12.grpc.ModelRequest\x1a\x13.grpc.ModelResponse0\x01\x32\xf8\x01\n\x07\x43ontrol\x12\x34\n\x05Start\x12\x14.grpc.ControlRequest\x1a\x15.grpc.ControlResponse\x12\x33\n\x04Stop\x12\x14.grpc.ControlRequest\x1a\x15.grpc.ControlResponse\x12\x44\n\x15\x46lushAggregationQueue\x12\x14.grpc.ControlRequest\x1a\x15.grpc.ControlResponse\x12<\n\rSetAggregator\x12\x14.grpc.ControlRequest\x1a\x15.grpc.ControlResponse2V\n\x07Reducer\x12K\n\x0eGetGlobalModel\x12\x1b.grpc.GetGlobalModelRequest\x1a\x1c.grpc.GetGlobalModelResponse2\xab\x03\n\tConnector\x12\x44\n\x14\x41llianceStatusStream\x12\x1c.grpc.ClientAvailableMessage\x1a\x0c.grpc.Status0\x01\x12*\n\nSendStatus\x12\x0c.grpc.Status\x1a\x0e.grpc.Response\x12?\n\x11ListActiveClients\x12\x18.grpc.ListClientsRequest\x1a\x10.grpc.ClientList\x12\x45\n\x10\x41\x63\x63\x65ptingClients\x12\x17.grpc.ConnectionRequest\x1a\x18.grpc.ConnectionResponse\x12\x30\n\rSendHeartbeat\x12\x0f.grpc.Heartbeat\x1a\x0e.grpc.Response\x12\x37\n\x0eReassignClient\x12\x15.grpc.ReassignRequest\x1a\x0e.grpc.Response\x12\x39\n\x0fReconnectClient\x12\x16.grpc.ReconnectRequest\x1a\x0e.grpc.Response2\xbf\x01\n\x08\x43ombiner\x12?\n\nTaskStream\x12\x1c.grpc.ClientAvailableMessage\x1a\x11.grpc.TaskRequest0\x01\x12\x34\n\x0fSendModelUpdate\x12\x11.grpc.ModelUpdate\x1a\x0e.grpc.Response\x12<\n\x13SendModelValidation\x12\x15.grpc.ModelValidation\x1a\x0e.grpc.Responseb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66\x65\x64n/network/grpc/fedn.proto\x12\x04\x66\x65\x64n\x1a\x1fgoogle/protobuf/timestamp.proto\":\n\x08Response\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x10\n\x08response\x18\x02 \x01(\t\"\xbc\x02\n\x06Status\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x0e\n\x06status\x18\x02 \x01(\t\x12(\n\tlog_level\x18\x03 \x01(\x0e\x32\x15.fedn.Status.LogLevel\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12-\n\ttimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x1e\n\x04type\x18\x07 \x01(\x0e\x32\x10.fedn.StatusType\x12\r\n\x05\x65xtra\x18\x08 \x01(\t\x12\x12\n\nsession_id\x18\t \x01(\t\"B\n\x08LogLevel\x12\x08\n\x04INFO\x10\x00\x12\t\n\x05\x44\x45\x42UG\x10\x01\x12\x0b\n\x07WARNING\x10\x02\x12\t\n\x05\x45RROR\x10\x03\x12\t\n\x05\x41UDIT\x10\x04\"\xd8\x01\n\x0bTaskRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x0c\n\x04meta\x18\x07 \x01(\t\x12\x12\n\nsession_id\x18\x08 \x01(\t\x12\x1e\n\x04type\x18\t \x01(\x0e\x32\x10.fedn.StatusType\"\xbf\x01\n\x0bModelUpdate\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x17\n\x0fmodel_update_id\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12\x11\n\ttimestamp\x18\x06 \x01(\t\x12\x0c\n\x04meta\x18\x07 \x01(\t\x12\x0e\n\x06\x63onfig\x18\x08 \x01(\t\"\xd8\x01\n\x0fModelValidation\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\t\x12\x16\n\x0e\x63orrelation_id\x18\x05 \x01(\t\x12-\n\ttimestamp\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04meta\x18\x07 \x01(\t\x12\x12\n\nsession_id\x18\x08 \x01(\t\"\x89\x01\n\x0cModelRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x0c\n\x04\x64\x61ta\x18\x03 \x01(\x0c\x12\n\n\x02id\x18\x04 \x01(\t\x12!\n\x06status\x18\x05 \x01(\x0e\x32\x11.fedn.ModelStatus\"]\n\rModelResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\n\n\x02id\x18\x02 \x01(\t\x12!\n\x06status\x18\x03 \x01(\x0e\x32\x11.fedn.ModelStatus\x12\x0f\n\x07message\x18\x04 \x01(\t\"U\n\x15GetGlobalModelRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\"h\n\x16GetGlobalModelResponse\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x10\n\x08model_id\x18\x03 \x01(\t\")\n\tHeartbeat\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\"W\n\x16\x43lientAvailableMessage\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\t\x12\x11\n\ttimestamp\x18\x03 \x01(\t\"P\n\x12ListClientsRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1c\n\x07\x63hannel\x18\x02 \x01(\x0e\x32\x0b.fedn.Queue\"*\n\nClientList\x12\x1c\n\x06\x63lient\x18\x01 \x03(\x0b\x32\x0c.fedn.Client\"0\n\x06\x43lient\x12\x18\n\x04role\x18\x01 \x01(\x0e\x32\n.fedn.Role\x12\x0c\n\x04name\x18\x02 \x01(\t\"m\n\x0fReassignRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x0e\n\x06server\x18\x03 \x01(\t\x12\x0c\n\x04port\x18\x04 \x01(\r\"c\n\x10ReconnectRequest\x12\x1c\n\x06sender\x18\x01 \x01(\x0b\x32\x0c.fedn.Client\x12\x1e\n\x08receiver\x18\x02 \x01(\x0b\x32\x0c.fedn.Client\x12\x11\n\treconnect\x18\x03 \x01(\r\"\'\n\tParameter\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"T\n\x0e\x43ontrolRequest\x12\x1e\n\x07\x63ommand\x18\x01 \x01(\x0e\x32\r.fedn.Command\x12\"\n\tparameter\x18\x02 \x03(\x0b\x32\x0f.fedn.Parameter\"F\n\x0f\x43ontrolResponse\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\"\n\tparameter\x18\x02 \x03(\x0b\x32\x0f.fedn.Parameter\"\x13\n\x11\x43onnectionRequest\"<\n\x12\x43onnectionResponse\x12&\n\x06status\x18\x01 \x01(\x0e\x32\x16.fedn.ConnectionStatus*\x84\x01\n\nStatusType\x12\x07\n\x03LOG\x10\x00\x12\x18\n\x14MODEL_UPDATE_REQUEST\x10\x01\x12\x10\n\x0cMODEL_UPDATE\x10\x02\x12\x1c\n\x18MODEL_VALIDATION_REQUEST\x10\x03\x12\x14\n\x10MODEL_VALIDATION\x10\x04\x12\r\n\tINFERENCE\x10\x05*$\n\x05Queue\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0e\n\nTASK_QUEUE\x10\x01*S\n\x0bModelStatus\x12\x06\n\x02OK\x10\x00\x12\x0f\n\x0bIN_PROGRESS\x10\x01\x12\x12\n\x0eIN_PROGRESS_OK\x10\x02\x12\n\n\x06\x46\x41ILED\x10\x03\x12\x0b\n\x07UNKNOWN\x10\x04*8\n\x04Role\x12\n\n\x06WORKER\x10\x00\x12\x0c\n\x08\x43OMBINER\x10\x01\x12\x0b\n\x07REDUCER\x10\x02\x12\t\n\x05OTHER\x10\x03*J\n\x07\x43ommand\x12\x08\n\x04IDLE\x10\x00\x12\t\n\x05START\x10\x01\x12\t\n\x05PAUSE\x10\x02\x12\x08\n\x04STOP\x10\x03\x12\t\n\x05RESET\x10\x04\x12\n\n\x06REPORT\x10\x05*I\n\x10\x43onnectionStatus\x12\x11\n\rNOT_ACCEPTING\x10\x00\x12\r\n\tACCEPTING\x10\x01\x12\x13\n\x0fTRY_AGAIN_LATER\x10\x02\x32z\n\x0cModelService\x12\x33\n\x06Upload\x12\x12.fedn.ModelRequest\x1a\x13.fedn.ModelResponse(\x01\x12\x35\n\x08\x44ownload\x12\x12.fedn.ModelRequest\x1a\x13.fedn.ModelResponse0\x01\x32\xf8\x01\n\x07\x43ontrol\x12\x34\n\x05Start\x12\x14.fedn.ControlRequest\x1a\x15.fedn.ControlResponse\x12\x33\n\x04Stop\x12\x14.fedn.ControlRequest\x1a\x15.fedn.ControlResponse\x12\x44\n\x15\x46lushAggregationQueue\x12\x14.fedn.ControlRequest\x1a\x15.fedn.ControlResponse\x12<\n\rSetAggregator\x12\x14.fedn.ControlRequest\x1a\x15.fedn.ControlResponse2V\n\x07Reducer\x12K\n\x0eGetGlobalModel\x12\x1b.fedn.GetGlobalModelRequest\x1a\x1c.fedn.GetGlobalModelResponse2\xab\x03\n\tConnector\x12\x44\n\x14\x41llianceStatusStream\x12\x1c.fedn.ClientAvailableMessage\x1a\x0c.fedn.Status0\x01\x12*\n\nSendStatus\x12\x0c.fedn.Status\x1a\x0e.fedn.Response\x12?\n\x11ListActiveClients\x12\x18.fedn.ListClientsRequest\x1a\x10.fedn.ClientList\x12\x45\n\x10\x41\x63\x63\x65ptingClients\x12\x17.fedn.ConnectionRequest\x1a\x18.fedn.ConnectionResponse\x12\x30\n\rSendHeartbeat\x12\x0f.fedn.Heartbeat\x1a\x0e.fedn.Response\x12\x37\n\x0eReassignClient\x12\x15.fedn.ReassignRequest\x1a\x0e.fedn.Response\x12\x39\n\x0fReconnectClient\x12\x16.fedn.ReconnectRequest\x1a\x0e.fedn.Response2\xbf\x01\n\x08\x43ombiner\x12?\n\nTaskStream\x12\x1c.fedn.ClientAvailableMessage\x1a\x11.fedn.TaskRequest0\x01\x12\x34\n\x0fSendModelUpdate\x12\x11.fedn.ModelUpdate\x1a\x0e.fedn.Response\x12<\n\x13SendModelValidation\x12\x15.fedn.ModelValidation\x1a\x0e.fedn.Responseb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -22,18 +22,18 @@ if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None - _globals['_STATUSTYPE']._serialized_start=2297 - _globals['_STATUSTYPE']._serialized_end=2429 - _globals['_QUEUE']._serialized_start=2431 - _globals['_QUEUE']._serialized_end=2467 - _globals['_MODELSTATUS']._serialized_start=2469 - _globals['_MODELSTATUS']._serialized_end=2552 - _globals['_ROLE']._serialized_start=2554 - _globals['_ROLE']._serialized_end=2610 - _globals['_COMMAND']._serialized_start=2612 - _globals['_COMMAND']._serialized_end=2686 - _globals['_CONNECTIONSTATUS']._serialized_start=2688 - _globals['_CONNECTIONSTATUS']._serialized_end=2761 + _globals['_STATUSTYPE']._serialized_start=2313 + _globals['_STATUSTYPE']._serialized_end=2445 + _globals['_QUEUE']._serialized_start=2447 + _globals['_QUEUE']._serialized_end=2483 + _globals['_MODELSTATUS']._serialized_start=2485 + _globals['_MODELSTATUS']._serialized_end=2568 + _globals['_ROLE']._serialized_start=2570 + _globals['_ROLE']._serialized_end=2626 + _globals['_COMMAND']._serialized_start=2628 + _globals['_COMMAND']._serialized_end=2702 + _globals['_CONNECTIONSTATUS']._serialized_start=2704 + _globals['_CONNECTIONSTATUS']._serialized_end=2777 _globals['_RESPONSE']._serialized_start=71 _globals['_RESPONSE']._serialized_end=129 _globals['_STATUS']._serialized_start=132 @@ -43,49 +43,49 @@ _globals['_TASKREQUEST']._serialized_start=451 _globals['_TASKREQUEST']._serialized_end=667 _globals['_MODELUPDATE']._serialized_start=670 - _globals['_MODELUPDATE']._serialized_end=845 - _globals['_MODELVALIDATION']._serialized_start=848 - _globals['_MODELVALIDATION']._serialized_end=1064 - _globals['_MODELREQUEST']._serialized_start=1067 - _globals['_MODELREQUEST']._serialized_end=1204 - _globals['_MODELRESPONSE']._serialized_start=1206 - _globals['_MODELRESPONSE']._serialized_end=1299 - _globals['_GETGLOBALMODELREQUEST']._serialized_start=1301 - _globals['_GETGLOBALMODELREQUEST']._serialized_end=1386 - _globals['_GETGLOBALMODELRESPONSE']._serialized_start=1388 - _globals['_GETGLOBALMODELRESPONSE']._serialized_end=1492 - _globals['_HEARTBEAT']._serialized_start=1494 - _globals['_HEARTBEAT']._serialized_end=1535 - _globals['_CLIENTAVAILABLEMESSAGE']._serialized_start=1537 - _globals['_CLIENTAVAILABLEMESSAGE']._serialized_end=1624 - _globals['_LISTCLIENTSREQUEST']._serialized_start=1626 - _globals['_LISTCLIENTSREQUEST']._serialized_end=1706 - _globals['_CLIENTLIST']._serialized_start=1708 - _globals['_CLIENTLIST']._serialized_end=1750 - _globals['_CLIENT']._serialized_start=1752 - _globals['_CLIENT']._serialized_end=1800 - _globals['_REASSIGNREQUEST']._serialized_start=1802 - _globals['_REASSIGNREQUEST']._serialized_end=1911 - _globals['_RECONNECTREQUEST']._serialized_start=1913 - _globals['_RECONNECTREQUEST']._serialized_end=2012 - _globals['_PARAMETER']._serialized_start=2014 - _globals['_PARAMETER']._serialized_end=2053 - _globals['_CONTROLREQUEST']._serialized_start=2055 - _globals['_CONTROLREQUEST']._serialized_end=2139 - _globals['_CONTROLRESPONSE']._serialized_start=2141 - _globals['_CONTROLRESPONSE']._serialized_end=2211 - _globals['_CONNECTIONREQUEST']._serialized_start=2213 - _globals['_CONNECTIONREQUEST']._serialized_end=2232 - _globals['_CONNECTIONRESPONSE']._serialized_start=2234 - _globals['_CONNECTIONRESPONSE']._serialized_end=2294 - _globals['_MODELSERVICE']._serialized_start=2763 - _globals['_MODELSERVICE']._serialized_end=2885 - _globals['_CONTROL']._serialized_start=2888 - _globals['_CONTROL']._serialized_end=3136 - _globals['_REDUCER']._serialized_start=3138 - _globals['_REDUCER']._serialized_end=3224 - _globals['_CONNECTOR']._serialized_start=3227 - _globals['_CONNECTOR']._serialized_end=3654 - _globals['_COMBINER']._serialized_start=3657 - _globals['_COMBINER']._serialized_end=3848 + _globals['_MODELUPDATE']._serialized_end=861 + _globals['_MODELVALIDATION']._serialized_start=864 + _globals['_MODELVALIDATION']._serialized_end=1080 + _globals['_MODELREQUEST']._serialized_start=1083 + _globals['_MODELREQUEST']._serialized_end=1220 + _globals['_MODELRESPONSE']._serialized_start=1222 + _globals['_MODELRESPONSE']._serialized_end=1315 + _globals['_GETGLOBALMODELREQUEST']._serialized_start=1317 + _globals['_GETGLOBALMODELREQUEST']._serialized_end=1402 + _globals['_GETGLOBALMODELRESPONSE']._serialized_start=1404 + _globals['_GETGLOBALMODELRESPONSE']._serialized_end=1508 + _globals['_HEARTBEAT']._serialized_start=1510 + _globals['_HEARTBEAT']._serialized_end=1551 + _globals['_CLIENTAVAILABLEMESSAGE']._serialized_start=1553 + _globals['_CLIENTAVAILABLEMESSAGE']._serialized_end=1640 + _globals['_LISTCLIENTSREQUEST']._serialized_start=1642 + _globals['_LISTCLIENTSREQUEST']._serialized_end=1722 + _globals['_CLIENTLIST']._serialized_start=1724 + _globals['_CLIENTLIST']._serialized_end=1766 + _globals['_CLIENT']._serialized_start=1768 + _globals['_CLIENT']._serialized_end=1816 + _globals['_REASSIGNREQUEST']._serialized_start=1818 + _globals['_REASSIGNREQUEST']._serialized_end=1927 + _globals['_RECONNECTREQUEST']._serialized_start=1929 + _globals['_RECONNECTREQUEST']._serialized_end=2028 + _globals['_PARAMETER']._serialized_start=2030 + _globals['_PARAMETER']._serialized_end=2069 + _globals['_CONTROLREQUEST']._serialized_start=2071 + _globals['_CONTROLREQUEST']._serialized_end=2155 + _globals['_CONTROLRESPONSE']._serialized_start=2157 + _globals['_CONTROLRESPONSE']._serialized_end=2227 + _globals['_CONNECTIONREQUEST']._serialized_start=2229 + _globals['_CONNECTIONREQUEST']._serialized_end=2248 + _globals['_CONNECTIONRESPONSE']._serialized_start=2250 + _globals['_CONNECTIONRESPONSE']._serialized_end=2310 + _globals['_MODELSERVICE']._serialized_start=2779 + _globals['_MODELSERVICE']._serialized_end=2901 + _globals['_CONTROL']._serialized_start=2904 + _globals['_CONTROL']._serialized_end=3152 + _globals['_REDUCER']._serialized_start=3154 + _globals['_REDUCER']._serialized_end=3240 + _globals['_CONNECTOR']._serialized_start=3243 + _globals['_CONNECTOR']._serialized_end=3670 + _globals['_COMBINER']._serialized_start=3673 + _globals['_COMBINER']._serialized_end=3864 # @@protoc_insertion_point(module_scope) diff --git a/fedn/fedn/network/grpc/fedn_pb2_grpc.py b/fedn/fedn/network/grpc/fedn_pb2_grpc.py index bb8086c3f..3c2db9a2c 100644 --- a/fedn/fedn/network/grpc/fedn_pb2_grpc.py +++ b/fedn/fedn/network/grpc/fedn_pb2_grpc.py @@ -15,12 +15,12 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.Upload = channel.stream_unary( - '/grpc.ModelService/Upload', + '/fedn.ModelService/Upload', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelResponse.FromString, ) self.Download = channel.unary_stream( - '/grpc.ModelService/Download', + '/fedn.ModelService/Download', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelResponse.FromString, ) @@ -56,7 +56,7 @@ def add_ModelServiceServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'grpc.ModelService', rpc_method_handlers) + 'fedn.ModelService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -75,7 +75,7 @@ def Upload(request_iterator, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.stream_unary(request_iterator, target, '/grpc.ModelService/Upload', + return grpc.experimental.stream_unary(request_iterator, target, '/fedn.ModelService/Upload', fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelResponse.FromString, options, channel_credentials, @@ -92,7 +92,7 @@ def Download(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream(request, target, '/grpc.ModelService/Download', + return grpc.experimental.unary_stream(request, target, '/fedn.ModelService/Download', fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelResponse.FromString, options, channel_credentials, @@ -109,22 +109,22 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.Start = channel.unary_unary( - '/grpc.Control/Start', + '/fedn.Control/Start', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, ) self.Stop = channel.unary_unary( - '/grpc.Control/Stop', + '/fedn.Control/Stop', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, ) self.FlushAggregationQueue = channel.unary_unary( - '/grpc.Control/FlushAggregationQueue', + '/fedn.Control/FlushAggregationQueue', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, ) self.SetAggregator = channel.unary_unary( - '/grpc.Control/SetAggregator', + '/fedn.Control/SetAggregator', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, ) @@ -182,7 +182,7 @@ def add_ControlServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'grpc.Control', rpc_method_handlers) + 'fedn.Control', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -201,7 +201,7 @@ def Start(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Control/Start', + return grpc.experimental.unary_unary(request, target, '/fedn.Control/Start', fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, options, channel_credentials, @@ -218,7 +218,7 @@ def Stop(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Control/Stop', + return grpc.experimental.unary_unary(request, target, '/fedn.Control/Stop', fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, options, channel_credentials, @@ -235,7 +235,7 @@ def FlushAggregationQueue(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Control/FlushAggregationQueue', + return grpc.experimental.unary_unary(request, target, '/fedn.Control/FlushAggregationQueue', fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, options, channel_credentials, @@ -252,7 +252,7 @@ def SetAggregator(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Control/SetAggregator', + return grpc.experimental.unary_unary(request, target, '/fedn.Control/SetAggregator', fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ControlResponse.FromString, options, channel_credentials, @@ -269,7 +269,7 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.GetGlobalModel = channel.unary_unary( - '/grpc.Reducer/GetGlobalModel', + '/fedn.Reducer/GetGlobalModel', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.GetGlobalModelRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.GetGlobalModelResponse.FromString, ) @@ -294,7 +294,7 @@ def add_ReducerServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'grpc.Reducer', rpc_method_handlers) + 'fedn.Reducer', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -313,7 +313,7 @@ def GetGlobalModel(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Reducer/GetGlobalModel', + return grpc.experimental.unary_unary(request, target, '/fedn.Reducer/GetGlobalModel', fedn_dot_network_dot_grpc_dot_fedn__pb2.GetGlobalModelRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.GetGlobalModelResponse.FromString, options, channel_credentials, @@ -330,37 +330,37 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.AllianceStatusStream = channel.unary_stream( - '/grpc.Connector/AllianceStatusStream', + '/fedn.Connector/AllianceStatusStream', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientAvailableMessage.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Status.FromString, ) self.SendStatus = channel.unary_unary( - '/grpc.Connector/SendStatus', + '/fedn.Connector/SendStatus', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Status.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) self.ListActiveClients = channel.unary_unary( - '/grpc.Connector/ListActiveClients', + '/fedn.Connector/ListActiveClients', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ListClientsRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientList.FromString, ) self.AcceptingClients = channel.unary_unary( - '/grpc.Connector/AcceptingClients', + '/fedn.Connector/AcceptingClients', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ConnectionRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ConnectionResponse.FromString, ) self.SendHeartbeat = channel.unary_unary( - '/grpc.Connector/SendHeartbeat', + '/fedn.Connector/SendHeartbeat', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Heartbeat.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) self.ReassignClient = channel.unary_unary( - '/grpc.Connector/ReassignClient', + '/fedn.Connector/ReassignClient', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ReassignRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) self.ReconnectClient = channel.unary_unary( - '/grpc.Connector/ReconnectClient', + '/fedn.Connector/ReconnectClient', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ReconnectRequest.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) @@ -456,7 +456,7 @@ def add_ConnectorServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'grpc.Connector', rpc_method_handlers) + 'fedn.Connector', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -475,7 +475,7 @@ def AllianceStatusStream(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream(request, target, '/grpc.Connector/AllianceStatusStream', + return grpc.experimental.unary_stream(request, target, '/fedn.Connector/AllianceStatusStream', fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientAvailableMessage.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Status.FromString, options, channel_credentials, @@ -492,7 +492,7 @@ def SendStatus(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/SendStatus', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/SendStatus', fedn_dot_network_dot_grpc_dot_fedn__pb2.Status.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials, @@ -509,7 +509,7 @@ def ListActiveClients(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/ListActiveClients', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/ListActiveClients', fedn_dot_network_dot_grpc_dot_fedn__pb2.ListClientsRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientList.FromString, options, channel_credentials, @@ -526,7 +526,7 @@ def AcceptingClients(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/AcceptingClients', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/AcceptingClients', fedn_dot_network_dot_grpc_dot_fedn__pb2.ConnectionRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.ConnectionResponse.FromString, options, channel_credentials, @@ -543,7 +543,7 @@ def SendHeartbeat(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/SendHeartbeat', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/SendHeartbeat', fedn_dot_network_dot_grpc_dot_fedn__pb2.Heartbeat.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials, @@ -560,7 +560,7 @@ def ReassignClient(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/ReassignClient', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/ReassignClient', fedn_dot_network_dot_grpc_dot_fedn__pb2.ReassignRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials, @@ -577,7 +577,7 @@ def ReconnectClient(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Connector/ReconnectClient', + return grpc.experimental.unary_unary(request, target, '/fedn.Connector/ReconnectClient', fedn_dot_network_dot_grpc_dot_fedn__pb2.ReconnectRequest.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials, @@ -594,17 +594,17 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.TaskStream = channel.unary_stream( - '/grpc.Combiner/TaskStream', + '/fedn.Combiner/TaskStream', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientAvailableMessage.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.TaskRequest.FromString, ) self.SendModelUpdate = channel.unary_unary( - '/grpc.Combiner/SendModelUpdate', + '/fedn.Combiner/SendModelUpdate', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelUpdate.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) self.SendModelValidation = channel.unary_unary( - '/grpc.Combiner/SendModelValidation', + '/fedn.Combiner/SendModelValidation', request_serializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelValidation.SerializeToString, response_deserializer=fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, ) @@ -652,7 +652,7 @@ def add_CombinerServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'grpc.Combiner', rpc_method_handlers) + 'fedn.Combiner', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -671,7 +671,7 @@ def TaskStream(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_stream(request, target, '/grpc.Combiner/TaskStream', + return grpc.experimental.unary_stream(request, target, '/fedn.Combiner/TaskStream', fedn_dot_network_dot_grpc_dot_fedn__pb2.ClientAvailableMessage.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.TaskRequest.FromString, options, channel_credentials, @@ -688,7 +688,7 @@ def SendModelUpdate(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Combiner/SendModelUpdate', + return grpc.experimental.unary_unary(request, target, '/fedn.Combiner/SendModelUpdate', fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelUpdate.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials, @@ -705,7 +705,7 @@ def SendModelValidation(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/grpc.Combiner/SendModelValidation', + return grpc.experimental.unary_unary(request, target, '/fedn.Combiner/SendModelValidation', fedn_dot_network_dot_grpc_dot_fedn__pb2.ModelValidation.SerializeToString, fedn_dot_network_dot_grpc_dot_fedn__pb2.Response.FromString, options, channel_credentials,