flwr-nightly 1.26.0.dev20260130__py3-none-any.whl → 1.26.0.dev20260202__py3-none-any.whl

flwr/cli/run/run.py

@@ -44,7 +44,7 @@ from flwr.common.serde import config_record_to_proto, fab_to_proto, user_config_
 from flwr.common.typing import Fab
 from flwr.proto.control_pb2 import StartRunRequest  # pylint: disable=E0611
 from flwr.proto.control_pb2_grpc import ControlStub
-from flwr.supercore.utils import parse_app_spec
+from flwr.supercore.utils import check_federation_format, parse_app_spec
 
 from ..log import start_stream
 from ..utils import (
@@ -67,6 +67,14 @@ def run(
         str | None,
         typer.Argument(help="Name of the SuperLink connection."),
     ] = None,
+    federation: Annotated[
+        str | None,
+        typer.Option(
+            "--federation",
+            help="The federation to submit the run to; must be in the "
+            "format `@<account>/<federation>`.",
+        ),
+    ] = None,
     run_config_overrides: Annotated[
         list[str] | None,
         typer.Option(
@@ -139,6 +147,7 @@ def run(
             _run_with_control_api(
                 app,
                 config,
+                federation,
                 superlink_connection,
                 run_config_overrides,
                 stream,
@@ -157,6 +166,7 @@ def run(
 def _run_with_control_api(
     app: Path,
     config: dict[str, Any],
+    federation: str | None,
     superlink_connection: SuperLinkConnection,
     config_overrides: list[str] | None,
     stream: bool,
@@ -165,6 +175,13 @@ def _run_with_control_api(
 ) -> None:
     channel = None
     is_remote_app = app_spec is not None
+
+    # Determine federation to use
+    if federation:  # Override federation from CLI
+        check_federation_format(federation)
+    else:  # Use federation from SuperLink connection if set
+        federation = superlink_connection.federation or ""
+
     try:
         channel = init_channel_from_connection(superlink_connection)
         stub = ControlStub(channel)
@@ -193,7 +210,7 @@ def _run_with_control_api(
         req = StartRunRequest(
             fab=fab_to_proto(fab),
             override_config=user_config_to_proto(parse_config_args(config_overrides)),
-            federation=superlink_connection.federation or "",
+            federation=federation,
             federation_options=config_record_to_proto(c_record),
             app_spec=app_spec or "",
         )

flwr/cli/utils.py

@@ -418,7 +418,8 @@ def flwr_cli_grpc_exc_handler() -> Iterator[None]:  # pylint: disable=too-many-b
             if e.details() == FEDERATION_NOT_SPECIFIED_MESSAGE:  # pylint: disable=E1101
                 raise click.ClickException(
                     "No federation specified. "
-                    "Please specify a federation and try again.",
+                    "Please use the `--federation` flag or set a default federation "
+                    "in your SuperLink connection configuration."
                 ) from None
             patten = re.compile(FEDERATION_NOT_FOUND_MESSAGE.replace("%s", "(.+)"))
             if m := patten.match(e.details()):  # pylint: disable=E1101

flwr/proto/clientappio_pb2.py

@@ -28,7 +28,7 @@ from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 from flwr.proto import appio_pb2 as flwr_dot_proto_dot_appio__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto2\xeb\x07\n\x0b\x43lientAppIo\x12_\n\x10ListAppsToLaunch\x12#.flwr.proto.ListAppsToLaunchRequest\x1a$.flwr.proto.ListAppsToLaunchResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\\\n\x13PullClientAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12_\n\x14PushClientAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12X\n\x0bPushMessage\x12\".flwr.proto.PushAppMessagesRequest\x1a#.flwr.proto.PushAppMessagesResponse\"\x00\x12X\n\x0bPullMessage\x12\".flwr.proto.PullAppMessagesRequest\x1a#.flwr.proto.PullAppMessagesResponse\"\x00\x12_\n\x10SendAppHeartbeat\x12#.flwr.proto.SendAppHeartbeatRequest\x1a$.flwr.proto.SendAppHeartbeatResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x66lwr/proto/clientappio.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto2\xdf\x07\n\x0b\x43lientAppIo\x12_\n\x10ListAppsToLaunch\x12#.flwr.proto.ListAppsToLaunchRequest\x1a$.flwr.proto.ListAppsToLaunchResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12_\n\x10SendAppHeartbeat\x12#.flwr.proto.SendAppHeartbeatRequest\x1a$.flwr.proto.SendAppHeartbeatResponse\"\x00\x12V\n\rPullAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12Y\n\x0ePushAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12M\n\nPushObject\x12\x1d.flwr.proto.PushObjectRequest\x1a\x1e.flwr.proto.PushObjectResponse\"\x00\x12M\n\nPullObject\x12\x1d.flwr.proto.PullObjectRequest\x1a\x1e.flwr.proto.PullObjectResponse\"\x00\x12q\n\x16\x43onfirmMessageReceived\x12).flwr.proto.ConfirmMessageReceivedRequest\x1a*.flwr.proto.ConfirmMessageReceivedResponse\"\x00\x12X\n\x0bPushMessage\x12\".flwr.proto.PushAppMessagesRequest\x1a#.flwr.proto.PushAppMessagesResponse\"\x00\x12X\n\x0bPullMessage\x12\".flwr.proto.PullAppMessagesRequest\x1a#.flwr.proto.PullAppMessagesResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -36,5 +36,5 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.clientappio_pb2'
 if not _descriptor._USE_C_DESCRIPTORS:
   DESCRIPTOR._loaded_options = None
   _globals['_CLIENTAPPIO']._serialized_start=145
-  _globals['_CLIENTAPPIO']._serialized_end=1148
+  _globals['_CLIENTAPPIO']._serialized_end=1136
 # @@protoc_insertion_point(module_scope)

flwr/proto/clientappio_pb2_grpc.py

@@ -52,31 +52,21 @@ class ClientAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
                 _registered_method=True)
-        self.PullClientAppInputs = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/PullClientAppInputs',
+        self.SendAppHeartbeat = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/SendAppHeartbeat',
+                request_serializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.FromString,
+                _registered_method=True)
+        self.PullAppInputs = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PullAppInputs',
                 request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
                 _registered_method=True)
-        self.PushClientAppOutputs = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/PushClientAppOutputs',
+        self.PushAppOutputs = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PushAppOutputs',
                 request_serializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.FromString,
                 _registered_method=True)
-        self.PushMessage = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/PushMessage',
-                request_serializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
-                _registered_method=True)
-        self.PullMessage = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/PullMessage',
-                request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
-                _registered_method=True)
-        self.SendAppHeartbeat = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/SendAppHeartbeat',
-                request_serializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.FromString,
-                _registered_method=True)
         self.PushObject = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/PushObject',
                 request_serializer=flwr_dot_proto_dot_message__pb2.PushObjectRequest.SerializeToString,
@@ -92,13 +82,27 @@ class ClientAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.FromString,
                 _registered_method=True)
