flwr 1.14.0__py3-none-any.whl → 1.15.1__py3-none-any.whl

flwr/server/superlink/linkstate/sqlite_linkstate.py

@@ -31,6 +31,7 @@ from flwr.common.constant import (
     MESSAGE_TTL_TOLERANCE,
     NODE_ID_NUM_BYTES,
     RUN_ID_NUM_BYTES,
+    SUPERLINK_NODE_ID,
     Status,
 )
 from flwr.common.record import ConfigsRecord
@@ -70,16 +71,9 @@ CREATE TABLE IF NOT EXISTS node(
 );
 """
 
-SQL_CREATE_TABLE_CREDENTIAL = """
-CREATE TABLE IF NOT EXISTS credential(
-    private_key BLOB PRIMARY KEY,
-    public_key BLOB
-);
-"""
-
 SQL_CREATE_TABLE_PUBLIC_KEY = """
 CREATE TABLE IF NOT EXISTS public_key(
-    public_key BLOB UNIQUE
+    public_key      BLOB PRIMARY KEY
 );
 """
 
@@ -128,9 +122,7 @@ CREATE TABLE IF NOT EXISTS task_ins(
     task_id                 TEXT UNIQUE,
     group_id                TEXT,
     run_id                  INTEGER,
-    producer_anonymous      BOOLEAN,
     producer_node_id        INTEGER,
-    consumer_anonymous      BOOLEAN,
     consumer_node_id        INTEGER,
     created_at              REAL,
     delivered_at            TEXT,
@@ -148,9 +140,7 @@ CREATE TABLE IF NOT EXISTS task_res(
     task_id                 TEXT UNIQUE,
     group_id                TEXT,
     run_id                  INTEGER,
-    producer_anonymous      BOOLEAN,
     producer_node_id        INTEGER,
-    consumer_anonymous      BOOLEAN,
     consumer_node_id        INTEGER,
     created_at              REAL,
     delivered_at            TEXT,
@@ -211,7 +201,6 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         cur.execute(SQL_CREATE_TABLE_TASK_INS)
         cur.execute(SQL_CREATE_TABLE_TASK_RES)
         cur.execute(SQL_CREATE_TABLE_NODE)
-        cur.execute(SQL_CREATE_TABLE_CREDENTIAL)
         cur.execute(SQL_CREATE_TABLE_PUBLIC_KEY)
         cur.execute(SQL_CREATE_INDEX_ONLINE_UNTIL)
         res = cur.execute("SELECT name FROM sqlite_schema;")
@@ -263,11 +252,8 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
 
         Constraints
         -----------
-        If `task_ins.task.consumer.anonymous` is `True`, then
-        `task_ins.task.consumer.node_id` MUST NOT be set (equal 0).
 
-        If `task_ins.task.consumer.anonymous` is `False`, then
-        `task_ins.task.consumer.node_id` MUST be set (not 0)
+        `task_ins.task.consumer.node_id` MUST be set (not constant.DRIVER_NODE_ID)
         """
         # Validate task
         errors = validate_task_ins_or_res(task_ins)
@@ -292,7 +278,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
             log(ERROR, "Invalid run ID for TaskIns: %s", task_ins.run_id)
             return None
         # Validate source node ID
