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

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/record/typeddict.py

@@ -18,6 +18,8 @@
 from collections.abc import ItemsView, Iterator, KeysView, MutableMapping, ValuesView
 from typing import Callable, Generic, TypeVar, cast
 
+from typing_extensions import Self
+
 K = TypeVar("K")  # Key type
 V = TypeVar("V")  # Value type
 
@@ -86,3 +88,13 @@ class TypedDict(MutableMapping[K, V], Generic[K, V]):
     def items(self) -> ItemsView[K, V]:
         """D.items() -> a set-like object providing a view on D's items."""
         return cast(dict[K, V], self.__dict__["_data"]).items()
+
+    def copy(self) -> Self:
+        """Return a shallow copy of the dictionary."""
+        # Allocate instance without going through __init__
+        new = self.__class__.__new__(type(self))
+        # Copy internal state
+        new.__dict__["_check_key_fn"] = self.__dict__["_check_key_fn"]
+        new.__dict__["_check_value_fn"] = self.__dict__["_check_value_fn"]
+        new.__dict__["_data"] = cast(dict[K, V], self.__dict__["_data"]).copy()
+        return new

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

flwr/proto/clientappio_pb2_grpc.py

@@ -3,7 +3,6 @@
 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
 from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 
@@ -17,15 +16,15 @@ class ClientAppIoStub(object):
         Args:
             channel: A grpc.Channel.
         """
-        self.GetRunIdsWithPendingMessages = channel.unary_unary(
-                '/flwr.proto.ClientAppIo/GetRunIdsWithPendingMessages',
-                request_serializer=flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesResponse.FromString,
+        self.ListAppsToLaunch = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/ListAppsToLaunch',
+                request_serializer=flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchResponse.FromString,
                 )
         self.RequestToken = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/RequestToken',
-                request_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.FromString,
+                request_serializer=flwr_dot_proto_dot_appio__pb2.RequestTokenRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_appio__pb2.RequestTokenResponse.FromString,
                 )
         self.GetRun = channel.unary_unary(
                 '/flwr.proto.ClientAppIo/GetRun',
@@ -72,7 +71,7 @@ class ClientAppIoStub(object):
 class ClientAppIoServicer(object):
     """Missing associated documentation comment in .proto file."""
 
-    def GetRunIdsWithPendingMessages(self, request, context):
+    def ListAppsToLaunch(self, request, context):
         """Get run IDs with pending messages
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -145,15 +144,15 @@ class ClientAppIoServicer(object):
 
 def add_ClientAppIoServicer_to_server(servicer, server):
     rpc_method_handlers = {
-            'GetRunIdsWithPendingMessages': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetRunIdsWithPendingMessages,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesResponse.SerializeToString,
+            'ListAppsToLaunch': grpc.unary_unary_rpc_method_handler(
+                    servicer.ListAppsToLaunch,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchResponse.SerializeToString,
             ),
             'RequestToken': grpc.unary_unary_rpc_method_handler(
                     servicer.RequestToken,
-                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_appio__pb2.RequestTokenRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_appio__pb2.RequestTokenResponse.SerializeToString,
             ),
             'GetRun': grpc.unary_unary_rpc_method_handler(
                     servicer.GetRun,
@@ -206,7 +205,7 @@ class ClientAppIo(object):
     """Missing associated documentation comment in .proto file."""
 
     @staticmethod
-    def GetRunIdsWithPendingMessages(request,
+    def ListAppsToLaunch(request,
             target,
             options=(),
             channel_credentials=None,
@@ -216,9 +215,9 @@ class ClientAppIo(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/GetRunIdsWithPendingMessages',
-            flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesRequest.SerializeToString,
-            flwr_dot_proto_dot_clientappio__pb2.GetRunIdsWithPendingMessagesResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/ListAppsToLaunch',
+            flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.ListAppsToLaunchResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -234,8 +233,8 @@ class ClientAppIo(object):
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/RequestToken',
-            flwr_dot_proto_dot_clientappio__pb2.RequestTokenRequest.SerializeToString,
-            flwr_dot_proto_dot_clientappio__pb2.RequestTokenResponse.FromString,
+            flwr_dot_proto_dot_appio__pb2.RequestTokenRequest.SerializeToString,
+            flwr_dot_proto_dot_appio__pb2.RequestTokenResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 

flwr/proto/clientappio_pb2_grpc.pyi

@@ -4,21 +4,20 @@ isort:skip_file
 """
 import abc
 import flwr.proto.appio_pb2
-import flwr.proto.clientappio_pb2
 import flwr.proto.message_pb2
 import flwr.proto.run_pb2
 import grpc
 
 class ClientAppIoStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
-    GetRunIdsWithPendingMessages: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.GetRunIdsWithPendingMessagesRequest,
-        flwr.proto.clientappio_pb2.GetRunIdsWithPendingMessagesResponse]
+    ListAppsToLaunch: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.appio_pb2.ListAppsToLaunchRequest,
+        flwr.proto.appio_pb2.ListAppsToLaunchResponse]
     """Get run IDs with pending messages"""
 
     RequestToken: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.clientappio_pb2.RequestTokenRequest,
-        flwr.proto.clientappio_pb2.RequestTokenResponse]
+        flwr.proto.appio_pb2.RequestTokenRequest,
+        flwr.proto.appio_pb2.RequestTokenResponse]
     """Request token"""
 
     GetRun: grpc.UnaryUnaryMultiCallable[
@@ -64,18 +63,18 @@ class ClientAppIoStub:
 
 class ClientAppIoServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
-    def GetRunIdsWithPendingMessages(self,
-        request: flwr.proto.clientappio_pb2.GetRunIdsWithPendingMessagesRequest,
+    def ListAppsToLaunch(self,
+        request: flwr.proto.appio_pb2.ListAppsToLaunchRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.GetRunIdsWithPendingMessagesResponse:
+    ) -> flwr.proto.appio_pb2.ListAppsToLaunchResponse:
         """Get run IDs with pending messages"""
         pass
 
     @abc.abstractmethod
     def RequestToken(self,
-        request: flwr.proto.clientappio_pb2.RequestTokenRequest,
+        request: flwr.proto.appio_pb2.RequestTokenRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.clientappio_pb2.RequestTokenResponse:
+    ) -> flwr.proto.appio_pb2.RequestTokenResponse:
         """Request token"""
         pass
 

flwr/proto/control_pb2.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/control.proto
+# Protobuf Python Version: 4.25.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
+from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
+from flwr.proto import recorddict_pb2 as flwr_dot_proto_dot_recorddict__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\"\xfa\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"&\n\x14PullArtifactsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"1\n\x15PullArtifactsResponse\x12\x10\n\x03url\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x06\n\x04_url2\xc0\x04\n\x07\x43ontrol\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x12V\n\rPullArtifacts\x12 .flwr.proto.PullArtifactsRequest\x1a!.flwr.proto.PullArtifactsResponse\"\x00\x62\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.control_pb2', _globals)
+if _descriptor._USE_C_DESCRIPTORS == False:
+  DESCRIPTOR._options = None
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._options = None
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._options = None
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_options = b'8\001'
+  _globals['_STARTRUNREQUEST']._serialized_start=142
+  _globals['_STARTRUNREQUEST']._serialized_end=392
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=319
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=392
+  _globals['_STARTRUNRESPONSE']._serialized_start=394
+  _globals['_STARTRUNRESPONSE']._serialized_end=444
+  _globals['_STREAMLOGSREQUEST']._serialized_start=446
+  _globals['_STREAMLOGSREQUEST']._serialized_end=506
+  _globals['_STREAMLOGSRESPONSE']._serialized_start=508
+  _globals['_STREAMLOGSRESPONSE']._serialized_end=574
+  _globals['_LISTRUNSREQUEST']._serialized_start=576
+  _globals['_LISTRUNSREQUEST']._serialized_end=625
+  _globals['_LISTRUNSRESPONSE']._serialized_start=628
+  _globals['_LISTRUNSRESPONSE']._serialized_end=785
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_start=722
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_end=785
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_start=787
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_end=811
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_start=814
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=952
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=954
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=997
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=999
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1067
+  _globals['_STOPRUNREQUEST']._serialized_start=1069
+  _globals['_STOPRUNREQUEST']._serialized_end=1101
+  _globals['_STOPRUNRESPONSE']._serialized_start=1103
+  _globals['_STOPRUNRESPONSE']._serialized_end=1137
+  _globals['_PULLARTIFACTSREQUEST']._serialized_start=1139
+  _globals['_PULLARTIFACTSREQUEST']._serialized_end=1177
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_start=1179
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_end=1228
+  _globals['_CONTROL']._serialized_start=1231
+  _globals['_CONTROL']._serialized_end=1807
+# @@protoc_insertion_point(module_scope)

flwr/proto/{exec_pb2.pyi → control_pb2.pyi}

@@ -210,3 +210,27 @@ class StopRunResponse(google.protobuf.message.Message):
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["success",b"success"]) -> None: ...
 global___StopRunResponse = StopRunResponse
+
+class PullArtifactsRequest(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___PullArtifactsRequest = PullArtifactsRequest
+
+class PullArtifactsResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    URL_FIELD_NUMBER: builtins.int
+    url: typing.Text
+    def __init__(self,
+        *,
+        url: typing.Optional[typing.Text] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["_url",b"_url","url",b"url"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_url",b"_url","url",b"url"]) -> None: ...
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_url",b"_url"]) -> typing.Optional[typing_extensions.Literal["url"]]: ...
+global___PullArtifactsResponse = PullArtifactsResponse