+        self.PushMessage = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PushMessage',
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
+                _registered_method=True)
+        self.PullMessage = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PullMessage',
+                request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
+                _registered_method=True)
 
 
 class ClientAppIoServicer(object):
     """Missing associated documentation comment in .proto file."""
 
     def ListAppsToLaunch(self, request, context):
-        """Get run IDs with pending messages
+        """///////////////////////////////////////////////////////////////////////////
+        General *AppIo endpoints for SuperExec processes
+        ///////////////////////////////////////////////////////////////////////////
+
+        Get run IDs with pending messages
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -112,63 +116,75 @@ class ClientAppIoServicer(object):
         raise NotImplementedError('Method not implemented!')
 
     def GetRun(self, request, context):
-        """Get run details
+        """///////////////////////////////////////////////////////////////////////////
+        General *AppIo endpoints for App Executor processes
+        ///////////////////////////////////////////////////////////////////////////
+
+        Get run details
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def PullClientAppInputs(self, request, context):
-        """Pull client app inputs
+    def SendAppHeartbeat(self, request, context):
+        """App heartbeat
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def PushClientAppOutputs(self, request, context):
-        """Push client app outputs
+    def PullAppInputs(self, request, context):
+        """Pull app inputs
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def PushMessage(self, request, context):
-        """Push Message
+    def PushAppOutputs(self, request, context):
+        """Push app outputs
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def PullMessage(self, request, context):
-        """Pull Message
+    def PushObject(self, request, context):
+        """///////////////////////////////////////////////////////////////////////////
+        Specific endpoints shared by ServerAppIo and ClientAppIo
+        ///////////////////////////////////////////////////////////////////////////
+
+        Push Object
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def SendAppHeartbeat(self, request, context):
-        """App heartbeat
+    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 PushObject(self, request, context):
-        """Push Object
+    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 PullObject(self, request, context):
-        """Pull Object
+    def PushMessage(self, request, context):
+        """///////////////////////////////////////////////////////////////////////////
+        Specific endpoints for ClientAppIo
+        ///////////////////////////////////////////////////////////////////////////
+
+        Push Message
         """
         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
+    def PullMessage(self, request, context):
+        """Pull Message
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
@@ -192,31 +208,21 @@ def add_ClientAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.SerializeToString,
             ),
