flwr-nightly 1.7.0.dev20240103__tar.gz → 1.7.0.dev20240104__tar.gz

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.7.0.dev20240103
+Version: 1.7.0.dev20240104
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.dev
 License: Apache-2.0

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.7.0-dev20240103"
+version = "1.7.0-dev20240104"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.dev>"]

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/app.py

@@ -349,7 +349,7 @@ def _start_client_internal(
                     break
 
                 # Register state
-                node_state.register_workloadstate(workload_id=task_ins.workload_id)
+                node_state.register_workloadstate(run_id=task_ins.run_id)
 
                 # Load app
                 app: Flower = load_flower_callable_fn()
@@ -357,15 +357,13 @@ def _start_client_internal(
                 # Handle task message
                 fwd_msg: Fwd = Fwd(
                     task_ins=task_ins,
-                    state=node_state.retrieve_workloadstate(
-                        workload_id=task_ins.workload_id
-                    ),
+                    state=node_state.retrieve_workloadstate(run_id=task_ins.run_id),
                 )
                 bwd_msg: Bwd = app(fwd=fwd_msg)
 
                 # Update node state
                 node_state.update_workloadstate(
-                    workload_id=bwd_msg.task_res.workload_id,
+                    run_id=bwd_msg.task_res.run_id,
                     workload_state=bwd_msg.state,
                 )
 

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/grpc_client/connection.py

@@ -119,7 +119,7 @@ def grpc_connection(
         return TaskIns(
             task_id=str(uuid.uuid4()),
             group_id="",
-            workload_id=0,
+            run_id=0,
             task=Task(
                 producer=Node(node_id=0, anonymous=True),
                 consumer=Node(node_id=0, anonymous=True),

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/message_handler/message_handler.py

@@ -112,7 +112,7 @@ def handle(
             task_res = TaskRes(
                 task_id="",
                 group_id="",
-                workload_id=0,
+                run_id=0,
                 task=Task(
                     ancestry=[],
                     sa=SecureAggregation(named_values=serde.named_values_to_proto(res)),

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/message_handler/task_handler.py

@@ -70,7 +70,7 @@ def validate_task_res(task_res: TaskRes) -> bool:
     Returns
     -------
     is_valid: bool
-        True if the `task_id`, `group_id`, and `workload_id` fields in TaskRes
+        True if the `task_id`, `group_id`, and `run_id` fields in TaskRes
         and the `producer`, `consumer`, and `ancestry` fields in its sub-message Task
         are not initialized accidentally elsewhere,
         False otherwise.
@@ -84,7 +84,7 @@ def validate_task_res(task_res: TaskRes) -> bool:
     if (
         "task_id" in initialized_fields_in_task_res
         or "group_id" in initialized_fields_in_task_res
-        or "workload_id" in initialized_fields_in_task_res
+        or "run_id" in initialized_fields_in_task_res
         or "producer" in initialized_fields_in_task
         or "consumer" in initialized_fields_in_task
         or "ancestry" in initialized_fields_in_task
@@ -129,7 +129,7 @@ def wrap_client_message_in_task_res(client_message: ClientMessage) -> TaskRes:
     return TaskRes(
         task_id="",
         group_id="",
-        workload_id=0,
+        run_id=0,
         task=Task(ancestry=[], legacy_client_message=client_message),
     )
 
@@ -139,7 +139,7 @@ def configure_task_res(
 ) -> TaskRes:
     """Set the metadata of a TaskRes.
 
-    Fill `group_id` and `workload_id` in TaskRes
+    Fill `group_id` and `run_id` in TaskRes
     and `producer`, `consumer`, and `ancestry` in Task in TaskRes.
 
     `producer` in Task in TaskRes will remain unchanged/unset.
@@ -152,7 +152,7 @@ def configure_task_res(
     task_res = TaskRes(
         task_id="",  # This will be generated by the server
         group_id=ref_task_ins.group_id,
-        workload_id=ref_task_ins.workload_id,
+        run_id=ref_task_ins.run_id,
         task=task_res.task,
     )
     # pylint: disable-next=no-member

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/node_state.py

@@ -27,24 +27,22 @@ class NodeState:
         self._meta: Dict[str, Any] = {}  # holds metadata about the node
         self.workload_states: Dict[int, WorkloadState] = {}
 
-    def register_workloadstate(self, workload_id: int) -> None:
+    def register_workloadstate(self, run_id: int) -> None:
         """Register new workload state for this node."""
-        if workload_id not in self.workload_states:
-            self.workload_states[workload_id] = WorkloadState({})
+        if run_id not in self.workload_states:
+            self.workload_states[run_id] = WorkloadState({})
 
-    def retrieve_workloadstate(self, workload_id: int) -> WorkloadState:
-        """Get workload state given a workload_id."""
-        if workload_id in self.workload_states:
-            return self.workload_states[workload_id]
+    def retrieve_workloadstate(self, run_id: int) -> WorkloadState:
+        """Get workload state given a run_id."""
+        if run_id in self.workload_states:
+            return self.workload_states[run_id]
 
         raise RuntimeError(
-            f"WorkloadState for workload_id={workload_id} doesn't exist."
+            f"WorkloadState for run_id={run_id} doesn't exist."
             " A workload must be registered before it can be retrieved or updated "
             " by a client."
         )
 
-    def update_workloadstate(
-        self, workload_id: int, workload_state: WorkloadState
-    ) -> None:
+    def update_workloadstate(self, run_id: int, workload_state: WorkloadState) -> None:
         """Update workload state."""
-        self.workload_states[workload_id] = workload_state
+        self.workload_states[run_id] = workload_state

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/client/node_state_tests.py

@@ -32,7 +32,7 @@ def _run_dummy_task(state: WorkloadState) -> WorkloadState:
 def test_multiworkload_in_node_state() -> None:
     """Test basic NodeState logic."""
     # Tasks to perform
-    tasks = [TaskIns(workload_id=w_id) for w_id in [0, 1, 1, 2, 3, 2, 1, 5]]
+    tasks = [TaskIns(run_id=r_id) for r_id in [0, 1, 1, 2, 3, 2, 1, 5]]
     # the "tasks" is to count how many times each workload is executed
     expected_values = {0: "1", 1: "1" * 3, 2: "1" * 2, 3: "1", 5: "1"}
 
@@ -40,20 +40,20 @@ def test_multiworkload_in_node_state() -> None:
     node_state = NodeState()
 
     for task in tasks:
-        w_id = task.workload_id
+        r_id = task.run_id
 
         # Register
-        node_state.register_workloadstate(workload_id=w_id)
+        node_state.register_workloadstate(run_id=r_id)
 
         # Get workload state
-        state = node_state.retrieve_workloadstate(workload_id=w_id)
+        state = node_state.retrieve_workloadstate(run_id=r_id)
 
         # Run "task"
         updated_state = _run_dummy_task(state)
 
         # Update workload state
-        node_state.update_workloadstate(workload_id=w_id, workload_state=updated_state)
+        node_state.update_workloadstate(run_id=r_id, workload_state=updated_state)
 
     # Verify values
-    for w_id, state in node_state.workload_states.items():
-        assert state.state["counter"] == expected_values[w_id]
+    for r_id, state in node_state.workload_states.items():
+        assert state.state["counter"] == expected_values[r_id]

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/driver/app.py

@@ -170,8 +170,8 @@ def update_client_manager(
     and dead nodes will be removed from the ClientManager via
     `client_manager.unregister()`.
     """
-    # Request for workload_id
-    workload_id = driver.create_workload(driver_pb2.CreateWorkloadRequest()).workload_id
+    # Request for run_id
+    run_id = driver.create_workload(driver_pb2.CreateWorkloadRequest()).run_id
 
     # Loop until the driver is disconnected
     registered_nodes: Dict[int, DriverClientProxy] = {}
@@ -181,7 +181,7 @@ def update_client_manager(
             if driver.stub is None:
                 break
             get_nodes_res = driver.get_nodes(
-                req=driver_pb2.GetNodesRequest(workload_id=workload_id)
+                req=driver_pb2.GetNodesRequest(run_id=run_id)
             )
         all_node_ids = {node.node_id for node in get_nodes_res.nodes}
         dead_nodes = set(registered_nodes).difference(all_node_ids)
@@ -199,7 +199,7 @@ def update_client_manager(
                 node_id=node_id,
                 driver=driver,
                 anonymous=False,
-                workload_id=workload_id,
+                run_id=run_id,
             )
             if client_manager.register(client_proxy):
                 registered_nodes[node_id] = client_proxy

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/driver/driver.py

@@ -54,37 +54,37 @@ class Driver:
         self.addr = driver_service_address
         self.certificates = certificates
         self.grpc_driver: Optional[GrpcDriver] = None
-        self.workload_id: Optional[int] = None
+        self.run_id: Optional[int] = None
         self.node = Node(node_id=0, anonymous=True)
 
-    def _get_grpc_driver_and_workload_id(self) -> Tuple[GrpcDriver, int]:
+    def _get_grpc_driver_and_run_id(self) -> Tuple[GrpcDriver, int]:
         # Check if the GrpcDriver is initialized
-        if self.grpc_driver is None or self.workload_id is None:
+        if self.grpc_driver is None or self.run_id is None:
             # Connect and create workload
             self.grpc_driver = GrpcDriver(
                 driver_service_address=self.addr, certificates=self.certificates
             )
             self.grpc_driver.connect()
             res = self.grpc_driver.create_workload(CreateWorkloadRequest())
-            self.workload_id = res.workload_id
+            self.run_id = res.run_id
 
-        return self.grpc_driver, self.workload_id
+        return self.grpc_driver, self.run_id
 
     def get_nodes(self) -> List[Node]:
         """Get node IDs."""
-        grpc_driver, workload_id = self._get_grpc_driver_and_workload_id()
+        grpc_driver, run_id = self._get_grpc_driver_and_run_id()
 
         # Call GrpcDriver method
-        res = grpc_driver.get_nodes(GetNodesRequest(workload_id=workload_id))
+        res = grpc_driver.get_nodes(GetNodesRequest(run_id=run_id))
         return list(res.nodes)
 
     def push_task_ins(self, task_ins_list: List[TaskIns]) -> List[str]:
         """Schedule tasks."""
-        grpc_driver, workload_id = self._get_grpc_driver_and_workload_id()
+        grpc_driver, run_id = self._get_grpc_driver_and_run_id()
 
-        # Set workload_id
+        # Set run_id
         for task_ins in task_ins_list:
-            task_ins.workload_id = workload_id
+            task_ins.run_id = run_id
 
         # Call GrpcDriver method
         res = grpc_driver.push_task_ins(PushTaskInsRequest(task_ins_list=task_ins_list))
@@ -92,7 +92,7 @@ class Driver:
 
     def pull_task_res(self, task_ids: Iterable[str]) -> List[TaskRes]:
         """Get task results."""
-        grpc_driver, _ = self._get_grpc_driver_and_workload_id()
+        grpc_driver, _ = self._get_grpc_driver_and_run_id()
 
         # Call GrpcDriver method
         res = grpc_driver.pull_task_res(

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/driver/driver_client_proxy.py

@@ -31,13 +31,11 @@ SLEEP_TIME = 1
 class DriverClientProxy(ClientProxy):
     """Flower client proxy which delegates work using the Driver API."""
 
-    def __init__(
-        self, node_id: int, driver: GrpcDriver, anonymous: bool, workload_id: int
-    ):
+    def __init__(self, node_id: int, driver: GrpcDriver, anonymous: bool, run_id: int):
         super().__init__(str(node_id))
         self.node_id = node_id
         self.driver = driver
-        self.workload_id = workload_id
+        self.run_id = run_id
         self.anonymous = anonymous
 
     def get_properties(
@@ -106,7 +104,7 @@ class DriverClientProxy(ClientProxy):
         task_ins = task_pb2.TaskIns(
             task_id="",
             group_id="",
-            workload_id=self.workload_id,
+            run_id=self.run_id,
             task=task_pb2.Task(
                 producer=node_pb2.Node(
                     node_id=0,

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/proto/driver_pb2.py

@@ -16,7 +16,7 @@ from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 from flwr.proto import task_pb2 as flwr_dot_proto_dot_task__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66lwr/proto/driver.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\"\x17\n\x15\x43reateWorkloadRequest\"-\n\x16\x43reateWorkloadResponse\x12\x13\n\x0bworkload_id\x18\x01 \x01(\x12\"&\n\x0fGetNodesRequest\x12\x13\n\x0bworkload_id\x18\x01 \x01(\x12\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"@\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"F\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes2\xd0\x02\n\x06\x44river\x12Y\n\x0e\x43reateWorkload\x12!.flwr.proto.CreateWorkloadRequest\x1a\".flwr.proto.CreateWorkloadResponse\"\x00\x12G\n\x08GetNodes\x12\x1b.flwr.proto.GetNodesRequest\x1a\x1c.flwr.proto.GetNodesResponse\"\x00\x12P\n\x0bPushTaskIns\x12\x1e.flwr.proto.PushTaskInsRequest\x1a\x1f.flwr.proto.PushTaskInsResponse\"\x00\x12P\n\x0bPullTaskRes\x12\x1e.flwr.proto.PullTaskResRequest\x1a\x1f.flwr.proto.PullTaskResResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17\x66lwr/proto/driver.proto\x12\nflwr.proto\x1a\x15\x66lwr/proto/node.proto\x1a\x15\x66lwr/proto/task.proto\"\x17\n\x15\x43reateWorkloadRequest\"(\n\x16\x43reateWorkloadResponse\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"!\n\x0fGetNodesRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x12\"3\n\x10GetNodesResponse\x12\x1f\n\x05nodes\x18\x01 \x03(\x0b\x32\x10.flwr.proto.Node\"@\n\x12PushTaskInsRequest\x12*\n\rtask_ins_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskIns\"\'\n\x13PushTaskInsResponse\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"F\n\x12PullTaskResRequest\x12\x1e\n\x04node\x18\x01 \x01(\x0b\x32\x10.flwr.proto.Node\x12\x10\n\x08task_ids\x18\x02 \x03(\t\"A\n\x13PullTaskResResponse\x12*\n\rtask_res_list\x18\x01 \x03(\x0b\x32\x13.flwr.proto.TaskRes2\xd0\x02\n\x06\x44river\x12Y\n\x0e\x43reateWorkload\x12!.flwr.proto.CreateWorkloadRequest\x1a\".flwr.proto.CreateWorkloadResponse\"\x00\x12G\n\x08GetNodes\x12\x1b.flwr.proto.GetNodesRequest\x1a\x1c.flwr.proto.GetNodesResponse\"\x00\x12P\n\x0bPushTaskIns\x12\x1e.flwr.proto.PushTaskInsRequest\x1a\x1f.flwr.proto.PushTaskInsResponse\"\x00\x12P\n\x0bPullTaskRes\x12\x1e.flwr.proto.PullTaskResRequest\x1a\x1f.flwr.proto.PullTaskResResponse\"\x00\x62\x06proto3')
 
 
 
@@ -91,19 +91,19 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _CREATEWORKLOADREQUEST._serialized_start=85
   _CREATEWORKLOADREQUEST._serialized_end=108
   _CREATEWORKLOADRESPONSE._serialized_start=110
-  _CREATEWORKLOADRESPONSE._serialized_end=155
-  _GETNODESREQUEST._serialized_start=157
-  _GETNODESREQUEST._serialized_end=195
-  _GETNODESRESPONSE._serialized_start=197
-  _GETNODESRESPONSE._serialized_end=248
-  _PUSHTASKINSREQUEST._serialized_start=250
-  _PUSHTASKINSREQUEST._serialized_end=314
-  _PUSHTASKINSRESPONSE._serialized_start=316
-  _PUSHTASKINSRESPONSE._serialized_end=355
-  _PULLTASKRESREQUEST._serialized_start=357
-  _PULLTASKRESREQUEST._serialized_end=427
-  _PULLTASKRESRESPONSE._serialized_start=429
-  _PULLTASKRESRESPONSE._serialized_end=494
-  _DRIVER._serialized_start=497
-  _DRIVER._serialized_end=833
+  _CREATEWORKLOADRESPONSE._serialized_end=150
+  _GETNODESREQUEST._serialized_start=152
+  _GETNODESREQUEST._serialized_end=185
+  _GETNODESRESPONSE._serialized_start=187
+  _GETNODESRESPONSE._serialized_end=238
+  _PUSHTASKINSREQUEST._serialized_start=240
+  _PUSHTASKINSREQUEST._serialized_end=304
+  _PUSHTASKINSRESPONSE._serialized_start=306
+  _PUSHTASKINSRESPONSE._serialized_end=345
+  _PULLTASKRESREQUEST._serialized_start=347
+  _PULLTASKRESREQUEST._serialized_end=417
+  _PULLTASKRESRESPONSE._serialized_start=419
+  _PULLTASKRESRESPONSE._serialized_end=484
+  _DRIVER._serialized_start=487
+  _DRIVER._serialized_end=823
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/proto/driver_pb2.pyi

@@ -22,25 +22,25 @@ global___CreateWorkloadRequest = CreateWorkloadRequest
 
 class CreateWorkloadResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    WORKLOAD_ID_FIELD_NUMBER: builtins.int
-    workload_id: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
     def __init__(self,
         *,
-        workload_id: builtins.int = ...,
+        run_id: builtins.int = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["workload_id",b"workload_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
 global___CreateWorkloadResponse = CreateWorkloadResponse
 
 class GetNodesRequest(google.protobuf.message.Message):
     """GetNodes messages"""
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    WORKLOAD_ID_FIELD_NUMBER: builtins.int
-    workload_id: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
+    run_id: builtins.int
     def __init__(self,
         *,
-        workload_id: builtins.int = ...,
+        run_id: builtins.int = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["workload_id",b"workload_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["run_id",b"run_id"]) -> None: ...
 global___GetNodesRequest = GetNodesRequest
 
 class GetNodesResponse(google.protobuf.message.Message):

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/proto/task_pb2.py

@@ -16,7 +16,7 @@ from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__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/transport.proto\"\xbe\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(\t\x12\x14\n\x0c\x64\x65livered_at\x18\x04 \x01(\t\x12\x0b\n\x03ttl\x18\x05 \x01(\t\x12\x10\n\x08\x61ncestry\x18\x06 \x03(\t\x12)\n\x02sa\x18\x07 \x01(\x0b\x32\x1d.flwr.proto.SecureAggregation\x12<\n\x15legacy_server_message\x18\x65 \x01(\x0b\x32\x19.flwr.proto.ServerMessageB\x02\x18\x01\x12<\n\x15legacy_client_message\x18\x66 \x01(\x0b\x32\x19.flwr.proto.ClientMessageB\x02\x18\x01\"a\n\x07TaskIns\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x13\n\x0bworkload_id\x18\x03 \x01(\x12\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Task\"a\n\x07TaskRes\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x10\n\x08group_id\x18\x02 \x01(\t\x12\x13\n\x0bworkload_id\x18\x03 \x01(\x12\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Task\"\xf3\x03\n\x05Value\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\x03 \x01(\x08H\x00\x12\x10\n\x06string\x18\x04 \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x05 \x01(\x0cH\x00\x12\x33\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x1c.flwr.proto.Value.DoubleListH\x00\x12\x33\n\x0bsint64_list\x18\x16 \x01(\x0b\x32\x1c.flwr.proto.Value.Sint64ListH\x00\x12/\n\tbool_list\x18\x17 \x01(\x0b\x32\x1a.flwr.proto.Value.BoolListH\x00\x12\x33\n\x0bstring_list\x18\x18 \x01(\x0b\x32\x1c.flwr.proto.Value.StringListH\x00\x12\x31\n\nbytes_list\x18\x19 \x01(\x0b\x32\x1b.flwr.proto.Value.BytesListH\x00\x1a\x1a\n\nDoubleList\x12\x0c\n\x04vals\x18\x01 \x03(\x01\x1a\x1a\n\nSint64List\x12\x0c\n\x04vals\x18\x01 \x03(\x12\x1a\x18\n\x08\x42oolList\x12\x0c\n\x04vals\x18\x01 \x03(\x08\x1a\x1a\n\nStringList\x12\x0c\n\x04vals\x18\x01 \x03(\t\x1a\x19\n\tBytesList\x12\x0c\n\x04vals\x18\x01 \x03(\x0c\x42\x07\n\x05value\"\xa0\x01\n\x11SecureAggregation\x12\x44\n\x0cnamed_values\x18\x01 \x03(\x0b\x32..flwr.proto.SecureAggregation.NamedValuesEntry\x1a\x45\n\x10NamedValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12 \n\x05value\x18\x02 \x01(\x0b\x32\x11.flwr.proto.Value:\x02\x38\x01\x62\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/transport.proto\"\xbe\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(\t\x12\x14\n\x0c\x64\x65livered_at\x18\x04 \x01(\t\x12\x0b\n\x03ttl\x18\x05 \x01(\t\x12\x10\n\x08\x61ncestry\x18\x06 \x03(\t\x12)\n\x02sa\x18\x07 \x01(\x0b\x32\x1d.flwr.proto.SecureAggregation\x12<\n\x15legacy_server_message\x18\x65 \x01(\x0b\x32\x19.flwr.proto.ServerMessageB\x02\x18\x01\x12<\n\x15legacy_client_message\x18\x66 \x01(\x0b\x32\x19.flwr.proto.ClientMessageB\x02\x18\x01\"\\\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(\x12\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(\x12\x12\x1e\n\x04task\x18\x04 \x01(\x0b\x32\x10.flwr.proto.Task\"\xf3\x03\n\x05Value\x12\x10\n\x06\x64ouble\x18\x01 \x01(\x01H\x00\x12\x10\n\x06sint64\x18\x02 \x01(\x12H\x00\x12\x0e\n\x04\x62ool\x18\x03 \x01(\x08H\x00\x12\x10\n\x06string\x18\x04 \x01(\tH\x00\x12\x0f\n\x05\x62ytes\x18\x05 \x01(\x0cH\x00\x12\x33\n\x0b\x64ouble_list\x18\x15 \x01(\x0b\x32\x1c.flwr.proto.Value.DoubleListH\x00\x12\x33\n\x0bsint64_list\x18\x16 \x01(\x0b\x32\x1c.flwr.proto.Value.Sint64ListH\x00\x12/\n\tbool_list\x18\x17 \x01(\x0b\x32\x1a.flwr.proto.Value.BoolListH\x00\x12\x33\n\x0bstring_list\x18\x18 \x01(\x0b\x32\x1c.flwr.proto.Value.StringListH\x00\x12\x31\n\nbytes_list\x18\x19 \x01(\x0b\x32\x1b.flwr.proto.Value.BytesListH\x00\x1a\x1a\n\nDoubleList\x12\x0c\n\x04vals\x18\x01 \x03(\x01\x1a\x1a\n\nSint64List\x12\x0c\n\x04vals\x18\x01 \x03(\x12\x1a\x18\n\x08\x42oolList\x12\x0c\n\x04vals\x18\x01 \x03(\x08\x1a\x1a\n\nStringList\x12\x0c\n\x04vals\x18\x01 \x03(\t\x1a\x19\n\tBytesList\x12\x0c\n\x04vals\x18\x01 \x03(\x0c\x42\x07\n\x05value\"\xa0\x01\n\x11SecureAggregation\x12\x44\n\x0cnamed_values\x18\x01 \x03(\x0b\x32..flwr.proto.SecureAggregation.NamedValuesEntry\x1a\x45\n\x10NamedValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12 \n\x05value\x18\x02 \x01(\x0b\x32\x11.flwr.proto.Value:\x02\x38\x01\x62\x06proto3')
 
 
 
@@ -126,23 +126,23 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _TASK._serialized_start=89
   _TASK._serialized_end=407
   _TASKINS._serialized_start=409
-  _TASKINS._serialized_end=506
-  _TASKRES._serialized_start=508
-  _TASKRES._serialized_end=605
-  _VALUE._serialized_start=608
-  _VALUE._serialized_end=1107
-  _VALUE_DOUBLELIST._serialized_start=963
-  _VALUE_DOUBLELIST._serialized_end=989
-  _VALUE_SINT64LIST._serialized_start=991
-  _VALUE_SINT64LIST._serialized_end=1017
-  _VALUE_BOOLLIST._serialized_start=1019
-  _VALUE_BOOLLIST._serialized_end=1043
-  _VALUE_STRINGLIST._serialized_start=1045
-  _VALUE_STRINGLIST._serialized_end=1071
-  _VALUE_BYTESLIST._serialized_start=1073
-  _VALUE_BYTESLIST._serialized_end=1098
-  _SECUREAGGREGATION._serialized_start=1110
-  _SECUREAGGREGATION._serialized_end=1270
-  _SECUREAGGREGATION_NAMEDVALUESENTRY._serialized_start=1201
-  _SECUREAGGREGATION_NAMEDVALUESENTRY._serialized_end=1270
+  _TASKINS._serialized_end=501
+  _TASKRES._serialized_start=503
+  _TASKRES._serialized_end=595
+  _VALUE._serialized_start=598
+  _VALUE._serialized_end=1097
+  _VALUE_DOUBLELIST._serialized_start=953
+  _VALUE_DOUBLELIST._serialized_end=979
+  _VALUE_SINT64LIST._serialized_start=981
+  _VALUE_SINT64LIST._serialized_end=1007
+  _VALUE_BOOLLIST._serialized_start=1009
+  _VALUE_BOOLLIST._serialized_end=1033
+  _VALUE_STRINGLIST._serialized_start=1035
+  _VALUE_STRINGLIST._serialized_end=1061
+  _VALUE_BYTESLIST._serialized_start=1063
+  _VALUE_BYTESLIST._serialized_end=1088
+  _SECUREAGGREGATION._serialized_start=1100
+  _SECUREAGGREGATION._serialized_end=1260
+  _SECUREAGGREGATION_NAMEDVALUESENTRY._serialized_start=1191
+  _SECUREAGGREGATION_NAMEDVALUESENTRY._serialized_end=1260
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/proto/task_pb2.pyi

@@ -59,44 +59,44 @@ class TaskIns(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TASK_ID_FIELD_NUMBER: builtins.int
     GROUP_ID_FIELD_NUMBER: builtins.int
-    WORKLOAD_ID_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
     TASK_FIELD_NUMBER: builtins.int
     task_id: typing.Text
     group_id: typing.Text
-    workload_id: builtins.int
+    run_id: builtins.int
     @property
     def task(self) -> global___Task: ...
     def __init__(self,
         *,
         task_id: typing.Text = ...,
         group_id: typing.Text = ...,
-        workload_id: builtins.int = ...,
+        run_id: builtins.int = ...,
         task: typing.Optional[global___Task] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["task",b"task"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["group_id",b"group_id","task",b"task","task_id",b"task_id","workload_id",b"workload_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["group_id",b"group_id","run_id",b"run_id","task",b"task","task_id",b"task_id"]) -> None: ...
 global___TaskIns = TaskIns
 
 class TaskRes(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     TASK_ID_FIELD_NUMBER: builtins.int
     GROUP_ID_FIELD_NUMBER: builtins.int
-    WORKLOAD_ID_FIELD_NUMBER: builtins.int
+    RUN_ID_FIELD_NUMBER: builtins.int
     TASK_FIELD_NUMBER: builtins.int
     task_id: typing.Text
     group_id: typing.Text
-    workload_id: builtins.int
+    run_id: builtins.int
     @property
     def task(self) -> global___Task: ...
     def __init__(self,
         *,
         task_id: typing.Text = ...,
         group_id: typing.Text = ...,
-        workload_id: builtins.int = ...,
+        run_id: builtins.int = ...,
         task: typing.Optional[global___Task] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["task",b"task"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["group_id",b"group_id","task",b"task","task_id",b"task_id","workload_id",b"workload_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["group_id",b"group_id","run_id",b"run_id","task",b"task","task_id",b"task_id"]) -> None: ...
 global___TaskRes = TaskRes
 
 class Value(google.protobuf.message.Message):

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/server/driver/driver_servicer.py

@@ -51,7 +51,7 @@ class DriverServicer(driver_pb2_grpc.DriverServicer):
         """Get available nodes."""
         log(INFO, "DriverServicer.GetNodes")
         state: State = self.state_factory.state()
-        all_ids: Set[int] = state.get_nodes(request.workload_id)
+        all_ids: Set[int] = state.get_nodes(request.run_id)
         nodes: List[Node] = [
             Node(node_id=node_id, anonymous=False) for node_id in all_ids
         ]
@@ -63,8 +63,8 @@ class DriverServicer(driver_pb2_grpc.DriverServicer):
         """Create workload ID."""
         log(INFO, "DriverServicer.CreateWorkload")
         state: State = self.state_factory.state()
-        workload_id = state.create_workload()
-        return CreateWorkloadResponse(workload_id=workload_id)
+        run_id = state.create_workload()
+        return CreateWorkloadResponse(run_id=run_id)
 
     def PushTaskIns(
         self, request: PushTaskInsRequest, context: grpc.ServicerContext

{flwr_nightly-1.7.0.dev20240103 → flwr_nightly-1.7.0.dev20240104}/src/py/flwr/server/state/in_memory_state.py

@@ -32,7 +32,7 @@ class InMemoryState(State):
 
     def __init__(self) -> None:
         self.node_ids: Set[int] = set()
-        self.workload_ids: Set[int] = set()
+        self.run_ids: Set[int] = set()
         self.task_ins_store: Dict[UUID, TaskIns] = {}
         self.task_res_store: Dict[UUID, TaskRes] = {}
 
@@ -43,9 +43,9 @@ class InMemoryState(State):
         if any(errors):
             log(ERROR, errors)
             return None
-        # Validate workload_id
-        if task_ins.workload_id not in self.workload_ids:
-            log(ERROR, "`workload_id` is invalid")
+        # Validate run_id
+        if task_ins.run_id not in self.run_ids:
+            log(ERROR, "`run_id` is invalid")
             return None
 
         # Create task_id, created_at and ttl
@@ -104,9 +104,9 @@ class InMemoryState(State):
             log(ERROR, errors)
             return None
 
-        # Validate workload_id
-        if task_res.workload_id not in self.workload_ids:
-            log(ERROR, "`workload_id` is invalid")
+        # Validate run_id
+        if task_res.run_id not in self.run_ids:
+            log(ERROR, "`run_id` is invalid")
             return None
 
         # Create task_id, created_at and ttl
@@ -199,25 +199,25 @@ class InMemoryState(State):
             raise ValueError(f"Node {node_id} not found")
         self.node_ids.remove(node_id)
 
-    def get_nodes(self, workload_id: int) -> Set[int]:
+    def get_nodes(self, run_id: int) -> Set[int]:
         """Return all available client nodes.
 
         Constraints
         -----------
-        If the provided `workload_id` does not exist or has no matching nodes,
+        If the provided `run_id` does not exist or has no matching nodes,
         an empty `Set` MUST be returned.
         """
-        if workload_id not in self.workload_ids:
+        if run_id not in self.run_ids:
             return set()
         return self.node_ids
 
     def create_workload(self) -> int:
         """Create one workload."""
-        # Sample a random int64 as workload_id
-        workload_id: int = int.from_bytes(os.urandom(8), "little", signed=True)
+        # Sample a random int64 as run_id
+        run_id: int = int.from_bytes(os.urandom(8), "little", signed=True)
 
-        if workload_id not in self.workload_ids:
-            self.workload_ids.add(workload_id)
-            return workload_id
+        if run_id not in self.run_ids:
+            self.run_ids.add(run_id)
+            return run_id
         log(ERROR, "Unexpected workload creation failure.")
         return 0