flwr-nightly 1.20.0.dev20250715__py3-none-any.whl → 1.20.0.dev20250717__py3-none-any.whl

flwr/proto/clientappio_pb2.pyi

@@ -3,35 +3,14 @@
 isort:skip_file
 """
 import builtins
-import flwr.proto.fab_pb2
-import flwr.proto.message_pb2
-import flwr.proto.run_pb2
 import google.protobuf.descriptor
 import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
 import google.protobuf.message
 import typing
 import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-class _ClientAppOutputCode:
-    ValueType = typing.NewType('ValueType', builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-class _ClientAppOutputCodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_ClientAppOutputCode.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    SUCCESS: _ClientAppOutputCode.ValueType  # 0
-    DEADLINE_EXCEEDED: _ClientAppOutputCode.ValueType  # 1
-    UNKNOWN_ERROR: _ClientAppOutputCode.ValueType  # 2
-class ClientAppOutputCode(_ClientAppOutputCode, metaclass=_ClientAppOutputCodeEnumTypeWrapper):
-    pass
-
-SUCCESS: ClientAppOutputCode.ValueType  # 0
-DEADLINE_EXCEEDED: ClientAppOutputCode.ValueType  # 1
-UNKNOWN_ERROR: ClientAppOutputCode.ValueType  # 2
-global___ClientAppOutputCode = ClientAppOutputCode
-
-
 class GetRunIdsWithPendingMessagesRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     def __init__(self,
@@ -73,124 +52,3 @@ class RequestTokenResponse(google.protobuf.message.Message):
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
 global___RequestTokenResponse = RequestTokenResponse
-
-class ClientAppOutputStatus(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    CODE_FIELD_NUMBER: builtins.int
-    MESSAGE_FIELD_NUMBER: builtins.int
-    code: global___ClientAppOutputCode.ValueType
-    message: typing.Text
-    def __init__(self,
-        *,
-        code: global___ClientAppOutputCode.ValueType = ...,
-        message: typing.Text = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["code",b"code","message",b"message"]) -> None: ...
-global___ClientAppOutputStatus = ClientAppOutputStatus
-
-class PullClientAppInputsRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    TOKEN_FIELD_NUMBER: builtins.int
-    token: typing.Text
-    def __init__(self,
-        *,
-        token: typing.Text = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
-global___PullClientAppInputsRequest = PullClientAppInputsRequest
-
-class PullClientAppInputsResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    CONTEXT_FIELD_NUMBER: builtins.int
-    RUN_FIELD_NUMBER: builtins.int
-    FAB_FIELD_NUMBER: builtins.int
-    @property
-    def context(self) -> flwr.proto.message_pb2.Context: ...
-    @property
-    def run(self) -> flwr.proto.run_pb2.Run: ...
-    @property
-    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
-    def __init__(self,
-        *,
-        context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
-        run: typing.Optional[flwr.proto.run_pb2.Run] = ...,
-        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> None: ...
-global___PullClientAppInputsResponse = PullClientAppInputsResponse
-
-class PushClientAppOutputsRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    TOKEN_FIELD_NUMBER: builtins.int
-    CONTEXT_FIELD_NUMBER: builtins.int
-    token: typing.Text
-    @property
-    def context(self) -> flwr.proto.message_pb2.Context: ...
-    def __init__(self,
-        *,
-        token: typing.Text = ...,
-        context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["context",b"context"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","token",b"token"]) -> None: ...
-global___PushClientAppOutputsRequest = PushClientAppOutputsRequest
-
-class PushClientAppOutputsResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    STATUS_FIELD_NUMBER: builtins.int
-    @property
-    def status(self) -> global___ClientAppOutputStatus: ...
-    def __init__(self,
-        *,
-        status: typing.Optional[global___ClientAppOutputStatus] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["status",b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["status",b"status"]) -> None: ...
-global___PushClientAppOutputsResponse = PushClientAppOutputsResponse
-
-class PullMessageRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    TOKEN_FIELD_NUMBER: builtins.int
-    token: typing.Text
-    def __init__(self,
-        *,
-        token: typing.Text = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
-global___PullMessageRequest = PullMessageRequest
-
-class PullMessageResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    MESSAGE_FIELD_NUMBER: builtins.int
-    @property
-    def message(self) -> flwr.proto.message_pb2.Message: ...
-    def __init__(self,
-        *,
-        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["message",b"message"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["message",b"message"]) -> None: ...
-global___PullMessageResponse = PullMessageResponse
-
-class PushMessageRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    TOKEN_FIELD_NUMBER: builtins.int
-    MESSAGE_FIELD_NUMBER: builtins.int
-    token: typing.Text
-    @property
-    def message(self) -> flwr.proto.message_pb2.Message: ...
-    def __init__(self,
-        *,
-        token: typing.Text = ...,
-        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
-        ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["message",b"message"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["message",b"message","token",b"token"]) -> None: ...
-global___PushMessageRequest = PushMessageRequest
-
-class PushMessageResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    def __init__(self,
-        ) -> None: ...
-global___PushMessageResponse = PushMessageResponse

flwr/proto/clientappio_pb2_grpc.py

@@ -2,7 +2,9 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
+from flwr.proto import appio_pb2 as flwr_dot_proto_dot_appio__pb2
 from flwr.proto import clientappio_pb2 as flwr_dot_proto_dot_clientappio__pb2
+from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 
 
 class ClientAppIoStub(object):
@@ -26,23 +28,38 @@ class ClientAppIoStub(object):
                 )
         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,
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
                 )
         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,
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.FromString,
                 )
         self.PushMessage = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PushMessage',
-                request_serializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
                 )
         self.PullMessage = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PullMessage',
-                request_serializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
+                )
+        self.PushObject = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PushObject',
+                request_serializer=flwr_dot_proto_dot_message__pb2.PushObjectRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_message__pb2.PushObjectResponse.FromString,
+                )
+        self.PullObject = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PullObject',
+                request_serializer=flwr_dot_proto_dot_message__pb2.PullObjectRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_message__pb2.PullObjectResponse.FromString,
+                )
+        self.ConfirmMessageReceived = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/ConfirmMessageReceived',
+                request_serializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.FromString,
                 )
 
 
@@ -91,6 +108,27 @@ class ClientAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def PushObject(self, request, context):
+        """Push Object
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def PullObject(self, request, context):
+        """Pull Object
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ConfirmMessageReceived(self, request, context):
+        """Confirm Message Received
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_ClientAppIoServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -106,23 +144,38 @@ def add_ClientAppIoServicer_to_server(servicer, server):
             ),
             'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullClientAppInputs,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PullClientAppInputsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.SerializeToString,
             ),
             'PushClientAppOutputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PushClientAppOutputs,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.SerializeToString,
             ),
             'PushMessage': grpc.unary_unary_rpc_method_handler(
                     servicer.PushMessage,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.SerializeToString,
             ),
             'PullMessage': grpc.unary_unary_rpc_method_handler(
                     servicer.PullMessage,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.SerializeToString,
+            ),
+            'PushObject': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushObject,
+                    request_deserializer=flwr_dot_proto_dot_message__pb2.PushObjectRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_message__pb2.PushObjectResponse.SerializeToString,
+            ),
+            'PullObject': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullObject,
+                    request_deserializer=flwr_dot_proto_dot_message__pb2.PullObjectRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_message__pb2.PullObjectResponse.SerializeToString,
+            ),
+            'ConfirmMessageReceived': grpc.unary_unary_rpc_method_handler(
+                    servicer.ConfirmMessageReceived,
+                    request_deserializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -180,8 +233,8 @@ class ClientAppIo(object):
             timeout=None,
             metadata=None):
         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,
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -197,8 +250,8 @@ class ClientAppIo(object):
             timeout=None,
             metadata=None):
         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,
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -214,8 +267,8 @@ class ClientAppIo(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PushMessage',
-            flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.SerializeToString,
-            flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.FromString,
+            flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -231,7 +284,58 @@ class ClientAppIo(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PullMessage',
-            flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.SerializeToString,
-            flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.FromString,
+            flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PushObject(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PushObject',
+            flwr_dot_proto_dot_message__pb2.PushObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PushObjectResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PullObject(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PullObject',
+            flwr_dot_proto_dot_message__pb2.PullObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PullObjectResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def ConfirmMessageReceived(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/ConfirmMessageReceived',
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/clientappio_pb2_grpc.pyi

@@ -3,7 +3,9 @@
 isort:skip_file
 """
 import abc
+import flwr.proto.appio_pb2
 import flwr.proto.clientappio_pb2
+import flwr.proto.message_pb2
 import grpc
 
 class ClientAppIoStub:
@@ -19,25 +21,40 @@ class ClientAppIoStub:
     """Request token"""
 
     PullClientAppInputs: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.PullClientAppInputsRequest,
-        flwr.proto.clientappio_pb2.PullClientAppInputsResponse]
+        flwr.proto.appio_pb2.PullAppInputsRequest,
+        flwr.proto.appio_pb2.PullAppInputsResponse]
     """Pull client app inputs"""
 
     PushClientAppOutputs: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.PushClientAppOutputsRequest,
-        flwr.proto.clientappio_pb2.PushClientAppOutputsResponse]
+        flwr.proto.appio_pb2.PushAppOutputsRequest,
+        flwr.proto.appio_pb2.PushAppOutputsResponse]
     """Push client app outputs"""
 
     PushMessage: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.PushMessageRequest,
-        flwr.proto.clientappio_pb2.PushMessageResponse]
+        flwr.proto.appio_pb2.PushAppMessagesRequest,
+        flwr.proto.appio_pb2.PushAppMessagesResponse]
     """Push Message"""
 
     PullMessage: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.PullMessageRequest,
-        flwr.proto.clientappio_pb2.PullMessageResponse]
+        flwr.proto.appio_pb2.PullAppMessagesRequest,
+        flwr.proto.appio_pb2.PullAppMessagesResponse]
     """Pull Message"""
 
+    PushObject: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.message_pb2.PushObjectRequest,
+        flwr.proto.message_pb2.PushObjectResponse]
+    """Push Object"""
+
+    PullObject: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.message_pb2.PullObjectRequest,
+        flwr.proto.message_pb2.PullObjectResponse]
+    """Pull Object"""
+
+    ConfirmMessageReceived: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.message_pb2.ConfirmMessageReceivedRequest,
+        flwr.proto.message_pb2.ConfirmMessageReceivedResponse]
+    """Confirm Message Received"""
+
 
 class ClientAppIoServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
@@ -58,35 +75,59 @@ class ClientAppIoServicer(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def PullClientAppInputs(self,
-        request: flwr.proto.clientappio_pb2.PullClientAppInputsRequest,
+        request: flwr.proto.appio_pb2.PullAppInputsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.PullClientAppInputsResponse:
+    ) -> flwr.proto.appio_pb2.PullAppInputsResponse:
         """Pull client app inputs"""
         pass
 
     @abc.abstractmethod
     def PushClientAppOutputs(self,
-        request: flwr.proto.clientappio_pb2.PushClientAppOutputsRequest,
+        request: flwr.proto.appio_pb2.PushAppOutputsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.PushClientAppOutputsResponse:
+    ) -> flwr.proto.appio_pb2.PushAppOutputsResponse:
         """Push client app outputs"""
         pass
 
     @abc.abstractmethod
     def PushMessage(self,
-        request: flwr.proto.clientappio_pb2.PushMessageRequest,
+        request: flwr.proto.appio_pb2.PushAppMessagesRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.PushMessageResponse:
+    ) -> flwr.proto.appio_pb2.PushAppMessagesResponse:
         """Push Message"""
         pass
 
     @abc.abstractmethod
     def PullMessage(self,
-        request: flwr.proto.clientappio_pb2.PullMessageRequest,
+        request: flwr.proto.appio_pb2.PullAppMessagesRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.PullMessageResponse:
+    ) -> flwr.proto.appio_pb2.PullAppMessagesResponse:
         """Pull Message"""
         pass
 
+    @abc.abstractmethod
+    def PushObject(self,
+        request: flwr.proto.message_pb2.PushObjectRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.message_pb2.PushObjectResponse:
+        """Push Object"""
+        pass
+
+    @abc.abstractmethod
+    def PullObject(self,
+        request: flwr.proto.message_pb2.PullObjectRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.message_pb2.PullObjectResponse:
+        """Pull Object"""
+        pass
+
+    @abc.abstractmethod
+    def ConfirmMessageReceived(self,
+        request: flwr.proto.message_pb2.ConfirmMessageReceivedRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.message_pb2.ConfirmMessageReceivedResponse:
+        """Confirm Message Received"""
+        pass
+
 
 def add_ClientAppIoServicer_to_server(servicer: ClientAppIoServicer, server: grpc.Server) -> None: ...

flwr/server/fleet_event_log_interceptor.py

@@ -41,6 +41,10 @@ class FleetEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
         if event logger is enabled on the SuperLink, else, terminate RPC call by setting
         context to abort.
         """
+        # Only apply to Fleet service
+        if not handler_call_details.method.startswith("/flwr.proto.Fleet/"):
+            return continuation(handler_call_details)
+
         # One of the method handlers in
         # `flwr.server.superlink.fleet.grpc_rere.fleet_servicer.FleetServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)

flwr/server/grid/grpc_grid.py

@@ -31,11 +31,12 @@ from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.inflatable import (
     get_all_nested_objects,
     get_object_tree,
+    iterate_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_grpc_utils import (
-    make_pull_object_fn_grpc,
-    make_push_object_fn_grpc,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -240,8 +241,8 @@ class GrpcGrid(Grid):
             # Push only object that are not in the store
             push_objects(
                 all_objects,
-                push_object_fn=make_push_object_fn_grpc(
-                    push_object_grpc=self._stub.PushObject,
+                push_object_fn=make_push_object_fn_protobuf(
+                    push_object_protobuf=self._stub.PushObject,
                     node=self.node,
                     run_id=run_id,
                 ),
@@ -304,12 +305,14 @@ class GrpcGrid(Grid):
             )
             # Pull Messages from store
             inflated_msgs: list[Message] = []
-            for msg_proto in res.messages_list:
+            for msg_proto, msg_tree in zip(res.messages_list, res.message_object_trees):
                 msg_id = msg_proto.metadata.message_id
                 all_object_contents = pull_objects(
-                    list(res.objects_to_pull[msg_id].object_ids) + [msg_id],
-                    pull_object_fn=make_pull_object_fn_grpc(
-                        pull_object_grpc=self._stub.PullObject,
+                    object_ids=[
+                        tree.object_id for tree in iterate_object_tree(msg_tree)
+                    ],
+                    pull_object_fn=make_pull_object_fn_protobuf(
+                        pull_object_protobuf=self._stub.PullObject,
                         node=self.node,
                         run_id=run_id,
                     ),

flwr/server/superlink/fleet/grpc_rere/server_interceptor.py

@@ -81,12 +81,9 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
         metadata sent by the node. Continue RPC call if node is authenticated, else,
         terminate RPC call by setting context to abort.
         """
-        # Filter out non-Fleet service calls
+        # Only apply to Fleet service
         if not handler_call_details.method.startswith("/flwr.proto.Fleet/"):
-            return _unary_unary_rpc_terminator(
-                "This request should be sent to a different service.",
-                grpc.StatusCode.FAILED_PRECONDITION,
-            )
+            return continuation(handler_call_details)
 
         state = self.state_factory.state()
         metadata_dict = dict(handler_call_details.invocation_metadata)

flwr/server/superlink/serverappio/serverappio_servicer.py

@@ -27,7 +27,6 @@ from flwr.common.inflatable import (
     UnexpectedObjectContentError,
     get_all_nested_objects,
     get_object_tree,
-    iterate_object_tree,
     no_object_id_recompute,
 )
 from flwr.common.logger import log
@@ -65,7 +64,6 @@ from flwr.proto.log_pb2 import (  # pylint: disable=E0611
 from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     ConfirmMessageReceivedRequest,
     ConfirmMessageReceivedResponse,
-    ObjectIDs,
     PullObjectRequest,
     PullObjectResponse,
     PushObjectRequest,
@@ -227,7 +225,7 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
 
         # Convert Messages to proto
         messages_list = []
-        objects_to_pull: dict[str, ObjectIDs] = {}
+        trees = []
         while messages_res:
             msg = messages_res.pop(0)
 
@@ -238,22 +236,20 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
                     request_name="PullMessages",
                     detail="`message.metadata` has mismatched `run_id`",
                 )
-            messages_list.append(message_to_proto(msg))
 
             try:
                 msg_object_id = msg.metadata.message_id
                 obj_tree = store.get_object_tree(msg_object_id)
-                descendants = [node.object_id for node in iterate_object_tree(obj_tree)]
-                descendants = descendants[:-1]  # Exclude the message itself
-                # Add mapping of message object ID to its descendants
-                objects_to_pull[msg_object_id] = ObjectIDs(object_ids=descendants)
+                # Add message and object tree to the response
+                messages_list.append(message_to_proto(msg))
+                trees.append(obj_tree)
             except NoObjectInStoreError as e:
                 log(ERROR, e.message)
                 # Delete message ins from state
                 state.delete_messages(message_ins_ids={msg_object_id})
 
         return PullAppMessagesResponse(
-            messages_list=messages_list, objects_to_pull=objects_to_pull
+            messages_list=messages_list, message_object_trees=trees
         )
 
     def GetRun(

flwr/superexec/exec_event_log_interceptor.py

@@ -44,6 +44,10 @@ class ExecEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
         Continue RPC call if event logger is enabled on the SuperLink, else, terminate
         RPC call by setting context to abort.
         """
+        # Only apply to Exec service
+        if not handler_call_details.method.startswith("/flwr.proto.Exec/"):
+            return continuation(handler_call_details)
+
         # One of the method handlers in
         # `flwr.superexec.exec_servicer.ExecServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)

flwr/superexec/exec_license_interceptor.py

@@ -42,6 +42,10 @@ class ExecLicenseInterceptor(grpc.ServerInterceptor):  # type: ignore
         Continue RPC call if license check is enabled and passes, else, terminate RPC
         call by setting context to abort.
         """
+        # Only apply to Exec service
+        if not handler_call_details.method.startswith("/flwr.proto.Exec/"):
+            return continuation(handler_call_details)
+
         # One of the method handlers in
         # `flwr.superexec.exec_servicer.ExecServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)