-            'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
-                    servicer.PullClientAppInputs,
+            'SendAppHeartbeat': grpc.unary_unary_rpc_method_handler(
+                    servicer.SendAppHeartbeat,
+                    request_deserializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.SerializeToString,
+            ),
+            'PullAppInputs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullAppInputs,
                     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,
+            'PushAppOutputs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushAppOutputs,
                     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_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_appio__pb2.PullAppMessagesRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.SerializeToString,
-            ),
-            'SendAppHeartbeat': grpc.unary_unary_rpc_method_handler(
-                    servicer.SendAppHeartbeat,
-                    request_deserializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.SerializeToString,
-            ),
             'PushObject': grpc.unary_unary_rpc_method_handler(
                     servicer.PushObject,
                     request_deserializer=flwr_dot_proto_dot_message__pb2.PushObjectRequest.FromString,
@@ -232,6 +238,16 @@ def add_ClientAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.SerializeToString,
             ),
+            'PushMessage': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushMessage,
+                    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_appio__pb2.PullAppMessagesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'flwr.proto.ClientAppIo', rpc_method_handlers)
@@ -325,7 +341,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PullClientAppInputs(request,
+    def SendAppHeartbeat(request,
             target,
             options=(),
             channel_credentials=None,
@@ -338,9 +354,9 @@ class ClientAppIo(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/flwr.proto.ClientAppIo/PullClientAppInputs',
-            flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
-            flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
+            '/flwr.proto.ClientAppIo/SendAppHeartbeat',
+            flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.SerializeToString,
+            flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -352,7 +368,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PushClientAppOutputs(request,
+    def PullAppInputs(request,
             target,
             options=(),
             channel_credentials=None,
@@ -365,9 +381,9 @@ class ClientAppIo(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/flwr.proto.ClientAppIo/PushClientAppOutputs',
-            flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
-            flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.FromString,
+            '/flwr.proto.ClientAppIo/PullAppInputs',
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -379,7 +395,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PushMessage(request,
+    def PushAppOutputs(request,
             target,
             options=(),
             channel_credentials=None,
@@ -392,9 +408,9 @@ class ClientAppIo(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/flwr.proto.ClientAppIo/PushMessage',
-            flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
-            flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
+            '/flwr.proto.ClientAppIo/PushAppOutputs',
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -406,7 +422,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PullMessage(request,
+    def PushObject(request,
             target,
             options=(),
             channel_credentials=None,
@@ -419,9 +435,9 @@ class ClientAppIo(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/flwr.proto.ClientAppIo/PullMessage',
-            flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
-            flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
+            '/flwr.proto.ClientAppIo/PushObject',
+            flwr_dot_proto_dot_message__pb2.PushObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PushObjectResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -433,7 +449,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def SendAppHeartbeat(request,
+    def PullObject(request,
             target,
             options=(),
             channel_credentials=None,
@@ -446,9 +462,9 @@ class ClientAppIo(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/flwr.proto.ClientAppIo/SendAppHeartbeat',
-            flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatRequest.SerializeToString,
-            flwr_dot_proto_dot_heartbeat__pb2.SendAppHeartbeatResponse.FromString,
+            '/flwr.proto.ClientAppIo/PullObject',
+            flwr_dot_proto_dot_message__pb2.PullObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PullObjectResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -460,7 +476,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PushObject(request,
+    def ConfirmMessageReceived(request,
             target,
             options=(),
             channel_credentials=None,
@@ -473,9 +489,9 @@ class ClientAppIo(object):
         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,
+            '/flwr.proto.ClientAppIo/ConfirmMessageReceived',
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -487,7 +503,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PullObject(request,
+    def PushMessage(request,
             target,
             options=(),
             channel_credentials=None,
@@ -500,9 +516,9 @@ class ClientAppIo(object):
         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,
+            '/flwr.proto.ClientAppIo/PushMessage',
+            flwr_dot_proto_dot_appio__pb2.PushAppMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PushAppMessagesResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -514,7 +530,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def ConfirmMessageReceived(request,
+    def PullMessage(request,
             target,
             options=(),
             channel_credentials=None,
@@ -527,9 +543,9 @@ class ClientAppIo(object):
         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,
+            '/flwr.proto.ClientAppIo/PullMessage',
+            flwr_dot_proto_dot_appio__pb2.PullAppMessagesRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PullAppMessagesResponse.FromString,
             options,
             channel_credentials,
             insecure,