Add node_id to metadata

src/py/flwr/client/grpc_client/connection.py

@@ -173,6 +173,7 @@ def receive() -> Message:
                 task_id=str(uuid.uuid4()),
                 group_id="",
                 ttl="",
+                node_id=0,
                 task_type=task_type,
             ),
             content=recordset,

src/py/flwr/client/grpc_client/connection_test.py

@@ -48,6 +48,7 @@
         run_id=0,
         task_id="",
         group_id="",
+        node_id=0,
         ttl="",
         task_type=TASK_TYPE_GET_PROPERTIES,
     ),
@@ -60,6 +61,7 @@
         run_id=0,
         task_id="",
         group_id="",
+        node_id=0,
         ttl="",
         task_type="reconnect",
     ),

src/py/flwr/client/message_handler/message_handler.py

@@ -92,6 +92,7 @@ def handle_control_message(message: Message) -> Tuple[Optional[Message], int]:
                 run_id=0,
                 task_id="",
                 group_id="",
+                node_id=0,
                 ttl="",
                 task_type="reconnect",
             ),
@@ -150,9 +151,10 @@ def handle_legacy_message_from_tasktype(
     # Return Message
     out_message = Message(
         metadata=Metadata(
-            run_id=0,  # Non-user defined
-            task_id="",  # Non-user defined
-            group_id="",  # Non-user defined
+            run_id=0,
+            task_id="",
+            group_id="",
+            node_id=0,
             ttl="",
             task_type=task_type,
         ),

src/py/flwr/client/message_handler/message_handler_test.py

@@ -124,6 +124,7 @@ def test_client_without_get_properties() -> None:
             run_id=0,
             task_id=str(uuid.uuid4()),
             group_id="",
+            node_id=0,
             ttl="",
             task_type=TASK_TYPE_GET_PROPERTIES,
         ),
@@ -162,6 +163,7 @@ def test_client_with_get_properties() -> None:
             run_id=0,
             task_id=str(uuid.uuid4()),
             group_id="",
+            node_id=0,
             ttl="",
             task_type=TASK_TYPE_GET_PROPERTIES,
         ),

src/py/flwr/client/mod/secure_aggregation/secaggplus_mod.py

@@ -207,7 +207,14 @@ def secaggplus_mod(
 
     # Return message
     return Message(
-        metadata=Metadata(0, "", "", "", TASK_TYPE_FIT),
+        metadata=Metadata(
+            run_id=0,
+            task_id="",
+            group_id="",
+            node_id=0,
+            ttl="",
+            task_type=TASK_TYPE_FIT,
+        ),
         content=RecordSet(configs={RECORD_KEY_CONFIGS: ConfigsRecord(res, False)}),
     )
 

src/py/flwr/client/mod/secure_aggregation/secaggplus_mod_test.py

@@ -57,15 +57,29 @@ def get_test_handler(
 
     def empty_ffn(_: Message, _2: Context) -> Message:
         return Message(
-            metadata=Metadata(0, "", "", "", TASK_TYPE_FIT),
+            metadata=Metadata(
+                run_id=0,
+                task_id="",
+                group_id="",
+                node_id=0,
+                ttl="",
+                task_type=TASK_TYPE_FIT,
+            ),
             content=RecordSet(),
         )
 
     app = make_ffn(empty_ffn, [secaggplus_mod])
 
     def func(configs: Dict[str, ConfigsRecordValues]) -> Dict[str, ConfigsRecordValues]:
         in_msg = Message(
-            metadata=Metadata(0, "", "", "", TASK_TYPE_FIT),
+            metadata=Metadata(
+                run_id=0,
+                task_id="",
+                group_id="",
+                node_id=0,
+                ttl="",
+                task_type=TASK_TYPE_FIT,
+            ),
             content=RecordSet(configs={RECORD_KEY_CONFIGS: ConfigsRecord(configs)}),
         )
         out_msg = app(in_msg, ctxt)

src/py/flwr/client/mod/utils_test.py

@@ -74,7 +74,9 @@ def app(message: Message, context: Context) -> Message:
 def _get_dummy_flower_message() -> Message:
     return Message(
         content=RecordSet(),
-        metadata=Metadata(run_id=0, task_id="", group_id="", ttl="", task_type="mock"),
+        metadata=Metadata(
+            run_id=0, task_id="", group_id="", node_id=0, ttl="", task_type="mock"
+        ),
     )
 
 

src/py/flwr/common/message.py

@@ -33,6 +33,8 @@ class Metadata:
     group_id : str
         An identifier for grouping tasks. In some settings
         this is used as the FL round.
+    node_id : int
+        An identifier for the node running a task.
     ttl : str
         Time-to-live for this task.
     task_type : str
@@ -43,6 +45,7 @@ class Metadata:
     run_id: int
     task_id: str
     group_id: str
+    node_id: int
     ttl: str
     task_type: str
 

src/py/flwr/common/serde.py

@@ -563,6 +563,7 @@ def message_from_taskins(taskins: TaskIns) -> Message:
         run_id=taskins.run_id,
         task_id=taskins.task_id,
         group_id=taskins.group_id,
+        node_id=taskins.task.consumer.node_id,
         ttl=taskins.task.ttl,
         task_type=taskins.task.task_type,
     )
@@ -592,6 +593,7 @@ def message_from_taskres(taskres: TaskRes) -> Message:
         run_id=taskres.run_id,
         task_id=taskres.task_id,
         group_id=taskres.group_id,
+        node_id=taskres.task.consumer.node_id,
         ttl=taskres.task.ttl,
         task_type=taskres.task.task_type,
     )

src/py/flwr/common/serde_test.py

@@ -219,6 +219,7 @@ def metadata(self) -> Metadata:
             run_id=self.rng.randint(0, 1 << 30),
             task_id=self.get_str(64),
             group_id=self.get_str(30),
+            node_id=self.rng.randint(0, 1 << 63),
             ttl=self.get_str(10),
             task_type=self.get_str(10),
         )
@@ -309,6 +310,7 @@ def test_message_to_and_from_taskins() -> None:
             run_id=0,
             task_id="",
             group_id="",
+            node_id=metadata.node_id,
             ttl=metadata.ttl,
             task_type=metadata.task_type,
         ),
@@ -320,6 +322,7 @@ def test_message_to_and_from_taskins() -> None:
     taskins.run_id = metadata.run_id
     taskins.task_id = metadata.task_id
     taskins.group_id = metadata.group_id
+    taskins.task.consumer.node_id = metadata.node_id
     deserialized = message_from_taskins(taskins)
 
     # Assert
@@ -337,6 +340,7 @@ def test_message_to_and_from_taskres() -> None:
             run_id=0,
             task_id="",
             group_id="",
+            node_id=metadata.node_id,
             ttl=metadata.ttl,
             task_type=metadata.task_type,
         ),
@@ -348,6 +352,7 @@ def test_message_to_and_from_taskres() -> None:
     taskres.run_id = metadata.run_id
     taskres.task_id = metadata.task_id
     taskres.group_id = metadata.group_id
+    taskres.task.consumer.node_id = metadata.node_id
     deserialized = message_from_taskres(taskres)
 
     # Assert