flwr-nightly 1.16.0.dev20250211__tar.gz → 1.16.0.dev20250217__tar.gz

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.16.0.dev20250211
+Version: 1.16.0.dev20250217
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0
@@ -40,7 +40,7 @@ Requires-Dist: pathspec (>=0.12.1,<0.13.0)
 Requires-Dist: protobuf (>=4.21.6,<5.0.0)
 Requires-Dist: pycryptodome (>=3.18.0,<4.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
-Requires-Dist: ray (==2.10.0) ; (python_version >= "3.9" and python_version < "3.12") and (extra == "simulation")
+Requires-Dist: ray (==2.31.0) ; (python_version >= "3.9" and python_version < "3.13") and (extra == "simulation")
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: rich (>=13.5.0,<14.0.0)
 Requires-Dist: starlette (>=0.45.2,<0.46.0) ; extra == "rest"

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.16.0.dev20250211"
+version = "1.16.0.dev20250217"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -81,7 +81,7 @@ rich = "^13.5.0"
 pyyaml = "^6.0.2"
 requests = "^2.31.0"
 # Optional dependencies (Simulation Engine)
-ray = { version = "==2.10.0", optional = true, python = ">=3.9,<3.12" }
+ray = { version = "==2.31.0", optional = true, python = ">=3.9,<3.13" }
 # Optional dependencies (REST transport layer)
 starlette = { version = "^0.45.2", optional = true }
 uvicorn = { version = "^0.34.0", extras = ["standard"], optional = true }

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/cli/new/new.py

@@ -213,7 +213,7 @@ def new(
         else:
             challenge_name = "Code"
             num_clients = "10"
-            dataset_name = "lucasmccabe-lmi/CodeAlpaca-20k"
+            dataset_name = "flwrlabs/code-alpaca-20k"
 
         context["llm_challenge_str"] = llm_challenge_str
         context["fraction_fit"] = fraction_fit

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/proto/task_pb2.py

@@ -17,7 +17,7 @@ from flwr.proto import recordset_pb2 as flwr_dot_proto_dot_recordset__pb2
 from flwr.proto import error_pb2 as flwr_dot_proto_dot_error__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/task.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x1a\x66lwr/proto/recordset.proto\x1a\x16\x66lwr/proto/error.proto\"\x89\x02\n\x04Task\x12\"\n\x08producer\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\"\n\x08\x63onsumer\x18\x02 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x12\n\ncreated_at\x18\x03 \x01(\x01\x12\x14\n\x0c\x64\x65livered_at\x18\x04 \x01(\t\x12\x11\n\tpushed_at\x18\x05 \x01(\x01\x12\x0b\n\x03ttl\x18\x06 \x01(\x01\x12\x10\n\x08\x61ncestry\x18\x07 \x03(\t\x12\x11\n\ttask_type\x18\x08 \x01(\t\x12(\n\trecordset\x18\t \x01(\x0b\x32\x15.flwr.proto.RecordSet\x12 \n\x05\x65rror\x18\n \x01(\x0b\x32\x11.flwr.proto.Error\"\\\n\x07TaskIns\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Task\"\\\n\x07TaskRes\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Taskb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/task.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x1a\x66lwr/proto/recordset.proto\x1a\x16\x66lwr/proto/error.proto\"\xf6\x01\n\x04Task\x12\"\n\x08producer\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\"\n\x08\x63onsumer\x18\x02 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x12\n\ncreated_at\x18\x03 \x01(\x01\x12\x14\n\x0c\x64\x65livered_at\x18\x04 \x01(\t\x12\x0b\n\x03ttl\x18\x06 \x01(\x01\x12\x10\n\x08\x61ncestry\x18\x07 \x03(\t\x12\x11\n\ttask_type\x18\x08 \x01(\t\x12(\n\trecordset\x18\t \x01(\x0b\x32\x15.flwr.proto.RecordSet\x12 \n\x05\x65rror\x18\n \x01(\x0b\x32\x11.flwr.proto.Error\"\\\n\x07TaskIns\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Task\"\\\n\x07TaskRes\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x0e\n\x06run_id\x18\x03 \x01(\x04\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Taskb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -25,9 +25,9 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.task_pb2', _glob
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_TASK']._serialized_start=113
-  _globals['_TASK']._serialized_end=378
-  _globals['_TASKINS']._serialized_start=380
-  _globals['_TASKINS']._serialized_end=472
-  _globals['_TASKRES']._serialized_start=474
-  _globals['_TASKRES']._serialized_end=566
+  _globals['_TASK']._serialized_end=359
+  _globals['_TASKINS']._serialized_start=361
+  _globals['_TASKINS']._serialized_end=453
+  _globals['_TASKRES']._serialized_start=455
+  _globals['_TASKRES']._serialized_end=547
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/proto/task_pb2.pyi

@@ -20,7 +20,6 @@ class Task(google.protobuf.message.Message):
     CONSUMER_FIELD_NUMBER: builtins.int
     CREATED_AT_FIELD_NUMBER: builtins.int
     DELIVERED_AT_FIELD_NUMBER: builtins.int
-    PUSHED_AT_FIELD_NUMBER: builtins.int
     TTL_FIELD_NUMBER: builtins.int
     ANCESTRY_FIELD_NUMBER: builtins.int
     TASK_TYPE_FIELD_NUMBER: builtins.int
@@ -32,7 +31,6 @@ class Task(google.protobuf.message.Message):
     def consumer(self) -> flwr.proto.node_pb2.Node: ...
     created_at: builtins.float
     delivered_at: typing.Text
-    pushed_at: builtins.float
     ttl: builtins.float
     @property
     def ancestry(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[typing.Text]: ...
@@ -47,7 +45,6 @@ class Task(google.protobuf.message.Message):
         consumer: typing.Optional[flwr.proto.node_pb2.Node] = ...,
         created_at: builtins.float = ...,
         delivered_at: typing.Text = ...,
-        pushed_at: builtins.float = ...,
         ttl: builtins.float = ...,
         ancestry: typing.Optional[typing.Iterable[typing.Text]] = ...,
         task_type: typing.Text = ...,
@@ -55,7 +52,7 @@ class Task(google.protobuf.message.Message):
         error: typing.Optional[flwr.proto.error_pb2.Error] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["consumer",b"consumer","error",b"error","producer",b"producer","recordset",b"recordset"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ancestry",b"ancestry","consumer",b"consumer","created_at",b"created_at","delivered_at",b"delivered_at","error",b"error","producer",b"producer","pushed_at",b"pushed_at","recordset",b"recordset","task_type",b"task_type","ttl",b"ttl"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["ancestry",b"ancestry","consumer",b"consumer","created_at",b"created_at","delivered_at",b"delivered_at","error",b"error","producer",b"producer","recordset",b"recordset","task_type",b"task_type","ttl",b"ttl"]) -> None: ...
 global___Task = Task
 
 class TaskIns(google.protobuf.message.Message):

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/driver/inmemory_driver.py

@@ -126,7 +126,6 @@ class InMemoryDriver(Driver):
             # Convert Message to TaskIns
             taskins = message_to_taskins(msg)
             # Store in state
-            taskins.task.pushed_at = time.time()
             task_id = self.state.store_task_ins(taskins)
             if task_id:
                 task_ids.append(str(task_id))

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/superlink/driver/serverappio_servicer.py

@@ -22,7 +22,7 @@ from uuid import UUID
 
 import grpc
 
-from flwr.common import ConfigsRecord, now
+from flwr.common import ConfigsRecord
 from flwr.common.constant import Status
 from flwr.common.logger import log
 from flwr.common.serde import (
@@ -151,9 +151,6 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             context,
         )
 
-        # Set pushed_at (timestamp in seconds)
-        pushed_at = now().timestamp()
-
         # Validate request and insert in State
         _raise_if(
             validation_error=len(request.messages_list) == 0,
@@ -165,7 +162,6 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             message_proto = request.messages_list.pop(0)
             message = message_from_proto(message_proto=message_proto)
             task_ins = message_to_taskins(message=message)
-            task_ins.task.pushed_at = pushed_at
             validation_errors = validate_task_ins_or_res(task_ins)
             _raise_if(
                 validation_error=bool(validation_errors),
@@ -212,6 +208,13 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         # Read from state
         task_res_list: list[TaskRes] = state.get_task_res(task_ids=message_ids)
 
+        # Delete the TaskIns/TaskRes pairs if TaskRes is found
+        task_ins_ids_to_delete = {
+            UUID(task_res.task.ancestry[0]) for task_res in task_res_list
+        }
+
+        state.delete_tasks(task_ins_ids=task_ins_ids_to_delete)
+
         # Convert to Messages
         messages_list = []
         while task_res_list:
@@ -224,13 +227,6 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
             message = message_from_taskres(taskres=task_res)
             messages_list.append(message_to_proto(message))
 
-        # Delete the TaskIns/TaskRes pairs if TaskRes is found
-        task_ins_ids_to_delete = {
-            UUID(task_res.task.ancestry[0]) for task_res in task_res_list
-        }
-
-        state.delete_tasks(task_ins_ids=task_ins_ids_to_delete)
-
         return PullResMessagesResponse(messages_list=messages_list)
 
     def GetRun(

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/superlink/fleet/message_handler/message_handler.py

@@ -15,7 +15,6 @@
 """Fleet API message handlers."""
 
 
-import time
 from typing import Optional
 from uuid import UUID
 
@@ -122,9 +121,6 @@ def push_messages(
     if abort_msg:
         raise InvalidRunStatusException(abort_msg)
 
-    # Set pushed_at (timestamp in seconds)
-    task_res.task.pushed_at = time.time()
-
     # Store TaskRes in State
     message_id: Optional[UUID] = state.store_task_res(task_res=task_res)
 

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -140,7 +140,6 @@ def worker(
                 # Convert to TaskRes
                 task_res = message_to_taskres(out_mssg)
                 # Store TaskRes in state
-                task_res.task.pushed_at = time.time()
                 taskres_queue.put(task_res)
 
 

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/superlink/linkstate/sqlite_linkstate.py

@@ -126,7 +126,6 @@ CREATE TABLE IF NOT EXISTS task_ins(
     consumer_node_id        INTEGER,
     created_at              REAL,
     delivered_at            TEXT,
-    pushed_at               REAL,
     ttl                     REAL,
     ancestry                TEXT,
     task_type               TEXT,
@@ -144,7 +143,6 @@ CREATE TABLE IF NOT EXISTS task_res(
     consumer_node_id        INTEGER,
     created_at              REAL,
     delivered_at            TEXT,
-    pushed_at               REAL,
     ttl                     REAL,
     ancestry                TEXT,
     task_type               TEXT,
@@ -1053,7 +1051,6 @@ def task_ins_to_dict(task_msg: TaskIns) -> dict[str, Any]:
         "consumer_node_id": task_msg.task.consumer.node_id,
         "created_at": task_msg.task.created_at,
         "delivered_at": task_msg.task.delivered_at,
-        "pushed_at": task_msg.task.pushed_at,
         "ttl": task_msg.task.ttl,
         "ancestry": ",".join(task_msg.task.ancestry),
         "task_type": task_msg.task.task_type,
@@ -1072,7 +1069,6 @@ def task_res_to_dict(task_msg: TaskRes) -> dict[str, Any]:
         "consumer_node_id": task_msg.task.consumer.node_id,
         "created_at": task_msg.task.created_at,
         "delivered_at": task_msg.task.delivered_at,
-        "pushed_at": task_msg.task.pushed_at,
         "ttl": task_msg.task.ttl,
         "ancestry": ",".join(task_msg.task.ancestry),
         "task_type": task_msg.task.task_type,
@@ -1099,7 +1095,6 @@ def dict_to_task_ins(task_dict: dict[str, Any]) -> TaskIns:
             ),
             created_at=task_dict["created_at"],
             delivered_at=task_dict["delivered_at"],
-            pushed_at=task_dict["pushed_at"],
             ttl=task_dict["ttl"],
             ancestry=task_dict["ancestry"].split(","),
             task_type=task_dict["task_type"],
@@ -1127,7 +1122,6 @@ def dict_to_task_res(task_dict: dict[str, Any]) -> TaskRes:
             ),
             created_at=task_dict["created_at"],
             delivered_at=task_dict["delivered_at"],
-            pushed_at=task_dict["pushed_at"],
             ttl=task_dict["ttl"],
             ancestry=task_dict["ancestry"].split(","),
             task_type=task_dict["task_type"],

{flwr_nightly-1.16.0.dev20250211 → flwr_nightly-1.16.0.dev20250217}/src/py/flwr/server/utils/validator.py

@@ -45,9 +45,6 @@ def validate_task_ins_or_res(tasks_ins_res: Union[TaskIns, TaskRes]) -> list[str
         validation_errors.append("`delivered_at` must be an empty str")
     if tasks_ins_res.task.ttl <= 0:
         validation_errors.append("`ttl` must be higher than zero")
-    if tasks_ins_res.task.pushed_at < 1711497600.0:
-        # unix timestamp of 27 March 2024 00h:00m:00s UTC
-        validation_errors.append("`pushed_at` is not a recent timestamp")
 
     # Verify TTL and created_at time
     current_time = time.time()