flwr-nightly 1.19.0.dev20250607__py3-none-any.whl → 1.19.0.dev20250609__py3-none-any.whl

flwr/common/inflatable.py

@@ -18,11 +18,9 @@
 from __future__ import annotations
 
 import hashlib
-from logging import ERROR
 from typing import TypeVar, cast
 
 from .constant import HEAD_BODY_DIVIDER, HEAD_VALUE_DIVIDER
-from .logger import log
 
 
 class UnexpectedObjectContentError(Exception):
@@ -175,16 +173,6 @@ def get_object_body_len_from_object_content(object_content: bytes) -> int:
     return get_object_head_values_from_object_content(object_content)[2]
 
 
-def check_body_len_consistency(object_content: bytes) -> bool:
-    """Check that the object body is of length as specified in the head."""
-    try:
-        body_len = get_object_body_len_from_object_content(object_content)
-        return body_len == len(_get_object_body(object_content))
-    except ValueError:
-        log(ERROR, "Object content does match the expected format.")
-        return False
-
-
 def get_object_head_values_from_object_content(
     object_content: bytes,
 ) -> tuple[str, list[str], int]:

flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -21,7 +21,7 @@ import grpc
 from google.protobuf.json_format import MessageToDict
 
 from flwr.common.constant import Status
-from flwr.common.inflatable import check_body_len_consistency
+from flwr.common.inflatable import UnexpectedObjectContentError
 from flwr.common.logger import log
 from flwr.common.typing import InvalidRunStatusException
 from flwr.proto import fleet_pb2_grpc  # pylint: disable=E0611
@@ -200,12 +200,6 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
             # Cancel insertion in ObjectStore
             context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
 
-        if not check_body_len_consistency(request.object_content):
-            # Cancel insertion in ObjectStore
-            context.abort(
-                grpc.StatusCode.FAILED_PRECONDITION, "Unexpected object length"
-            )
-
         # Init store
         store = self.objectstore_factory.store()
 
@@ -216,6 +210,9 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
             stored = True
         except (NoObjectInStoreError, ValueError) as e:
             log(ERROR, str(e))
+        except UnexpectedObjectContentError as e:
+            # Object content is not valid
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, str(e))
 
         return PushObjectResponse(stored=stored)
 

flwr/server/superlink/serverappio/serverappio_servicer.py

@@ -23,7 +23,10 @@ import grpc
 
 from flwr.common import Message
 from flwr.common.constant import SUPERLINK_NODE_ID, Status
-from flwr.common.inflatable import check_body_len_consistency, get_descendant_object_ids
+from flwr.common.inflatable import (
+    UnexpectedObjectContentError,
+    get_descendant_object_ids,
+)
 from flwr.common.logger import log
 from flwr.common.serde import (
     context_from_proto,
@@ -424,12 +427,6 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             # Cancel insertion in ObjectStore
             context.abort(grpc.StatusCode.FAILED_PRECONDITION, "Unexpected node ID.")
 
-        if not check_body_len_consistency(request.object_content):
-            # Cancel insertion in ObjectStore
-            context.abort(
-                grpc.StatusCode.FAILED_PRECONDITION, "Unexpected object length."
-            )
-
         # Init store
         store = self.objectstore_factory.store()
 
@@ -440,6 +437,9 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             stored = True
         except (NoObjectInStoreError, ValueError) as e:
             log(ERROR, str(e))
+        except UnexpectedObjectContentError as e:
+            # Object content is not valid
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, str(e))
 
         return PushObjectResponse(stored=stored)
 

flwr/supercore/object_store/in_memory_object_store.py

@@ -18,6 +18,7 @@
 from typing import Optional
 
 from flwr.common.inflatable import get_object_id, is_valid_sha256_hash
+from flwr.common.inflatable_utils import validate_object_content
 
 from .object_store import NoObjectInStoreError, ObjectStore
 
@@ -52,12 +53,15 @@ class InMemoryObjectStore(ObjectStore):
                 f"Object with ID '{object_id}' was not pre-registered."
             )
 
