flwr-nightly 1.12.0.dev20241008__py3-none-any.whl → 1.12.0.dev20241009__py3-none-any.whl

flwr/server/superlink/state/in_memory_state.py

@@ -116,6 +116,7 @@ class InMemoryState(State):  # pylint: disable=R0902,R0904
         # Return TaskIns
         return task_ins_list
 
+    # pylint: disable=R0911
     def store_task_res(self, task_res: TaskRes) -> Optional[UUID]:
         """Store one TaskRes."""
         # Validate task
@@ -129,6 +130,17 @@ class InMemoryState(State):  # pylint: disable=R0902,R0904
             task_ins_id = task_res.task.ancestry[0]
             task_ins = self.task_ins_store.get(UUID(task_ins_id))
 
+            # Ensure that the consumer_id of taskIns matches the producer_id of taskRes.
+            if (
+                task_ins
+                and task_res
+                and not (
+                    task_ins.task.consumer.anonymous or task_res.task.producer.anonymous
+                )
+                and task_ins.task.consumer.node_id != task_res.task.producer.node_id
+            ):
+                return None
+
             if task_ins is None:
                 log(ERROR, "TaskIns with task_id %s does not exist.", task_ins_id)
                 return None
@@ -189,6 +201,19 @@ class InMemoryState(State):  # pylint: disable=R0902,R0904
             replied_task_ids: set[UUID] = set()
             for _, task_res in self.task_res_store.items():
                 reply_to = UUID(task_res.task.ancestry[0])
+
+                # Check if corresponding TaskIns exists and is not expired
+                task_ins = self.task_ins_store.get(reply_to)
+                if task_ins is None:
+                    log(WARNING, "TaskIns with task_id %s does not exist.", reply_to)
+                    task_ids.remove(reply_to)
+                    continue
+
+                if task_ins.task.created_at + task_ins.task.ttl <= time.time():
+                    log(WARNING, "TaskIns with task_id %s is expired.", reply_to)
+                    task_ids.remove(reply_to)
+                    continue
+
                 if reply_to in task_ids and task_res.task.delivered_at == "":
                     task_res_list.append(task_res)
                     replied_task_ids.add(reply_to)

flwr/server/superlink/state/sqlite_state.py

@@ -14,6 +14,7 @@
 # ==============================================================================
 """SQLite based implemenation of server state."""
 
+# pylint: disable=too-many-lines
 
 import json
 import re
@@ -389,6 +390,16 @@ class SqliteState(State):  # pylint: disable=R0904
             )
             return None
 
+        # Ensure that the consumer_id of taskIns matches the producer_id of taskRes.
+        if (
+            task_ins
+            and task_res
+            and not (task_ins["consumer_anonymous"] or task_res.task.producer.anonymous)
+            and convert_sint64_to_uint64(task_ins["consumer_node_id"])
+            != task_res.task.producer.node_id
+        ):
+            return None
+
         # Fail if the TaskRes TTL exceeds the
         # expiration time of the TaskIns it replies to.
         # Condition: TaskIns.created_at + TaskIns.ttl ≥
@@ -432,7 +443,7 @@ class SqliteState(State):  # pylint: disable=R0904
 
         return task_id
 
