flwr-nightly 1.19.0.dev20250605__tar.gz → 1.19.0.dev20250607__tar.gz

{flwr_nightly-1.19.0.dev20250605 → flwr_nightly-1.19.0.dev20250607}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250605
+Version: 1.19.0.dev20250607
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.19.0.dev20250605 → flwr_nightly-1.19.0.dev20250607}/py/flwr/client/grpc_rere_client/connection.py

@@ -30,16 +30,16 @@ from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.constant import HEARTBEAT_CALL_TIMEOUT, HEARTBEAT_DEFAULT_INTERVAL
 from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.heartbeat import HeartbeatSender
+from flwr.common.inflatable import get_all_nested_objects
 from flwr.common.inflatable_grpc_utils import (
-    pull_object_from_servicer,
-    push_object_to_servicer,
+    inflate_object_from_contents,
+    make_pull_object_fn_grpc,
+    make_push_object_fn_grpc,
+    pull_objects,
+    push_objects,
 )
 from flwr.common.logger import log
-from flwr.common.message import (
-    Message,
-    get_message_to_descendant_id_mapping,
-    remove_content_from_message,
-)
+from flwr.common.message import Message, remove_content_from_message
 from flwr.common.retry_invoker import RetryInvoker, _wrap_stub
 from flwr.common.secure_aggregation.crypto.symmetric_encryption import (
     generate_key_pairs,
@@ -60,6 +60,7 @@ from flwr.proto.heartbeat_pb2 import (  # pylint: disable=E0611
     SendNodeHeartbeatRequest,
     SendNodeHeartbeatResponse,
 )
+from flwr.proto.message_pb2 import ObjectIDs  # pylint: disable=E0611
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 
@@ -265,21 +266,21 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         in_message: Optional[Message] = None
 
         if message_proto:
-            in_message = cast(
-                Message,
-                pull_object_from_servicer(
-                    object_id=message_proto.metadata.message_id,
-                    stub=stub,
+            msg_id = message_proto.metadata.message_id
+            all_object_contents = pull_objects(
+                list(response.objects_to_pull[msg_id].object_ids) + [msg_id],
+                pull_object_fn=make_pull_object_fn_grpc(
+                    pull_object_grpc=stub.PullObject,
                     node=node,
                     run_id=message_proto.metadata.run_id,
                 ),
             )
-
-        if in_message:
+            in_message = cast(
+                Message, inflate_object_from_contents(msg_id, all_object_contents)
+            )
             # The deflated message doesn't contain the message_id (its own object_id)
             # Inject
-            # pylint: disable-next=W0212
-            in_message.metadata._message_id = message_proto.metadata.message_id  # type: ignore
+            in_message.metadata.__dict__["_message_id"] = msg_id
 
         # Remember `metadata` of the in message
         nonlocal metadata
@@ -308,23 +309,30 @@ def grpc_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
             log(ERROR, "Invalid out message")
             return
 
+        # Get all nested objects
+        all_objects = get_all_nested_objects(message)
+        all_object_ids = list(all_objects.keys())
+        msg_id = all_object_ids[-1]  # Last object is the message itself
+        descendant_ids = all_object_ids[:-1]  # All but the last object are descendants
+
         # Serialize Message
         message_proto = message_to_proto(message=remove_content_from_message(message))
-        descendants_mapping = get_message_to_descendant_id_mapping(message)
         request = PushMessagesRequest(
             node=node,
             messages_list=[message_proto],
-            msg_to_descendant_mapping=descendants_mapping,
+            msg_to_descendant_mapping={msg_id: ObjectIDs(object_ids=descendant_ids)},
         )
         response: PushMessagesResponse = stub.PushMessages(request=request)
 
         if response.objects_to_push:
             objs_to_push = set(response.objects_to_push[message.object_id].object_ids)
-            push_object_to_servicer(
-                message,
-                stub,
-                node,
-                run_id=message.metadata.run_id,
+            push_objects(
+                all_objects,
+                push_object_fn=make_push_object_fn_grpc(
+                    push_object_grpc=stub.PushObject,
+                    node=node,
+                    run_id=message.metadata.run_id,
+                ),
                 object_ids_to_push=objs_to_push,
             )
             log(DEBUG, "Pushed %s objects to servicer.", len(objs_to_push))

{flwr_nightly-1.19.0.dev20250605 → flwr_nightly-1.19.0.dev20250607}/py/flwr/common/constant.py

@@ -138,6 +138,17 @@ HEAD_VALUE_DIVIDER = " "
 # Constants for serialization
 INT64_MAX_VALUE = 9223372036854775807  # (1 << 63) - 1
 
+# Constants for `flwr-serverapp` and `flwr-clientapp` CLI commands
+FLWR_APP_TOKEN_LENGTH = 128  # Length of the token used
+
+# Constants for object pushing and pulling
+MAX_CONCURRENT_PUSHES = 8  # Default maximum number of concurrent pushes
+MAX_CONCURRENT_PULLS = 8  # Default maximum number of concurrent pulls
+PULL_MAX_TIME = 7200  # Default maximum time to wait for pulling objects
+PULL_MAX_TRIES_PER_OBJECT = 500  # Default maximum number of tries to pull an object
+PULL_INITIAL_BACKOFF = 1  # Initial backoff time for pulling objects
+PULL_BACKOFF_CAP = 10  # Maximum backoff time for pulling objects
+
 
 class MessageType:
     """Message type."""

{flwr_nightly-1.19.0.dev20250605 → flwr_nightly-1.19.0.dev20250607}/py/flwr/common/inflatable.py

@@ -25,6 +25,16 @@ from .constant import HEAD_BODY_DIVIDER, HEAD_VALUE_DIVIDER
 from .logger import log
 
 
+class UnexpectedObjectContentError(Exception):
+    """Exception raised when the content of an object does not conform to the expected
+    structure for an InflatableObject (i.e., head, body, and values within the head)."""
+
+    def __init__(self, object_id: str, reason: str):
+        super().__init__(
+            f"Object with ID '{object_id}' has an unexpected structure. {reason}"
+        )
+
+
 class InflatableObject:
     """Base class for inflatable objects."""
 
@@ -117,12 +127,14 @@ def add_header_to_object_body(object_body: bytes, obj: InflatableObject) -> byte
 
 def _get_object_head(object_content: bytes) -> bytes:
     """Return object head from object content."""
-    return object_content.split(HEAD_BODY_DIVIDER, 1)[0]
+    index = object_content.find(HEAD_BODY_DIVIDER)
+    return object_content[:index]
 
 
 def _get_object_body(object_content: bytes) -> bytes:
     """Return object body from object content."""
-    return object_content.split(HEAD_BODY_DIVIDER, 1)[1]
+    index = object_content.find(HEAD_BODY_DIVIDER)
+    return object_content[index + len(HEAD_BODY_DIVIDER) :]
 
 
 def is_valid_sha256_hash(object_id: str) -> bool:
@@ -197,21 +209,25 @@ def get_object_head_values_from_object_content(
     return obj_type, children_ids, int(body_len)
 
 
-def _get_descendants_object_ids_recursively(obj: InflatableObject) -> set[str]:
+def get_descendant_object_ids(obj: InflatableObject) -> set[str]:
+    """Get a set of object IDs of all descendants."""
+    descendants = set(get_all_nested_objects(obj).keys())
+    # Exclude Object ID of parent object
+    descendants.discard(obj.object_id)
+    return descendants
 
-    descendants: set[str] = set()
-    if children := obj.children:
-        for child in children.values():
-            descendants |= _get_descendants_object_ids_recursively(child)
 
-    descendants.add(obj.object_id)
+def get_all_nested_objects(obj: InflatableObject) -> dict[str, InflatableObject]:
+    """Get a dictionary of all nested objects, including the object itself.
 
-    return descendants
+    Each key in the dictionary is an object ID, and the entries are ordered by post-
+    order traversal, i.e., child objects appear before their respective parents.
+    """
+    ret: dict[str, InflatableObject] = {}
+    if children := obj.children:
+        for child in children.values():
+            ret.update(get_all_nested_objects(child))
 
+    ret[obj.object_id] = obj
 
-def get_desdendant_object_ids(obj: InflatableObject) -> set[str]:
-    """Get a set of object IDs of all descendants."""
-    descendants = _get_descendants_object_ids_recursively(obj)
-    # Exclude Object ID of parent object
-    descendants.discard(obj.object_id)
-    return descendants
+    return ret

flwr_nightly-1.19.0.dev20250607/py/flwr/common/inflatable_grpc_utils.py

@@ -0,0 +1,362 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""InflatableObject utils."""
+
+
+import concurrent.futures
+import random
+import threading
+import time
+from typing import Callable, Optional
+
+from flwr.proto.message_pb2 import (  # pylint: disable=E0611
+    PullObjectRequest,
+    PullObjectResponse,
+    PushObjectRequest,
+    PushObjectResponse,
+)
+from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
+
+from .constant import (
+    MAX_CONCURRENT_PULLS,
+    MAX_CONCURRENT_PUSHES,
+    PULL_BACKOFF_CAP,
+    PULL_INITIAL_BACKOFF,
+    PULL_MAX_TIME,
+    PULL_MAX_TRIES_PER_OBJECT,
+)
+from .inflatable import InflatableObject, get_object_head_values_from_object_content
+from .message import Message
+from .record import Array, ArrayRecord, ConfigRecord, MetricRecord, RecordDict
+
+# Helper registry that maps names of classes to their type
+inflatable_class_registry: dict[str, type[InflatableObject]] = {
+    Array.__qualname__: Array,
+    ArrayRecord.__qualname__: ArrayRecord,
+    ConfigRecord.__qualname__: ConfigRecord,
+    Message.__qualname__: Message,
+    MetricRecord.__qualname__: MetricRecord,
+    RecordDict.__qualname__: RecordDict,
+}
+
+
+class ObjectUnavailableError(Exception):
+    """Exception raised when an object has been pre-registered but is not yet
+    available."""
+
+    def __init__(self, object_id: str):
+        super().__init__(f"Object with ID '{object_id}' is not yet available.")
+
+
+class ObjectIdNotPreregisteredError(Exception):
+    """Exception raised when an object ID is not pre-registered."""
+
+    def __init__(self, object_id: str):
+        super().__init__(f"Object with ID '{object_id}' could not be found.")
+
+
+def make_pull_object_fn_grpc(
+    pull_object_grpc: Callable[[PullObjectRequest], PullObjectResponse],
+    node: Node,
+    run_id: int,
+) -> Callable[[str], bytes]:
+    """Create a pull object function that uses gRPC to pull objects.
+
+    Parameters
+    ----------
+    pull_object_grpc : Callable[[PullObjectRequest], PullObjectResponse]
+        The gRPC function to pull objects, e.g., `FleetStub.PullObject`.
+    node : Node
+        The node making the request.
+    run_id : int
+        The run ID for the current operation.
+
+    Returns
+    -------
+    Callable[[str], bytes]
+        A function that takes an object ID and returns the object content as bytes.
+        The function raises `ObjectIdNotPreregisteredError` if the object ID is not
+        pre-registered, or `ObjectUnavailableError` if the object is not yet available.
+    """
+
+    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)
+        if not response.object_found:
+            raise ObjectIdNotPreregisteredError(object_id)
+        if not response.object_available:
+            raise ObjectUnavailableError(object_id)
+        return response.object_content
+
+    return pull_object_fn
+
+
+def make_push_object_fn_grpc(
+    push_object_grpc: Callable[[PushObjectRequest], PushObjectResponse],
+    node: Node,
+    run_id: int,
+) -> Callable[[str, bytes], None]:
+    """Create a push object function that uses gRPC to push objects.
+
+    Parameters
+    ----------
+    push_object_grpc : Callable[[PushObjectRequest], PushObjectResponse]
+        The gRPC function to push objects, e.g., `FleetStub.PushObject`.
+    node : Node
+        The node making the request.
+    run_id : int
+        The run ID for the current operation.
+
+    Returns
+    -------
+    Callable[[str, bytes], None]
+        A function that takes an object ID and its content as bytes, and pushes it
+        to the servicer. The function raises `ObjectIdNotPreregisteredError` if
+        the object ID is not pre-registered.
+    """
+
+    def push_object_fn(object_id: str, object_content: bytes) -> None:
+        request = PushObjectRequest(
+            node=node, run_id=run_id, object_id=object_id, object_content=object_content
+        )
+        response: PushObjectResponse = push_object_grpc(request)
+        if not response.stored:
+            raise ObjectIdNotPreregisteredError(object_id)
+
+    return push_object_fn
+
+
+def push_objects(
+    objects: dict[str, InflatableObject],
+    push_object_fn: Callable[[str, bytes], None],
+    *,
+    object_ids_to_push: Optional[set[str]] = None,
+    keep_objects: bool = False,
+    max_concurrent_pushes: int = MAX_CONCURRENT_PUSHES,
+) -> None:
+    """Push multiple objects to the servicer.
+
+    Parameters
+    ----------
+    objects : dict[str, InflatableObject]
+        A dictionary of objects to push, where keys are object IDs and values are
+        `InflatableObject` instances.
+    push_object_fn : Callable[[str, bytes], None]
+        A function that takes an object ID and its content as bytes, and pushes
+        it to the servicer. This function should raise `ObjectIdNotPreregisteredError`
+        if the object ID is not pre-registered.
+    object_ids_to_push : Optional[set[str]] (default: None)
+        A set of object IDs to push. If not provided, all objects will be pushed.
+    keep_objects : bool (default: False)
+        If `True`, the original objects will be kept in the `objects` dictionary
+        after pushing. If `False`, they will be removed from the dictionary to avoid
+        high memory usage.
+    max_concurrent_pushes : int (default: MAX_CONCURRENT_PUSHES)
+        The maximum number of concurrent pushes to perform.
+    """
+    if object_ids_to_push is not None:
+        # Filter objects to push only those with IDs in the set
+        objects = {k: v for k, v in objects.items() if k in object_ids_to_push}
+
+    lock = threading.Lock()
+
+    def push(obj_id: str) -> None:
+        """Push a single object."""
+        object_content = objects[obj_id].deflate()
+        if not keep_objects:
+            with lock:
+                del objects[obj_id]
+        push_object_fn(obj_id, object_content)
+
+    with concurrent.futures.ThreadPoolExecutor(
+        max_workers=max_concurrent_pushes
+    ) as executor:
+        list(executor.map(push, list(objects.keys())))
+
+
+def pull_objects(  # pylint: disable=too-many-arguments
+    object_ids: list[str],
+    pull_object_fn: Callable[[str], bytes],
+    *,
+    max_concurrent_pulls: int = MAX_CONCURRENT_PULLS,
+    max_time: Optional[float] = PULL_MAX_TIME,
+    max_tries_per_object: Optional[int] = PULL_MAX_TRIES_PER_OBJECT,
+    initial_backoff: float = PULL_INITIAL_BACKOFF,
+    backoff_cap: float = PULL_BACKOFF_CAP,
+) -> dict[str, bytes]:
+    """Pull multiple objects from the servicer.
+
+    Parameters
+    ----------
+    object_ids : list[str]
+        A list of object IDs to pull.
+    pull_object_fn : Callable[[str], bytes]
+        A function that takes an object ID and returns the object content as bytes.
+        The function should raise `ObjectUnavailableError` if the object is not yet
+        available, or `ObjectIdNotPreregisteredError` if the object ID is not
+        pre-registered.
+    max_concurrent_pulls : int (default: MAX_CONCURRENT_PULLS)
+        The maximum number of concurrent pulls to perform.
+    max_time : Optional[float] (default: PULL_MAX_TIME)
+        The maximum time to wait for all pulls to complete. If `None`, waits
+        indefinitely.
+    max_tries_per_object : Optional[int] (default: PULL_MAX_TRIES_PER_OBJECT)
+        The maximum number of attempts to pull each object. If `None`, pulls
+        indefinitely until the object is available.
+    initial_backoff : float (default: PULL_INITIAL_BACKOFF)
+        The initial backoff time in seconds for retrying pulls after an
+        `ObjectUnavailableError`.
+    backoff_cap : float (default: PULL_BACKOFF_CAP)
+        The maximum backoff time in seconds. Backoff times will not exceed this value.
+
+    Returns
+    -------
+    dict[str, bytes]
+        A dictionary where keys are object IDs and values are the pulled
+        object contents.
+    """
+    if max_tries_per_object is None:
+        max_tries_per_object = int(1e9)
+    if max_time is None:
+        max_time = float("inf")
+
+    results: dict[str, bytes] = {}
+    results_lock = threading.Lock()
+    err_to_raise: Optional[Exception] = None
+    early_stop = threading.Event()
+    start = time.monotonic()
+
+    def pull_with_retries(object_id: str) -> None:
+        """Attempt to pull a single object with retry and backoff."""
+        nonlocal err_to_raise
+        tries = 0
+        delay = initial_backoff
+
+        while not early_stop.is_set():
+            try:
+                object_content = pull_object_fn(object_id)
+                with results_lock:
+                    results[object_id] = object_content
+                return
+
+            except ObjectUnavailableError as err:
+                tries += 1
+                if (
+                    tries >= max_tries_per_object
+                    or time.monotonic() - start >= max_time
+                ):
+                    # Stop all work if one object exhausts retries
+                    early_stop.set()
+                    with results_lock:
+                        if err_to_raise is None:
+                            err_to_raise = err
+                    return
+
+                # Apply exponential backoff with ±20% jitter
+                sleep_time = delay * (1 + random.uniform(-0.2, 0.2))
+                early_stop.wait(sleep_time)
+                delay = min(delay * 2, backoff_cap)
+
+            except ObjectIdNotPreregisteredError as err:
+                # Permanent failure: object ID is invalid
+                early_stop.set()
+                with results_lock:
+                    if err_to_raise is None:
+                        err_to_raise = err
+                return
+
+    # Submit all pull tasks concurrently
+    with concurrent.futures.ThreadPoolExecutor(
+        max_workers=max_concurrent_pulls
+    ) as executor:
+        futures = {
+            executor.submit(pull_with_retries, obj_id): obj_id for obj_id in object_ids
+        }
+
+        # Wait for completion
+        concurrent.futures.wait(futures)
+
+    if err_to_raise is not None:
+        raise err_to_raise
+
+    return results
+
+
+def inflate_object_from_contents(
+    object_id: str,
+    object_contents: dict[str, bytes],
+    *,
+    keep_object_contents: bool = False,
+    objects: Optional[dict[str, InflatableObject]] = None,
+) -> InflatableObject:
+    """Inflate an object from object contents.
+
+    Parameters
+    ----------
+    object_id : str
+        The ID of the object to inflate.
+    object_contents : dict[str, bytes]
+        A dictionary mapping object IDs to their contents as bytes.
+        All descendant objects must be present in this dictionary.
+    keep_object_contents : bool (default: False)
+        If `True`, the object content will be kept in the `object_contents`
+        dictionary after inflation. If `False`, the object content will be
+        removed from the dictionary to save memory.
+    objects : Optional[dict[str, InflatableObject]] (default: None)
+        No need to provide this parameter. A dictionary to store already
+        inflated objects, mapping object IDs to their corresponding
+        `InflatableObject` instances.
+
+    Returns
+    -------
+    InflatableObject
+        The inflated object.
+    """
+    if objects is None:
+        # Initialize objects dictionary
+        objects = {}
+
+    if object_id in objects:
+        # If the object is already in the objects dictionary, return it
+        return objects[object_id]
+
+    # Extract object class and object_ids of children
+    object_content = object_contents[object_id]
+    obj_type, children_obj_ids, _ = get_object_head_values_from_object_content(
+        object_content=object_contents[object_id]
+    )
+
+    # Remove the object content from the dictionary to save memory
+    if not keep_object_contents:
+        del object_contents[object_id]
+
+    # Resolve object class
+    cls_type = inflatable_class_registry[obj_type]
+
+    # Inflate all children objects
+    children: dict[str, InflatableObject] = {}
+    for child_obj_id in children_obj_ids:
+        children[child_obj_id] = inflate_object_from_contents(
+            child_obj_id,
+            object_contents,
+            keep_object_contents=keep_object_contents,
+            objects=objects,
+        )
+
+    # Inflate object passing its children
+    obj = cls_type.inflate(object_content, children=children)
+    del object_content  # Free memory after inflation
+    objects[object_id] = obj
+    return obj

flwr_nightly-1.19.0.dev20250607/py/flwr/common/inflatable_utils.py

@@ -0,0 +1,75 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""InflatableObject utilities."""
+
+
+from .constant import HEAD_BODY_DIVIDER, HEAD_VALUE_DIVIDER
+from .inflatable import (
+    UnexpectedObjectContentError,
+    _get_object_head,
+    get_object_id,
+    is_valid_sha256_hash,
+)
+from .inflatable_grpc_utils import inflatable_class_registry
+
+
+def validate_object_content(content: bytes) -> None:
+    """Validate the deflated content of an InflatableObject."""
+    try:
+        # Check if there is a head-body divider
+        index = content.find(HEAD_BODY_DIVIDER)
+        if index == -1:
+            raise ValueError(
+                "Unexpected format for object content. Head and body "
+                "could not be split."
+            )
+
+        head = _get_object_head(content)
+
+        # check if the head has three parts:
+        # <object_type> <children_ids> <object_body_len>
+        head_decoded = head.decode(encoding="utf-8")
+        head_parts = head_decoded.split(HEAD_VALUE_DIVIDER)
+
+        if len(head_parts) != 3:
+            raise ValueError("Unexpected format for object head.")
+
+        obj_type, children_str, body_len = head_parts
+
+        # Check that children IDs are valid IDs
+        children = children_str.split(",")
+        for children_id in children:
+            if children_id and not is_valid_sha256_hash(children_id):
+                raise ValueError(
+                    f"Detected invalid object ID ({children_id}) in children."
+                )
+
+        # Check that object type is recognized
+        if obj_type not in inflatable_class_registry:
+            if obj_type != "CustomDataClass":  # to allow for the class in tests
+                raise ValueError(f"Object of type {obj_type} is not supported.")
+
+        # Check if the body length in the head matches that of the body
+        actual_body_len = len(content) - len(head) - len(HEAD_BODY_DIVIDER)
+        if actual_body_len != int(body_len):
+            raise ValueError(
+                f"Object content length expected {body_len} bytes but got "
+                f"{actual_body_len} bytes."
+            )
+
+    except ValueError as err:
+        raise UnexpectedObjectContentError(
+            object_id=get_object_id(content), reason=str(err)
+        ) from err

{flwr_nightly-1.19.0.dev20250605 → flwr_nightly-1.19.0.dev20250607}/py/flwr/common/message.py

@@ -32,7 +32,7 @@ from .constant import MESSAGE_TTL_TOLERANCE
 from .inflatable import (
     InflatableObject,
     add_header_to_object_body,
-    get_desdendant_object_ids,
+    get_descendant_object_ids,
     get_object_body,
     get_object_children_ids_from_object_content,
 )
@@ -524,6 +524,6 @@ def get_message_to_descendant_id_mapping(message: Message) -> dict[str, ObjectID
     """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))
+            object_ids=list(get_descendant_object_ids(message))
         )
     }