-        # Verify object_id and object_content match
         if self.verify:
+            # Verify object_id and object_content match
             object_id_from_content = get_object_id(object_content)
             if object_id != object_id_from_content:
                 raise ValueError(f"Object ID {object_id} does not match content hash")
 
+            # Validate object content
+            validate_object_content(content=object_content)
+
         # Return if object is already present in the store
         if self.store[object_id] != b"":
             return

{flwr_nightly-1.19.0.dev20250607.dist-info → flwr_nightly-1.19.0.dev20250609.dist-info}/METADATA

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

@@ -122,7 +122,7 @@ flwr/common/exit/exit_code.py,sha256=PNEnCrZfOILjfDAFu5m-2YWEJBrk97xglq4zCUlqV7E
 flwr/common/exit_handlers.py,sha256=IaqJ60fXZuu7McaRYnoYKtlbH9t4Yl9goNExKqtmQbs,4304
 flwr/common/grpc.py,sha256=manTaHaPiyYngUq1ErZvvV2B2GxlXUUUGRy3jc3TBIQ,9798
 flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
-flwr/common/inflatable.py,sha256=b8Br0TKB_yMijbICPVD4gbGMr4l0iXtH9s8MztTry4A,7717
+flwr/common/inflatable.py,sha256=gdAICtXklkQRMrxoTYEbzJl7AeFqZtUm4JU6f2it9FM,7264
 flwr/common/inflatable_grpc_utils.py,sha256=M982VQ8x1wh4QnLXR-IKWdtGuOFACvIsU6lYbbs1TI8,13040
 flwr/common/inflatable_utils.py,sha256=hPwap-P9pxHcxo-EtxtrnKNiFA2HsNGJaKX2b002PnE,2892
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
@@ -285,7 +285,7 @@ flwr/server/superlink/fleet/grpc_bidi/grpc_bridge.py,sha256=KouR9PUcrPmMtoLooF4O
 flwr/server/superlink/fleet/grpc_bidi/grpc_client_proxy.py,sha256=iSf0mbBAlig7G6subQwBSVjcUCgSihONKdZ1RmQPTOk,4887
 flwr/server/superlink/fleet/grpc_bidi/grpc_server.py,sha256=OsS-6GgCIzMMZDVu5Y-OKjynHVUrpdc_5OrtuB-IbU0,5174
 flwr/server/superlink/fleet/grpc_rere/__init__.py,sha256=ahDJJ1e-lDxBpeBMgPk7YZt2wB38_QltcpOC0gLbpFs,758
-flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py,sha256=SsMtj1EeOgumffWtYTQt-ii3JPldszXvP91C3axznq8,9176
+flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py,sha256=iD45MSaGxPmkmPp_Y6XR-crUaQIcAcfyw0qJZwt7C0o,9106
 flwr/server/superlink/fleet/grpc_rere/server_interceptor.py,sha256=DrHubsaLgJCwCeeJPYogQTiP0xYqjxwnT9rh7OP7BoU,6984
 flwr/server/superlink/fleet/message_handler/__init__.py,sha256=fHsRV0KvJ8HtgSA4_YBsEzuhJLjO8p6xx4aCY2oE1p4,731
 flwr/server/superlink/fleet/message_handler/message_handler.py,sha256=P43PapLZJKbZ0Oo0kP_KcO5zSMvO53SakQgPMiR5d1M,6500
@@ -304,7 +304,7 @@ flwr/server/superlink/linkstate/sqlite_linkstate.py,sha256=sHJPK1w0tP0m2WCXH2F9l
 flwr/server/superlink/linkstate/utils.py,sha256=IeLh7iGRCHU5MEWOl7iriaSE4L__8GWOa2OleXadK5M,15444
 flwr/server/superlink/serverappio/__init__.py,sha256=Fy4zJuoccZe5mZSEIpOmQvU6YeXFBa1M4eZuXXmJcn8,717
 flwr/server/superlink/serverappio/serverappio_grpc.py,sha256=6-FUUt0GiLcBPljj8bBrUNeAITUoDQOLzaMihKo52hg,2326
