flwr-nightly 1.19.0.dev20250528__py3-none-any.whl → 1.19.0.dev20250530__py3-none-any.whl

flwr/cli/utils.py

@@ -291,9 +291,9 @@ def init_channel(
 def flwr_cli_grpc_exc_handler() -> Iterator[None]:
     """Context manager to handle specific gRPC errors.
 
-    It catches grpc.RpcError exceptions with UNAUTHENTICATED and UNIMPLEMENTED statuses,
-    informs the user, and exits the application. All other exceptions will be allowed to
-    escape.
+    It catches grpc.RpcError exceptions with UNAUTHENTICATED, UNIMPLEMENTED, and
+    PERMISSION_DENIED statuses, informs the user, and exits the application. All other
+    exceptions will be allowed to escape.
     """
     try:
         yield
@@ -313,4 +313,12 @@ def flwr_cli_grpc_exc_handler() -> Iterator[None]:
                 bold=True,
             )
             raise typer.Exit(code=1) from None
+        if e.code() == grpc.StatusCode.PERMISSION_DENIED:
+            typer.secho(
+                "❌ Authorization failed. Please contact your administrator"
+                " to check your permissions.",
+                fg=typer.colors.RED,
+                bold=True,
+            )
+            raise typer.Exit(code=1) from None
         raise

flwr/client/mod/comms_mods.py

