flwr-nightly 1.23.0.dev20251017__py3-none-any.whl → 1.23.0.dev20251021__py3-none-any.whl

flwr/proto/control_pb2_grpc.py

@@ -49,20 +49,20 @@ class ControlStub(object):
                 request_serializer=flwr_dot_proto_dot_control__pb2.PullArtifactsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_control__pb2.PullArtifactsResponse.FromString,
                 )
-        self.CreateNodeCli = channel.unary_unary(
-                '/flwr.proto.Control/CreateNodeCli',
-                request_serializer=flwr_dot_proto_dot_control__pb2.CreateNodeCliRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_control__pb2.CreateNodeCliResponse.FromString,
+        self.RegisterNode = channel.unary_unary(
+                '/flwr.proto.Control/RegisterNode',
+                request_serializer=flwr_dot_proto_dot_control__pb2.RegisterNodeRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.RegisterNodeResponse.FromString,
                 )
-        self.DeleteNodeCli = channel.unary_unary(
-                '/flwr.proto.Control/DeleteNodeCli',
-                request_serializer=flwr_dot_proto_dot_control__pb2.DeleteNodeCliRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_control__pb2.DeleteNodeCliResponse.FromString,
+        self.UnregisterNode = channel.unary_unary(
+                '/flwr.proto.Control/UnregisterNode',
+                request_serializer=flwr_dot_proto_dot_control__pb2.UnregisterNodeRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.UnregisterNodeResponse.FromString,
                 )
-        self.ListNodesCli = channel.unary_unary(
-                '/flwr.proto.Control/ListNodesCli',
-                request_serializer=flwr_dot_proto_dot_control__pb2.ListNodesCliRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_control__pb2.ListNodesCliResponse.FromString,
+        self.ListNodes = channel.unary_unary(
+                '/flwr.proto.Control/ListNodes',
+                request_serializer=flwr_dot_proto_dot_control__pb2.ListNodesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.ListNodesResponse.FromString,
                 )
 
 
@@ -118,21 +118,21 @@ class ControlServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def CreateNodeCli(self, request, context):
-        """Add SuperNode
+    def RegisterNode(self, request, context):
+        """Register SuperNode
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def DeleteNodeCli(self, request, context):
-        """Remove SuperNode
+    def UnregisterNode(self, request, context):
+        """Unregister SuperNode
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def ListNodesCli(self, request, context):
+    def ListNodes(self, request, context):
         """List SuperNodes
         """
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -177,20 +177,20 @@ def add_ControlServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_control__pb2.PullArtifactsRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_control__pb2.PullArtifactsResponse.SerializeToString,
             ),
-            'CreateNodeCli': grpc.unary_unary_rpc_method_handler(
-                    servicer.CreateNodeCli,
-                    request_deserializer=flwr_dot_proto_dot_control__pb2.CreateNodeCliRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_control__pb2.CreateNodeCliResponse.SerializeToString,
+            'RegisterNode': grpc.unary_unary_rpc_method_handler(
+                    servicer.RegisterNode,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.RegisterNodeRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.RegisterNodeResponse.SerializeToString,
             ),
-            'DeleteNodeCli': grpc.unary_unary_rpc_method_handler(
-                    servicer.DeleteNodeCli,
-                    request_deserializer=flwr_dot_proto_dot_control__pb2.DeleteNodeCliRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_control__pb2.DeleteNodeCliResponse.SerializeToString,
+            'UnregisterNode': grpc.unary_unary_rpc_method_handler(
+                    servicer.UnregisterNode,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.UnregisterNodeRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.UnregisterNodeResponse.SerializeToString,
             ),
-            'ListNodesCli': grpc.unary_unary_rpc_method_handler(
-                    servicer.ListNodesCli,
-                    request_deserializer=flwr_dot_proto_dot_control__pb2.ListNodesCliRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_control__pb2.ListNodesCliResponse.SerializeToString,
+            'ListNodes': grpc.unary_unary_rpc_method_handler(
+                    servicer.ListNodes,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.ListNodesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.ListNodesResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -322,7 +322,7 @@ class Control(object):
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
-    def CreateNodeCli(request,
+    def RegisterNode(request,
             target,
             options=(),
             channel_credentials=None,
@@ -332,14 +332,14 @@ class Control(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/CreateNodeCli',
-            flwr_dot_proto_dot_control__pb2.CreateNodeCliRequest.SerializeToString,
-            flwr_dot_proto_dot_control__pb2.CreateNodeCliResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/RegisterNode',
+            flwr_dot_proto_dot_control__pb2.RegisterNodeRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.RegisterNodeResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
-    def DeleteNodeCli(request,
+    def UnregisterNode(request,
             target,
             options=(),
             channel_credentials=None,
@@ -349,14 +349,14 @@ class Control(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/DeleteNodeCli',
-            flwr_dot_proto_dot_control__pb2.DeleteNodeCliRequest.SerializeToString,
-            flwr_dot_proto_dot_control__pb2.DeleteNodeCliResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/UnregisterNode',
+            flwr_dot_proto_dot_control__pb2.UnregisterNodeRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.UnregisterNodeResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
     @staticmethod
-    def ListNodesCli(request,
+    def ListNodes(request,
             target,
             options=(),
             channel_credentials=None,
@@ -366,8 +366,8 @@ class Control(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/ListNodesCli',
-            flwr_dot_proto_dot_control__pb2.ListNodesCliRequest.SerializeToString,
-            flwr_dot_proto_dot_control__pb2.ListNodesCliResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/ListNodes',
+            flwr_dot_proto_dot_control__pb2.ListNodesRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.ListNodesResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/control_pb2_grpc.pyi

@@ -44,19 +44,19 @@ class ControlStub:
         flwr.proto.control_pb2.PullArtifactsResponse]
     """Pull artifacts generated during a run (flwr pull)"""
 
-    CreateNodeCli: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.control_pb2.CreateNodeCliRequest,
-        flwr.proto.control_pb2.CreateNodeCliResponse]
-    """Add SuperNode"""
-
-    DeleteNodeCli: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.control_pb2.DeleteNodeCliRequest,
-        flwr.proto.control_pb2.DeleteNodeCliResponse]
-    """Remove SuperNode"""
-
-    ListNodesCli: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.control_pb2.ListNodesCliRequest,
-        flwr.proto.control_pb2.ListNodesCliResponse]
+    RegisterNode: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.control_pb2.RegisterNodeRequest,
+        flwr.proto.control_pb2.RegisterNodeResponse]
+    """Register SuperNode"""
+
+    UnregisterNode: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.control_pb2.UnregisterNodeRequest,
+        flwr.proto.control_pb2.UnregisterNodeResponse]
+    """Unregister SuperNode"""
+
+    ListNodes: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.control_pb2.ListNodesRequest,
+        flwr.proto.control_pb2.ListNodesResponse]
     """List SuperNodes"""
 
 
@@ -118,26 +118,26 @@ class ControlServicer(metaclass=abc.ABCMeta):
         pass
 
     @abc.abstractmethod
-    def CreateNodeCli(self,
-        request: flwr.proto.control_pb2.CreateNodeCliRequest,
+    def RegisterNode(self,
+        request: flwr.proto.control_pb2.RegisterNodeRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.control_pb2.CreateNodeCliResponse:
-        """Add SuperNode"""
+    ) -> flwr.proto.control_pb2.RegisterNodeResponse:
+        """Register SuperNode"""
         pass
 
     @abc.abstractmethod
-    def DeleteNodeCli(self,
-        request: flwr.proto.control_pb2.DeleteNodeCliRequest,
+    def UnregisterNode(self,
+        request: flwr.proto.control_pb2.UnregisterNodeRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.control_pb2.DeleteNodeCliResponse:
-        """Remove SuperNode"""
+    ) -> flwr.proto.control_pb2.UnregisterNodeResponse:
+        """Unregister SuperNode"""
         pass
 
     @abc.abstractmethod
-    def ListNodesCli(self,
-        request: flwr.proto.control_pb2.ListNodesCliRequest,
+    def ListNodes(self,
+        request: flwr.proto.control_pb2.ListNodesRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.control_pb2.ListNodesCliResponse:
+    ) -> flwr.proto.control_pb2.ListNodesResponse:
         """List SuperNodes"""
         pass
 

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\"\x17\n\x04Node\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\xc6\x02\n\x08NodeInfo\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\x12\x11\n\towner_aid\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\t\x12\x12\n\ncreated_at\x18\x04 \x01(\t\x12\x1e\n\x11last_activated_at\x18\x05 \x01(\tH\x00\x88\x01\x01\x12 \n\x13last_deactivated_at\x18\x06 \x01(\tH\x01\x88\x01\x01\x12\x17\n\ndeleted_at\x18\x07 \x01(\tH\x02\x88\x01\x01\x12\x19\n\x0conline_until\x18\x08 \x01(\x01H\x03\x88\x01\x01\x12\x1a\n\x12heartbeat_interval\x18\t \x01(\x01\x12\x12\n\npublic_key\x18\n \x01(\x0c\x42\x14\n\x12_last_activated_atB\x16\n\x14_last_deactivated_atB\r\n\x0b_deleted_atB\x0f\n\r_online_untilb\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\"\xd3\x02\n\x08NodeInfo\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\x12\x11\n\towner_aid\x18\x02 \x01(\t\x12\x0e\n\x06status\x18\x03 \x01(\t\x12\x15\n\rregistered_at\x18\x04 \x01(\t\x12\x1e\n\x11last_activated_at\x18\x05 \x01(\tH\x00\x88\x01\x01\x12 \n\x13last_deactivated_at\x18\x06 \x01(\tH\x01\x88\x01\x01\x12\x1c\n\x0funregistered_at\x18\x07 \x01(\tH\x02\x88\x01\x01\x12\x19\n\x0conline_until\x18\x08 \x01(\x01H\x03\x88\x01\x01\x12\x1a\n\x12heartbeat_interval\x18\t \x01(\x01\x12\x12\n\npublic_key\x18\n \x01(\x0c\x42\x14\n\x12_last_activated_atB\x16\n\x14_last_deactivated_atB\x12\n\x10_unregistered_atB\x0f\n\r_online_untilb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -24,5 +24,5 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_NODE']._serialized_start=37
   _globals['_NODE']._serialized_end=60
   _globals['_NODEINFO']._serialized_start=63
-  _globals['_NODEINFO']._serialized_end=389
+  _globals['_NODEINFO']._serialized_end=402
 # @@protoc_insertion_point(module_scope)

flwr/proto/node_pb2.pyi

@@ -26,20 +26,20 @@ class NodeInfo(google.protobuf.message.Message):
     NODE_ID_FIELD_NUMBER: builtins.int
     OWNER_AID_FIELD_NUMBER: builtins.int
     STATUS_FIELD_NUMBER: builtins.int
-    CREATED_AT_FIELD_NUMBER: builtins.int
+    REGISTERED_AT_FIELD_NUMBER: builtins.int
     LAST_ACTIVATED_AT_FIELD_NUMBER: builtins.int
     LAST_DEACTIVATED_AT_FIELD_NUMBER: builtins.int
-    DELETED_AT_FIELD_NUMBER: builtins.int
+    UNREGISTERED_AT_FIELD_NUMBER: builtins.int
     ONLINE_UNTIL_FIELD_NUMBER: builtins.int
     HEARTBEAT_INTERVAL_FIELD_NUMBER: builtins.int
     PUBLIC_KEY_FIELD_NUMBER: builtins.int
     node_id: builtins.int
     owner_aid: typing.Text
     status: typing.Text
-    created_at: typing.Text
+    registered_at: typing.Text
     last_activated_at: typing.Text
     last_deactivated_at: typing.Text
-    deleted_at: typing.Text
+    unregistered_at: typing.Text
     online_until: builtins.float
     heartbeat_interval: builtins.float
     public_key: builtins.bytes
@@ -48,22 +48,22 @@ class NodeInfo(google.protobuf.message.Message):
         node_id: builtins.int = ...,
         owner_aid: typing.Text = ...,
         status: typing.Text = ...,
-        created_at: typing.Text = ...,
+        registered_at: typing.Text = ...,
         last_activated_at: typing.Optional[typing.Text] = ...,
         last_deactivated_at: typing.Optional[typing.Text] = ...,
-        deleted_at: typing.Optional[typing.Text] = ...,
+        unregistered_at: typing.Optional[typing.Text] = ...,
         online_until: typing.Optional[builtins.float] = ...,
         heartbeat_interval: builtins.float = ...,
         public_key: builtins.bytes = ...,
         ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_deleted_at",b"_deleted_at","_last_activated_at",b"_last_activated_at","_last_deactivated_at",b"_last_deactivated_at","_online_until",b"_online_until","deleted_at",b"deleted_at","last_activated_at",b"last_activated_at","last_deactivated_at",b"last_deactivated_at","online_until",b"online_until"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_deleted_at",b"_deleted_at","_last_activated_at",b"_last_activated_at","_last_deactivated_at",b"_last_deactivated_at","_online_until",b"_online_until","created_at",b"created_at","deleted_at",b"deleted_at","heartbeat_interval",b"heartbeat_interval","last_activated_at",b"last_activated_at","last_deactivated_at",b"last_deactivated_at","node_id",b"node_id","online_until",b"online_until","owner_aid",b"owner_aid","public_key",b"public_key","status",b"status"]) -> None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_deleted_at",b"_deleted_at"]) -> typing.Optional[typing_extensions.Literal["deleted_at"]]: ...
+    def HasField(self, field_name: typing_extensions.Literal["_last_activated_at",b"_last_activated_at","_last_deactivated_at",b"_last_deactivated_at","_online_until",b"_online_until","_unregistered_at",b"_unregistered_at","last_activated_at",b"last_activated_at","last_deactivated_at",b"last_deactivated_at","online_until",b"online_until","unregistered_at",b"unregistered_at"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["_last_activated_at",b"_last_activated_at","_last_deactivated_at",b"_last_deactivated_at","_online_until",b"_online_until","_unregistered_at",b"_unregistered_at","heartbeat_interval",b"heartbeat_interval","last_activated_at",b"last_activated_at","last_deactivated_at",b"last_deactivated_at","node_id",b"node_id","online_until",b"online_until","owner_aid",b"owner_aid","public_key",b"public_key","registered_at",b"registered_at","status",b"status","unregistered_at",b"unregistered_at"]) -> None: ...
     @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_last_activated_at",b"_last_activated_at"]) -> typing.Optional[typing_extensions.Literal["last_activated_at"]]: ...
     @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_last_deactivated_at",b"_last_deactivated_at"]) -> typing.Optional[typing_extensions.Literal["last_deactivated_at"]]: ...
     @typing.overload
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_online_until",b"_online_until"]) -> typing.Optional[typing_extensions.Literal["online_until"]]: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["_unregistered_at",b"_unregistered_at"]) -> typing.Optional[typing_extensions.Literal["unregistered_at"]]: ...
 global___NodeInfo = NodeInfo

flwr/server/app.py

@@ -235,6 +235,17 @@ def run_superlink() -> None:
 
     # If supernode authentication is disabled, warn users
     enable_supernode_auth: bool = args.enable_supernode_auth
+    if enable_supernode_auth and args.insecure:
+        url_v = f"https://flower.ai/docs/framework/v{package_version}/en/"
+        page = "how-to-authenticate-supernodes.html"
+        flwr_exit(
+            ExitCode.SUPERLINK_INVALID_ARGS,
+            "The `--enable-supernode-auth` flag requires encrypted TLS communications. "
+            "Please provide TLS certificates using the `--ssl-certfile`, "
+            "`--ssl-keyfile` and `--ssl-ca-certfile` arguments to your SuperLink. "
+            "Please refer to the Flower documentation for more information: "
+            f"{url_v}{page}",
+        )
     if not enable_supernode_auth:
         log(
             WARN,

flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -15,6 +15,7 @@
 """Fleet API gRPC request-response servicer."""
 
 
+import threading
 from logging import DEBUG, ERROR, INFO
 
 import grpc
@@ -53,6 +54,7 @@ from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=
 from flwr.server.superlink.fleet.message_handler import message_handler
 from flwr.server.superlink.linkstate import LinkStateFactory
 from flwr.server.superlink.utils import abort_grpc_context
+from flwr.supercore.constant import NodeStatus
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 
@@ -71,6 +73,7 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
         self.ffs_factory = ffs_factory
         self.objectstore_factory = objectstore_factory
         self.enable_supernode_auth = enable_supernode_auth
+        self.lock = threading.Lock()
 
     def CreateNode(
         self, request: CreateNodeRequest, context: grpc.ServicerContext
@@ -88,8 +91,31 @@ class FleetServicer(fleet_pb2_grpc.FleetServicer):
 
             # Check if public key is already in use
             if node_id := state.get_node_id_by_public_key(request.public_key):
-                # Prepare response with existing node_id
-                response = CreateNodeResponse(node=Node(node_id=node_id))
+
+                # Ensure only one request that requires checking the node state
+                # is processed at a time. This avoids race conditions when two
+                # SuperNodes try to connect at the same time with the same
+                # public key.
+                with self.lock:
+                    node_info = state.get_node_info(node_ids=[node_id])[0]
+                    if node_info.status == NodeStatus.ONLINE:
+                        # Node is already active
+                        log(
+                            ERROR,
+                            "Public key already in use (node_id=%s)",
+                            node_id,
+                        )
+                        raise ValueError(
+                            "Public key already in use by an active SuperNode"
+                        )
+
+                    # Prepare response with existing node_id
+                    response = CreateNodeResponse(node=Node(node_id=node_id))
+                    # Awknowledge heartbeat to mark node as online
+                    state.acknowledge_node_heartbeat(
+                        node_id=node_id,
+                        heartbeat_interval=request.heartbeat_interval,
+                    )
             else:
                 if self.enable_supernode_auth:
                     # When SuperNode authentication is enabled,

flwr/server/superlink/linkstate/in_memory_linkstate.py

@@ -262,6 +262,7 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
                     node_id: self.nodes[node_id].online_until
                     for node_id in dst_node_ids
                     if node_id in self.nodes
+                    and self.nodes[node_id].status != NodeStatus.UNREGISTERED
                 },
                 current_time=current,
             )
@@ -353,11 +354,11 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             self.nodes[node_id] = NodeInfo(
                 node_id=node_id,
                 owner_aid=owner_aid,
-                status=NodeStatus.CREATED,
-                created_at=now().isoformat(),
+                status=NodeStatus.REGISTERED,
+                registered_at=now().isoformat(),
                 last_activated_at=None,
                 last_deactivated_at=None,
-                deleted_at=None,
+                unregistered_at=None,
                 online_until=None,
                 heartbeat_interval=heartbeat_interval,
                 public_key=public_key,
@@ -371,16 +372,19 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         with self.lock:
             if (
                 not (node := self.nodes.get(node_id))
-                or node.status == NodeStatus.DELETED
+                or node.status == NodeStatus.UNREGISTERED
                 or owner_aid != self.nodes[node_id].owner_aid
             ):
                 raise ValueError(
-                    f"Node ID {node_id} already deleted, not found or unauthorized "
-                    "deletion attempt."
+                    f"Node ID {node_id} already unregistered, not found or "
+                    "the request was unauthorized."
                 )
 
-            node.status = NodeStatus.DELETED
-            node.deleted_at = now().isoformat()
+            node.status = NodeStatus.UNREGISTERED
+            current = now()
+            node.unregistered_at = current.isoformat()
+            # Set online_until to current timestamp on deletion, if it is in the future
+            node.online_until = min(node.online_until, current.timestamp())
 
     def get_nodes(self, run_id: int) -> set[int]:
         """Return all available nodes.
@@ -436,7 +440,7 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         with self.lock:
             if (
                 node := self.nodes.get(node_id)
-            ) is None or node.status == NodeStatus.DELETED:
+            ) is None or node.status == NodeStatus.UNREGISTERED:
                 raise ValueError(f"Node ID {node_id} not found")
             return node.public_key
 
@@ -450,7 +454,7 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
                 return None
 
             node_info = self.nodes[node_id]
-            if node_info.status == NodeStatus.DELETED:
+            if node_info.status == NodeStatus.UNREGISTERED:
                 return None
             return node_id
 
@@ -639,11 +643,13 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         the node is marked as offline.
         """
         with self.lock:
-            if (node := self.nodes.get(node_id)) and node.status != NodeStatus.DELETED:
+            if (
+                node := self.nodes.get(node_id)
+            ) and node.status != NodeStatus.UNREGISTERED:
                 current_dt = now()
 
                 # Set timestamp if the status changes
-                if node.status != NodeStatus.ONLINE:  # offline or created
+                if node.status != NodeStatus.ONLINE:  # offline or registered
                     node.status = NodeStatus.ONLINE
                     node.last_activated_at = current_dt.isoformat()