-        if task_ins.task.producer.node_id != 0:
+        if task_ins.task.producer.node_id != SUPERLINK_NODE_ID:
             log(
                 ERROR,
                 "Invalid source node ID for TaskIns: %s",
@@ -301,14 +287,13 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
             return None
         # Validate destination node ID
         query = "SELECT node_id FROM node WHERE node_id = ?;"
-        if not task_ins.task.consumer.anonymous:
-            if not self.query(query, (data[0]["consumer_node_id"],)):
-                log(
-                    ERROR,
-                    "Invalid destination node ID for TaskIns: %s",
-                    task_ins.task.consumer.node_id,
-                )
-                return None
+        if not self.query(query, (data[0]["consumer_node_id"],)):
+            log(
+                ERROR,
+                "Invalid destination node ID for TaskIns: %s",
+                task_ins.task.consumer.node_id,
+            )
+            return None
 
         columns = ", ".join([f":{key}" for key in data[0]])
         query = f"INSERT INTO task_ins VALUES({columns});"
@@ -319,25 +304,18 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
 
         return task_id
 
-    def get_task_ins(
-        self, node_id: Optional[int], limit: Optional[int]
-    ) -> list[TaskIns]:
-        """Get undelivered TaskIns for one node (either anonymous or with ID).
+    def get_task_ins(self, node_id: int, limit: Optional[int]) -> list[TaskIns]:
+        """Get undelivered TaskIns for one node.
 
         Usually, the Fleet API calls this for Nodes planning to work on one or more
         TaskIns.
 
         Constraints
         -----------
-        If `node_id` is not `None`, retrieve all TaskIns where
+        Retrieve all TaskIns where
 
             1. the `task_ins.task.consumer.node_id` equals `node_id` AND
-            2. the `task_ins.task.consumer.anonymous` equals `False` AND
-            3. the `task_ins.task.delivered_at` equals `""`.
-
-        If `node_id` is `None`, retrieve all TaskIns where the
-        `task_ins.task.consumer.node_id` equals `0` and
-        `task_ins.task.consumer.anonymous` is set to `True`.
+            2. the `task_ins.task.delivered_at` equals `""`.
 
         `delivered_at` MUST BE set (i.e., not `""`) otherwise the TaskIns MUST not be in
         the result.
@@ -348,38 +326,23 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         if limit is not None and limit < 1:
             raise AssertionError("`limit` must be >= 1")
 
-        if node_id == 0:
-            msg = (
-                "`node_id` must be >= 1"
-                "\n\n For requesting anonymous tasks use `node_id` equal `None`"
-            )
+        if node_id == SUPERLINK_NODE_ID:
+            msg = f"`node_id` must be != {SUPERLINK_NODE_ID}"
             raise AssertionError(msg)
 
         data: dict[str, Union[str, int]] = {}
 
-        if node_id is None:
-            # Retrieve all anonymous Tasks
-            query = """
-                SELECT task_id
-                FROM task_ins
-                WHERE consumer_anonymous == 1
-                AND   consumer_node_id == 0
-                AND   delivered_at = ""
-                AND   (created_at + ttl) > CAST(strftime('%s', 'now') AS REAL)
-            """
-        else:
-            # Convert the uint64 value to sint64 for SQLite
-            data["node_id"] = convert_uint64_to_sint64(node_id)
+        # Convert the uint64 value to sint64 for SQLite
+        data["node_id"] = convert_uint64_to_sint64(node_id)
 
-            # Retrieve all TaskIns for node_id
-            query = """
-                SELECT task_id
-                FROM task_ins
-                WHERE consumer_anonymous == 0
-                AND   consumer_node_id == :node_id
-                AND   delivered_at = ""
-                AND   (created_at + ttl) > CAST(strftime('%s', 'now') AS REAL)
-            """
+        # Retrieve all TaskIns for node_id
+        query = """
+            SELECT task_id
+            FROM task_ins
+            WHERE   consumer_node_id == :node_id
+            AND   delivered_at = ""
+            AND   (created_at + ttl) > CAST(strftime('%s', 'now') AS REAL)
+        """
 
         if limit is not None:
             query += " LIMIT :limit"
@@ -429,11 +392,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
 
         Constraints
         -----------
-        If `task_res.task.consumer.anonymous` is `True`, then
-        `task_res.task.consumer.node_id` MUST NOT be set (equal 0).
-
-        If `task_res.task.consumer.anonymous` is `False`, then
-        `task_res.task.consumer.node_id` MUST be set (not 0)
+        `task_res.task.consumer.node_id` MUST be set (not constant.DRIVER_NODE_ID)
         """
         # Validate task
         errors = validate_task_ins_or_res(task_res)
@@ -459,7 +418,6 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         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
         ):
@@ -635,23 +593,16 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
 
         return {UUID(row["task_id"]) for row in rows}
 
-    def create_node(
-        self, ping_interval: float, public_key: Optional[bytes] = None
-    ) -> int:
+    def create_node(self, ping_interval: float) -> int:
         """Create, store in the link state, and return `node_id`."""
         # Sample a random uint64 as node_id
-        uint64_node_id = generate_rand_int_from_bytes(NODE_ID_NUM_BYTES)
+        uint64_node_id = generate_rand_int_from_bytes(
+            NODE_ID_NUM_BYTES, exclude=[SUPERLINK_NODE_ID, 0]
+        )
 
         # Convert the uint64 value to sint64 for SQLite
         sint64_node_id = convert_uint64_to_sint64(uint64_node_id)
 
-        query = "SELECT node_id FROM node WHERE public_key = :public_key;"
-        row = self.query(query, {"public_key": public_key})
-
-        if len(row) > 0:
-            log(ERROR, "Unexpected node registration failure.")
-            return 0
-
         query = (
             "INSERT INTO node "
             "(node_id, online_until, ping_interval, public_key) "
@@ -665,7 +616,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
                     sint64_node_id,
                     time.time() + ping_interval,
                     ping_interval,
-                    public_key,
+                    b"",  # Initialize with an empty public key
                 ),
             )
         except sqlite3.IntegrityError:
@@ -675,7 +626,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         # Note: we need to return the uint64 value of the node_id
         return uint64_node_id
 
-    def delete_node(self, node_id: int, public_key: Optional[bytes] = None) -> None:
+    def delete_node(self, node_id: int) -> None:
         """Delete a node."""
         # Convert the uint64 value to sint64 for SQLite
         sint64_node_id = convert_uint64_to_sint64(node_id)
@@ -683,10 +634,6 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         query = "DELETE FROM node WHERE node_id = ?"
         params = (sint64_node_id,)
 
-        if public_key is not None:
-            query += " AND public_key = ?"
-            params += (public_key,)  # type: ignore
-
         if self.conn is None:
             raise AttributeError("LinkState is not initialized.")
 
@@ -694,7 +641,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
             with self.conn:
                 rows = self.conn.execute(query, params)
                 if rows.rowcount < 1:
-                    raise ValueError("Public key or node_id not found")
+                    raise ValueError(f"Node {node_id} not found")
         except KeyError as exc:
             log(ERROR, {"query": query, "data": params, "exception": exc})
 
@@ -722,6 +669,41 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         result: set[int] = {convert_sint64_to_uint64(row["node_id"]) for row in rows}
         return result
 
+    def set_node_public_key(self, node_id: int, public_key: bytes) -> None:
+        """Set `public_key` for the specified `node_id`."""
+        # Convert the uint64 value to sint64 for SQLite
+        sint64_node_id = convert_uint64_to_sint64(node_id)
+
+        # Check if the node exists in the `node` table
+        query = "SELECT 1 FROM node WHERE node_id = ?"
+        if not self.query(query, (sint64_node_id,)):
+            raise ValueError(f"Node {node_id} not found")
+
+        # Check if the public key is already in use in the `node` table
+        query = "SELECT 1 FROM node WHERE public_key = ?"
+        if self.query(query, (public_key,)):
+            raise ValueError("Public key already in use")
+
+        # Update the `node` table to set the public key for the given node ID
+        query = "UPDATE node SET public_key = ? WHERE node_id = ?"
+        self.query(query, (public_key, sint64_node_id))
+
+    def get_node_public_key(self, node_id: int) -> Optional[bytes]:
+        """Get `public_key` for the specified `node_id`."""
+        # Convert the uint64 value to sint64 for SQLite
+        sint64_node_id = convert_uint64_to_sint64(node_id)
+
+        # Query the public key for the given node_id
+        query = "SELECT public_key FROM node WHERE node_id = ?"
+        rows = self.query(query, (sint64_node_id,))
+
+        # If no result is found, return None
+        if not rows:
+            raise ValueError(f"Node {node_id} not found")
+
+        # Return the public key if it is not empty, otherwise return None
+        return rows[0]["public_key"] or None
+
     def get_node_id(self, node_public_key: bytes) -> Optional[int]:
         """Retrieve stored `node_id` filtered by `node_public_keys`."""
         query = "SELECT node_id FROM node WHERE public_key = :public_key;"
@@ -783,46 +765,9 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         log(ERROR, "Unexpected run creation failure.")
         return 0
 
-    def store_server_private_public_key(
-        self, private_key: bytes, public_key: bytes
-    ) -> None:
-        """Store `server_private_key` and `server_public_key` in the link state."""
-        query = "SELECT COUNT(*) FROM credential"
-        count = self.query(query)[0]["COUNT(*)"]
-        if count < 1:
-            query = (
-                "INSERT OR REPLACE INTO credential (private_key, public_key) "
-                "VALUES (:private_key, :public_key)"
-            )
-            self.query(query, {"private_key": private_key, "public_key": public_key})
-        else:
-            raise RuntimeError("Server private and public key already set")
-
-    def get_server_private_key(self) -> Optional[bytes]:
-        """Retrieve `server_private_key` in urlsafe bytes."""
-        query = "SELECT private_key FROM credential"
-        rows = self.query(query)
-        try:
-            private_key: Optional[bytes] = rows[0]["private_key"]
-        except IndexError:
-            private_key = None
-        return private_key
-
-    def get_server_public_key(self) -> Optional[bytes]:
-        """Retrieve `server_public_key` in urlsafe bytes."""
-        query = "SELECT public_key FROM credential"
-        rows = self.query(query)
-        try:
-            public_key: Optional[bytes] = rows[0]["public_key"]
-        except IndexError:
-            public_key = None
-        return public_key
-
-    def clear_supernode_auth_keys_and_credentials(self) -> None:
-        """Clear stored `node_public_keys` and credentials in the link state if any."""
-        queries = ["DELETE FROM public_key;", "DELETE FROM credential;"]
-        for query in queries:
-            self.query(query)
+    def clear_supernode_auth_keys(self) -> None:
+        """Clear stored `node_public_keys` in the link state if any."""
+        self.query("DELETE FROM public_key;")
 
     def store_node_public_keys(self, public_keys: set[bytes]) -> None:
         """Store a set of `node_public_keys` in the link state."""
@@ -982,17 +927,16 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         """Acknowledge a ping received from a node, serving as a heartbeat."""
         sint64_node_id = convert_uint64_to_sint64(node_id)
 
-        # Update `online_until` and `ping_interval` for the given `node_id`
-        query = "UPDATE node SET online_until = ?, ping_interval = ? WHERE node_id = ?;"
-        try:
-            self.query(
-                query, (time.time() + ping_interval, ping_interval, sint64_node_id)
-            )
-            return True
-        except sqlite3.IntegrityError:
-            log(ERROR, "`node_id` does not exist.")
+        # Check if the node exists in the `node` table
+        query = "SELECT 1 FROM node WHERE node_id = ?"
+        if not self.query(query, (sint64_node_id,)):
             return False
 
+        # Update `online_until` and `ping_interval` for the given `node_id`
+        query = "UPDATE node SET online_until = ?, ping_interval = ? WHERE node_id = ?"
+        self.query(query, (time.time() + ping_interval, ping_interval, sint64_node_id))
+        return True
+
     def get_serverapp_context(self, run_id: int) -> Optional[Context]:
         """Get the context for the specified `run_id`."""
         # Retrieve context if any
@@ -1105,9 +1049,7 @@ def task_ins_to_dict(task_msg: TaskIns) -> dict[str, Any]:
         "task_id": task_msg.task_id,
         "group_id": task_msg.group_id,
         "run_id": task_msg.run_id,
-        "producer_anonymous": task_msg.task.producer.anonymous,
         "producer_node_id": task_msg.task.producer.node_id,
-        "consumer_anonymous": task_msg.task.consumer.anonymous,
         "consumer_node_id": task_msg.task.consumer.node_id,
         "created_at": task_msg.task.created_at,
         "delivered_at": task_msg.task.delivered_at,
@@ -1126,9 +1068,7 @@ def task_res_to_dict(task_msg: TaskRes) -> dict[str, Any]:
         "task_id": task_msg.task_id,
         "group_id": task_msg.group_id,
         "run_id": task_msg.run_id,
-        "producer_anonymous": task_msg.task.producer.anonymous,
         "producer_node_id": task_msg.task.producer.node_id,
-        "consumer_anonymous": task_msg.task.consumer.anonymous,
         "consumer_node_id": task_msg.task.consumer.node_id,
         "created_at": task_msg.task.created_at,
         "delivered_at": task_msg.task.delivered_at,
@@ -1153,11 +1093,9 @@ def dict_to_task_ins(task_dict: dict[str, Any]) -> TaskIns:
         task=Task(
             producer=Node(
                 node_id=task_dict["producer_node_id"],
-                anonymous=task_dict["producer_anonymous"],
             ),
             consumer=Node(
                 node_id=task_dict["consumer_node_id"],
-                anonymous=task_dict["consumer_anonymous"],
             ),
             created_at=task_dict["created_at"],
             delivered_at=task_dict["delivered_at"],
@@ -1183,11 +1121,9 @@ def dict_to_task_res(task_dict: dict[str, Any]) -> TaskRes:
         task=Task(
             producer=Node(
                 node_id=task_dict["producer_node_id"],
-                anonymous=task_dict["producer_anonymous"],
             ),
             consumer=Node(
                 node_id=task_dict["consumer_node_id"],
-                anonymous=task_dict["consumer_anonymous"],
             ),
             created_at=task_dict["created_at"],
             delivered_at=task_dict["delivered_at"],

flwr/server/superlink/linkstate/utils.py

@@ -21,7 +21,7 @@ from typing import Optional, Union
 from uuid import UUID, uuid4
 
 from flwr.common import ConfigsRecord, Context, log, now, serde
-from flwr.common.constant import ErrorCode, Status, SubStatus
+from flwr.common.constant import SUPERLINK_NODE_ID, ErrorCode, Status, SubStatus
 from flwr.common.typing import RunStatus
 
 # pylint: disable=E0611
@@ -60,9 +60,19 @@ REPLY_MESSAGE_UNAVAILABLE_ERROR_REASON = (
 )
 
 
-def generate_rand_int_from_bytes(num_bytes: int) -> int:
-    """Generate a random unsigned integer from `num_bytes` bytes."""
-    return int.from_bytes(urandom(num_bytes), "little", signed=False)
+def generate_rand_int_from_bytes(
+    num_bytes: int, exclude: Optional[list[int]] = None
+) -> int:
+    """Generate a random unsigned integer from `num_bytes` bytes.
+
+    If `exclude` is set, this function guarantees such number is not returned.
+    """
+    num = int.from_bytes(urandom(num_bytes), "little", signed=False)
+
+    if exclude:
+        while num in exclude:
+            num = int.from_bytes(urandom(num_bytes), "little", signed=False)
+    return num
 
 
 def convert_uint64_to_sint64(u: int) -> int:
@@ -246,8 +256,8 @@ def create_taskres_for_unavailable_taskins(taskins_id: Union[str, UUID]) -> Task
         run_id=0,  # Unknown run ID
         task=Task(
             # This function is only called by SuperLink, and thus it's the producer.
-            producer=Node(node_id=0, anonymous=False),
-            consumer=Node(node_id=0, anonymous=False),
+            producer=Node(node_id=SUPERLINK_NODE_ID),
+            consumer=Node(node_id=SUPERLINK_NODE_ID),
             created_at=current_time,
             ttl=0,
             ancestry=[str(taskins_id)],
@@ -285,8 +295,8 @@ def create_taskres_for_unavailable_taskres(ref_taskins: TaskIns) -> TaskRes:
         run_id=ref_taskins.run_id,
         task=Task(
             # This function is only called by SuperLink, and thus it's the producer.
-            producer=Node(node_id=0, anonymous=False),
-            consumer=Node(node_id=0, anonymous=False),
+            producer=Node(node_id=SUPERLINK_NODE_ID),
+            consumer=Node(node_id=SUPERLINK_NODE_ID),
             created_at=current_time,
             ttl=ttl,
             ancestry=[ref_taskins.task_id],

flwr/server/superlink/simulation/simulationio_grpc.py

@@ -21,6 +21,7 @@ from typing import Optional
 import grpc
 
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
+from flwr.common.grpc import generic_create_grpc_server
 from flwr.common.logger import log
 from flwr.proto.simulationio_pb2_grpc import (  # pylint: disable=E0611
     add_SimulationIoServicer_to_server,
@@ -28,7 +29,6 @@ from flwr.proto.simulationio_pb2_grpc import (  # pylint: disable=E0611
 from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
 
-from ..fleet.grpc_bidi.grpc_server import generic_create_grpc_server
 from .simulationio_servicer import SimulationIoServicer
 
 

flwr/server/utils/validator.py

@@ -18,6 +18,7 @@
 import time
 from typing import Union
 
+from flwr.common.constant import SUPERLINK_NODE_ID
 from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
 
 
@@ -58,24 +59,14 @@ def validate_task_ins_or_res(tasks_ins_res: Union[TaskIns, TaskRes]) -> list[str
         # Task producer
         if not tasks_ins_res.task.HasField("producer"):
             validation_errors.append("`producer` does not set field `producer`")
-        if tasks_ins_res.task.producer.node_id != 0:
-            validation_errors.append("`producer.node_id` is not 0")
-        if not tasks_ins_res.task.producer.anonymous:
-            validation_errors.append("`producer` is not anonymous")
+        if tasks_ins_res.task.producer.node_id != SUPERLINK_NODE_ID:
+            validation_errors.append(f"`producer.node_id` is not {SUPERLINK_NODE_ID}")
 
         # Task consumer
         if not tasks_ins_res.task.HasField("consumer"):
             validation_errors.append("`consumer` does not set field `consumer`")
-        if (
-            tasks_ins_res.task.consumer.anonymous
-            and tasks_ins_res.task.consumer.node_id != 0
-        ):
-            validation_errors.append("anonymous consumers MUST NOT set a `node_id`")
-        if (
-            not tasks_ins_res.task.consumer.anonymous
-            and tasks_ins_res.task.consumer.node_id == 0
-        ):
-            validation_errors.append("non-anonymous consumer MUST provide a `node_id`")
+        if tasks_ins_res.task.consumer.node_id == SUPERLINK_NODE_ID:
+            validation_errors.append("consumer MUST provide a valid `node_id`")
 
         # Content check
         if tasks_ins_res.task.task_type == "":
@@ -95,30 +86,14 @@ def validate_task_ins_or_res(tasks_ins_res: Union[TaskIns, TaskRes]) -> list[str
         # Task producer
         if not tasks_ins_res.task.HasField("producer"):
             validation_errors.append("`producer` does not set field `producer`")
-        if (
-            tasks_ins_res.task.producer.anonymous
-            and tasks_ins_res.task.producer.node_id != 0
-        ):
-            validation_errors.append("anonymous producers MUST NOT set a `node_id`")
-        if (
-            not tasks_ins_res.task.producer.anonymous
-            and tasks_ins_res.task.producer.node_id == 0
-        ):
-            validation_errors.append("non-anonymous producer MUST provide a `node_id`")
+        if tasks_ins_res.task.producer.node_id == SUPERLINK_NODE_ID:
+            validation_errors.append("producer MUST provide a valid `node_id`")
 
         # Task consumer
         if not tasks_ins_res.task.HasField("consumer"):
             validation_errors.append("`consumer` does not set field `consumer`")
-        if (
-            tasks_ins_res.task.consumer.anonymous
-            and tasks_ins_res.task.consumer.node_id != 0
-        ):
-            validation_errors.append("anonymous consumers MUST NOT set a `node_id`")
-        if (
-            not tasks_ins_res.task.consumer.anonymous
-            and tasks_ins_res.task.consumer.node_id == 0
-        ):
-            validation_errors.append("non-anonymous consumer MUST provide a `node_id`")
+        if tasks_ins_res.task.consumer.node_id != SUPERLINK_NODE_ID:
+            validation_errors.append(f"consumer is not {SUPERLINK_NODE_ID}")
 
         # Content check
         if tasks_ins_res.task.task_type == "":

flwr/simulation/app.py

@@ -16,7 +16,6 @@
 
 
 import argparse
-import sys
 from logging import DEBUG, ERROR, INFO
 from queue import Queue
 from time import sleep
@@ -39,6 +38,7 @@ from flwr.common.constant import (
     Status,
     SubStatus,
 )
+from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.logger import (
     log,
     mirror_output_to_queue,
@@ -81,12 +81,10 @@ def flwr_simulation() -> None:
     log(INFO, "Starting Flower Simulation")
 
     if not args.insecure:
-        log(
-            ERROR,
-            "`flwr-simulation` does not support TLS yet. "
-            "Please use the '--insecure' flag.",
+        flwr_exit(
+            ExitCode.COMMON_TLS_NOT_SUPPORTED,
+            "`flwr-simulation` does not support TLS yet. ",
         )
-        sys.exit(1)
 
     log(
         DEBUG,

flwr/simulation/legacy_app.py

@@ -29,7 +29,7 @@ from ray.util.scheduling_strategies import NodeAffinitySchedulingStrategy
 
 from flwr.client import ClientFnExt
 from flwr.common import EventType, event
-from flwr.common.constant import NODE_ID_NUM_BYTES
+from flwr.common.constant import NODE_ID_NUM_BYTES, SUPERLINK_NODE_ID
 from flwr.common.logger import (
     log,
     set_logger_propagation,
@@ -87,7 +87,9 @@ def _create_node_id_to_partition_mapping(
     nodes_mapping: NodeToPartitionMapping = {}  # {node-id; partition-id}
     for i in range(num_clients):
         while True:
-            node_id = generate_rand_int_from_bytes(NODE_ID_NUM_BYTES)
+            node_id = generate_rand_int_from_bytes(
+                NODE_ID_NUM_BYTES, exclude=[SUPERLINK_NODE_ID, 0]
+            )
             if node_id not in nodes_mapping:
                 break
         nodes_mapping[node_id] = i

flwr/simulation/run_simulation.py

@@ -350,7 +350,7 @@ def _main_loop(
         # Initialize Driver
         driver = InMemoryDriver(state_factory=state_factory)
         driver.set_run(run_id=run.run_id)
-        output_context_queue: "Queue[Context]" = Queue()
+        output_context_queue: Queue[Context] = Queue()
 
         # Get and run ServerApp thread
         serverapp_th = run_serverapp_th(

flwr/simulation/simulationio_connection.py

@@ -21,7 +21,7 @@ from typing import Optional, cast
 import grpc
 
 from flwr.common.constant import SIMULATIONIO_API_DEFAULT_CLIENT_ADDRESS
-from flwr.common.grpc import create_channel
+from flwr.common.grpc import create_channel, on_channel_state_change
 from flwr.common.logger import log
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.proto.simulationio_pb2_grpc import SimulationIoStub  # pylint: disable=E0611
@@ -73,6 +73,7 @@ class SimulationIoConnection:
             insecure=(self._cert is None),
             root_certificates=self._cert,
         )
+        self._channel.subscribe(on_channel_state_change)
         self._grpc_stub = SimulationIoStub(self._channel)
         _wrap_stub(self._grpc_stub, self._retry_invoker)
         log(DEBUG, "[SimulationIO] Connected to %s", self._addr)

flwr/superexec/exec_grpc.py

@@ -23,11 +23,11 @@ import grpc
 
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.auth_plugin import ExecAuthPlugin
+from flwr.common.grpc import generic_create_grpc_server
 from flwr.common.logger import log
 from flwr.common.typing import UserConfig
 from flwr.proto.exec_pb2_grpc import add_ExecServicer_to_server
 from flwr.server.superlink.ffs.ffs_factory import FfsFactory
-from flwr.server.superlink.fleet.grpc_bidi.grpc_server import generic_create_grpc_server
 from flwr.server.superlink.linkstate import LinkStateFactory
 from flwr.superexec.exec_user_auth_interceptor import ExecUserAuthInterceptor