@@ -32,14 +32,17 @@ def message_size_mod(
 
     This mod logs the size in bytes of the message being transmited.
     """
-    message_size_in_bytes = 0
+    # Log the size of the incoming message in bytes
+    total_bytes = sum(record.count_bytes() for record in msg.content.values())
+    log(INFO, "Incoming message size: %i bytes", total_bytes)
 
-    for record in msg.content.values():
-        message_size_in_bytes += record.count_bytes()
+    # Call the next layer
+    msg = call_next(msg, ctxt)
 
-    log(INFO, "Message size: %i bytes", message_size_in_bytes)
-
-    return call_next(msg, ctxt)
+    # Log the size of the outgoing message in bytes
+    total_bytes = sum(record.count_bytes() for record in msg.content.values())
+    log(INFO, "Outgoing message size: %i bytes", total_bytes)
+    return msg
 
 
 def arrays_size_mod(
@@ -50,25 +53,41 @@ def arrays_size_mod(
     This mod logs the number of array elements transmitted in ``ArrayRecord`` objects
     of the message as well as their sizes in bytes.
     """
-    model_size_stats = {}
-    arrays_size_in_bytes = 0
+    # Log the ArrayRecord size statistics and the total size in the incoming message
+    array_record_size_stats = _get_array_record_size_stats(msg)
+    total_bytes = sum(stat["bytes"] for stat in array_record_size_stats.values())
+    if array_record_size_stats:
+        log(INFO, "Incoming `ArrayRecord` size statistics:")
+        log(INFO, array_record_size_stats)
+    log(INFO, "Total array elements received: %i bytes", total_bytes)
+
+    msg = call_next(msg, ctxt)
+
+    # Log the ArrayRecord size statistics and the total size in the outgoing message
+    array_record_size_stats = _get_array_record_size_stats(msg)
+    total_bytes = sum(stat["bytes"] for stat in array_record_size_stats.values())
+    if array_record_size_stats:
+        log(INFO, "Outgoing `ArrayRecord` size statistics:")
+        log(INFO, array_record_size_stats)
+    log(INFO, "Total array elements sent: %i bytes", total_bytes)
+    return msg
+
+
+def _get_array_record_size_stats(
+    msg: Message,
+) -> dict[str, dict[str, int]]:
+    """Get `ArrayRecord` size statistics from the message."""
+    array_record_size_stats = {}
     for record_name, arr_record in msg.content.array_records.items():
         arr_record_bytes = arr_record.count_bytes()
-        arrays_size_in_bytes += arr_record_bytes
         element_count = 0
         for array in arr_record.values():
             element_count += (
                 int(np.prod(array.shape)) if array.shape else array.numpy().size
             )
 
-        model_size_stats[f"{record_name}"] = {
+        array_record_size_stats[record_name] = {
             "elements": element_count,
             "bytes": arr_record_bytes,
         }
-
-    if model_size_stats:
-        log(INFO, model_size_stats)
-
-    log(INFO, "Total array elements transmitted: %i bytes", arrays_size_in_bytes)
-
-    return call_next(msg, ctxt)
+    return array_record_size_stats

flwr/common/auth_plugin/auth_plugin.py

@@ -33,6 +33,9 @@ class ExecAuthPlugin(ABC):
     ----------
     user_auth_config_path : Path
         Path to the YAML file containing the authentication configuration.
+    verify_tls_cert : bool
+        Boolean indicating whether to verify the TLS certificate
+        when making requests to the server.
     """
 
     @abstractmethod
@@ -60,7 +63,7 @@ class ExecAuthPlugin(ABC):
     @abstractmethod
     def refresh_tokens(
         self, metadata: Sequence[tuple[str, Union[str, bytes]]]
-    ) -> Optional[Sequence[tuple[str, Union[str, bytes]]]]:
+    ) -> tuple[Optional[Sequence[tuple[str, Union[str, bytes]]]], Optional[UserInfo]]:
         """Refresh authentication tokens in the provided metadata."""
 
 
@@ -69,12 +72,15 @@ class ExecAuthzPlugin(ABC):  # pylint: disable=too-few-public-methods
 
     Parameters
     ----------
-    user_authz_config_path : Path
+    user_auth_config_path : Path
         Path to the YAML file containing the authorization configuration.
+    verify_tls_cert : bool
+        Boolean indicating whether to verify the TLS certificate
+        when making requests to the server.
     """
 
     @abstractmethod
-    def __init__(self, user_authz_config_path: Path, verify_tls_cert: bool):
+    def __init__(self, user_auth_config_path: Path, verify_tls_cert: bool):
         """Abstract constructor."""
 
     @abstractmethod

flwr/common/exit_handlers.py

@@ -30,6 +30,7 @@ SIGNAL_TO_EXIT_CODE: dict[int, int] = {
     signal.SIGINT: ExitCode.GRACEFUL_EXIT_SIGINT,
     signal.SIGTERM: ExitCode.GRACEFUL_EXIT_SIGTERM,
 }
+registered_exit_handlers: list[Callable[[], None]] = []
 
 # SIGQUIT is not available on Windows
 if hasattr(signal, "SIGQUIT"):
@@ -41,6 +42,7 @@ def register_exit_handlers(
     exit_message: Optional[str] = None,
     grpc_servers: Optional[list[Server]] = None,
     bckg_threads: Optional[list[Thread]] = None,
+    exit_handlers: Optional[list[Callable[[], None]]] = None,
 ) -> None:
     """Register exit handlers for `SIGINT`, `SIGTERM` and `SIGQUIT` signals.
 
@@ -56,8 +58,12 @@ def register_exit_handlers(
     bckg_threads: Optional[List[Thread]] (default: None)
         An optional list of threads that need to be gracefully
         terminated before exiting.
+    exit_handlers: Optional[List[Callable[[], None]]] (default: None)
+        An optional list of exit handlers to be called before exiting.
+        Additional exit handlers can be added using `add_exit_handler`.
     """
     default_handlers: dict[int, Callable[[int, FrameType], None]] = {}
+    registered_exit_handlers.extend(exit_handlers or [])
 
     def graceful_exit_handler(signalnum: int, _frame: FrameType) -> None:
         """Exit handler to be registered with `signal.signal`.
@@ -68,6 +74,9 @@ def register_exit_handlers(
         # Reset to default handler
         signal.signal(signalnum, default_handlers[signalnum])  # type: ignore
 
+        for handler in registered_exit_handlers:
+            handler()
+
         if grpc_servers is not None:
             for grpc_server in grpc_servers:
                 grpc_server.stop(grace=1)
@@ -87,3 +96,24 @@ def register_exit_handlers(
     for sig in SIGNAL_TO_EXIT_CODE:
         default_handler = signal.signal(sig, graceful_exit_handler)  # type: ignore
         default_handlers[sig] = default_handler  # type: ignore
+
+
+def add_exit_handler(exit_handler: Callable[[], None]) -> None:
+    """Add an exit handler to be called on graceful exit.
+
+    This function allows you to register additional exit handlers
+    that will be executed when the application exits gracefully,
+    if `register_exit_handlers` was called.
+
+    Parameters
+    ----------
+    exit_handler : Callable[[], None]
+        A callable that takes no arguments and performs cleanup or
+        other actions before the application exits.
+
+    Notes
+    -----
+    This method is not thread-safe, and it allows you to add the
+    same exit handler multiple times.
+    """
+    registered_exit_handlers.append(exit_handler)

flwr/common/inflatable_grpc_utils.py

@@ -15,7 +15,7 @@
 """InflatableObject utils."""
 
 
-from typing import Union
+from typing import Optional, Union
 
 from flwr.proto.fleet_pb2_grpc import FleetStub  # pylint: disable=E0611
 from flwr.proto.message_pb2 import (  # pylint: disable=E0611
@@ -24,6 +24,7 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PushObjectRequest,
     PushObjectResponse,
 )
+from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub  # pylint: disable=E0611
 
 from .inflatable import (
@@ -46,40 +47,51 @@ inflatable_class_registry: dict[str, type[InflatableObject]] = {
 
 
 def push_object_to_servicer(
-    obj: InflatableObject, stub: Union[FleetStub, ServerAppIoStub]
+    obj: InflatableObject,
+    stub: Union[FleetStub, ServerAppIoStub],
+    node: Node,
+    object_ids_to_push: Optional[set[str]] = None,
 ) -> set[str]:
     """Recursively deflate an object and push it to the servicer.
 
-    Objects with the same ID are not pushed twice. It returns the set of pushed object
+    Objects with the same ID are not pushed twice. If `object_ids_to_push` is set,
+    only objects with those IDs are pushed. It returns the set of pushed object
     IDs.
     """
     pushed_object_ids: set[str] = set()
     # Push children if it has any
     if children := obj.children:
         for child in children.values():
-            pushed_object_ids |= push_object_to_servicer(child, stub)
+            pushed_object_ids |= push_object_to_servicer(
+                child, stub, node, object_ids_to_push
+            )
 
     # Deflate object and push
     object_content = obj.deflate()
     object_id = get_object_id(object_content)
-    _: PushObjectResponse = stub.PushObject(
-        PushObjectRequest(
-            object_id=object_id,
-            object_content=object_content,
+    # Push always if no object set is specified, or if the object is in the set
+    if object_ids_to_push is None or object_id in object_ids_to_push:
+        _: PushObjectResponse = stub.PushObject(
+            PushObjectRequest(
+                node=node,
+                object_id=object_id,
+                object_content=object_content,
+            )
         )
-    )
-    pushed_object_ids.add(object_id)
+        pushed_object_ids.add(object_id)
 
     return pushed_object_ids
 
 
 def pull_object_from_servicer(
-    object_id: str, stub: Union[FleetStub, ServerAppIoStub]
+    object_id: str,
+    stub: Union[FleetStub, ServerAppIoStub],
+    node: Node,
 ) -> InflatableObject:
     """Recursively inflate an object by pulling it from the servicer."""
     # Pull object
     object_proto: PullObjectResponse = stub.PullObject(
-        PullObjectRequest(object_id=object_id)
+        PullObjectRequest(node=node, object_id=object_id)
     )
     object_content = object_proto.object_content
 
@@ -93,7 +105,9 @@ def pull_object_from_servicer(
     # Pull all children objects
     children: dict[str, InflatableObject] = {}
     for child_object_id in children_obj_ids:
-        children[child_object_id] = pull_object_from_servicer(child_object_id, stub)
+        children[child_object_id] = pull_object_from_servicer(
+            child_object_id, stub, node
+        )
 
     # Inflate object passing its children
     return cls_type.inflate(object_content, children=children)

flwr/common/message.py

@@ -24,6 +24,7 @@ from flwr.common.date import now
 from flwr.common.logger import warn_deprecated_feature
 from flwr.proto.message_pb2 import Message as ProtoMessage  # pylint: disable=E0611
 from flwr.proto.message_pb2 import Metadata as ProtoMetadata  # pylint: disable=E0611
+from flwr.proto.message_pb2 import ObjectIDs  # pylint: disable=E0611
 
 from ..app.error import Error
 from ..app.metadata import Metadata
@@ -31,6 +32,7 @@ from .constant import MESSAGE_TTL_TOLERANCE
 from .inflatable import (
     InflatableObject,
     add_header_to_object_body,
+    get_desdendant_object_ids,
     get_object_body,
     get_object_children_ids_from_object_content,
 )
@@ -505,3 +507,12 @@ def _check_arg_types(  # pylint: disable=too-many-arguments, R0917
     ):
         return
     raise MessageInitializationError()
+
+
+def get_message_to_descendant_id_mapping(message: Message) -> dict[str, ObjectIDs]:
+    """Construct a mapping between message object_id and that of its descendants."""
+    return {
+        message.object_id: ObjectIDs(
+            object_ids=list(get_desdendant_object_ids(message))
+        )
+    }

flwr/common/record/array.py

@@ -62,8 +62,8 @@ class Array(InflatableObject):
         A string representing the data type of the serialized object (e.g. `"float32"`).
         Only required if you are not passing in a ndarray or a tensor.
 
-    shape : Optional[list[int]] (default: None)
-        A list representing the shape of the unserialized array-like object. Only
+    shape : Optional[tuple[int, ...]] (default: None)
+        A tuple representing the shape of the unserialized array-like object. Only
         required if you are not passing in a ndarray or a tensor.
 
     stype : Optional[str] (default: None)
@@ -107,24 +107,13 @@ class Array(InflatableObject):
     """
 
     dtype: str
+    shape: tuple[int, ...]
     stype: str
     data: bytes
 
-    @property
-    def shape(self) -> list[int]:
-        """Get the shape of the array."""
-        self.is_dirty = True  # Mark as dirty when shape is accessed
-        return cast(list[int], self.__dict__["_shape"])
-
-    @shape.setter
-    def shape(self, value: list[int]) -> None:
-        """Set the shape of the array."""
-        self.is_dirty = True  # Mark as dirty when shape is set
-        self.__dict__["_shape"] = value
-
     @overload
     def __init__(  # noqa: E704
-        self, dtype: str, shape: list[int], stype: str, data: bytes
+        self, dtype: str, shape: tuple[int, ...], stype: str, data: bytes
     ) -> None: ...
 
     @overload
@@ -137,7 +126,7 @@ class Array(InflatableObject):
         self,
         *args: Any,
         dtype: str | None = None,
-        shape: list[int] | None = None,
+        shape: tuple[int, ...] | None = None,
         stype: str | None = None,
         data: bytes | None = None,
         ndarray: NDArray | None = None,
@@ -145,7 +134,7 @@ class Array(InflatableObject):
     ) -> None:
         # Determine the initialization method and validate input arguments.
         # Support three initialization formats:
-        # 1. Array(dtype: str, shape: list[int], stype: str, data: bytes)
+        # 1. Array(dtype: str, shape: tuple[int, ...], stype: str, data: bytes)
         # 2. Array(ndarray: NDArray)
         # 3. Array(torch_tensor: torch.Tensor)
 
@@ -192,7 +181,7 @@ class Array(InflatableObject):
             if (
                 len(all_args) == 4  # pylint: disable=too-many-boolean-expressions
                 and isinstance(all_args[0], str)
-                and isinstance(all_args[1], list)
+                and isinstance(all_args[1], tuple)
                 and all(isinstance(i, int) for i in all_args[1])
                 and isinstance(all_args[2], str)
                 and isinstance(all_args[3], bytes)
@@ -232,7 +221,7 @@ class Array(InflatableObject):
         data = buffer.getvalue()
         return Array(
             dtype=str(ndarray.dtype),
-            shape=list(ndarray.shape),
+            shape=tuple(ndarray.shape),
             stype=SType.NUMPY,
             data=data,
         )
@@ -302,7 +291,7 @@ class Array(InflatableObject):
         proto_array = ArrayProto.FromString(obj_body)
         return cls(
             dtype=proto_array.dtype,
-            shape=list(proto_array.shape),
+            shape=tuple(proto_array.shape),
             stype=proto_array.stype,
             data=proto_array.data,
         )
@@ -328,7 +317,7 @@ class Array(InflatableObject):
 
     def __setattr__(self, name: str, value: Any) -> None:
         """Set attribute with special handling for dirty state."""
-        if name in ("dtype", "stype", "data"):
+        if name in ("dtype", "shape", "stype", "data"):
             # Mark as dirty if any of the main attributes are set
             self.is_dirty = True
         super().__setattr__(name, value)

flwr/common/record/arrayrecord.py

@@ -252,7 +252,7 @@ class ArrayRecord(TypedDict[str, Array], InflatableObject):
         record = ArrayRecord()
         for k, v in array_dict.items():
             record[k] = Array(
-                dtype=v.dtype, shape=list(v.shape), stype=v.stype, data=v.data
+                dtype=v.dtype, shape=tuple(v.shape), stype=v.stype, data=v.data
             )
         if not keep_input:
             array_dict.clear()

flwr/common/recorddict_compat.py

@@ -111,12 +111,12 @@ def parameters_to_arrayrecord(parameters: Parameters, keep_input: bool) -> Array
         else:
             tensor = parameters.tensors.pop(0)
         ordered_dict[str(idx)] = Array(
-            data=tensor, dtype="", stype=tensor_type, shape=[]
+            data=tensor, dtype="", stype=tensor_type, shape=()
         )
 
     if num_arrays == 0:
         ordered_dict[EMPTY_TENSOR_KEY] = Array(
-            data=b"", dtype="", stype=tensor_type, shape=[]
+            data=b"", dtype="", stype=tensor_type, shape=()
         )
     return ArrayRecord(ordered_dict, keep_input=keep_input)
 

flwr/common/serde.py

@@ -390,7 +390,7 @@ def array_from_proto(array_proto: ProtoArray) -> Array:
     """Deserialize Array from ProtoBuf."""
     return Array(
         dtype=array_proto.dtype,
-        shape=list(array_proto.shape),
+        shape=tuple(array_proto.shape),
         stype=array_proto.stype,
         data=array_proto.data,
     )

flwr/proto/fleet_pb2.py

@@ -19,7 +19,7 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import message_pb2 as flwr_dot_proto_dot_message__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x18\x66lwr/proto/message.proto\"/\n\x11\x43reateNodeRequest\x12\x1a\n\x12heartbeat_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"\x87\x02\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12L\n\x0fobjects_to_pull\x18\x03 \x03(\x0b\x32\x33.flwr.proto.PullMessagesResponse.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\"\x91\x02\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12Z\n\x17msg_to_children_mapping\x18\x03 \x03(\x0b\x32\x39.flwr.proto.PushMessagesRequest.MsgToChildrenMappingEntry\x1aR\n\x19MsgToChildrenMappingEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.flwr.proto.ObjectIDs:\x02\x38\x01\"\xcb\x02\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.ResultsEntry\x12L\n\x0fobjects_to_push\x18\x03 \x03(\x0b\x32\x33.flwr.proto.PushMessagesResponse.ObjectsToPushEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\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\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\xd7\x05\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12\x62\n\x11SendNodeHeartbeat\x12$.flwr.proto.SendNodeHeartbeatRequest\x1a%.flwr.proto.SendNodeHeartbeatResponse\"\x00\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\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\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x66lwr/proto/fleet.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x18\x66lwr/proto/message.proto\"/\n\x11\x43reateNodeRequest\x12\x1a\n\x12heartbeat_interval\x18\x01 \x01(\x01\"4\n\x12\x43reateNodeResponse\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"3\n\x11\x44\x65leteNodeRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\"\x14\n\x12\x44\x65leteNodeResponse\"J\n\x13PullMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x13\n\x0bmessage_ids\x18\x02 \x03(\t\"\x87\x02\n\x14PullMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12L\n\x0fobjects_to_pull\x18\x03 \x03(\x0b\x32\x33.flwr.proto.PullMessagesResponse.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\"\x97\x02\n\x13PushMessagesRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12*\n\rmessages_list\x18\x02 \x03(\x0b\x32\x13.flwr.proto.Message\x12^\n\x19msg_to_descendant_mapping\x18\x03 \x03(\x0b\x32;.flwr.proto.PushMessagesRequest.MsgToDescendantMappingEntry\x1aT\n\x1bMsgToDescendantMappingEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12$\n\x05value\x18\x02 \x01(\x0b\x32\x15.flwr.proto.ObjectIDs:\x02\x38\x01\"\xcb\x02\n\x14PushMessagesResponse\x12(\n\treconnect\x18\x01 \x01(\x0b\x32\x15.flwr.proto.Reconnect\x12>\n\x07results\x18\x02 \x03(\x0b\x32-.flwr.proto.PushMessagesResponse.ResultsEntry\x12L\n\x0fobjects_to_push\x18\x03 \x03(\x0b\x32\x33.flwr.proto.PushMessagesResponse.ObjectsToPushEntry\x1a.\n\x0cResultsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\r:\x02\x38\x01\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\"\x1e\n\tReconnect\x12\x11\n\treconnect\x18\x01 \x01(\x04\x32\xd7\x05\n\x05\x46leet\x12M\n\nCreateNode\x12\x1d.flwr.proto.CreateNodeRequest\x1a\x1e.flwr.proto.CreateNodeResponse\"\x00\x12M\n\nDeleteNode\x12\x1d.flwr.proto.DeleteNodeRequest\x1a\x1e.flwr.proto.DeleteNodeResponse\"\x00\x12\x62\n\x11SendNodeHeartbeat\x12$.flwr.proto.SendNodeHeartbeatRequest\x1a%.flwr.proto.SendNodeHeartbeatResponse\"\x00\x12S\n\x0cPullMessages\x12\x1f.flwr.proto.PullMessagesRequest\x1a .flwr.proto.PullMessagesResponse\"\x00\x12S\n\x0cPushMessages\x12\x1f.flwr.proto.PushMessagesRequest\x1a .flwr.proto.PushMessagesResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12\x41\n\x06GetFab\x12\x19.flwr.proto.GetFabRequest\x1a\x1a.flwr.proto.GetFabResponse\"\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\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -28,8 +28,8 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_PULLMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._options = None
   _globals['_PULLMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_options = b'8\001'
-  _globals['_PUSHMESSAGESREQUEST_MSGTOCHILDRENMAPPINGENTRY']._options = None
-  _globals['_PUSHMESSAGESREQUEST_MSGTOCHILDRENMAPPINGENTRY']._serialized_options = b'8\001'
+  _globals['_PUSHMESSAGESREQUEST_MSGTODESCENDANTMAPPINGENTRY']._options = None
+  _globals['_PUSHMESSAGESREQUEST_MSGTODESCENDANTMAPPINGENTRY']._serialized_options = b'8\001'
   _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._options = None
   _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_options = b'8\001'
   _globals['_PUSHMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._options = None
@@ -49,17 +49,17 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PULLMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_start=602
   _globals['_PULLMESSAGESRESPONSE_OBJECTSTOPULLENTRY']._serialized_end=677
   _globals['_PUSHMESSAGESREQUEST']._serialized_start=680
-  _globals['_PUSHMESSAGESREQUEST']._serialized_end=953
-  _globals['_PUSHMESSAGESREQUEST_MSGTOCHILDRENMAPPINGENTRY']._serialized_start=871
-  _globals['_PUSHMESSAGESREQUEST_MSGTOCHILDRENMAPPINGENTRY']._serialized_end=953
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=956
-  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=1287
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=1164
-  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=1210
-  _globals['_PUSHMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_start=1212
-  _globals['_PUSHMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_end=1287
-  _globals['_RECONNECT']._serialized_start=1289
-  _globals['_RECONNECT']._serialized_end=1319
-  _globals['_FLEET']._serialized_start=1322
-  _globals['_FLEET']._serialized_end=2049
+  _globals['_PUSHMESSAGESREQUEST']._serialized_end=959
+  _globals['_PUSHMESSAGESREQUEST_MSGTODESCENDANTMAPPINGENTRY']._serialized_start=875
+  _globals['_PUSHMESSAGESREQUEST_MSGTODESCENDANTMAPPINGENTRY']._serialized_end=959
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_start=962
+  _globals['_PUSHMESSAGESRESPONSE']._serialized_end=1293
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_start=1170
+  _globals['_PUSHMESSAGESRESPONSE_RESULTSENTRY']._serialized_end=1216
+  _globals['_PUSHMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_start=1218
+  _globals['_PUSHMESSAGESRESPONSE_OBJECTSTOPUSHENTRY']._serialized_end=1293
+  _globals['_RECONNECT']._serialized_start=1295
+  _globals['_RECONNECT']._serialized_end=1325
+  _globals['_FLEET']._serialized_start=1328
+  _globals['_FLEET']._serialized_end=2055
 # @@protoc_insertion_point(module_scope)

flwr/proto/fleet_pb2.pyi

@@ -115,7 +115,7 @@ global___PullMessagesResponse = PullMessagesResponse
 class PushMessagesRequest(google.protobuf.message.Message):
     """PushMessages messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    class MsgToChildrenMappingEntry(google.protobuf.message.Message):
+    class MsgToDescendantMappingEntry(google.protobuf.message.Message):
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
         KEY_FIELD_NUMBER: builtins.int
         VALUE_FIELD_NUMBER: builtins.int
@@ -132,21 +132,21 @@ class PushMessagesRequest(google.protobuf.message.Message):
 
     NODE_FIELD_NUMBER: builtins.int
     MESSAGES_LIST_FIELD_NUMBER: builtins.int
-    MSG_TO_CHILDREN_MAPPING_FIELD_NUMBER: builtins.int
+    MSG_TO_DESCENDANT_MAPPING_FIELD_NUMBER: builtins.int
     @property
     def node(self) -> flwr.proto.node_pb2.Node: ...
     @property
     def messages_list(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.message_pb2.Message]: ...
     @property
-    def msg_to_children_mapping(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.message_pb2.ObjectIDs]: ...
+    def msg_to_descendant_mapping(self) -> google.protobuf.internal.containers.MessageMap[typing.Text, flwr.proto.message_pb2.ObjectIDs]: ...
     def __init__(self,
         *,
         node: typing.Optional[flwr.proto.node_pb2.Node] = ...,
         messages_list: typing.Optional[typing.Iterable[flwr.proto.message_pb2.Message]] = ...,
-        msg_to_children_mapping: typing.Optional[typing.Mapping[typing.Text, flwr.proto.message_pb2.ObjectIDs]] = ...,
+        msg_to_descendant_mapping: typing.Optional[typing.Mapping[typing.Text, flwr.proto.message_pb2.ObjectIDs]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["node",b"node"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list","msg_to_children_mapping",b"msg_to_children_mapping","node",b"node"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["messages_list",b"messages_list","msg_to_descendant_mapping",b"msg_to_descendant_mapping","node",b"node"]) -> None: ...
 global___PushMessagesRequest = PushMessagesRequest
 
 class PushMessagesResponse(google.protobuf.message.Message):

flwr/proto/message_pb2.py

@@ -18,7 +18,7 @@ from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/message.proto\x12\nflwr.proto\x1a\x16\x66lwr/proto/error.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x15\x66lwr/proto/node.proto\"|\n\x07Message\x12&\n\x08metadata\x18\x01 \x01(\x0b\x32\x14.flwr.proto.Metadata\x12\'\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12 \n\x05\x65rror\x18\x03 \x01(\x0b\x32\x11.flwr.proto.Error\"\xd0\x02\n\x07\x43ontext\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x0f\n\x07node_id\x18\x02 \x01(\x04\x12\x38\n\x0bnode_config\x18\x03 \x03(\x0b\x32#.flwr.proto.Context.NodeConfigEntry\x12%\n\x05state\x18\x04 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12\x36\n\nrun_config\x18\x05 \x03(\x0b\x32\".flwr.proto.Context.RunConfigEntry\x1a\x45\n\x0fNodeConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x44\n\x0eRunConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\xbe\x01\n\x08Metadata\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x12\n\nmessage_id\x18\x02 \x01(\t\x12\x13\n\x0bsrc_node_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x64st_node_id\x18\x04 \x01(\x04\x12\x1b\n\x13reply_to_message_id\x18\x05 \x01(\t\x12\x10\n\x08group_id\x18\x06 \x01(\t\x12\x0b\n\x03ttl\x18\x07 \x01(\x01\x12\x14\n\x0cmessage_type\x18\x08 \x01(\t\x12\x12\n\ncreated_at\x18\t \x01(\x01\"\x1e\n\tObjectIDs\x12\x11\n\tobject_id\x18\x01 \x03(\t\"^\n\x11PushObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \x01(\t\x12\x16\n\x0eobject_content\x18\x03 \x01(\x0c\"\x14\n\x12PushObjectResponse\"F\n\x11PullObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \x01(\t\",\n\x12PullObjectResponse\x12\x16\n\x0eobject_content\x18\x01 \x01(\x0c\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/message.proto\x12\nflwr.proto\x1a\x16\x66lwr/proto/error.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x15\x66lwr/proto/node.proto\"|\n\x07Message\x12&\n\x08metadata\x18\x01 \x01(\x0b\x32\x14.flwr.proto.Metadata\x12\'\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12 \n\x05\x65rror\x18\x03 \x01(\x0b\x32\x11.flwr.proto.Error\"\xd0\x02\n\x07\x43ontext\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x0f\n\x07node_id\x18\x02 \x01(\x04\x12\x38\n\x0bnode_config\x18\x03 \x03(\x0b\x32#.flwr.proto.Context.NodeConfigEntry\x12%\n\x05state\x18\x04 \x01(\x0b\x32\x16.flwr.proto.RecordDict\x12\x36\n\nrun_config\x18\x05 \x03(\x0b\x32\".flwr.proto.Context.RunConfigEntry\x1a\x45\n\x0fNodeConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\x1a\x44\n\x0eRunConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"\xbe\x01\n\x08Metadata\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x12\n\nmessage_id\x18\x02 \x01(\t\x12\x13\n\x0bsrc_node_id\x18\x03 \x01(\x04\x12\x13\n\x0b\x64st_node_id\x18\x04 \x01(\x04\x12\x1b\n\x13reply_to_message_id\x18\x05 \x01(\t\x12\x10\n\x08group_id\x18\x06 \x01(\t\x12\x0b\n\x03ttl\x18\x07 \x01(\x01\x12\x14\n\x0cmessage_type\x18\x08 \x01(\t\x12\x12\n\ncreated_at\x18\t \x01(\x01\"\x1f\n\tObjectIDs\x12\x12\n\nobject_ids\x18\x01 \x03(\t\"^\n\x11PushObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \x01(\t\x12\x16\n\x0eobject_content\x18\x03 \x01(\x0c\"\x14\n\x12PushObjectResponse\"F\n\x11PullObjectRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x11\n\tobject_id\x18\x02 \x01(\t\",\n\x12PullObjectResponse\x12\x16\n\x0eobject_content\x18\x01 \x01(\x0c\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -40,13 +40,13 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_METADATA']._serialized_start=610
   _globals['_METADATA']._serialized_end=800
   _globals['_OBJECTIDS']._serialized_start=802
-  _globals['_OBJECTIDS']._serialized_end=832
-  _globals['_PUSHOBJECTREQUEST']._serialized_start=834
-  _globals['_PUSHOBJECTREQUEST']._serialized_end=928
-  _globals['_PUSHOBJECTRESPONSE']._serialized_start=930
-  _globals['_PUSHOBJECTRESPONSE']._serialized_end=950
-  _globals['_PULLOBJECTREQUEST']._serialized_start=952
-  _globals['_PULLOBJECTREQUEST']._serialized_end=1022
-  _globals['_PULLOBJECTRESPONSE']._serialized_start=1024
-  _globals['_PULLOBJECTRESPONSE']._serialized_end=1068
+  _globals['_OBJECTIDS']._serialized_end=833
+  _globals['_PUSHOBJECTREQUEST']._serialized_start=835
+  _globals['_PUSHOBJECTREQUEST']._serialized_end=929
+  _globals['_PUSHOBJECTRESPONSE']._serialized_start=931
+  _globals['_PUSHOBJECTRESPONSE']._serialized_end=951
+  _globals['_PULLOBJECTREQUEST']._serialized_start=953
+  _globals['_PULLOBJECTREQUEST']._serialized_end=1023
+  _globals['_PULLOBJECTRESPONSE']._serialized_start=1025
+  _globals['_PULLOBJECTRESPONSE']._serialized_end=1069
 # @@protoc_insertion_point(module_scope)

flwr/proto/message_pb2.pyi

@@ -130,14 +130,14 @@ global___Metadata = Metadata
 
 class ObjectIDs(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    OBJECT_ID_FIELD_NUMBER: builtins.int
+    OBJECT_IDS_FIELD_NUMBER: builtins.int
     @property
-    def object_id(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
+    def object_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
     def __init__(self,
         *,
-        object_id: typing.Optional[typing.Iterable[typing.Text]] = ...,
+        object_ids: typing.Optional[typing.Iterable[typing.Text]] = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["object_id",b"object_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["object_ids",b"object_ids"]) -> None: ...
 global___ObjectIDs = ObjectIDs
 
 class PushObjectRequest(google.protobuf.message.Message):