flwr-nightly 1.19.0.dev20250515__py3-none-any.whl → 1.19.0.dev20250516__py3-none-any.whl

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/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/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/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/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/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/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.dev20250515.dist-info → flwr_nightly-1.19.0.dev20250516.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250515
+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.dev20250515.dist-info → flwr_nightly-1.19.0.dev20250516.dist-info}/RECORD

@@ -115,7 +115,7 @@ flwr/common/args.py,sha256=-aX_jVnSaDrJR2KZ8Wq0Y3dQHII4R4MJtJOIXzVUA0c,5417
 flwr/common/auth_plugin/__init__.py,sha256=m271m9YjK2QfKDOuIIhcTvGmv1GWh1PL97QB05NTSHs,887
 flwr/common/auth_plugin/auth_plugin.py,sha256=GaXw4IiU2DkVNkp5S9ue821sbkU9zWSu6HSVZetEdjs,3938
 flwr/common/config.py,sha256=glcZDjco-amw1YfQcYTFJ4S1pt9APoexT-mf1QscuHs,13960
-flwr/common/constant.py,sha256=Q8N-up1TvL_vllV_QA8mQlKjqVJ6Kdoze3iem6nSF9E,7375
+flwr/common/constant.py,sha256=FeS_KqX2T3GtzMjR_lm1R1FcV9q0SIUvzdexzcq_bjs,7372
 flwr/common/context.py,sha256=Be8obQR_OvEDy1OmshuUKxGRQ7Qx89mf5F4xlhkR10s,2407
 flwr/common/date.py,sha256=1ZT2cRSpC2DJqprOVTLXYCR_O2_OZR0zXO_brJ3LqWc,1554
 flwr/common/differential_privacy.py,sha256=FdlpdpPl_H_2HJa8CQM1iCUGBBQ5Dc8CzxmHERM-EoE,6148
@@ -129,19 +129,19 @@ flwr/common/exit/exit_code.py,sha256=PNEnCrZfOILjfDAFu5m-2YWEJBrk97xglq4zCUlqV7E
 flwr/common/exit_handlers.py,sha256=MEk5_savTLphn-6lW57UQlos-XrFA39XEBn-OF1vXXg,3174
 flwr/common/grpc.py,sha256=manTaHaPiyYngUq1ErZvvV2B2GxlXUUUGRy3jc3TBIQ,9798
 flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
-flwr/common/inflatable.py,sha256=tErMOhZnkj3VGRe7ihZINBdAWnlkvsycPgwmYLF4AtQ,4419
+flwr/common/inflatable.py,sha256=ZKW4L2GMAxInUlbNK_zDZs7uW4-CuQui9TnWVglpDic,5279
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
 flwr/common/message.py,sha256=znr205Erq2hkxwFbvNNCsQTRS2UKv_Qsyu0sFNEhEAw,23721
 flwr/common/object_ref.py,sha256=p3SfTeqo3Aj16SkB-vsnNn01zswOPdGNBitcbRnqmUk,9134
 flwr/common/parameter.py,sha256=UVw6sOgehEFhFs4uUCMl2kfVq1PD6ncmWgPLMsZPKPE,2095
 flwr/common/pyproject.py,sha256=2SU6yJW7059SbMXgzjOdK1GZRWO6AixDH7BmdxbMvHI,1386
 flwr/common/record/__init__.py,sha256=cNGccdDoxttqgnUgyKRIqLWULjW-NaSmOufVxtXq-sw,1197
-flwr/common/record/array.py,sha256=7c5peTvVsnhXQVvYOIFqm2UowGO-Uu0_44EeqybU0HY,10850
-flwr/common/record/arrayrecord.py,sha256=-9iIfBKtCS-fGmh5NLTDS7GTHqfHA3o1MguPyyybAyI,16787
-flwr/common/record/configrecord.py,sha256=2BqauemtQBsZDWLtkTZp51_4J7L9-8i5LrM9RV8nmNQ,9664
+flwr/common/record/array.py,sha256=bomTFJViJjeQ649Fo9CREEJdSrqiYLDYRFWogpiBKCs,10850
+flwr/common/record/arrayrecord.py,sha256=1DII6iloauHvBaWPzYtgaVAT9plNRBaaInGA6p8-j20,16787
+flwr/common/record/configrecord.py,sha256=SYpGR89JSDWTjdGT3jemuUW-EHATrkSDmPSgqzZ_H1M,9664
 flwr/common/record/conversion_utils.py,sha256=wbNCzy7oAqaA3-arhls_EqRZYXRC4YrWIoE-Gy82fJ0,1191
-flwr/common/record/metricrecord.py,sha256=PGeYISykqf_NSyij-qXdf85Pfnder7Rw9CagIolBe30,8839
-flwr/common/record/recorddict.py,sha256=qnRET_r6_7o7JSQQO2PnMAKezA4yZEy0frsfy8CKxb8,14986
+flwr/common/record/metricrecord.py,sha256=Gxl9TdVpMAHg6pNN2SxB-as8iPDnPx398KEhORU4n3A,8839
+flwr/common/record/recorddict.py,sha256=p7hBimFpKM1XKUe6OAkR_7pYGzGL_EwUJUvJ8odZEcY,14986
 flwr/common/record/typeddict.py,sha256=dDKgUThs2BscYUNcgP82KP8-qfAYXYftDrf2LszAC_o,3599
 flwr/common/recorddict_compat.py,sha256=Znn1xRGiqLpPPgviVqyb-GPTM-pCK6tpnEmhWSXafy8,14119
 flwr/common/retry_invoker.py,sha256=T6puUH3nCxdRzQHeanyr-0nTxhRiS1TH07rmef9vuLQ,14482
@@ -333,7 +333,7 @@ flwr/superexec/exec_servicer.py,sha256=Z0YYfs6eNPhqn8rY0x_R04XgR2mKFpggt07IH0EhU
 flwr/superexec/exec_user_auth_interceptor.py,sha256=iqygALkOMBUu_s_R9G0mFThZA7HTUzuXCLgxLCefiwI,4440
 flwr/superexec/executor.py,sha256=M5ucqSE53jfRtuCNf59WFLqQvA1Mln4741TySeZE7qQ,3112
 flwr/superexec/simulation.py,sha256=j6YwUvBN7EQ09ID7MYOCVZ70PGbuyBy8f9bXU0EszEM,4088
-flwr_nightly-1.19.0.dev20250515.dist-info/METADATA,sha256=YOC5YuQk4zVD3zbwFvfneiW-hsWLoC8BwDVGK3ig7rw,15910
-flwr_nightly-1.19.0.dev20250515.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.19.0.dev20250515.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
-flwr_nightly-1.19.0.dev20250515.dist-info/RECORD,,
+flwr_nightly-1.19.0.dev20250516.dist-info/METADATA,sha256=UonPzdp9wmMEFyT7_6JpqX1De35aXAtDj1cUVzzcNkg,15910
+flwr_nightly-1.19.0.dev20250516.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.19.0.dev20250516.dist-info/entry_points.txt,sha256=2-1L-GNKhwGw2_7_RoH55vHw2SIHjdAQy3HAVAWl9PY,374
+flwr_nightly-1.19.0.dev20250516.dist-info/RECORD,,