-flwr/server/superlink/serverappio/serverappio_servicer.py,sha256=GElRmXPxkrbnqD9lMVvJJHQF5hYJODL8uhAvvI97ItQ,17290
+flwr/server/superlink/serverappio/serverappio_servicer.py,sha256=mRDMklbizitbDcN6hrCSp0NpsFegdAE84MHEulW7eBQ,17232
 flwr/server/superlink/simulation/__init__.py,sha256=Ry8DrNaZCMcQXvUc4FoCN2m3dvUQgWjasfp015o3Ec4,718
 flwr/server/superlink/simulation/simulationio_grpc.py,sha256=0l0F-UjYEk6W7HZmI28PbJQLFxSi_vBHRkdchgdaSMQ,2224
 flwr/server/superlink/simulation/simulationio_servicer.py,sha256=aJezU8RSJswcmWm7Eoy0BqsU13jrcfuFwX3ljm-cORM,7719
@@ -331,7 +331,7 @@ flwr/simulation/run_simulation.py,sha256=Nvw_6hI71aE2nU95_tt1F9VSo3OJWrvA97e3XZu
 flwr/simulation/simulationio_connection.py,sha256=mzS1C6EEREwQDPceDo30anAasmTDLb9qqV2tXlBhOUA,3494
 flwr/supercore/__init__.py,sha256=pqkFoow_E6UhbBlhmoD1gmTH-33yJRhBsIZqxRPFZ7U,755
 flwr/supercore/object_store/__init__.py,sha256=cdfPAmjINY6iOp8oI_LdcVh2simg469Mkdl4LLV4kHI,911
-flwr/supercore/object_store/in_memory_object_store.py,sha256=OPZPNM2CLi5tZq9bVBKAzPch4CRXrUz_20Op1bRsFJc,3913
+flwr/supercore/object_store/in_memory_object_store.py,sha256=8EfTJHb6-RObWmzb2ZxBgxMobCod6NP820DzrMnYdbY,4081
 flwr/supercore/object_store/object_store.py,sha256=yZ6A_JgK_aGF54zlPISLK_d9FvxpYJlI2qNfmQBdlzM,4328
 flwr/supercore/object_store/object_store_factory.py,sha256=QVwE2ywi7vsj2iKfvWWnNw3N_I7Rz91NUt2RpcbJ7iM,1527
 flwr/superexec/__init__.py,sha256=YFqER0IJc1XEWfsX6AxZ9LSRq0sawPYrNYki-brvTIc,715
@@ -358,7 +358,7 @@ flwr/supernode/servicer/__init__.py,sha256=lucTzre5WPK7G1YLCfaqg3rbFWdNSb7ZTt-ca
 flwr/supernode/servicer/clientappio/__init__.py,sha256=vJyOjO2FXZ2URbnthmdsgs6948wbYfdq1L1V8Um-Lr8,895
 flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=LmzkxtNQBn5vVrHc0Bhq2WqaK6-LM2v4kfLBN0PiNNM,8522
 flwr/supernode/start_client_internal.py,sha256=5CwTNV-XmIhwR1jv3G7aQAXGhf6OFWS6U-vmxY1iKGA,16984
-flwr_nightly-1.19.0.dev20250607.dist-info/METADATA,sha256=YhYf05eYMhWNR6GdMIdEh39UZLZMmlX3x0MifwkcURo,15910
-flwr_nightly-1.19.0.dev20250607.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.19.0.dev20250607.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.19.0.dev20250607.dist-info/RECORD,,
+flwr_nightly-1.19.0.dev20250609.dist-info/METADATA,sha256=HloLs2HPXsSLn_UVyxQf1G9yLasbznXJstMQ1Cr1mo4,15910
+flwr_nightly-1.19.0.dev20250609.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.19.0.dev20250609.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.19.0.dev20250609.dist-info/RECORD,,