flwr 1.20.0__py3-none-any.whl → 1.21.0__py3-none-any.whl

flwr/common/exit/exit.py

@@ -22,11 +22,15 @@ from logging import ERROR, INFO
 from typing import Any, NoReturn
 
 from flwr.common import EventType, event
+from flwr.common.version import package_version
 
 from ..logger import log
 from .exit_code import EXIT_CODE_HELP
+from .exit_handler import trigger_exit_handlers
 
-HELP_PAGE_URL = "https://flower.ai/docs/framework/ref-exit-codes/"
+HELP_PAGE_URL = (
+    f"https://flower.ai/docs/framework/v{package_version}/en/ref-exit-codes/"
+)
 
 
 def flwr_exit(
@@ -77,6 +81,9 @@ def flwr_exit(
     # Log the exit message
     log(log_level, exit_message)
 
+    # Trigger exit handlers
+    trigger_exit_handlers()
+
     # Exit
     sys.exit(sys_exit_code)
 

flwr/common/exit/exit_code.py

@@ -32,19 +32,21 @@ class ExitCode:
     SUPERLINK_LICENSE_INVALID = 101
     SUPERLINK_LICENSE_MISSING = 102
     SUPERLINK_LICENSE_URL_INVALID = 103
+    SUPERLINK_INVALID_ARGS = 104
 
     # ServerApp-specific exit codes (200-299)
+    SERVERAPP_STRATEGY_PRECONDITION_UNMET = 200
+    SERVERAPP_EXCEPTION = 201
+    SERVERAPP_STRATEGY_AGGREGATION_ERROR = 202
 
     # SuperNode-specific exit codes (300-399)
     SUPERNODE_REST_ADDRESS_INVALID = 300
     SUPERNODE_NODE_AUTH_KEYS_REQUIRED = 301
     SUPERNODE_NODE_AUTH_KEYS_INVALID = 302
 
-    # ClientApp-specific exit codes (400-499)
+    # SuperExec-specific exit codes (400-499)
 
-    # Simulation-specific exit codes (500-599)
-
-    # Common exit codes (600-)
+    # Common exit codes (600-699)
     COMMON_ADDRESS_INVALID = 600
     COMMON_MISSING_EXTRA_REST = 601
     COMMON_TLS_NOT_SUPPORTED = 602
@@ -75,7 +77,25 @@ EXIT_CODE_HELP = {
         "The license URL is invalid. Please ensure that the `FLWR_LICENSE_URL` "
         "environment variable is set to a valid URL."
     ),
+    ExitCode.SUPERLINK_INVALID_ARGS: (
+        "Invalid arguments provided to SuperLink. Use `--help` check for the correct "
+        "usage. Alternatively, check the documentation."
+    ),
     # ServerApp-specific exit codes (200-299)
+    ExitCode.SERVERAPP_STRATEGY_PRECONDITION_UNMET: (
+        "The strategy received replies that cannot be aggregated. Please ensure all "
+        "replies returned by ClientApps have one `ArrayRecord` (none when replies are "
+        "from a round of federated evaluation, i.e. when message type is "
+        "`MessageType.EVALUATE`) and one `MetricRecord`. The records in all replies "
+        "must use identical keys. In addition, if the strategy expects a key to "
+        "perform weighted average (e.g. in FedAvg) please ensure the returned "
+        "MetricRecord from ClientApps do include this key."
+    ),
+    ExitCode.SERVERAPP_EXCEPTION: "An unhandled exception occurred in the ServerApp.",
+    ExitCode.SERVERAPP_STRATEGY_AGGREGATION_ERROR: (
+        "The strategy encountered an error during aggregation. Please check the logs "
+        "for more details."
+    ),
     # SuperNode-specific exit codes (300-399)
     ExitCode.SUPERNODE_REST_ADDRESS_INVALID: (
         "When using the REST API, please provide `https://` or "
@@ -91,9 +111,8 @@ EXIT_CODE_HELP = {
         "Please ensure that the file path points to a valid private/public key "
         "file and try again."
     ),
-    # ClientApp-specific exit codes (400-499)
-    # Simulation-specific exit codes (500-599)
-    # Common exit codes (600-)
+    # SuperExec-specific exit codes (400-499)
+    # Common exit codes (600-699)
     ExitCode.COMMON_ADDRESS_INVALID: (
         "Please provide a valid URL, IPv4 or IPv6 address."
     ),

flwr/common/exit/exit_handler.py

@@ -0,0 +1,62 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Common function to register exit handlers."""
+
+
+import signal
+import threading
+from typing import Callable
+
+from .exit_code import ExitCode
+
+SIGNAL_TO_EXIT_CODE: dict[int, int] = {
+    signal.SIGINT: ExitCode.GRACEFUL_EXIT_SIGINT,
+    signal.SIGTERM: ExitCode.GRACEFUL_EXIT_SIGTERM,
+}
+registered_exit_handlers: list[Callable[[], None]] = []
+_lock_handlers = threading.Lock()
+
+# SIGQUIT is not available on Windows
+if hasattr(signal, "SIGQUIT"):
+    SIGNAL_TO_EXIT_CODE[signal.SIGQUIT] = ExitCode.GRACEFUL_EXIT_SIGQUIT
+
+
+def add_exit_handler(exit_handler: Callable[[], None]) -> None:
+    """Add an exit handler to be called on graceful exit.
+
+    This function allows you to register additional exit handlers
+    that will be executed when `flwr_exit` is called.
+
+    Parameters
+    ----------
+    exit_handler : Callable[[], None]
+        A callable that takes no arguments and performs cleanup or
+        other actions before the application exits.
+
+    Notes
+    -----
+    The registered exit handlers will be called in LIFO order, i.e.,
+    the last registered handler will be the first to be called.
+    """
+    with _lock_handlers:
+        registered_exit_handlers.append(exit_handler)
+
+
+def trigger_exit_handlers() -> None:
+    """Trigger all registered exit handlers in LIFO order."""
+    with _lock_handlers:
+        for handler in reversed(registered_exit_handlers):
+            handler()
+        registered_exit_handlers.clear()

flwr/common/{exit_handlers.py → exit/signal_handler.py}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Common function to register exit handlers for server and client."""
+"""Common function to register signal handlers."""
 
 
 import signal
@@ -24,20 +24,21 @@ from grpc import Server
 
 from flwr.common.telemetry import EventType
 
-from .exit import ExitCode, flwr_exit
+from .exit import flwr_exit
+from .exit_code import ExitCode
+from .exit_handler import add_exit_handler
 
 SIGNAL_TO_EXIT_CODE: dict[int, int] = {
     signal.SIGINT: ExitCode.GRACEFUL_EXIT_SIGINT,
     signal.SIGTERM: ExitCode.GRACEFUL_EXIT_SIGTERM,
 }
-registered_exit_handlers: list[Callable[[], None]] = []
 
 # SIGQUIT is not available on Windows
 if hasattr(signal, "SIGQUIT"):
     SIGNAL_TO_EXIT_CODE[signal.SIGQUIT] = ExitCode.GRACEFUL_EXIT_SIGQUIT
 
 
-def register_exit_handlers(
+def register_signal_handlers(
     event_type: EventType,
     exit_message: Optional[str] = None,
     grpc_servers: Optional[list[Server]] = None,
@@ -63,7 +64,21 @@ def register_exit_handlers(
         Additional exit handlers can be added using `add_exit_handler`.
     """
     default_handlers: dict[int, Callable[[int, FrameType], None]] = {}
-    registered_exit_handlers.extend(exit_handlers or [])
+
+    def _wait_to_stop() -> None:
+        if grpc_servers is not None:
+            for grpc_server in grpc_servers:
+                grpc_server.stop(grace=1)
+
+        if bckg_threads is not None:
+            for bckg_thread in bckg_threads:
+                bckg_thread.join()
+
+    # Ensure that `_wait_to_stop` is the last handler called on exit
+    add_exit_handler(_wait_to_stop)
+
+    for handler in exit_handlers or []:
+        add_exit_handler(handler)
 
     def graceful_exit_handler(signalnum: int, _frame: FrameType) -> None:
         """Exit handler to be registered with `signal.signal`.
@@ -74,17 +89,6 @@ def register_exit_handlers(
         # Reset to default handler
         signal.signal(signalnum, default_handlers[signalnum])  # type: ignore
 
-        for handler in registered_exit_handlers:
-            handler()
-
-        if grpc_servers is not None:
-            for grpc_server in grpc_servers:
-                grpc_server.stop(grace=1)
-
-        if bckg_threads is not None:
-            for bckg_thread in bckg_threads:
-                bckg_thread.join()
-
         # Setup things for graceful exit
         flwr_exit(
             code=SIGNAL_TO_EXIT_CODE[signalnum],
@@ -96,24 +100,3 @@ def register_exit_handlers(
     for sig in SIGNAL_TO_EXIT_CODE:
         default_handler = signal.signal(sig, graceful_exit_handler)  # type: ignore
         default_handlers[sig] = default_handler  # type: ignore
-
-
-def add_exit_handler(exit_handler: Callable[[], None]) -> None:
-    """Add an exit handler to be called on graceful exit.
-
-    This function allows you to register additional exit handlers
-    that will be executed when the application exits gracefully,
-    if `register_exit_handlers` was called.
-
-    Parameters
-    ----------
-    exit_handler : Callable[[], None]
-        A callable that takes no arguments and performs cleanup or
-        other actions before the application exits.
-
-    Notes
-    -----
-    This method is not thread-safe, and it allows you to add the
-    same exit handler multiple times.
-    """
-    registered_exit_handlers.append(exit_handler)

flwr/common/grpc.py

@@ -23,9 +23,6 @@ from logging import DEBUG, ERROR
 from typing import Any, Callable, Optional
 
 import grpc
-from grpc_health.v1.health_pb2_grpc import add_HealthServicer_to_server
-
-from flwr.supercore.grpc_health import SimpleHealthServicer
 
 from .address import is_port_in_use
 from .logger import log
@@ -109,7 +106,6 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments, R0914, R0
     keepalive_time_ms: int = 210000,
     certificates: Optional[tuple[bytes, bytes, bytes]] = None,
     interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
-    health_servicer: Optional[Any] = None,
 ) -> grpc.Server:
     """Create a gRPC server with a single servicer.
 
@@ -157,10 +153,6 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments, R0914, R0
             * server private key.
     interceptors : Optional[Sequence[grpc.ServerInterceptor]] (default: None)
         A list of gRPC interceptors.
-    health_servicer : Optional[Any] (default: None)
-        An optional health servicer to add to the server. If provided, it should be an
-        instance of a class that inherits the `HealthServicer` class.
-        If None is provided, `SimpleHealthServicer` will be used by default.
 
     Returns
     -------
@@ -211,9 +203,6 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments, R0914, R0
     )
     add_servicer_to_server_fn(servicer, server)
 
-    # Enable health service
-    add_HealthServicer_to_server(health_servicer or SimpleHealthServicer(), server)
-
     if certificates is not None:
         if not valid_certificates(certificates):
             sys.exit(1)

flwr/common/inflatable_utils.py

@@ -34,7 +34,7 @@ from .constant import (
     PULL_MAX_TIME,
     PULL_MAX_TRIES_PER_OBJECT,
 )
-from .exit_handlers import add_exit_handler
+from .exit import add_exit_handler
 from .inflatable import (
     InflatableObject,
     UnexpectedObjectContentError,

flwr/common/logger.py

@@ -132,13 +132,13 @@ if log_level := os.getenv("FLWR_LOG_LEVEL"):
     log_level = log_level.upper()
     try:
         is_debug = log_level == "DEBUG"
+        update_console_handler(level=log_level, timestamps=is_debug, colored=True)
         if is_debug:
             log(
                 WARN,
                 "DEBUG logs enabled. Do not use this in production, as it may expose "
                 "sensitive details.",
             )
-        update_console_handler(level=log_level, timestamps=is_debug, colored=True)
     except Exception:  # pylint: disable=broad-exception-caught
         # Alert user but don't raise exception
         log(

flwr/common/retry_invoker.py

@@ -17,6 +17,7 @@
 
 import itertools
 import random
+import threading
 import time
 from collections.abc import Generator, Iterable
 from dataclasses import dataclass
@@ -319,8 +320,12 @@ class RetryInvoker:
 
 def _make_simple_grpc_retry_invoker() -> RetryInvoker:
     """Create a simple gRPC retry invoker."""
+    lock = threading.Lock()
+    system_healthy = threading.Event()
+    system_healthy.set()  # Initially, the connection is healthy
 
-    def _on_sucess(retry_state: RetryState) -> None:
+    def _on_success(retry_state: RetryState) -> None:
+        system_healthy.set()
         if retry_state.tries > 1:
             log(
                 INFO,
@@ -329,17 +334,11 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
                 retry_state.tries,
             )
 
-    def _on_backoff(retry_state: RetryState) -> None:
-        if retry_state.tries == 1:
-            log(WARN, "Connection attempt failed, retrying...")
-        else:
-            log(
-                WARN,
-                "Connection attempt failed, retrying in %.2f seconds",
-                retry_state.actual_wait,
-            )
+    def _on_backoff(_: RetryState) -> None:
+        system_healthy.clear()
 
     def _on_giveup(retry_state: RetryState) -> None:
+        system_healthy.clear()
         if retry_state.tries > 1:
             log(
                 WARN,
@@ -355,15 +354,35 @@ def _make_simple_grpc_retry_invoker() -> RetryInvoker:
             return False
         return True
 
+    def _wait(wait_time: float) -> None:
+        # Use a lock to prevent multiple gRPC calls from retrying concurrently,
+        # which is unnecessary since they are all likely to fail.
+        with lock:
+            # Log the wait time
+            log(
+                WARN,
+                "Connection attempt failed, retrying in %.2f seconds",
+                wait_time,
+            )
+
+            start = time.monotonic()
+            # Avoid sequential waits if the system is healthy
+            system_healthy.wait(wait_time)
+
+        remaining_time = wait_time - (time.monotonic() - start)
+        if remaining_time > 0:
+            time.sleep(remaining_time)
+
     return RetryInvoker(
         wait_gen_factory=lambda: exponential(max_delay=MAX_RETRY_DELAY),
         recoverable_exceptions=grpc.RpcError,
         max_tries=None,
         max_time=None,
-        on_success=_on_sucess,
+        on_success=_on_success,
         on_backoff=_on_backoff,
         on_giveup=_on_giveup,
         should_giveup=_should_giveup_fn,
+        wait_function=_wait,
     )
 
 

flwr/common/telemetry.py

@@ -181,6 +181,10 @@ class EventType(str, Enum):
     RUN_SUPERNODE_ENTER = auto()
     RUN_SUPERNODE_LEAVE = auto()
 
+    # CLI: `flower-superexec`
+    RUN_SUPEREXEC_ENTER = auto()
+    RUN_SUPEREXEC_LEAVE = auto()
+
 
 # Use the ThreadPoolExecutor with max_workers=1 to have a queue
 # and also ensure that telemetry calls are not blocking.

flwr/compat/server/app.py

@@ -22,7 +22,7 @@ from typing import Optional
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.address import parse_address
 from flwr.common.constant import FLEET_API_GRPC_BIDI_DEFAULT_ADDRESS
-from flwr.common.exit_handlers import register_exit_handlers
+from flwr.common.exit import register_signal_handlers
 from flwr.common.logger import log, warn_deprecated_feature
 from flwr.server.client_manager import ClientManager
 from flwr.server.history import History
@@ -154,7 +154,7 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
     )
 
     # Graceful shutdown
-    register_exit_handlers(
+    register_signal_handlers(
         event_type=EventType.START_SERVER_LEAVE,
         exit_message="Flower server terminated gracefully.",
         grpc_servers=[grpc_server],

flwr/proto/appio_pb2.py

@@ -17,27 +17,35 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/appio.proto\x12\nflwr.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\"\x99\x01\n\x16PushAppMessagesRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x34\n\x14message_object_trees\x18\x04 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"G\n\x17PushAppMessagesResponse\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\x12\x17\n\x0fobjects_to_push\x18\x02 \x03(\t\"L\n\x16PullAppMessagesRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\"{\n\x17PullAppMessagesResponse\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x02 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"%\n\x14PullAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\"y\n\x15PullAppInputsResponse\x12$\n\x07\x63ontext\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Fab\"\\\n\x15PushAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"\x18\n\x16PushAppOutputsResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/appio.proto\x12\nflwr.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\"\x19\n\x17ListAppsToLaunchRequest\"+\n\x18ListAppsToLaunchResponse\x12\x0f\n\x07run_ids\x18\x01 \x03(\x04\"%\n\x13RequestTokenRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"%\n\x14RequestTokenResponse\x12\r\n\x05token\x18\x01 \x01(\t\"\x99\x01\n\x16PushAppMessagesRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x34\n\x14message_object_trees\x18\x04 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"G\n\x17PushAppMessagesResponse\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\x12\x17\n\x0fobjects_to_push\x18\x02 \x03(\t\"L\n\x16PullAppMessagesRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\"{\n\x17PullAppMessagesResponse\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x34\n\x14message_object_trees\x18\x02 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"%\n\x14PullAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\"y\n\x15PullAppInputsResponse\x12$\n\x07\x63ontext\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Fab\"\\\n\x15PushAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"\x18\n\x16PushAppOutputsResponseb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.appio_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_start=109
-  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_end=262
-  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_start=264
-  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_end=335
-  _globals['_PULLAPPMESSAGESREQUEST']._serialized_start=337
-  _globals['_PULLAPPMESSAGESREQUEST']._serialized_end=413
-  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_start=415
-  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_end=538
-  _globals['_PULLAPPINPUTSREQUEST']._serialized_start=540
-  _globals['_PULLAPPINPUTSREQUEST']._serialized_end=577
-  _globals['_PULLAPPINPUTSRESPONSE']._serialized_start=579
-  _globals['_PULLAPPINPUTSRESPONSE']._serialized_end=700
-  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_start=702
-  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_end=794
-  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_start=796
-  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_end=820
+  _globals['_LISTAPPSTOLAUNCHREQUEST']._serialized_start=108
+  _globals['_LISTAPPSTOLAUNCHREQUEST']._serialized_end=133
+  _globals['_LISTAPPSTOLAUNCHRESPONSE']._serialized_start=135
+  _globals['_LISTAPPSTOLAUNCHRESPONSE']._serialized_end=178
+  _globals['_REQUESTTOKENREQUEST']._serialized_start=180
+  _globals['_REQUESTTOKENREQUEST']._serialized_end=217
+  _globals['_REQUESTTOKENRESPONSE']._serialized_start=219
+  _globals['_REQUESTTOKENRESPONSE']._serialized_end=256
+  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_start=259
+  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_end=412
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_start=414
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_end=485
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_start=487
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_end=563
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_start=565
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_end=688
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_start=690
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_end=727
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_start=729
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_end=850
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_start=852
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_end=944
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_start=946
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_end=970
 # @@protoc_insertion_point(module_scope)

flwr/proto/appio_pb2.pyi

@@ -14,12 +14,56 @@ import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
-class PushAppMessagesRequest(google.protobuf.message.Message):
+class ListAppsToLaunchRequest(google.protobuf.message.Message):
     """These messages are used by both ServerAppIo and ClientAppIo services
 
-    PushAppMessages messages
+    ListAppsToLaunch messages
     """
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___ListAppsToLaunchRequest = ListAppsToLaunchRequest
+
+class ListAppsToLaunchResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_IDS_FIELD_NUMBER: builtins.int
+    @property
+    def run_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
+        """List of run IDs of the apps to launch"""
+        pass
+    def __init__(self,
+        *,
+        run_ids: typing.Optional[typing.Iterable[builtins.int]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_ids",b"run_ids"]) -> None: ...
+global___ListAppsToLaunchResponse = ListAppsToLaunchResponse
+
+class RequestTokenRequest(google.protobuf.message.Message):
+    """RequestToken messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
+global___RequestTokenRequest = RequestTokenRequest
+
+class RequestTokenResponse(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___RequestTokenResponse = RequestTokenResponse
+
+class PushAppMessagesRequest(google.protobuf.message.Message):
+    """PushAppMessages messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TOKEN_FIELD_NUMBER: builtins.int
     MESSAGES_LIST_FIELD_NUMBER: builtins.int
     RUN_ID_FIELD_NUMBER: builtins.int

flwr/proto/clientappio_pb2.py

@@ -18,21 +18,13 @@ 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\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto\"%\n#GetRunIdsWithPendingMessagesRequest\"7\n$GetRunIdsWithPendingMessagesResponse\x12\x0f\n\x07run_ids\x18\x01 \x03(\x04\"%\n\x13RequestTokenRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"%\n\x14RequestTokenResponse\x12\r\n\x05token\x18\x01 \x01(\t2\xaf\x07\n\x0b\x43lientAppIo\x12\x83\x01\n\x1cGetRunIdsWithPendingMessages\x12/.flwr.proto.GetRunIdsWithPendingMessagesRequest\x1a\x30.flwr.proto.GetRunIdsWithPendingMessagesResponse\"\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\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\x14\x66lwr/proto/fab.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x16\x66lwr/proto/appio.proto2\x8a\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\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')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.clientappio_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_start=138
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_end=175
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_start=177
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_end=232
-  _globals['_REQUESTTOKENREQUEST']._serialized_start=234
-  _globals['_REQUESTTOKENREQUEST']._serialized_end=271
-  _globals['_REQUESTTOKENRESPONSE']._serialized_start=273
-  _globals['_REQUESTTOKENRESPONSE']._serialized_end=310
-  _globals['_CLIENTAPPIO']._serialized_start=313
-  _globals['_CLIENTAPPIO']._serialized_end=1256
+  _globals['_CLIENTAPPIO']._serialized_start=139
+  _globals['_CLIENTAPPIO']._serialized_end=1045
 # @@protoc_insertion_point(module_scope)

flwr/proto/clientappio_pb2.pyi

@@ -2,53 +2,6 @@
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
 """
-import builtins
 import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.message
-import typing
-import typing_extensions
 
 DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class GetRunIdsWithPendingMessagesRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    def __init__(self,
-        ) -> None: ...
-global___GetRunIdsWithPendingMessagesRequest = GetRunIdsWithPendingMessagesRequest
-
-class GetRunIdsWithPendingMessagesResponse(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    RUN_IDS_FIELD_NUMBER: builtins.int
-    @property
-    def run_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.int]:
-        """List of run IDs"""
-        pass
-    def __init__(self,
-        *,
-        run_ids: typing.Optional[typing.Iterable[builtins.int]] = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["run_ids",b"run_ids"]) -> None: ...
-global___GetRunIdsWithPendingMessagesResponse = GetRunIdsWithPendingMessagesResponse
-
-class RequestTokenRequest(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    RUN_ID_FIELD_NUMBER: builtins.int
-    run_id: builtins.int
-    def __init__(self,
-        *,
-        run_id: builtins.int = ...,
-        ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
-global___RequestTokenRequest = RequestTokenRequest
-
-class RequestTokenResponse(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___RequestTokenResponse = RequestTokenResponse