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

flwr/client/grpc_rere_client/connection.py

@@ -31,6 +31,7 @@ from flwr.common.heartbeat import HeartbeatSender
 from flwr.common.inflatable import (
     get_all_nested_objects,
     get_object_tree,
+    iterate_object_tree,
     no_object_id_recompute,
 )
 from flwr.common.inflatable_grpc_utils import (
@@ -273,8 +274,9 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         if message_proto:
             msg_id = message_proto.metadata.message_id
             run_id = message_proto.metadata.run_id
+            object_tree = response.message_object_trees[0]
             all_object_contents = pull_objects(
-                list(response.objects_to_pull[msg_id].object_ids) + [msg_id],
+                [tree.object_id for tree in iterate_object_tree(object_tree)],
                 pull_object_fn=make_pull_object_fn_grpc(
                     pull_object_grpc=stub.PullObject,
                     node=node,

flwr/client/rest_client/connection.py

@@ -30,6 +30,7 @@ from flwr.common.heartbeat import HeartbeatSender
 from flwr.common.inflatable import (
     get_all_nested_objects,
     get_object_tree,
+    iterate_object_tree,
     no_object_id_recompute,
 )
 from flwr.common.inflatable_rest_utils import (
@@ -333,8 +334,9 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 return res
 
             try:
+                object_tree = res.message_object_trees[0]
                 all_object_contents = pull_objects(
-                    list(res.objects_to_pull[msg_id].object_ids) + [msg_id],
+                    [tree.object_id for tree in iterate_object_tree(object_tree)],
                     pull_object_fn=make_pull_object_fn_rest(
                         pull_object_rest=fn,
                         node=node,

flwr/common/grpc.py

@@ -23,6 +23,9 @@ 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
@@ -98,7 +101,7 @@ def valid_certificates(certificates: tuple[bytes, bytes, bytes]) -> bool:
     return is_valid
 
 
-def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
+def generic_create_grpc_server(  # pylint: disable=too-many-arguments, R0914, R0917
     servicer_and_add_fn: tuple[Any, AddServicerToServerFn],
     server_address: str,
     max_concurrent_workers: int = 1000,
@@ -106,6 +109,7 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
     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.
 
@@ -153,6 +157,10 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
             * 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
     -------
@@ -203,6 +211,9 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments,R0917
     )
     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

@@ -15,6 +15,7 @@
 """InflatableObject utilities."""
 
 import concurrent.futures
+import os
 import random
 import threading
 import time
@@ -69,6 +70,13 @@ class ObjectIdNotPreregisteredError(Exception):
         super().__init__(f"Object with ID '{object_id}' could not be found.")
 
 
+def get_num_workers(max_concurrent: int) -> int:
+    """Get number of workers based on the number of CPU cores and the maximum
+    allowed."""
+    num_cores = os.cpu_count() or 1
+    return min(max_concurrent, num_cores)
+
+
 def push_objects(
     objects: dict[str, InflatableObject],
     push_object_fn: Callable[[str, bytes], None],
@@ -111,13 +119,13 @@ def push_objects(
                 del objects[obj_id]
         push_object_fn(obj_id, object_content)
 
-    with concurrent.futures.ThreadPoolExecutor(
-        max_workers=max_concurrent_pushes
-    ) as executor:
+    # Push all objects concurrently
+    num_workers = get_num_workers(max_concurrent_pushes)
+    with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
         list(executor.map(push, list(objects.keys())))
 
 
-def pull_objects(  # pylint: disable=too-many-arguments
+def pull_objects(  # pylint: disable=too-many-arguments,too-many-locals
     object_ids: list[str],
     pull_object_fn: Callable[[str], bytes],
     *,
@@ -209,9 +217,8 @@ def pull_objects(  # pylint: disable=too-many-arguments
                 return
 
     # Submit all pull tasks concurrently
-    with concurrent.futures.ThreadPoolExecutor(
-        max_workers=max_concurrent_pulls
-    ) as executor:
+    num_workers = get_num_workers(max_concurrent_pulls)
+    with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
         futures = {
             executor.submit(pull_with_retries, obj_id): obj_id for obj_id in object_ids
         }

flwr/proto/appio_pb2.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: flwr/proto/appio.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 message_pb2 as flwr_dot_proto_dot_message__pb2
+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\"\x8a\x01\n\x16PushAppMessagesRequest\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\x12\x34\n\x14message_object_trees\x18\x03 \x03(\x0b\x32\x16.flwr.proto.ObjectTree\"\xcc\x01\n\x17PushAppMessagesResponse\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\x12O\n\x0fobjects_to_push\x18\x02 \x03(\x0b\x32\x36.flwr.proto.PushAppMessagesResponse.ObjectsToPushEntry\x1aK\n\x12ObjectsToPushEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.flwr.proto.ObjectIDs:\x02\x38\x01\"=\n\x16PullAppMessagesRequest\x12\x13\n\x0bmessage_ids\x18\x01 \x03(\t\x12\x0e\n\x06run_id\x18\x02 \x01(\x04\"\xe3\x01\n\x17PullAppMessagesResponse\x12*\n\rmessages_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.Message\x12O\n\x0fobjects_to_pull\x18\x02 \x03(\x0b\x32\x36.flwr.proto.PullAppMessagesResponse.ObjectsToPullEntry\x1aK\n\x12ObjectsToPullEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.flwr.proto.ObjectIDs:\x02\x38\x01\"\x16\n\x14PullAppInputsRequest\"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\"M\n\x15PushAppOutputsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12$\n\x07\x63ontext\x18\x02 \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['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._options = None
+  _globals['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_options = b'8\001'
+  _globals['_PULLAPPMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._options = None
+  _globals['_PULLAPPMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_options = b'8\001'
+  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_start=109
+  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_end=247
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_start=250
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_end=454
+  _globals['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_start=379
+  _globals['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_end=454
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_start=456
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_end=517
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_start=520
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_end=747
+  _globals['_PULLAPPMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_start=672
+  _globals['_PULLAPPMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_end=747
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_start=749
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_end=771
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_start=773
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_end=894
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_start=896
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_end=973
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_start=975
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_end=999
+# @@protoc_insertion_point(module_scope)

flwr/proto/appio_pb2.pyi

@@ -0,0 +1,167 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import builtins
+import flwr.proto.fab_pb2
+import flwr.proto.message_pb2
+import flwr.proto.run_pb2
+import google.protobuf.descriptor
+import google.protobuf.internal.containers
+import google.protobuf.message
+import typing
+import typing_extensions
+
+DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+
+class PushAppMessagesRequest(google.protobuf.message.Message):
+    """These messages are used by both ServerAppIo and ClientAppIo services
+
+    PushAppMessages messages
+    """
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGES_LIST_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    MESSAGE_OBJECT_TREES_FIELD_NUMBER: builtins.int
+    @property
+    def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
+    run_id: builtins.int
+    @property
+    def message_object_trees(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.ObjectTree]: ...
+    def __init__(self,
+        *,
+        messages_list: typing.Optional[typing.Iterable[flwr.proto.message_pb2.Message]] = ...,
+        run_id: builtins.int = ...,
+        message_object_trees: typing.Optional[typing.Iterable[flwr.proto.message_pb2.ObjectTree]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_object_trees",b"message_object_trees","messages_list",b"messages_list","run_id",b"run_id"]) -> None: ...
+global___PushAppMessagesRequest = PushAppMessagesRequest
+
+class PushAppMessagesResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    class ObjectsToPushEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        @property
+        def value(self) -> flwr.proto.message_pb2.ObjectIDs: ...
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Optional[flwr.proto.message_pb2.ObjectIDs] = ...,
+            ) -> None: ...
+        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
+    MESSAGE_IDS_FIELD_NUMBER: builtins.int
+    OBJECTS_TO_PUSH_FIELD_NUMBER: builtins.int
+    @property
+    def message_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
+    @property
+    def objects_to_push(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.message_pb2.ObjectIDs]: ...
+    def __init__(self,
+        *,
+        message_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
+        objects_to_push: typing.Optional[typing.Mapping[typing.Text, flwr.proto.message_pb2.ObjectIDs]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_ids",b"message_ids","objects_to_push",b"objects_to_push"]) -> None: ...
+global___PushAppMessagesResponse = PushAppMessagesResponse
+
+class PullAppMessagesRequest(google.protobuf.message.Message):
+    """PullAppMessages messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGE_IDS_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    @property
+    def message_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
+    run_id: builtins.int
+    def __init__(self,
+        *,
+        message_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
+        run_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_ids",b"message_ids","run_id",b"run_id"]) -> None: ...
+global___PullAppMessagesRequest = PullAppMessagesRequest
+
+class PullAppMessagesResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    class ObjectsToPullEntry(google.protobuf.message.Message):
+        DESCRIPTOR: google.protobuf.descriptor.Descriptor
+        KEY_FIELD_NUMBER: builtins.int
+        VALUE_FIELD_NUMBER: builtins.int
+        key: typing.Text
+        @property
+        def value(self) -> flwr.proto.message_pb2.ObjectIDs: ...
+        def __init__(self,
+            *,
+            key: typing.Text = ...,
+            value: typing.Optional[flwr.proto.message_pb2.ObjectIDs] = ...,
+            ) -> None: ...
+        def HasField(self, field_name: typing_extensions.Literal["value",b"value"]) -> builtins.bool: ...
+        def ClearField(self, field_name: typing_extensions.Literal["key",b"key","value",b"value"]) -> None: ...
+
+    MESSAGES_LIST_FIELD_NUMBER: builtins.int
+    OBJECTS_TO_PULL_FIELD_NUMBER: builtins.int
+    @property
+    def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
+    @property
+    def objects_to_pull(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.message_pb2.ObjectIDs]: ...
+    def __init__(self,
+        *,
+        messages_list: typing.Optional[typing.Iterable[flwr.proto.message_pb2.Message]] = ...,
+        objects_to_pull: typing.Optional[typing.Mapping[typing.Text, flwr.proto.message_pb2.ObjectIDs]] = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list","objects_to_pull",b"objects_to_pull"]) -> None: ...
+global___PullAppMessagesResponse = PullAppMessagesResponse
+
+class PullAppInputsRequest(google.protobuf.message.Message):
+    """PullAppInputs messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___PullAppInputsRequest = PullAppInputsRequest
+
+class PullAppInputsResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    CONTEXT_FIELD_NUMBER: builtins.int
+    RUN_FIELD_NUMBER: builtins.int
+    FAB_FIELD_NUMBER: builtins.int
+    @property
+    def context(self) -> flwr.proto.message_pb2.Context: ...
+    @property
+    def run(self) -> flwr.proto.run_pb2.Run: ...
+    @property
+    def fab(self) -> flwr.proto.fab_pb2.Fab: ...
+    def __init__(self,
+        *,
+        context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
+        run: typing.Optional[flwr.proto.run_pb2.Run] = ...,
+        fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> None: ...
+global___PullAppInputsResponse = PullAppInputsResponse
+
+class PushAppOutputsRequest(google.protobuf.message.Message):
+    """PushAppInputs messages"""
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    RUN_ID_FIELD_NUMBER: builtins.int
+    CONTEXT_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
+    @property
+    def context(self) -> flwr.proto.message_pb2.Context: ...
+    def __init__(self,
+        *,
+        run_id: builtins.int = ...,
+        context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["context",b"context"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","run_id",b"run_id"]) -> None: ...
+global___PushAppOutputsRequest = PushAppOutputsRequest
+
+class PushAppOutputsResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___PushAppOutputsResponse = PushAppOutputsResponse

flwr/proto/appio_pb2_grpc.py

@@ -0,0 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+

flwr/proto/appio_pb2_grpc.pyi

@@ -0,0 +1,4 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""

flwr/proto/clientappio_pb2.py

@@ -17,15 +17,15 @@ from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__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\"%\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(\t\"W\n\x15\x43lientAppOutputStatus\x12-\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1f.flwr.proto.ClientAppOutputCode\x12\x0f\n\x07message\x18\x02 \x01(\t\"+\n\x1aPullClientAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\"\xa5\x01\n\x1bPullClientAppInputsResponse\x12$\n\x07message\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\x12\x1c\n\x03run\x18\x03 \x01(\x0b\x32\x0f.flwr.proto.Run\x12\x1c\n\x03\x66\x61\x62\x18\x04 \x01(\x0b\x32\x0f.flwr.proto.Fab\"x\n\x1bPushClientAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12$\n\x07message\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Message\x12$\n\x07\x63ontext\x18\x03 \x01(\x0b\x32\x13.flwr.proto.Context\"Q\n\x1cPushClientAppOutputsResponse\x12\x31\n\x06status\x18\x01 \x01(\x0b\x32!.flwr.proto.ClientAppOutputStatus*L\n\x13\x43lientAppOutputCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x32\xbf\x03\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\x12h\n\x13PullClientAppInputs\x12&.flwr.proto.PullClientAppInputsRequest\x1a\'.flwr.proto.PullClientAppInputsResponse\"\x00\x12k\n\x14PushClientAppOutputs\x12\'.flwr.proto.PushClientAppOutputsRequest\x1a(.flwr.proto.PushClientAppOutputsResponse\"\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\"%\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(\t\"W\n\x15\x43lientAppOutputStatus\x12-\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x1f.flwr.proto.ClientAppOutputCode\x12\x0f\n\x07message\x18\x02 \x01(\t\"+\n\x1aPullClientAppInputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\"\x7f\n\x1bPullClientAppInputsResponse\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\"R\n\x1bPushClientAppOutputsRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12$\n\x07\x63ontext\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Context\"Q\n\x1cPushClientAppOutputsResponse\x12\x31\n\x06status\x18\x01 \x01(\x0b\x32!.flwr.proto.ClientAppOutputStatus\"#\n\x12PullMessageRequest\x12\r\n\x05token\x18\x01 \x01(\t\";\n\x13PullMessageResponse\x12$\n\x07message\x18\x01 \x01(\x0b\x32\x13.flwr.proto.Message\"I\n\x12PushMessageRequest\x12\r\n\x05token\x18\x01 \x01(\t\x12$\n\x07message\x18\x02 \x01(\x0b\x32\x13.flwr.proto.Message\"\x15\n\x13PushMessageResponse*L\n\x13\x43lientAppOutputCode\x12\x0b\n\x07SUCCESS\x10\x00\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x01\x12\x11\n\rUNKNOWN_ERROR\x10\x02\x32\xe3\x04\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\x12h\n\x13PullClientAppInputs\x12&.flwr.proto.PullClientAppInputsRequest\x1a\'.flwr.proto.PullClientAppInputsResponse\"\x00\x12k\n\x14PushClientAppOutputs\x12\'.flwr.proto.PushClientAppOutputsRequest\x1a(.flwr.proto.PushClientAppOutputsResponse\"\x00\x12P\n\x0bPushMessage\x12\x1e.flwr.proto.PushMessageRequest\x1a\x1f.flwr.proto.PushMessageResponse\"\x00\x12P\n\x0bPullMessage\x12\x1e.flwr.proto.PullMessageRequest\x1a\x1f.flwr.proto.PullMessageResponse\"\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['_CLIENTAPPOUTPUTCODE']._serialized_start=795
-  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=871
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_start=914
+  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=990
   _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_start=114
   _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_end=151
   _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_start=153
@@ -38,12 +38,20 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_end=375
   _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_start=377
   _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_end=420
-  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_start=423
-  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=588
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=590
-  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=710
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=712
-  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=793
-  _globals['_CLIENTAPPIO']._serialized_start=874
-  _globals['_CLIENTAPPIO']._serialized_end=1321
+  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_start=422
+  _globals['_PULLCLIENTAPPINPUTSRESPONSE']._serialized_end=549
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_start=551
+  _globals['_PUSHCLIENTAPPOUTPUTSREQUEST']._serialized_end=633
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_start=635
+  _globals['_PUSHCLIENTAPPOUTPUTSRESPONSE']._serialized_end=716
+  _globals['_PULLMESSAGEREQUEST']._serialized_start=718
+  _globals['_PULLMESSAGEREQUEST']._serialized_end=753
+  _globals['_PULLMESSAGERESPONSE']._serialized_start=755
+  _globals['_PULLMESSAGERESPONSE']._serialized_end=814
+  _globals['_PUSHMESSAGEREQUEST']._serialized_start=816
+  _globals['_PUSHMESSAGEREQUEST']._serialized_end=889
+  _globals['_PUSHMESSAGERESPONSE']._serialized_start=891
+  _globals['_PUSHMESSAGERESPONSE']._serialized_end=912
+  _globals['_CLIENTAPPIO']._serialized_start=993
+  _globals['_CLIENTAPPIO']._serialized_end=1604
 # @@protoc_insertion_point(module_scope)

flwr/proto/clientappio_pb2.pyi

@@ -101,13 +101,10 @@ global___PullClientAppInputsRequest = PullClientAppInputsRequest
 
 class PullClientAppInputsResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    MESSAGE_FIELD_NUMBER: builtins.int
     CONTEXT_FIELD_NUMBER: builtins.int
     RUN_FIELD_NUMBER: builtins.int
     FAB_FIELD_NUMBER: builtins.int
     @property
-    def message(self) -> flwr.proto.message_pb2.Message: ...
-    @property
     def context(self) -> flwr.proto.message_pb2.Context: ...
     @property
     def run(self) -> flwr.proto.run_pb2.Run: ...
@@ -115,33 +112,28 @@ class PullClientAppInputsResponse(google.protobuf.message.Message):
     def fab(self) -> flwr.proto.fab_pb2.Fab: ...
     def __init__(self,
         *,
-        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
         context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
         run: typing.Optional[flwr.proto.run_pb2.Run] = ...,
         fab: typing.Optional[flwr.proto.fab_pb2.Fab] = ...,
         ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","message",b"message","run",b"run"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","fab",b"fab","run",b"run"]) -> None: ...
 global___PullClientAppInputsResponse = PullClientAppInputsResponse
 
 class PushClientAppOutputsRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TOKEN_FIELD_NUMBER: builtins.int
-    MESSAGE_FIELD_NUMBER: builtins.int
     CONTEXT_FIELD_NUMBER: builtins.int
     token: typing.Text
     @property
-    def message(self) -> flwr.proto.message_pb2.Message: ...
-    @property
     def context(self) -> flwr.proto.message_pb2.Context: ...
     def __init__(self,
         *,
         token: typing.Text = ...,
-        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
         context: typing.Optional[flwr.proto.message_pb2.Context] = ...,
         ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","message",b"message","token",b"token"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["context",b"context"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","token",b"token"]) -> None: ...
 global___PushClientAppOutputsRequest = PushClientAppOutputsRequest
 
 class PushClientAppOutputsResponse(google.protobuf.message.Message):
@@ -156,3 +148,49 @@ class PushClientAppOutputsResponse(google.protobuf.message.Message):
     def HasField(self, field_name: typing_extensions.Literal["status",b"status"]) -> builtins.bool: ...
     def ClearField(self, field_name: typing_extensions.Literal["status",b"status"]) -> None: ...
 global___PushClientAppOutputsResponse = PushClientAppOutputsResponse
+
+class PullMessageRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    TOKEN_FIELD_NUMBER: builtins.int
+    token: typing.Text
+    def __init__(self,
+        *,
+        token: typing.Text = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["token",b"token"]) -> None: ...
+global___PullMessageRequest = PullMessageRequest
+
+class PullMessageResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    MESSAGE_FIELD_NUMBER: builtins.int
+    @property
+    def message(self) -> flwr.proto.message_pb2.Message: ...
+    def __init__(self,
+        *,
+        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["message",b"message"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message",b"message"]) -> None: ...
+global___PullMessageResponse = PullMessageResponse
+
+class PushMessageRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    TOKEN_FIELD_NUMBER: builtins.int
+    MESSAGE_FIELD_NUMBER: builtins.int
+    token: typing.Text
+    @property
+    def message(self) -> flwr.proto.message_pb2.Message: ...
+    def __init__(self,
+        *,
+        token: typing.Text = ...,
+        message: typing.Optional[flwr.proto.message_pb2.Message] = ...,
+        ) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["message",b"message"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message",b"message","token",b"token"]) -> None: ...
+global___PushMessageRequest = PushMessageRequest
+
+class PushMessageResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___PushMessageResponse = PushMessageResponse

flwr/proto/clientappio_pb2_grpc.py

@@ -34,6 +34,16 @@ class ClientAppIoStub(object):
                 request_serializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.FromString,
                 )
+        self.PushMessage = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PushMessage',
+                request_serializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.FromString,
+                )
+        self.PullMessage = channel.unary_unary(
+                '/flwr.proto.ClientAppIo/PullMessage',
+                request_serializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.FromString,
+                )
 
 
 class ClientAppIoServicer(object):
@@ -67,6 +77,20 @@ class ClientAppIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    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 PullMessage(self, request, context):
+        """Pull Message
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_ClientAppIoServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -90,6 +114,16 @@ def add_ClientAppIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.SerializeToString,
             ),
+            'PushMessage': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushMessage,
+                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.SerializeToString,
+            ),
+            'PullMessage': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullMessage,
+                    request_deserializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'flwr.proto.ClientAppIo', rpc_method_handlers)
@@ -167,3 +201,37 @@ class ClientAppIo(object):
             flwr_dot_proto_dot_clientappio__pb2.PushClientAppOutputsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PushMessage(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PushMessage',
+            flwr_dot_proto_dot_clientappio__pb2.PushMessageRequest.SerializeToString,
+            flwr_dot_proto_dot_clientappio__pb2.PushMessageResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PullMessage(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ClientAppIo/PullMessage',
+            flwr_dot_proto_dot_clientappio__pb2.PullMessageRequest.SerializeToString,
+            flwr_dot_proto_dot_clientappio__pb2.PullMessageResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/clientappio_pb2_grpc.pyi

@@ -28,6 +28,16 @@ class ClientAppIoStub:
         flwr.proto.clientappio_pb2.PushClientAppOutputsResponse]
     """Push client app outputs"""
 
+    PushMessage: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.clientappio_pb2.PushMessageRequest,
+        flwr.proto.clientappio_pb2.PushMessageResponse]
+    """Push Message"""
+
+    PullMessage: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.clientappio_pb2.PullMessageRequest,
+        flwr.proto.clientappio_pb2.PullMessageResponse]
+    """Pull Message"""
+
 
 class ClientAppIoServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
@@ -62,5 +72,21 @@ class ClientAppIoServicer(metaclass=abc.ABCMeta):
         """Push client app outputs"""
         pass
 
+    @abc.abstractmethod
+    def PushMessage(self,
+        request: flwr.proto.clientappio_pb2.PushMessageRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.clientappio_pb2.PushMessageResponse:
+        """Push Message"""
+        pass
+
+    @abc.abstractmethod
+    def PullMessage(self,
+        request: flwr.proto.clientappio_pb2.PullMessageRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.clientappio_pb2.PullMessageResponse:
+        """Pull Message"""
+        pass
+
 
 def add_ClientAppIoServicer_to_server(servicer: ClientAppIoServicer, server: grpc.Server) -> None: ...