flwr-nightly 1.15.0.dev20250114__tar.gz → 1.15.0.dev20250115__tar.gz

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.15.0.dev20250114
+Version: 1.15.0.dev20250115
 Summary: Flower: A Friendly Federated AI Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.15.0.dev20250114"
+version = "1.15.0.dev20250115"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/common/constant.py

@@ -83,6 +83,9 @@ FAB_HASH_TRUNCATION = 8
 FLWR_DIR = ".flwr"  # The default Flower directory: ~/.flwr/
 FLWR_HOME = "FLWR_HOME"  # If set, override the default Flower directory
 
+# Constant for SuperLink
+SUPERLINK_NODE_ID = 1
+
 # Constants entries in Node config for Simulation
 PARTITION_ID_KEY = "partition-id"
 NUM_PARTITIONS_KEY = "num-partitions"

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/common/logger.py

@@ -320,7 +320,7 @@ def _log_uploader(
 ) -> None:
     """Upload logs to the SuperLink."""
     exit_flag = False
-    node = Node(node_id=node_id, anonymous=False)
+    node = Node(node_id=node_id)
     msgs: list[str] = []
     while True:
         # Fetch all messages from the queue

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/common/serde.py

@@ -21,6 +21,8 @@ from typing import Any, TypeVar, cast
 
 from google.protobuf.message import Message as GrpcMessage
 
+from flwr.common.constant import SUPERLINK_NODE_ID
+
 # pylint: disable=E0611
 from flwr.proto.clientappio_pb2 import ClientAppOutputCode, ClientAppOutputStatus
 from flwr.proto.error_pb2 import Error as ProtoError