-    # pylint: disable-next=R0914
+    # pylint: disable-next=R0912,R0915,R0914
     def get_task_res(self, task_ids: set[UUID], limit: Optional[int]) -> list[TaskRes]:
         """Get TaskRes for task_ids.
 
@@ -451,6 +462,35 @@ class SqliteState(State):  # pylint: disable=R0904
         if limit is not None and limit < 1:
             raise AssertionError("`limit` must be >= 1")
 
+        # Check if corresponding TaskIns exists and is not expired
+        task_ids_placeholders = ",".join([f":id_{i}" for i in range(len(task_ids))])
+        query = f"""
+            SELECT *
+            FROM task_ins
+            WHERE task_id IN ({task_ids_placeholders})
+            AND (created_at + ttl) > CAST(strftime('%s', 'now') AS REAL)
+        """
+        query += ";"
+
+        task_ins_data = {}
+        for index, task_id in enumerate(task_ids):
+            task_ins_data[f"id_{index}"] = str(task_id)
+
+        task_ins_rows = self.query(query, task_ins_data)
+
+        if not task_ins_rows:
+            return []
+
+        for row in task_ins_rows:
+            # Convert values from sint64 to uint64
+            convert_sint64_values_in_dict_to_uint64(
+                row, ["run_id", "producer_node_id", "consumer_node_id"]
+            )
+            task_ins = dict_to_task_ins(row)
+            if task_ins.task.created_at + task_ins.task.ttl <= time.time():
+                log(WARNING, "TaskIns with task_id %s is expired.", task_ins.task_id)
+                task_ids.remove(UUID(task_ins.task_id))
+
         # Retrieve all anonymous Tasks
         if len(task_ids) == 0:
             return []

{flwr_nightly-1.12.0.dev20241008.dist-info → flwr_nightly-1.12.0.dev20241009.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.12.0.dev20241008
+Version: 1.12.0.dev20241009
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.12.0.dev20241008.dist-info → flwr_nightly-1.12.0.dev20241009.dist-info}/RECORD

@@ -272,8 +272,8 @@ flwr/server/superlink/fleet/vce/backend/backend.py,sha256=LBAQxnbfPAphVOVIvYMj0Q
 flwr/server/superlink/fleet/vce/backend/raybackend.py,sha256=7kB3re3mR53b7E6L6DPSioTSKD3YGtS3uJsPD7Hn2Fw,7155
 flwr/server/superlink/fleet/vce/vce_api.py,sha256=cGPsjS_4SJHm8jszGjsHh8ZNk9nqWoIQwW_62yKKR1Y,12647
 flwr/server/superlink/state/__init__.py,sha256=Gj2OTFLXvA-mAjBvwuKDM3rDrVaQPcIoybSa2uskMTE,1003
-flwr/server/superlink/state/in_memory_state.py,sha256=XL1cqXSnF87lpTprEtyl9aYRbDp2VuOiJdxvhTSvO18,14936
-flwr/server/superlink/state/sqlite_state.py,sha256=B1DOzHB9BpKLPmCSp4YyjcFspZpFpDsNJqCML6WQlhs,34259
+flwr/server/superlink/state/in_memory_state.py,sha256=P00PeiBjNqxrWVUpMfoNFEbK9XwTULlaOzSgpaMBzkA,15960
+flwr/server/superlink/state/sqlite_state.py,sha256=WlPVEfiPHcumnTXrnYhxxrxiAfC5xEKACV99w_9Q-js,35806
 flwr/server/superlink/state/state.py,sha256=KpM894R8RE1N0b-s_Nlii6i0TDxj0DRkKa3Vf24Gt70,8127
 flwr/server/superlink/state/state_factory.py,sha256=Fo8pBQ1WWrVJK5TOEPZ_zgJE69_mfTGjTO6czh6571o,2021
 flwr/server/superlink/state/utils.py,sha256=OsF3OOoU4bU4PgLWkypX6EDoFs0L8RP_mHEBG-tVqGA,5227
@@ -301,8 +301,8 @@ flwr/superexec/exec_grpc.py,sha256=ZPq7EP55Vwj0kRcLVuTCokFqfIgBk-7YmDykZoMKi-c,1
 flwr/superexec/exec_servicer.py,sha256=TRpwPVl7eI0Y_xlCY6DmVpAo0yFU1gLwzyIeqFw9pyk,4746
 flwr/superexec/executor.py,sha256=-5J-ZLs-uArro3T2pCq0YQRC65cs18M888nufzdYE4E,2375
 flwr/superexec/simulation.py,sha256=J6pw-RqCSiUed8I_3MasZH4tl57ZmDebPAHNnbb0-vE,7420
-flwr_nightly-1.12.0.dev20241008.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-flwr_nightly-1.12.0.dev20241008.dist-info/METADATA,sha256=zN8XXlFv6FErD9p0u6EZbxrZpYWCteNx8zJGkuPZMmM,15618
-flwr_nightly-1.12.0.dev20241008.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-flwr_nightly-1.12.0.dev20241008.dist-info/entry_points.txt,sha256=WUCbqhLEOzjx_lyATIM0-f0e8kOVaQjzwOvyOxHrMhs,434
-flwr_nightly-1.12.0.dev20241008.dist-info/RECORD,,
+flwr_nightly-1.12.0.dev20241009.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+flwr_nightly-1.12.0.dev20241009.dist-info/METADATA,sha256=coU4H2vio6xXLZKrcCpJMOecM6p-az9LZ8WFBggz0bE,15618
+flwr_nightly-1.12.0.dev20241009.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+flwr_nightly-1.12.0.dev20241009.dist-info/entry_points.txt,sha256=WUCbqhLEOzjx_lyATIM0-f0e8kOVaQjzwOvyOxHrMhs,434
+flwr_nightly-1.12.0.dev20241009.dist-info/RECORD,,