From 1d412ad45698202c597f9f6a0e4323090f67a2bf Mon Sep 17 00:00:00 2001 From: Heng Pan Date: Fri, 25 Oct 2024 17:35:33 +0100 Subject: [PATCH] reset to main --- .../grpc_adapter_fleet_connection.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/py/flwr/client/connection/grpc_adapter/grpc_adapter_fleet_connection.py b/src/py/flwr/client/connection/grpc_adapter/grpc_adapter_fleet_connection.py index 72fb70f01450..659b1b57b8ad 100644 --- a/src/py/flwr/client/connection/grpc_adapter/grpc_adapter_fleet_connection.py +++ b/src/py/flwr/client/connection/grpc_adapter/grpc_adapter_fleet_connection.py @@ -27,11 +27,15 @@ from flwr.common import log from flwr.common.constant import ( + GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_NAME_KEY, + GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_VERSION_KEY, GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY, + GRPC_ADAPTER_METADATA_MESSAGE_MODULE_KEY, + GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY, GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY, ) from flwr.common.grpc import create_channel, on_channel_state_change -from flwr.common.version import package_version +from flwr.common.version import package_name, package_version from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse # pylint: disable=E0611 from flwr.proto.fleet_pb2 import ( # pylint: disable=E0611 CreateNodeRequest, @@ -100,9 +104,16 @@ def _send_and_receive( self, request: GrpcMessage, response_type: type[T], **kwargs: Any ) -> T: # Serialize request + req_cls = request.__class__ container_req = MessageContainer( - metadata={GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY: package_version}, - grpc_message_name=request.__class__.__qualname__, + metadata={ + GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_NAME_KEY: package_name, + GRPC_ADAPTER_METADATA_FLOWER_PACKAGE_VERSION_KEY: package_version, + GRPC_ADAPTER_METADATA_FLOWER_VERSION_KEY: package_version, + GRPC_ADAPTER_METADATA_MESSAGE_MODULE_KEY: req_cls.__module__, + GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY: req_cls.__qualname__, + }, + grpc_message_name=req_cls.__qualname__, grpc_message_content=request.SerializeToString(), )