flwr-nightly 1.23.0.dev20251009__tar.gz → 1.23.0.dev20251011__tar.gz

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.23.0.dev20251009
+Version: 1.23.0.dev20251011
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/cli/supernode/create.py

@@ -21,6 +21,7 @@ from pathlib import Path
 from typing import Annotated, Optional
 
 import typer
+from cryptography.exceptions import UnsupportedAlgorithm
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import ec
 from rich.console import Console
@@ -32,6 +33,7 @@ from flwr.cli.config_utils import (
     validate_federation_in_project_config,
 )
 from flwr.common.constant import FAB_CONFIG_FILE, CliOutputFormat
+from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     CreateNodeCliRequest,
@@ -163,7 +165,7 @@ def try_load_public_key(public_key_path: Path) -> bytes:
 
     with open(public_key_path, "rb") as key_file:
         try:
-            public_key = serialization.load_pem_public_key(key_file.read())
+            public_key = serialization.load_ssh_public_key(key_file.read())
 
             if not isinstance(public_key, ec.EllipticCurvePublicKey):
                 raise ValueError(f"Not an EC public key, got {type(public_key)}")
@@ -174,11 +176,9 @@ def try_load_public_key(public_key_path: Path) -> bytes:
                     f"EC curve {public_key.curve.name} is not an approved NIST curve"
                 )
 
