flwr-nightly 1.19.0.dev20250514__tar.gz → 1.19.0.dev20250516__tar.gz

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250514
+Version: 1.19.0.dev20250516
 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.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/constant.py

@@ -130,7 +130,7 @@ GC_THRESHOLD = 200_000_000  # 200 MB
 
 # Constants for Inflatable
 HEAD_BODY_DIVIDER = b"\x00"
-TYPE_BODY_LEN_DIVIDER = " "
+HEAD_VALUE_DIVIDER = " "
 
 # Constants for serialization
 INT64_MAX_VALUE = 9223372036854775807  # (1 << 63) - 1

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/inflatable.py

@@ -20,9 +20,7 @@ from __future__ import annotations
 import hashlib
 from typing import TypeVar
 
-from .constant import HEAD_BODY_DIVIDER, TYPE_BODY_LEN_DIVIDER
-
-T = TypeVar("T", bound="InflatableObject")
+from .constant import HEAD_BODY_DIVIDER, HEAD_VALUE_DIVIDER
 
 
 class InflatableObject:
@@ -65,6 +63,9 @@ class InflatableObject:
         return None
 
 
+T = TypeVar("T", bound=InflatableObject)
+
+
 def get_object_id(object_content: bytes) -> str:
     """Return a SHA-256 hash of the (deflated) object content."""
     return hashlib.sha256(object_content).hexdigest()
@@ -84,13 +85,21 @@ def get_object_body(object_content: bytes, cls: type[T]) -> bytes:
     return _get_object_body(object_content)
 
 
-def add_header_to_object_body(object_body: bytes, cls: T) -> bytes:
+def add_header_to_object_body(object_body: bytes, obj: InflatableObject) -> bytes:
     """Add header to object content."""
     # Construct header
-    header = f"{cls.__class__.__qualname__}{TYPE_BODY_LEN_DIVIDER}{len(object_body)}"
-    enc_header = header.encode(encoding="utf-8")
+    header = f"%s{HEAD_VALUE_DIVIDER}%s{HEAD_VALUE_DIVIDER}%d" % (
+        obj.__class__.__qualname__,  # Type of object
+        ",".join((obj.children or {}).keys()),  # IDs of child objects
+        len(object_body),  # Length of object body
+    )
+
     # Concatenate header and object body
-    return enc_header + HEAD_BODY_DIVIDER + object_body
+    ret = bytearray()
+    ret.extend(header.encode(encoding="utf-8"))
+    ret.extend(HEAD_BODY_DIVIDER)
+    ret.extend(object_body)
+    return bytes(ret)
 
 
 def _get_object_head(object_content: bytes) -> bytes:
@@ -108,9 +117,14 @@ def get_object_type_from_object_content(object_content: bytes) -> str:
     return get_object_head_values_from_object_content(object_content)[0]
 
 
+def get_object_children_ids_from_object_content(object_content: bytes) -> list[str]:
+    """Return object children IDs from bytes."""
+    return get_object_head_values_from_object_content(object_content)[1]
+
+
 def get_object_body_len_from_object_content(object_content: bytes) -> int:
     """Return length of the object body."""
-    return get_object_head_values_from_object_content(object_content)[1]
+    return get_object_head_values_from_object_content(object_content)[2]
 
 
 def check_body_len_consistency(object_content: bytes) -> bool:
@@ -121,8 +135,23 @@ def check_body_len_consistency(object_content: bytes) -> bool:
 
 def get_object_head_values_from_object_content(
     object_content: bytes,
-) -> tuple[str, int]:
-    """Return object type and body length from object content."""
+) -> tuple[str, list[str], int]:
+    """Return object type and body length from object content.
+
+    Parameters
+    ----------
+    object_content : bytes
+        The deflated object content.
+
+    Returns
+    -------
+    tuple[str, list[str], int]
+        A tuple containing:
+        - The object type as a string.
+        - A list of child object IDs as strings.
+        - The length of the object body as an integer.
+    """
     head = _get_object_head(object_content).decode(encoding="utf-8")
-    obj_type, body_len = head.split(TYPE_BODY_LEN_DIVIDER, 1)
-    return obj_type, int(body_len)
+    obj_type, children_str, body_len = head.split(HEAD_VALUE_DIVIDER)
+    children_ids = children_str.split(",") if children_str else []
+    return obj_type, children_ids, int(body_len)

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/record/array.py

@@ -262,7 +262,7 @@ class Array(InflatableObject):
         )
 
         obj_body = array_proto.SerializeToString(deterministic=True)
-        return add_header_to_object_body(object_body=obj_body, cls=self)
+        return add_header_to_object_body(object_body=obj_body, obj=self)
 
     @classmethod
     def inflate(

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/record/arrayrecord.py

@@ -382,7 +382,7 @@ class ArrayRecord(TypedDict[str, Array], InflatableObject):
 
         # Serialize references dict
         object_body = json.dumps(array_refs).encode("utf-8")
-        return add_header_to_object_body(object_body=object_body, cls=self)
+        return add_header_to_object_body(object_body=object_body, obj=self)
 
     @classmethod
     def inflate(

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/record/configrecord.py

@@ -182,7 +182,7 @@ class ConfigRecord(TypedDict[str, ConfigRecordValues], InflatableObject):
                 ProtoConfigRecordValue,
             )
         ).SerializeToString(deterministic=True)
-        return add_header_to_object_body(object_body=obj_body, cls=self)
+        return add_header_to_object_body(object_body=obj_body, obj=self)
 
     @classmethod
     def inflate(

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/record/metricrecord.py

@@ -157,7 +157,7 @@ class MetricRecord(TypedDict[str, MetricRecordValues], InflatableObject):
         obj_body = ProtoMetricRecord(
             data=record_value_dict_to_proto(self, [float, int], ProtoMetricRecordValue)
         ).SerializeToString(deterministic=True)
-        return add_header_to_object_body(object_body=obj_body, cls=self)
+        return add_header_to_object_body(object_body=obj_body, obj=self)
 
     @classmethod
     def inflate(

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/py/flwr/common/record/recorddict.py

@@ -303,7 +303,7 @@ class RecordDict(TypedDict[str, RecordType], InflatableObject):
 
         # Serialize references dict
         object_body = json.dumps(record_refs).encode("utf-8")
-        return add_header_to_object_body(object_body=object_body, cls=self)
+        return add_header_to_object_body(object_body=object_body, obj=self)
 
     @classmethod
     def inflate(

{flwr_nightly-1.19.0.dev20250514 → flwr_nightly-1.19.0.dev20250516}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.19.0.dev20250514"
+version = "1.19.0.dev20250516"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]