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

flwr/client/grpc_rere_client/connection.py

@@ -34,9 +34,9 @@ from flwr.common.inflatable import (
     iterate_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_grpc_utils import (
-    make_pull_object_fn_grpc,
-    make_push_object_fn_grpc,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -277,8 +277,8 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             object_tree = response.message_object_trees[0]
             all_object_contents = pull_objects(
                 [tree.object_id for tree in iterate_object_tree(object_tree)],
-                pull_object_fn=make_pull_object_fn_grpc(
-                    pull_object_grpc=stub.PullObject,
+                pull_object_fn=make_pull_object_fn_protobuf(
+                    pull_object_protobuf=stub.PullObject,
                     node=node,
                     run_id=run_id,
                 ),
@@ -330,8 +330,8 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 )
                 push_objects(
                     all_objects,
-                    push_object_fn=make_push_object_fn_grpc(
-                        push_object_grpc=stub.PushObject,
+                    push_object_fn=make_push_object_fn_protobuf(
+                        push_object_protobuf=stub.PushObject,
                         node=node,
                         run_id=message.metadata.run_id,
                     ),

flwr/client/rest_client/connection.py

@@ -14,6 +14,7 @@
 # ==============================================================================
 """Contextmanager for a REST request-response channel to the Flower server."""
 
+
 from collections.abc import Iterator
 from contextlib import contextmanager
 from logging import DEBUG, ERROR, INFO, WARN
@@ -33,9 +34,9 @@ from flwr.common.inflatable import (
     iterate_object_tree,
     no_object_id_recompute,
 )
-from flwr.common.inflatable_rest_utils import (
-    make_pull_object_fn_rest,
-    make_push_object_fn_rest,
+from flwr.common.inflatable_protobuf_utils import (
+    make_pull_object_fn_protobuf,
+    make_push_object_fn_protobuf,
 )
 from flwr.common.inflatable_utils import (
     inflate_object_from_contents,
@@ -337,8 +338,8 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 object_tree = res.message_object_trees[0]
                 all_object_contents = pull_objects(
                     [tree.object_id for tree in iterate_object_tree(object_tree)],
-                    pull_object_fn=make_pull_object_fn_rest(
-                        pull_object_rest=fn,
+                    pull_object_fn=make_pull_object_fn_protobuf(
+                        pull_object_protobuf=fn,
                         node=node,
                         run_id=run_id,
                     ),
@@ -415,8 +416,8 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
                 try:
                     push_objects(
                         all_objects,
-                        push_object_fn=make_push_object_fn_rest(
-                            push_object_rest=fn,
+                        push_object_fn=make_push_object_fn_protobuf(
+                            push_object_protobuf=fn,
                             node=node,
                             run_id=message_proto.metadata.run_id,
                         ),

flwr/common/{inflatable_grpc_utils.py → inflatable_protobuf_utils.py}

@@ -28,8 +28,8 @@ from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from .inflatable_utils import ObjectIdNotPreregisteredError, ObjectUnavailableError
 
 
-def make_pull_object_fn_grpc(
-    pull_object_grpc: Callable[[PullObjectRequest], PullObjectResponse],
+def make_pull_object_fn_protobuf(
+    pull_object_protobuf: Callable[[PullObjectRequest], PullObjectResponse],
     node: Node,
     run_id: int,
 ) -> Callable[[str], bytes]:
@@ -37,8 +37,9 @@ def make_pull_object_fn_grpc(
 
     Parameters
     ----------
-    pull_object_grpc : Callable[[PullObjectRequest], PullObjectResponse]
-        The gRPC function to pull objects, e.g., `FleetStub.PullObject`.
+    pull_object_protobuf : Callable[[PullObjectRequest], PullObjectResponse]
+        A callable that takes a `PullObjectRequest` and returns a `PullObjectResponse`.
+        This function is typically backed by a gRPC client stub.
     node : Node
         The node making the request.
     run_id : int
@@ -54,7 +55,7 @@ def make_pull_object_fn_grpc(
 
     def pull_object_fn(object_id: str) -> bytes:
         request = PullObjectRequest(node=node, run_id=run_id, object_id=object_id)
-        response: PullObjectResponse = pull_object_grpc(request)
+        response: PullObjectResponse = pull_object_protobuf(request)
         if not response.object_found:
             raise ObjectIdNotPreregisteredError(object_id)
         if not response.object_available:
@@ -64,8 +65,8 @@ def make_pull_object_fn_grpc(
     return pull_object_fn
 
 
-def make_push_object_fn_grpc(
-    push_object_grpc: Callable[[PushObjectRequest], PushObjectResponse],
+def make_push_object_fn_protobuf(
+    push_object_protobuf: Callable[[PushObjectRequest], PushObjectResponse],
     node: Node,
     run_id: int,
 ) -> Callable[[str, bytes], None]:
@@ -73,8 +74,9 @@ def make_push_object_fn_grpc(
 
     Parameters
     ----------
-    push_object_grpc : Callable[[PushObjectRequest], PushObjectResponse]
-        The gRPC function to push objects, e.g., `FleetStub.PushObject`.
+    push_object_protobuf : Callable[[PushObjectRequest], PushObjectResponse]
+        A callable that takes a `PushObjectRequest` and returns a `PushObjectResponse`.
+        This function is typically backed by a gRPC client stub.
     node : Node
         The node making the request.
     run_id : int
@@ -92,7 +94,7 @@ def make_push_object_fn_grpc(
         request = PushObjectRequest(
             node=node, run_id=run_id, object_id=object_id, object_content=object_content
         )
-        response: PushObjectResponse = push_object_grpc(request)
+        response: PushObjectResponse = push_object_protobuf(request)
         if not response.stored:
             raise ObjectIdNotPreregisteredError(object_id)
 

flwr/common/record/array.py

@@ -321,8 +321,8 @@ class Array(InflatableObject):
         Array
             The inflated Array.
         """
-        if not children:
-            raise ValueError("`Array` objects must have children.")
+        if children is None:
+            children = {}
 
         obj_body = get_object_body(object_content, cls)
 

flwr/common/serde.py

@@ -19,7 +19,6 @@ from collections import OrderedDict
 from typing import Any, cast
 
 # pylint: disable=E0611
-from flwr.proto.clientappio_pb2 import ClientAppOutputCode, ClientAppOutputStatus
 from flwr.proto.fab_pb2 import Fab as ProtoFab
 from flwr.proto.message_pb2 import Context as ProtoContext
 from flwr.proto.message_pb2 import Message as ProtoMessage
@@ -653,33 +652,6 @@ def run_from_proto(run_proto: ProtoRun) -> typing.Run:
     return run
 
 
-# === ClientApp status messages ===
-
-
-def clientappstatus_to_proto(
-    status: typing.ClientAppOutputStatus,
-) -> ClientAppOutputStatus:
-    """Serialize `ClientAppOutputStatus` to ProtoBuf."""
-    code = ClientAppOutputCode.SUCCESS
-    if status.code == typing.ClientAppOutputCode.DEADLINE_EXCEEDED:
-        code = ClientAppOutputCode.DEADLINE_EXCEEDED
-    if status.code == typing.ClientAppOutputCode.UNKNOWN_ERROR:
-        code = ClientAppOutputCode.UNKNOWN_ERROR
-    return ClientAppOutputStatus(code=code, message=status.message)
-
-
-def clientappstatus_from_proto(
-    msg: ClientAppOutputStatus,
-) -> typing.ClientAppOutputStatus:
-    """Deserialize `ClientAppOutputStatus` from ProtoBuf."""
-    code = typing.ClientAppOutputCode.SUCCESS
-    if msg.code == ClientAppOutputCode.DEADLINE_EXCEEDED:
-        code = typing.ClientAppOutputCode.DEADLINE_EXCEEDED
-    if msg.code == ClientAppOutputCode.UNKNOWN_ERROR:
-        code = typing.ClientAppOutputCode.UNKNOWN_ERROR
-    return typing.ClientAppOutputStatus(code=code, message=msg.message)
-
-
 # === Run status ===
 
 

flwr/compat/client/app.py

@@ -29,8 +29,6 @@ from flwr.cli.config_utils import get_fab_metadata
 from flwr.cli.install import install_from_fab
 from flwr.client.client import Client
 from flwr.client.client_app import ClientApp, LoadClientAppError
-from flwr.client.grpc_adapter_client.connection import grpc_adapter
-from flwr.client.grpc_rere_client.connection import grpc_request_response
 from flwr.client.message_handler.message_handler import handle_control_message
 from flwr.client.numpy_client import NumPyClient
 from flwr.client.run_info_store import DeprecatedRunInfoStore
@@ -39,10 +37,7 @@ from flwr.common import GRPC_MAX_MESSAGE_LENGTH, Context, EventType, Message, ev
 from flwr.common.address import parse_address
 from flwr.common.constant import (
     MAX_RETRY_DELAY,
-    TRANSPORT_TYPE_GRPC_ADAPTER,
     TRANSPORT_TYPE_GRPC_BIDI,
-    TRANSPORT_TYPE_GRPC_RERE,
-    TRANSPORT_TYPE_REST,
     TRANSPORT_TYPES,
     ErrorCode,
 )
@@ -121,10 +116,8 @@ def start_client(
         Starts an insecure gRPC connection when True. Enables HTTPS connection
         when False, using system certificates if `root_certificates` is None.
     transport : Optional[str] (default: None)
-        Configure the transport layer. Allowed values:
-        - 'grpc-bidi': gRPC, bidirectional streaming
-        - 'grpc-rere': gRPC, request-response (experimental)
-        - 'rest': HTTP (experimental)
+        **[Deprecated]** This argument is no longer supported and will be
+        removed in a future release.
     authentication_keys : Optional[Tuple[PrivateKey, PublicKey]] (default: None)
         Tuple containing the elliptic curve private key and public key for
         authentication from the cryptography library.
@@ -180,6 +173,12 @@ def start_client(
     )
     warn_deprecated_feature(name=msg)
 
+    if transport is not None and transport != "grpc-bidi":
+        raise ValueError(
+            f"Transport type {transport} is not supported. "
+            "Use 'grpc-bidi' or None (default) instead."
+        )
+
     event(EventType.START_CLIENT_ENTER)
     start_client_internal(
         server_address=server_address,
@@ -429,7 +428,7 @@ def start_client_internal(
 
                     run: Run = runs[run_id]
                     if get_fab is not None and run.fab_hash:
-                        fab = get_fab(run.fab_hash, run_id)
+                        fab = get_fab(run.fab_hash, run_id)  # pylint: disable=E1102
                         # If `ClientApp` runs in the same process, install the FAB
                         install_from_fab(fab.content, flwr_path, True)
                         fab_id, fab_version = get_fab_metadata(fab.content)
@@ -573,10 +572,8 @@ def start_numpy_client(
         Starts an insecure gRPC connection when True. Enables HTTPS connection
         when False, using system certificates if `root_certificates` is None.
     transport : Optional[str] (default: None)
-        Configure the transport layer. Allowed values:
-        - 'grpc-bidi': gRPC, bidirectional streaming
-        - 'grpc-rere': gRPC, request-response (experimental)
-        - 'rest': HTTP (experimental)
+        **[Deprecated]** This argument is no longer supported and will be
+        removed in a future release.
 
     Examples
     --------
@@ -672,23 +669,9 @@ def _init_connection(transport: Optional[str], server_address: str) -> tuple[
     if transport is None:
         transport = TRANSPORT_TYPE_GRPC_BIDI
 
-    # Use either gRPC bidirectional streaming or REST request/response
-    if transport == TRANSPORT_TYPE_REST:
-        try:
-            from requests.exceptions import ConnectionError as RequestsConnectionError
-
-            from flwr.client.rest_client.connection import http_request_response
-        except ModuleNotFoundError:
-            flwr_exit(ExitCode.COMMON_MISSING_EXTRA_REST)
-        if server_address[:4] != "http":
-            flwr_exit(ExitCode.SUPERNODE_REST_ADDRESS_INVALID)
-        connection, error_type = http_request_response, RequestsConnectionError
-    elif transport == TRANSPORT_TYPE_GRPC_RERE:
-        connection, error_type = grpc_request_response, RpcError
-    elif transport == TRANSPORT_TYPE_GRPC_ADAPTER:
-        connection, error_type = grpc_adapter, RpcError
-    elif transport == TRANSPORT_TYPE_GRPC_BIDI:
-        connection, error_type = grpc_connection, RpcError  # type: ignore[assignment]
+    # Use gRPC bidirectional streaming
+    if transport == TRANSPORT_TYPE_GRPC_BIDI:
+        connection, error_type = grpc_connection, RpcError
     else:
         raise ValueError(
             f"Unknown transport type: {transport} (possible: {TRANSPORT_TYPES})"

flwr/proto/appio_pb2.py

@@ -17,7 +17,7 @@ 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')
+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\"\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\"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)
@@ -26,26 +26,22 @@ 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
+  _globals['_PUSHAPPMESSAGESREQUEST']._serialized_end=262
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_start=265
+  _globals['_PUSHAPPMESSAGESRESPONSE']._serialized_end=469
+  _globals['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_start=394
+  _globals['_PUSHAPPMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_end=469
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_start=471
+  _globals['_PULLAPPMESSAGESREQUEST']._serialized_end=547
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_start=549
+  _globals['_PULLAPPMESSAGESRESPONSE']._serialized_end=672
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_start=674
+  _globals['_PULLAPPINPUTSREQUEST']._serialized_end=711
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_start=713
+  _globals['_PULLAPPINPUTSRESPONSE']._serialized_end=834
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_start=836
+  _globals['_PUSHAPPOUTPUTSREQUEST']._serialized_end=928
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_start=930
+  _globals['_PUSHAPPOUTPUTSRESPONSE']._serialized_end=954
 # @@protoc_insertion_point(module_scope)

flwr/proto/appio_pb2.pyi

@@ -20,9 +20,11 @@ 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
     MESSAGE_OBJECT_TREES_FIELD_NUMBER: builtins.int
+    token: typing.Text
     @property
     def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
     run_id: builtins.int
@@ -30,11 +32,12 @@ class PushAppMessagesRequest(google.protobuf.message.Message):
     def message_object_trees(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.ObjectTree]: ...
     def __init__(self,
         *,
+        token: typing.Text = ...,
         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: ...
+    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","token",b"token"]) -> None: ...
 global___PushAppMessagesRequest = PushAppMessagesRequest
 
 class PushAppMessagesResponse(google.protobuf.message.Message):
@@ -71,55 +74,48 @@ global___PushAppMessagesResponse = PushAppMessagesResponse
 class PullAppMessagesRequest(google.protobuf.message.Message):
     """PullAppMessages messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    TOKEN_FIELD_NUMBER: builtins.int
     MESSAGE_IDS_FIELD_NUMBER: builtins.int
     RUN_ID_FIELD_NUMBER: builtins.int
+    token: typing.Text
     @property
     def message_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
     run_id: builtins.int
     def __init__(self,
         *,
+        token: typing.Text = ...,
         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: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_ids",b"message_ids","run_id",b"run_id","token",b"token"]) -> 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
+    MESSAGE_OBJECT_TREES_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 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]] = ...,
-        objects_to_pull: typing.Optional[typing.Mapping[typing.Text, flwr.proto.message_pb2.ObjectIDs]] = ...,
+        message_object_trees: typing.Optional[typing.Iterable[flwr.proto.message_pb2.ObjectTree]] = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list","objects_to_pull",b"objects_to_pull"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["message_object_trees",b"message_object_trees","messages_list",b"messages_list"]) -> None: ...
 global___PullAppMessagesResponse = PullAppMessagesResponse
 
 class PullAppInputsRequest(google.protobuf.message.Message):
     """PullAppInputs messages"""
     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___PullAppInputsRequest = PullAppInputsRequest
 
 class PullAppInputsResponse(google.protobuf.message.Message):
@@ -146,18 +142,21 @@ global___PullAppInputsResponse = PullAppInputsResponse
 class PushAppOutputsRequest(google.protobuf.message.Message):
     """PushAppInputs messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    TOKEN_FIELD_NUMBER: builtins.int
     RUN_ID_FIELD_NUMBER: builtins.int
     CONTEXT_FIELD_NUMBER: builtins.int
+    token: typing.Text
     run_id: builtins.int
     @property
     def context(self) -> flwr.proto.message_pb2.Context: ...
     def __init__(self,
         *,
+        token: typing.Text = ...,
         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: ...
+    def ClearField(self, field_name: typing_extensions.Literal["context",b"context","run_id",b"run_id","token",b"token"]) -> None: ...
 global___PushAppOutputsRequest = PushAppOutputsRequest
 
 class PushAppOutputsResponse(google.protobuf.message.Message):

flwr/proto/clientappio_pb2.py

@@ -15,43 +15,24 @@ _sym_db = _symbol_database.Default()
 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
 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\"%\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')
+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\xec\x06\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\\\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['_CLIENTAPPOUTPUTCODE']._serialized_start=914
-  _globals['_CLIENTAPPOUTPUTCODE']._serialized_end=990
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_start=114
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESREQUEST']._serialized_end=151
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_start=153
-  _globals['_GETRUNIDSWITHPENDINGMESSAGESRESPONSE']._serialized_end=208
-  _globals['_REQUESTTOKENREQUEST']._serialized_start=210
-  _globals['_REQUESTTOKENREQUEST']._serialized_end=247
-  _globals['_REQUESTTOKENRESPONSE']._serialized_start=249
-  _globals['_REQUESTTOKENRESPONSE']._serialized_end=286
-  _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_start=288
-  _globals['_CLIENTAPPOUTPUTSTATUS']._serialized_end=375
-  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_start=377
-  _globals['_PULLCLIENTAPPINPUTSREQUEST']._serialized_end=420
-  _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
+  _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=1189
 # @@protoc_insertion_point(module_scope)