@@ -605,8 +607,8 @@ def message_to_taskins(message: Message) -> TaskIns:
         group_id=md.group_id,
         run_id=md.run_id,
         task=Task(
-            producer=Node(node_id=0, anonymous=True),  # Assume driver node
-            consumer=Node(node_id=md.dst_node_id, anonymous=False),
+            producer=Node(node_id=SUPERLINK_NODE_ID),  # Assume driver node
+            consumer=Node(node_id=md.dst_node_id),
             created_at=md.created_at,
             ttl=md.ttl,
             ancestry=[md.reply_to_message] if md.reply_to_message != "" else [],
@@ -659,8 +661,8 @@ def message_to_taskres(message: Message) -> TaskRes:
         group_id=md.group_id,
         run_id=md.run_id,
         task=Task(
-            producer=Node(node_id=md.src_node_id, anonymous=False),
-            consumer=Node(node_id=0, anonymous=True),  # Assume driver node
+            producer=Node(node_id=md.src_node_id),
+            consumer=Node(node_id=SUPERLINK_NODE_ID),  # Assume driver node
             created_at=md.created_at,
             ttl=md.ttl,
             ancestry=[md.reply_to_message] if md.reply_to_message != "" else [],

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/proto/node_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/node.proto\x12\nflwr.proto\"*\n\x04Node\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\x12\x11\n\tanonymous\x18\x02 \x01(\x08\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x66lwr/proto/node.proto\x12\nflwr.proto\"\x17\n\x04Node\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -22,5 +22,5 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.node_pb2', _glob
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_NODE']._serialized_start=37
-  _globals['_NODE']._serialized_end=79
+  _globals['_NODE']._serialized_end=60
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/proto/node_pb2.pyi

@@ -12,13 +12,10 @@ DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 class Node(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODE_ID_FIELD_NUMBER: builtins.int
-    ANONYMOUS_FIELD_NUMBER: builtins.int
     node_id: builtins.int
-    anonymous: builtins.bool
     def __init__(self,
         *,
         node_id: builtins.int = ...,
-        anonymous: builtins.bool = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["anonymous",b"anonymous","node_id",b"node_id"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
 global___Node = Node

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/compat/app_utils.py

@@ -95,7 +95,6 @@ def _update_client_manager(
             client_proxy = DriverClientProxy(
                 node_id=node_id,
                 driver=driver,
-                anonymous=False,
                 run_id=driver.run.run_id,
             )
             if client_manager.register(client_proxy):

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/compat/driver_client_proxy.py

@@ -28,12 +28,11 @@ from ..driver.driver import Driver
 class DriverClientProxy(ClientProxy):
     """Flower client proxy which delegates work using the Driver API."""
 
-    def __init__(self, node_id: int, driver: Driver, anonymous: bool, run_id: int):
+    def __init__(self, node_id: int, driver: Driver, run_id: int):
         super().__init__(str(node_id))
         self.node_id = node_id
         self.driver = driver
         self.run_id = run_id
-        self.anonymous = anonymous
 
     def get_properties(
         self,

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/driver/grpc_driver.py

@@ -24,7 +24,10 @@ from typing import Optional, cast
 import grpc
 
 from flwr.common import DEFAULT_TTL, Message, Metadata, RecordSet
-from flwr.common.constant import SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS
+from flwr.common.constant import (
+    SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
+    SUPERLINK_NODE_ID,
+)
 from flwr.common.grpc import create_channel
 from flwr.common.logger import log
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
@@ -76,7 +79,7 @@ class GrpcDriver(Driver):
         self._run: Optional[Run] = None
         self._grpc_stub: Optional[ServerAppIoStub] = None
         self._channel: Optional[grpc.Channel] = None
-        self.node = Node(node_id=0, anonymous=True)
+        self.node = Node(node_id=SUPERLINK_NODE_ID)
         self._retry_invoker = _make_simple_grpc_retry_invoker()
 
     @property

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/driver/inmemory_driver.py

@@ -22,6 +22,7 @@ from typing import Optional, cast
 from uuid import UUID
 
 from flwr.common import DEFAULT_TTL, Message, Metadata, RecordSet
+from flwr.common.constant import SUPERLINK_NODE_ID
 from flwr.common.serde import message_from_taskres, message_to_taskins
 from flwr.common.typing import Run
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
@@ -49,7 +50,7 @@ class InMemoryDriver(Driver):
         self._run: Optional[Run] = None
         self.state = state_factory.state()
         self.pull_interval = pull_interval
-        self.node = Node(node_id=0, anonymous=True)
+        self.node = Node(node_id=SUPERLINK_NODE_ID)
 
     def _check_message(self, message: Message) -> None:
         # Check if the message is valid

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/superlink/driver/serverappio_servicer.py

@@ -102,9 +102,7 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         )
 
         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
-        ]
+        nodes: list[Node] = [Node(node_id=node_id) for node_id in all_ids]
         return GetNodesResponse(nodes=nodes)
 
     def CreateRun(

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/superlink/fleet/grpc_rere/server_interceptor.py

@@ -218,11 +218,11 @@ class AuthenticateServerInterceptor(grpc.ServerInterceptor):  # type: ignore
         # Return previously assigned `node_id` for the provided `public_key`
         if node_id is not None:
             state.acknowledge_ping(node_id, request.ping_interval)
-            return CreateNodeResponse(node=Node(node_id=node_id, anonymous=False))
+            return CreateNodeResponse(node=Node(node_id=node_id))
 
         # No `node_id` exists for the provided `public_key`
         # Handle `CreateNode` here instead of calling the default method handler
         # Note: the innermost `CreateNode` method will never be called
         node_id = state.create_node(request.ping_interval)
         state.set_node_public_key(node_id, public_key_bytes)
-        return CreateNodeResponse(node=Node(node_id=node_id, anonymous=False))
+        return CreateNodeResponse(node=Node(node_id=node_id))

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/superlink/fleet/message_handler/message_handler.py

@@ -66,13 +66,13 @@ def create_node(
     """."""
     # Create node
     node_id = state.create_node(ping_interval=request.ping_interval)
-    return CreateNodeResponse(node=Node(node_id=node_id, anonymous=False))
+    return CreateNodeResponse(node=Node(node_id=node_id))
 
 
 def delete_node(request: DeleteNodeRequest, state: LinkState) -> DeleteNodeResponse:
     """."""
     # Validate node_id
-    if request.node.anonymous or request.node.node_id == 0:
+    if request.node.node_id == 0:  # i.e. unset `node_id`
         return DeleteNodeResponse()
 
     # Update state
@@ -91,9 +91,8 @@ def ping(
 
 def pull_task_ins(request: PullTaskInsRequest, state: LinkState) -> PullTaskInsResponse:
     """Pull TaskIns handler."""
-    # Get node_id if client node is not anonymous
     node = request.node  # pylint: disable=no-member
-    node_id: Optional[int] = None if node.anonymous else node.node_id
+    node_id: int = node.node_id
 
     # Retrieve TaskIns from State
     task_ins_list: list[TaskIns] = state.get_task_ins(node_id=node_id, limit=1)
@@ -111,7 +110,7 @@ def pull_messages(
     """Pull Messages handler."""
     # Get node_id if client node is not anonymous
     node = request.node  # pylint: disable=no-member
-    node_id: Optional[int] = None if node.anonymous else node.node_id
+    node_id: int = node.node_id
 
     # Retrieve TaskIns from State
     task_ins_list: list[TaskIns] = state.get_task_ins(node_id=node_id, limit=1)

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/superlink/linkstate/in_memory_linkstate.py

@@ -28,6 +28,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
@@ -90,7 +91,7 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,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",
@@ -98,14 +99,13 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             )
             return None
         # Validate destination node ID
-        if not task_ins.task.consumer.anonymous:
-            if task_ins.task.consumer.node_id not in self.node_ids:
-                log(
-                    ERROR,
-                    "Invalid destination node ID for TaskIns: %s",
-                    task_ins.task.consumer.node_id,
-                )
-                return None
+        if task_ins.task.consumer.node_id not in self.node_ids:
+            log(
+                ERROR,
+                "Invalid destination node ID for TaskIns: %s",
+                task_ins.task.consumer.node_id,
+            )
+            return None
 
         # Create task_id
         task_id = uuid4()
@@ -118,9 +118,7 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         # Return the new task_id
         return task_id
 
-    def get_task_ins(
-        self, node_id: Optional[int], limit: Optional[int]
-    ) -> list[TaskIns]:
+    def get_task_ins(self, node_id: int, limit: Optional[int]) -> list[TaskIns]:
         """Get all TaskIns that have not been delivered yet."""
         if limit is not None and limit < 1:
             raise AssertionError("`limit` must be >= 1")
@@ -130,17 +128,8 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         current_time = time.time()
         with self.lock:
             for _, task_ins in self.task_ins_store.items():
-                # pylint: disable=too-many-boolean-expressions
                 if (
-                    node_id is not None  # Not anonymous
-                    and task_ins.task.consumer.anonymous is False
-                    and task_ins.task.consumer.node_id == node_id
-                    and task_ins.task.delivered_at == ""
-                    and task_ins.task.created_at + task_ins.task.ttl > current_time
-                ) or (
-                    node_id is None  # Anonymous
-                    and task_ins.task.consumer.anonymous is True
-                    and task_ins.task.consumer.node_id == 0
+                    task_ins.task.consumer.node_id == node_id
                     and task_ins.task.delivered_at == ""
                     and task_ins.task.created_at + task_ins.task.ttl > current_time
                 ):
@@ -174,9 +163,6 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             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
@@ -310,7 +296,9 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
     def create_node(self, ping_interval: float) -> int:
         """Create, store in the link state, and return `node_id`."""
         # Sample a random int64 as node_id
-        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]
+        )
 
         with self.lock:
             if node_id in self.node_ids:

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/flwr/server/superlink/linkstate/linkstate.py

@@ -40,20 +40,14 @@ class LinkState(abc.ABC):  # 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)
 
         If `task_ins.run_id` is invalid, then
         storing the `task_ins` MUST fail.
         """
 
     @abc.abstractmethod
-    def get_task_ins(
-        self, node_id: Optional[int], limit: Optional[int]
-    ) -> list[TaskIns]:
+    def get_task_ins(self, node_id: int, limit: Optional[int]) -> list[TaskIns]:
         """Get TaskIns optionally filtered by node_id.
 
         Usually, the Fleet API calls this for Nodes planning to work on one or more
@@ -61,15 +55,11 @@ class LinkState(abc.ABC):  # pylint: disable=R0904
 
         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 `""`.
+            2. 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`.
 
         If `delivered_at` MUST BE set (not `""`) otherwise the TaskIns MUST not be in
         the result.
@@ -89,11 +79,8 @@ class LinkState(abc.ABC):  # 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)
 
         If `task_res.run_id` is invalid, then
         storing the `task_res` MUST fail.

{flwr_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/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
@@ -128,9 +129,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 +147,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,
@@ -263,11 +260,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 +286,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 +295,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 +312,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 +334,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 +400,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 +426,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
         ):
@@ -638,7 +604,9 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
     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)
@@ -1126,9 +1094,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,
@@ -1147,9 +1113,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,
@@ -1174,11 +1138,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"],
@@ -1204,11 +1166,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_nightly-1.15.0.dev20250114 → flwr_nightly-1.15.0.dev20250115}/src/py/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],