flwr-nightly 1.26.0.dev20260129__py3-none-any.whl → 1.26.0.dev20260201__py3-none-any.whl

flwr/cli/build.py

@@ -106,7 +106,7 @@ def build(
     if app is None:
         app = Path.cwd()
 
-    app = app.resolve()
+    app = app.expanduser().resolve()
     if not app.is_dir():
         raise click.ClickException(
             f"The path {app} is not a valid path to a Flower app."

flwr/cli/config_migration.py

@@ -125,7 +125,7 @@ def _migrate_pyproject_toml_to_flower_config(
             if cert_path := toml_fed_config.get("root-certificates"):
                 if not Path(cert_path).is_absolute():
                     toml_fed_config["root-certificates"] = str(
-                        (app / cert_path).resolve()
+                        (app / cert_path).expanduser().resolve()
                     )
             # Parse and write SuperLink connection
             conn = parse_superlink_connection(toml_fed_config, name)
@@ -223,7 +223,7 @@ def migrate(
     # Determine app path for migration
     arg1 = positional_arg_1
     app = Path(arg1) if arg1 else Path(".")
-    app = app.resolve()
+    app = app.expanduser().resolve()
 
     # Check if migration is applicable and if legacy usage is detected
     is_migratable, reason = _is_migratable(app)

flwr/cli/install.py

@@ -63,7 +63,7 @@ def install(
     if source is None:
         source = Path(typer.prompt("Enter the source FAB file"))
 
-    source = source.resolve()
+    source = source.expanduser().resolve()
     if not source.exists() or not source.is_file():
         raise click.ClickException(
             f"The source {source} does not exist or is not a file."

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(
@@ -125,11 +133,11 @@ def run(
 
         # Validate TOML configuration for local app
         else:
+            app = app.expanduser().resolve()  # Resolve path to absolute
             config, warnings = load_and_validate(app / FAB_CONFIG_FILE)
             if warnings:
                 typer.secho(
-                    "Missing recommended fields in Flower App configuration "
-                    "(pyproject.toml):\n"
+                    f"Flower App configuration warnings in '{app / FAB_CONFIG_FILE}':\n"
                     + "\n".join([f"- {line}" for line in warnings]),
                     fg=typer.colors.YELLOW,
                     bold=True,
@@ -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/supernode/register.py

@@ -66,8 +66,7 @@ def register(  # pylint: disable=R0914
 ) -> None:
     """Add a SuperNode to the federation."""
     # Load public key
-    public_key_path = Path(public_key)
-    public_key_bytes = try_load_public_key(public_key_path)
+    public_key_bytes = try_load_public_key(public_key.expanduser())
 
     with cli_output_handler(output_format=output_format) as is_json:
         # Migrate legacy usage if any

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/client/grpc_rere_client/connection.py

@@ -136,7 +136,7 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     confirm_message_received : Callable[[str], None]
     """
     if isinstance(root_certificates, str):
-        root_certificates = Path(root_certificates).read_bytes()
+        root_certificates = Path(root_certificates).expanduser().read_bytes()
 
     # Automatic node auth: generate keys if user didn't provide any
     self_registered = False

flwr/common/args.py

@@ -95,7 +95,7 @@ def try_obtain_root_certificates(
             log(ERROR, "Path argument `--root-certificates` does not point to a file.")
             sys.exit(1)
         else:
-            root_certificates = Path(root_cert_path).read_bytes()
+            root_certificates = Path(root_cert_path).expanduser().read_bytes()
         log(
             DEBUG,
             "Starting secure HTTPS channel to %s "
@@ -129,9 +129,9 @@ def try_obtain_server_certificates(
         if not isfile(args.ssl_keyfile):
             sys.exit("Path argument `--ssl-keyfile` does not point to a file.")
         certificates = (
-            Path(args.ssl_ca_certfile).read_bytes(),  # CA certificate
-            Path(args.ssl_certfile).read_bytes(),  # server certificate
-            Path(args.ssl_keyfile).read_bytes(),  # server private key
+            Path(args.ssl_ca_certfile).expanduser().read_bytes(),  # CA certificate
+            Path(args.ssl_certfile).expanduser().read_bytes(),  # server certificate
+            Path(args.ssl_keyfile).expanduser().read_bytes(),  # server private key
         )
         return certificates
     if args.ssl_certfile or args.ssl_keyfile or args.ssl_ca_certfile:

flwr/common/config.py

@@ -42,7 +42,7 @@ T_dict = TypeVar("T_dict", bound=dict[str, Any])  # pylint: disable=invalid-name
 
 def get_flwr_dir(provided_path: str | None = None) -> Path:
     """Return the Flower home directory based on env variables."""
-    if provided_path is None or not Path(provided_path).is_dir():
+    if provided_path is None or not Path(provided_path).expanduser().is_dir():
         return Path(
             os.getenv(
                 FLWR_HOME,
@@ -213,7 +213,7 @@ def parse_config_args(config: list[str] | None, flatten: bool = True) -> dict[st
 
     # Handle if .toml file is passed
     if len(config) == 1 and config[0].endswith(".toml"):
-        with Path(config[0]).open("rb") as config_file:
+        with Path(config[0]).expanduser().open("rb") as config_file:
             overrides = flatten_dict(tomli.load(config_file))
         return overrides
 

flwr/common/exit/exit.py

@@ -87,9 +87,6 @@ def flwr_exit(
     # Log the exit message
     log(log_level, exit_message)
 
-    # Trigger exit handlers
-    trigger_exit_handlers()
-
     # Start a daemon thread to force exit if graceful exit fails
     def force_exit() -> None:
         time.sleep(FORCE_EXIT_TIMEOUT_SECONDS)
@@ -97,6 +94,9 @@ def flwr_exit(
 
     threading.Thread(target=force_exit, daemon=True).start()
 
+    # Trigger exit handlers
+    trigger_exit_handlers()
+
     # Exit
     sys.exit(sys_exit_code)
 

flwr/common/logger.py

@@ -385,7 +385,7 @@ def start_log_uploader(
 ) -> threading.Thread:
     """Start the log uploader thread and return it."""
     thread = threading.Thread(
-        target=_log_uploader, args=(log_queue, node_id, run_id, stub)
+        target=_log_uploader, args=(log_queue, node_id, run_id, stub), daemon=True
     )
     thread.start()
     return thread

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\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\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\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\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)

flwr/proto/clientappio_pb2_grpc.py

@@ -52,26 +52,6 @@ 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',
-                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',
-                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,
@@ -92,13 +72,37 @@ 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.PullClientAppInputs = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PullClientAppInputs',
+                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',
+                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)
 
 
 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 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 PushMessage(self, request, context):
-        """Push Message
+    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 PullMessage(self, request, context):
-        """Pull Message
+    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 SendAppHeartbeat(self, request, context):
-        """App heartbeat
+    def PullClientAppInputs(self, request, context):
+        """///////////////////////////////////////////////////////////////////////////
+        Specific endpoints for ClientAppIo
+        ///////////////////////////////////////////////////////////////////////////
+
+        Pull client app inputs
         """
         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 PushClientAppOutputs(self, request, context):
+        """Push client app outputs
         """
         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):
+        """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,26 +208,6 @@ 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,
-                    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_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,
@@ -232,6 +228,26 @@ 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,
             ),
+            'PullClientAppInputs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullClientAppInputs,
+                    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_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,
+            ),
     }
     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 PushObject(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/PushObject',
+            flwr_dot_proto_dot_message__pb2.PushObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PushObjectResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -379,7 +395,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PushMessage(request,
+    def PullObject(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/PullObject',
+            flwr_dot_proto_dot_message__pb2.PullObjectRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.PullObjectResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -406,7 +422,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PullMessage(request,
+    def ConfirmMessageReceived(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/ConfirmMessageReceived',
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedRequest.SerializeToString,
+            flwr_dot_proto_dot_message__pb2.ConfirmMessageReceivedResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -433,7 +449,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def SendAppHeartbeat(request,
+    def PullClientAppInputs(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/PullClientAppInputs',
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PullAppInputsResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -460,7 +476,7 @@ class ClientAppIo(object):
             _registered_method=True)
 
     @staticmethod
-    def PushObject(request,
+    def PushClientAppOutputs(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/PushClientAppOutputs',
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.PushAppOutputsResponse.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,