-        except ValueError as err:
-            typer.secho(
-                f"❌ Unable to load public key from '{public_key_path}': {err}",
-                fg=typer.colors.RED,
-                bold=True,
+        except (ValueError, UnsupportedAlgorithm) as err:
+            flwr_exit(
+                ExitCode.FLWRCLI_NODE_AUTH_PUBLIC_KEY_INVALID,
+                str(err),
             )
-            raise typer.Exit(code=1) from err
     return public_key_to_bytes(public_key)

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/cli/supernode/ls.py

@@ -47,7 +47,7 @@ from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugi
 _NodeListType = tuple[int, str, str, str, str, str, str, str]
 
 
-def ls(  # pylint: disable=R0914
+def ls(  # pylint: disable=R0914, R0913, R0917
     ctx: typer.Context,
     app: Annotated[
         Path,
@@ -73,6 +73,13 @@ def ls(  # pylint: disable=R0914
             help="Enable verbose output",
         ),
     ] = False,
+    dry_run: Annotated[
+        bool,
+        typer.Option(
+            "--dry-run",
+            help="Simulate the command without contacting any SuperNodes",
+        ),
+    ] = False,
 ) -> None:
     """List SuperNodes in the federation."""
     # Resolve command used (list or ls)
@@ -98,7 +105,7 @@ def ls(  # pylint: disable=R0914
             channel = init_channel(app, federation_config, auth_plugin)
             stub = ControlStub(channel)
             typer.echo("📄 Listing all nodes...")
-            formatted_nodes = _list_nodes(stub)
+            formatted_nodes = _list_nodes(stub, dry_run=dry_run)
             restore_output()
             if output_format == CliOutputFormat.JSON:
                 Console().print_json(_to_json(formatted_nodes, verbose=verbose))
@@ -125,10 +132,12 @@ def ls(  # pylint: disable=R0914
         captured_output.close()
 
 
-def _list_nodes(stub: ControlStub) -> list[_NodeListType]:
+def _list_nodes(stub: ControlStub, dry_run: bool) -> list[_NodeListType]:
     """List all nodes."""
     with flwr_cli_grpc_exc_handler():
-        res: ListNodesCliResponse = stub.ListNodesCli(ListNodesCliRequest())
+        res: ListNodesCliResponse = stub.ListNodesCli(
+            ListNodesCliRequest(dry_run=dry_run)
+        )
 
     return _format_nodes(list(res.nodes_info), res.now)
 

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/common/exit/exit_code.py

@@ -47,6 +47,9 @@ class ExitCode:
     # SuperExec-specific exit codes (400-499)
     SUPEREXEC_INVALID_PLUGIN_CONFIG = 400
 
+    # FlowerCLI-specific exit codes (500-599)
+    FLWRCLI_NODE_AUTH_PUBLIC_KEY_INVALID = 500
+
     # Common exit codes (600-699)
     COMMON_ADDRESS_INVALID = 600
     COMMON_MISSING_EXTRA_REST = 601
@@ -116,6 +119,13 @@ EXIT_CODE_HELP = {
     ExitCode.SUPEREXEC_INVALID_PLUGIN_CONFIG: (
         "The YAML configuration for the SuperExec plugin is invalid."
     ),
+    # FlowerCLI-specific exit codes (500-599)
+    ExitCode.FLWRCLI_NODE_AUTH_PUBLIC_KEY_INVALID: (
+        "Node authentication requires a valid elliptic curve public key in the "
+        "SSH format and following a NIST standard elliptic curve (e.g. SECP384R1). "
+        "Please ensure that the file path points to a valid public key "
+        "file and try again."
+    ),
     # Common exit codes (600-699)
     ExitCode.COMMON_ADDRESS_INVALID: (
         "Please provide a valid URL, IPv4 or IPv6 address."

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/proto/control_pb2.py

@@ -19,7 +19,7 @@ from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
 from flwr.proto import node_pb2 as flwr_dot_proto_dot_node__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x15\x66lwr/proto/node.proto\"\xfa\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8b\x01\n\x17GetLoginDetailsResponse\x12\x12\n\nauthn_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"&\n\x14PullArtifactsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"1\n\x15PullArtifactsResponse\x12\x10\n\x03url\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x06\n\x04_url\"*\n\x14\x43reateNodeCliRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\"9\n\x15\x43reateNodeCliResponse\x12\x14\n\x07node_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\n\n\x08_node_id\"\'\n\x14\x44\x65leteNodeCliRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x17\n\x15\x44\x65leteNodeCliResponse\"\x15\n\x13ListNodesCliRequest\"M\n\x14ListNodesCliResponse\x12(\n\nnodes_info\x18\x01 \x03(\x0b\x32\x14.flwr.proto.NodeInfo\x12\x0b\n\x03now\x18\x02 \x01(\t2\xc5\x06\n\x07\x43ontrol\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x12V\n\rPullArtifacts\x12 .flwr.proto.PullArtifactsRequest\x1a!.flwr.proto.PullArtifactsResponse\"\x00\x12V\n\rCreateNodeCli\x12 .flwr.proto.CreateNodeCliRequest\x1a!.flwr.proto.CreateNodeCliResponse\"\x00\x12V\n\rDeleteNodeCli\x12 .flwr.proto.DeleteNodeCliRequest\x1a!.flwr.proto.DeleteNodeCliResponse\"\x00\x12S\n\x0cListNodesCli\x12\x1f.flwr.proto.ListNodesCliRequest\x1a .flwr.proto.ListNodesCliResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66lwr/proto/control.proto\x12\nflwr.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x1a\x66lwr/proto/transport.proto\x1a\x1b\x66lwr/proto/recorddict.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x15\x66lwr/proto/node.proto\"\xfa\x01\n\x0fStartRunRequest\x12\x1c\n\x03\x66\x61\x62\x18\x01 \x01(\x0b\x32\x0f.flwr.proto.Fab\x12H\n\x0foverride_config\x18\x02 \x03(\x0b\x32/.flwr.proto.StartRunRequest.OverrideConfigEntry\x12\x34\n\x12\x66\x65\x64\x65ration_options\x18\x03 \x01(\x0b\x32\x18.flwr.proto.ConfigRecord\x1aI\n\x13OverrideConfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.flwr.proto.Scalar:\x02\x38\x01\"2\n\x10StartRunResponse\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"<\n\x11StreamLogsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\x12\x17\n\x0f\x61\x66ter_timestamp\x18\x02 \x01(\x01\"B\n\x12StreamLogsResponse\x12\x12\n\nlog_output\x18\x01 \x01(\t\x12\x18\n\x10latest_timestamp\x18\x02 \x01(\x01\"1\n\x0fListRunsRequest\x12\x13\n\x06run_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\t\n\x07_run_id\"\x9d\x01\n\x10ListRunsResponse\x12;\n\x08run_dict\x18\x01 \x03(\x0b\x32).flwr.proto.ListRunsResponse.RunDictEntry\x12\x0b\n\x03now\x18\x02 \x01(\t\x1a?\n\x0cRunDictEntry\x12\x0b\n\x03key\x18\x01 \x01(\x04\x12\x1e\n\x05value\x18\x02 \x01(\x0b\x32\x0f.flwr.proto.Run:\x02\x38\x01\"\x18\n\x16GetLoginDetailsRequest\"\x8b\x01\n\x17GetLoginDetailsResponse\x12\x12\n\nauthn_type\x18\x01 \x01(\t\x12\x13\n\x0b\x64\x65vice_code\x18\x02 \x01(\t\x12!\n\x19verification_uri_complete\x18\x03 \x01(\t\x12\x12\n\nexpires_in\x18\x04 \x01(\x03\x12\x10\n\x08interval\x18\x05 \x01(\x03\"+\n\x14GetAuthTokensRequest\x12\x13\n\x0b\x64\x65vice_code\x18\x01 \x01(\t\"D\n\x15GetAuthTokensResponse\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x01 \x01(\t\x12\x15\n\rrefresh_token\x18\x02 \x01(\t\" \n\x0eStopRunRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"\"\n\x0fStopRunResponse\x12\x0f\n\x07success\x18\x01 \x01(\x08\"&\n\x14PullArtifactsRequest\x12\x0e\n\x06run_id\x18\x01 \x01(\x04\"1\n\x15PullArtifactsResponse\x12\x10\n\x03url\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x06\n\x04_url\"*\n\x14\x43reateNodeCliRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\"9\n\x15\x43reateNodeCliResponse\x12\x14\n\x07node_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\n\n\x08_node_id\"\'\n\x14\x44\x65leteNodeCliRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x17\n\x15\x44\x65leteNodeCliResponse\"&\n\x13ListNodesCliRequest\x12\x0f\n\x07\x64ry_run\x18\x01 \x01(\x08\"M\n\x14ListNodesCliResponse\x12(\n\nnodes_info\x18\x01 \x03(\x0b\x32\x14.flwr.proto.NodeInfo\x12\x0b\n\x03now\x18\x02 \x01(\t2\xc5\x06\n\x07\x43ontrol\x12G\n\x08StartRun\x12\x1b.flwr.proto.StartRunRequest\x1a\x1c.flwr.proto.StartRunResponse\"\x00\x12\x44\n\x07StopRun\x12\x1a.flwr.proto.StopRunRequest\x1a\x1b.flwr.proto.StopRunResponse\"\x00\x12O\n\nStreamLogs\x12\x1d.flwr.proto.StreamLogsRequest\x1a\x1e.flwr.proto.StreamLogsResponse\"\x00\x30\x01\x12G\n\x08ListRuns\x12\x1b.flwr.proto.ListRunsRequest\x1a\x1c.flwr.proto.ListRunsResponse\"\x00\x12\\\n\x0fGetLoginDetails\x12\".flwr.proto.GetLoginDetailsRequest\x1a#.flwr.proto.GetLoginDetailsResponse\"\x00\x12V\n\rGetAuthTokens\x12 .flwr.proto.GetAuthTokensRequest\x1a!.flwr.proto.GetAuthTokensResponse\"\x00\x12V\n\rPullArtifacts\x12 .flwr.proto.PullArtifactsRequest\x1a!.flwr.proto.PullArtifactsResponse\"\x00\x12V\n\rCreateNodeCli\x12 .flwr.proto.CreateNodeCliRequest\x1a!.flwr.proto.CreateNodeCliResponse\"\x00\x12V\n\rDeleteNodeCli\x12 .flwr.proto.DeleteNodeCliRequest\x1a!.flwr.proto.DeleteNodeCliResponse\"\x00\x12S\n\x0cListNodesCli\x12\x1f.flwr.proto.ListNodesCliRequest\x1a .flwr.proto.ListNodesCliResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -71,9 +71,9 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_DELETENODECLIRESPONSE']._serialized_start=1398
   _globals['_DELETENODECLIRESPONSE']._serialized_end=1421
   _globals['_LISTNODESCLIREQUEST']._serialized_start=1423
-  _globals['_LISTNODESCLIREQUEST']._serialized_end=1444
-  _globals['_LISTNODESCLIRESPONSE']._serialized_start=1446
-  _globals['_LISTNODESCLIRESPONSE']._serialized_end=1523
-  _globals['_CONTROL']._serialized_start=1526
-  _globals['_CONTROL']._serialized_end=2363
+  _globals['_LISTNODESCLIREQUEST']._serialized_end=1461
+  _globals['_LISTNODESCLIRESPONSE']._serialized_start=1463
+  _globals['_LISTNODESCLIRESPONSE']._serialized_end=1540
+  _globals['_CONTROL']._serialized_start=1543
+  _globals['_CONTROL']._serialized_end=2380
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/proto/control_pb2.pyi

@@ -279,8 +279,13 @@ global___DeleteNodeCliResponse = DeleteNodeCliResponse
 
 class ListNodesCliRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    DRY_RUN_FIELD_NUMBER: builtins.int
+    dry_run: builtins.bool
     def __init__(self,
+        *,
+        dry_run: builtins.bool = ...,
         ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["dry_run",b"dry_run"]) -> None: ...
 global___ListNodesCliRequest = ListNodesCliRequest
 
 class ListNodesCliResponse(google.protobuf.message.Message):

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/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\"\x17\n\x04Node\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\xe4\x01\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\x19\n\x11last_activated_at\x18\x05 \x01(\t\x12\x1b\n\x13last_deactivated_at\x18\x06 \x01(\t\x12\x12\n\ndeleted_at\x18\x07 \x01(\t\x12\x14\n\x0conline_until\x18\x08 \x01(\x01\x12\x1a\n\x12heartbeat_interval\x18\t \x01(\x01\x12\x12\n\npublic_key\x18\n \x01(\x0c\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\"\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')
 
 _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=291
+  _globals['_NODEINFO']._serialized_end=389
 # @@protoc_insertion_point(module_scope)

flwr_nightly-1.23.0.dev20251011/py/flwr/proto/node_pb2.pyi

@@ -0,0 +1,69 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import builtins
+import google.protobuf.descriptor
+import google.protobuf.message
+import typing
+import typing_extensions
+
+DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+
+class Node(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: builtins.int = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
+global___Node = Node
+
+class NodeInfo(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    OWNER_AID_FIELD_NUMBER: builtins.int
+    STATUS_FIELD_NUMBER: builtins.int
+    CREATED_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
+    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
+    last_activated_at: typing.Text
+    last_deactivated_at: typing.Text
+    deleted_at: typing.Text
+    online_until: builtins.float
+    heartbeat_interval: builtins.float
+    public_key: builtins.bytes
+    def __init__(self,
+        *,
+        node_id: builtins.int = ...,
+        owner_aid: typing.Text = ...,
+        status: typing.Text = ...,
+        created_at: typing.Text = ...,
+        last_activated_at: typing.Optional[typing.Text] = ...,
+        last_deactivated_at: typing.Optional[typing.Text] = ...,
+        deleted_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"]]: ...
+    @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"]]: ...
+global___NodeInfo = NodeInfo

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -63,6 +63,9 @@ def _register_nodes(
             secrets.token_bytes(32),
             heartbeat_interval=HEARTBEAT_MAX_INTERVAL,
         )
+        state.acknowledge_node_heartbeat(
+            node_id=node_id, heartbeat_interval=HEARTBEAT_MAX_INTERVAL
+        )
         nodes_mapping[node_id] = i
     log(DEBUG, "Registered %i nodes", len(nodes_mapping))
     return nodes_mapping

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/server/superlink/linkstate/in_memory_linkstate.py

@@ -19,7 +19,9 @@ import secrets
 import threading
 from bisect import bisect_right
 from collections import defaultdict
+from collections.abc import Sequence
 from dataclasses import dataclass, field
+from datetime import datetime
 from logging import ERROR, WARNING
 from typing import Optional
 
@@ -41,6 +43,7 @@ from flwr.common.typing import Run, RunStatus, UserConfig
 from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
 from flwr.server.superlink.linkstate.linkstate import LinkState
 from flwr.server.utils import validate_message
+from flwr.supercore.constant import NodeStatus
 
 from .utils import (
     check_node_availability_for_in_message,
@@ -346,17 +349,16 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             if public_key in self.registered_node_public_keys:
                 raise ValueError("Public key already in use")
 
-            # Mark the node online until now().timestamp() + heartbeat_interval
-            current = now()
+            # The node is not activated upon creation
             self.nodes[node_id] = NodeInfo(
                 node_id=node_id,
-                owner_aid=owner_aid,  # Unused for now
-                status="created",  # Unused for now
-                created_at=current.isoformat(),  # Unused for now
-                last_activated_at=current.isoformat(),  # Unused for now
-                last_deactivated_at="",  # Unused for now
-                deleted_at="",  # Unused for now
-                online_until=current.timestamp() + heartbeat_interval,
+                owner_aid=owner_aid,
+                status=NodeStatus.CREATED,
+                created_at=now().isoformat(),
+                last_activated_at=None,
+                last_deactivated_at=None,
+                deleted_at=None,
+                online_until=None,
                 heartbeat_interval=heartbeat_interval,
                 public_key=public_key,
             )
@@ -367,13 +369,18 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
     def delete_node(self, owner_aid: str, node_id: int) -> None:
         """Delete a node."""
         with self.lock:
-            if node_id not in self.nodes or owner_aid != self.nodes[node_id].owner_aid:
+            if (
+                not (node := self.nodes.get(node_id))
+                or node.status == NodeStatus.DELETED
+                or owner_aid != self.nodes[node_id].owner_aid
+            ):
                 raise ValueError(
-                    f"Node ID {node_id} not found or unauthorized deletion attempt."
+                    f"Node ID {node_id} already deleted, not found or unauthorized "
+                    "deletion attempt."
                 )
 
-            node = self.nodes.pop(node_id)
-            self.registered_node_public_keys.discard(node.public_key)
+            node.status = NodeStatus.DELETED
+            node.deleted_at = now().isoformat()
 
     def get_nodes(self, run_id: int) -> set[int]:
         """Return all available nodes.
@@ -386,19 +393,51 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         with self.lock:
             if run_id not in self.run_ids:
                 return set()
-            current_time = now().timestamp()
             return {
-                info.node_id
-                for info in self.nodes.values()
-                if info.online_until > current_time
+                node.node_id
+                for node in self.get_node_info(statuses=[NodeStatus.ONLINE])
             }
 
+    def get_node_info(
+        self,
+        *,
+        node_ids: Optional[Sequence[int]] = None,
+        owner_aids: Optional[Sequence[str]] = None,
+        statuses: Optional[Sequence[str]] = None,
+    ) -> Sequence[NodeInfo]:
+        """Retrieve information about nodes based on the specified filters."""
+        with self.lock:
+            self._check_and_tag_deactivated_nodes()
+            result = []
+            for node in self.nodes.values():
+                if node_ids is not None and node.node_id not in node_ids:
+                    continue
+                if owner_aids is not None and node.owner_aid not in owner_aids:
+                    continue
+                if statuses is not None and node.status not in statuses:
+                    continue
+                result.append(node)
+            return result
+
+    def _check_and_tag_deactivated_nodes(self) -> None:
+        with self.lock:
+            # Set all nodes of "online" status to "offline" if they've offline
+            current_ts = now().timestamp()
+            for node in self.nodes.values():
+                if node.status == NodeStatus.ONLINE:
+                    if node.online_until <= current_ts:
+                        node.status = NodeStatus.OFFLINE
+                        node.last_deactivated_at = datetime.fromtimestamp(
+                            node.online_until
+                        ).isoformat()
+
     def get_node_public_key(self, node_id: int) -> bytes:
         """Get `public_key` for the specified `node_id`."""
         with self.lock:
-            if (node := self.nodes.get(node_id)) is None:
+            if (
+                node := self.nodes.get(node_id)
+            ) is None or node.status == NodeStatus.DELETED:
                 raise ValueError(f"Node ID {node_id} not found")
-
             return node.public_key
 
     # pylint: disable=too-many-arguments,too-many-positional-arguments
@@ -606,11 +645,19 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
         the node is marked as offline.
         """
         with self.lock:
-            if info := self.nodes.get(node_id):
-                info.online_until = (
-                    now().timestamp() + HEARTBEAT_PATIENCE * heartbeat_interval
+            if (node := self.nodes.get(node_id)) and node.status != NodeStatus.DELETED:
+                current_dt = now()
+
+                # Set timestamp if the status changes
+                if node.status != NodeStatus.ONLINE:  # offline or created
+                    node.status = NodeStatus.ONLINE
+                    node.last_activated_at = current_dt.isoformat()
+
+                # Refresh `online_until` and `heartbeat_interval`
+                node.online_until = (
+                    current_dt.timestamp() + HEARTBEAT_PATIENCE * heartbeat_interval
                 )
-                info.heartbeat_interval = heartbeat_interval
+                node.heartbeat_interval = heartbeat_interval
                 return True
             return False
 

{flwr_nightly-1.23.0.dev20251009 → flwr_nightly-1.23.0.dev20251011}/py/flwr/server/superlink/linkstate/linkstate.py

@@ -16,11 +16,13 @@
 
 
 import abc
+from collections.abc import Sequence
 from typing import Optional
 
 from flwr.common import Context, Message
 from flwr.common.record import ConfigRecord
 from flwr.common.typing import Run, RunStatus, UserConfig
+from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
 from flwr.supercore.corestate import CoreState
 
 
@@ -147,6 +149,38 @@ class LinkState(CoreState):  # pylint: disable=R0904
         an empty `Set` MUST be returned.
         """
 
+    @abc.abstractmethod
+    def get_node_info(
+        self,
+        *,
+        node_ids: Optional[Sequence[int]] = None,
+        owner_aids: Optional[Sequence[str]] = None,
+        statuses: Optional[Sequence[str]] = None,
+    ) -> Sequence[NodeInfo]:
+        """Retrieve information about nodes based on the specified filters.
+
+        If a filter is set to None, it is ignored.
+        If multiple filters are provided, they are combined using AND logic.
+
+        Parameters
+        ----------
+        node_ids : Optional[Sequence[int]] (default: None)
+            Sequence of node IDs to filter by. If a sequence is provided,
+            it is treated as an OR condition.
+        owner_aids : Optional[Sequence[str]] (default: None)
+            Sequence of owner account IDs to filter by. If a sequence is provided,
+            it is treated as an OR condition.
+        statuses : Optional[Sequence[str]] (default: None)
+            Sequence of node status values (e.g., "created", "activated")
+            to filter by. If a sequence is provided, it is treated as an OR condition.
+
+        Returns
+        -------
+        Sequence[NodeInfo]
+            A sequence of NodeInfo objects representing the nodes matching
+            the specified filters.
+        """
+
     @abc.abstractmethod
     def get_node_public_key(self, node_id: int) -> bytes:
         """Get `public_key` for the specified `node_id`.