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

flwr/cli/app.py

@@ -28,9 +28,9 @@ from .new import new
 from .pull import pull
 from .run import run
 from .stop import stop
-from .supernode import create as supernode_create
-from .supernode import delete as supernode_delete
 from .supernode import ls as supernode_list
+from .supernode import register as supernode_register
+from .supernode import unregister as supernode_unregister
 
 app = typer.Typer(
     help=typer.style(
@@ -55,8 +55,8 @@ app.command()(pull)
 
 # Create supernode command group
 supernode_app = typer.Typer(help="Manage SuperNodes")
-supernode_app.command()(supernode_create)
-supernode_app.command()(supernode_delete)
+supernode_app.command()(supernode_register)
+supernode_app.command()(supernode_unregister)
 # Make it appear as "list"
 supernode_app.command("list")(supernode_list)
 # Hide "ls" command (left as alias)

flwr/cli/supernode/__init__.py

@@ -14,12 +14,12 @@
 # ==============================================================================
 """Flower command line interface `supernode` command."""
 
-from .create import create as create
-from .delete import delete as delete
 from .ls import ls as ls
+from .register import register as register
+from .unregister import unregister as unregister
 
 __all__ = [
-    "create",
-    "delete",
     "ls",
+    "register",
+    "unregister",
 ]

flwr/cli/supernode/ls.py

@@ -36,8 +36,8 @@ from flwr.common.constant import FAB_CONFIG_FILE, CliOutputFormat
 from flwr.common.date import format_timedelta, isoformat8601_utc
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
-    ListNodesCliRequest,
-    ListNodesCliResponse,
+    ListNodesRequest,
+    ListNodesResponse,
 )
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
@@ -135,9 +135,7 @@ def ls(  # pylint: disable=R0914, R0913, R0917
 def _list_nodes(stub: ControlStub, dry_run: bool) -> list[_NodeListType]:
     """List all nodes."""
     with flwr_cli_grpc_exc_handler():
-        res: ListNodesCliResponse = stub.ListNodesCli(
-            ListNodesCliRequest(dry_run=dry_run)
-        )
+        res: ListNodesResponse = stub.ListNodes(ListNodesRequest(dry_run=dry_run))
 
     return _format_nodes(list(res.nodes_info), res.now)
 
@@ -153,7 +151,9 @@ def _format_nodes(
 
     formatted_nodes: list[_NodeListType] = []
     # Add rows
-    for node in sorted(nodes_info, key=lambda x: datetime.fromisoformat(x.created_at)):
+    for node in sorted(
+        nodes_info, key=lambda x: datetime.fromisoformat(x.registered_at)
+    ):
 
         # Calculate elapsed times
         elapsed_time_activated = timedelta()
@@ -168,10 +168,10 @@ def _format_nodes(
                 node.node_id,
                 node.owner_aid,
                 node.status,
-                _format_datetime(node.created_at),
+                _format_datetime(node.registered_at),
                 _format_datetime(node.last_activated_at),
                 _format_datetime(node.last_deactivated_at),
-                _format_datetime(node.deleted_at),
+                _format_datetime(node.unregistered_at),
                 format_timedelta(elapsed_time_activated),
             )
         )
@@ -200,7 +200,7 @@ def _to_table(nodes_info: list[_NodeListType], verbose: bool) -> Table:
             _,
             last_activated_at,
             last_deactivated_at,
-            deleted_at,
+            unregistered_at,
             elapse_activated,
         ) = row
 
@@ -210,12 +210,12 @@ def _to_table(nodes_info: list[_NodeListType], verbose: bool) -> Table:
         elif status == "offline":
             status_style = "bright_yellow"
             time_at = last_deactivated_at
-        elif status == "deleted":
+        elif status == "unregistered":
             if not verbose:
                 continue
             status_style = "red"
-            time_at = deleted_at
-        elif status == "created":
+            time_at = unregistered_at
+        elif status == "registered":
             status_style = "blue"
             time_at = "N/A"
         else:

flwr/cli/supernode/{create.py → register.py}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower command line interface `supernode create` command."""
+"""Flower command line interface `supernode register` command."""
 
 
 import io
@@ -36,8 +36,8 @@ 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,
-    CreateNodeCliResponse,
+    RegisterNodeRequest,
+    RegisterNodeResponse,
 )
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.supercore.primitives.asymmetric import public_key_to_bytes, uses_nist_ec_curve
@@ -45,7 +45,7 @@ from flwr.supercore.primitives.asymmetric import public_key_to_bytes, uses_nist_
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
 
 
-def create(  # pylint: disable=R0914
+def register(  # pylint: disable=R0914
     public_key: Annotated[
         Path,
         typer.Argument(
@@ -90,7 +90,7 @@ def create(  # pylint: disable=R0914
         federation, federation_config = validate_federation_in_project_config(
             federation, config
         )
-        exit_if_no_address(federation_config, "supernode create")
+        exit_if_no_address(federation_config, "supernode register")
 
         channel = None
         try:
@@ -98,7 +98,7 @@ def create(  # pylint: disable=R0914
             channel = init_channel(app, federation_config, auth_plugin)
             stub = ControlStub(channel)  # pylint: disable=unused-variable # noqa: F841
 
-            _create_node(
+            _register_node(
                 stub=stub, public_key=public_key_bytes, output_format=output_format
             )
 
@@ -130,15 +130,16 @@ def create(  # pylint: disable=R0914
         captured_output.close()
 
 
-def _create_node(stub: ControlStub, public_key: bytes, output_format: str) -> None:
-    """Create a node."""
+def _register_node(stub: ControlStub, public_key: bytes, output_format: str) -> None:
+    """Register a node."""
     with flwr_cli_grpc_exc_handler():
-        response: CreateNodeCliResponse = stub.CreateNodeCli(
-            request=CreateNodeCliRequest(public_key=public_key)
+        response: RegisterNodeResponse = stub.RegisterNode(
+            request=RegisterNodeRequest(public_key=public_key)
         )
     if response.node_id:
         typer.secho(
-            f"✅ Node {response.node_id} created successfully.", fg=typer.colors.GREEN
+            f"✅ SuperNode {response.node_id} registered successfully.",
+            fg=typer.colors.GREEN,
         )
         if output_format == CliOutputFormat.JSON:
             run_output = json.dumps(
@@ -150,7 +151,7 @@ def _create_node(stub: ControlStub, public_key: bytes, output_format: str) -> No
             restore_output()
             Console().print_json(run_output)
     else:
-        typer.secho("❌ Node couldn't be created.", fg=typer.colors.RED)
+        typer.secho("❌ SuperNode couldn't be registered.", fg=typer.colors.RED)
 
 
 def try_load_public_key(public_key_path: Path) -> bytes:

flwr/cli/supernode/{delete.py → unregister.py}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower command line interface `supernode delete` command."""
+"""Flower command line interface `supernode unregister` command."""
 
 
 import io
@@ -31,13 +31,13 @@ from flwr.cli.config_utils import (
 )
 from flwr.common.constant import FAB_CONFIG_FILE, CliOutputFormat
 from flwr.common.logger import print_json_error, redirect_output, restore_output
-from flwr.proto.control_pb2 import DeleteNodeCliRequest  # pylint: disable=E0611
+from flwr.proto.control_pb2 import UnregisterNodeRequest  # pylint: disable=E0611
 from flwr.proto.control_pb2_grpc import ControlStub
 
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
 
 
-def delete(  # pylint: disable=R0914
+def unregister(  # pylint: disable=R0914
     node_id: Annotated[
         int,
         typer.Argument(
@@ -61,7 +61,7 @@ def delete(  # pylint: disable=R0914
         ),
     ] = CliOutputFormat.DEFAULT,
 ) -> None:
-    """Remove a SuperNode from the federation."""
+    """Unregister a SuperNode from the federation."""
     suppress_output = output_format == CliOutputFormat.JSON
     captured_output = io.StringIO()
 
@@ -78,7 +78,7 @@ def delete(  # pylint: disable=R0914
         federation, federation_config = validate_federation_in_project_config(
             federation, config
         )
-        exit_if_no_address(federation_config, "supernode remove")
+        exit_if_no_address(federation_config, "supernode unregister")
 
         channel = None
         try:
@@ -86,7 +86,7 @@ def delete(  # pylint: disable=R0914
             channel = init_channel(app, federation_config, auth_plugin)
             stub = ControlStub(channel)  # pylint: disable=unused-variable # noqa: F841
 
-            _delete_node(stub=stub, node_id=node_id, output_format=output_format)
+            _unregister_node(stub=stub, node_id=node_id, output_format=output_format)
 
         except ValueError as err:
             typer.secho(
@@ -116,15 +116,17 @@ def delete(  # pylint: disable=R0914
         captured_output.close()
 
 
-def _delete_node(
+def _unregister_node(
     stub: ControlStub,
     node_id: int,
     output_format: str,
 ) -> None:
-    """Delete a SuperNode from the federation."""
+    """Unregister a SuperNode from the federation."""
     with flwr_cli_grpc_exc_handler():
-        stub.DeleteNodeCli(request=DeleteNodeCliRequest(node_id=node_id))
-    typer.secho(f"✅ SuperNode {node_id} deleted successfully.", fg=typer.colors.GREEN)
+        stub.UnregisterNode(request=UnregisterNodeRequest(node_id=node_id))
+    typer.secho(
+        f"✅ SuperNode {node_id} unregistered successfully.", fg=typer.colors.GREEN
+    )
     if output_format == CliOutputFormat.JSON:
         run_output = json.dumps(
             {

flwr/common/exit/exit_code.py

@@ -43,6 +43,7 @@ class ExitCode:
     SUPERNODE_REST_ADDRESS_INVALID = 300
     # SUPERNODE_NODE_AUTH_KEYS_REQUIRED = 301 --- DELETED ---
     SUPERNODE_NODE_AUTH_KEY_INVALID = 302
+    SUPERNODE_STARTED_WITHOUT_TLS_BUT_NODE_AUTH_ENABLED = 303
 
     # SuperExec-specific exit codes (400-499)
     SUPEREXEC_INVALID_PLUGIN_CONFIG = 400
@@ -110,6 +111,10 @@ EXIT_CODE_HELP = {
         "Please ensure that the file path points to a valid private key "
         "file and try again."
     ),
+    ExitCode.SUPERNODE_STARTED_WITHOUT_TLS_BUT_NODE_AUTH_ENABLED: (
+        "The private key for SuperNode authentication was provided, but TLS is not "
+        "enabled. Node authentication can only be used when TLS is enabled."
+    ),
     # SuperExec-specific exit codes (400-499)
     ExitCode.SUPEREXEC_INVALID_PLUGIN_CONFIG: (
         "The YAML configuration for the SuperExec plugin is invalid."

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\"&\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')
+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\x13RegisterNodeRequest\x12\x12\n\npublic_key\x18\x01 \x01(\x0c\"8\n\x14RegisterNodeResponse\x12\x14\n\x07node_id\x18\x01 \x01(\x04H\x00\x88\x01\x01\x42\n\n\x08_node_id\"(\n\x15UnregisterNodeRequest\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\"\x18\n\x16UnregisterNodeResponse\"#\n\x10ListNodesRequest\x12\x0f\n\x07\x64ry_run\x18\x01 \x01(\x08\"J\n\x11ListNodesResponse\x12(\n\nnodes_info\x18\x01 \x03(\x0b\x32\x14.flwr.proto.NodeInfo\x12\x0b\n\x03now\x18\x02 \x01(\t2\xbc\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\x12S\n\x0cRegisterNode\x12\x1f.flwr.proto.RegisterNodeRequest\x1a .flwr.proto.RegisterNodeResponse\"\x00\x12Y\n\x0eUnregisterNode\x12!.flwr.proto.UnregisterNodeRequest\x1a\".flwr.proto.UnregisterNodeResponse\"\x00\x12J\n\tListNodes\x12\x1c.flwr.proto.ListNodesRequest\x1a\x1d.flwr.proto.ListNodesResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -62,18 +62,18 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_PULLARTIFACTSREQUEST']._serialized_end=1201
   _globals['_PULLARTIFACTSRESPONSE']._serialized_start=1203
   _globals['_PULLARTIFACTSRESPONSE']._serialized_end=1252
-  _globals['_CREATENODECLIREQUEST']._serialized_start=1254
-  _globals['_CREATENODECLIREQUEST']._serialized_end=1296
-  _globals['_CREATENODECLIRESPONSE']._serialized_start=1298
-  _globals['_CREATENODECLIRESPONSE']._serialized_end=1355
-  _globals['_DELETENODECLIREQUEST']._serialized_start=1357
-  _globals['_DELETENODECLIREQUEST']._serialized_end=1396
-  _globals['_DELETENODECLIRESPONSE']._serialized_start=1398
-  _globals['_DELETENODECLIRESPONSE']._serialized_end=1421
-  _globals['_LISTNODESCLIREQUEST']._serialized_start=1423
-  _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
+  _globals['_REGISTERNODEREQUEST']._serialized_start=1254
+  _globals['_REGISTERNODEREQUEST']._serialized_end=1295
+  _globals['_REGISTERNODERESPONSE']._serialized_start=1297
+  _globals['_REGISTERNODERESPONSE']._serialized_end=1353
+  _globals['_UNREGISTERNODEREQUEST']._serialized_start=1355
+  _globals['_UNREGISTERNODEREQUEST']._serialized_end=1395
+  _globals['_UNREGISTERNODERESPONSE']._serialized_start=1397
+  _globals['_UNREGISTERNODERESPONSE']._serialized_end=1421
+  _globals['_LISTNODESREQUEST']._serialized_start=1423
+  _globals['_LISTNODESREQUEST']._serialized_end=1458
+  _globals['_LISTNODESRESPONSE']._serialized_start=1460
+  _globals['_LISTNODESRESPONSE']._serialized_end=1534
+  _globals['_CONTROL']._serialized_start=1537
+  _globals['_CONTROL']._serialized_end=2365
 # @@protoc_insertion_point(module_scope)

flwr/proto/control_pb2.pyi

@@ -236,7 +236,7 @@ class PullArtifactsResponse(google.protobuf.message.Message):
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_url",b"_url"]) -> typing.Optional[typing_extensions.Literal["url"]]: ...
 global___PullArtifactsResponse = PullArtifactsResponse
 
-class CreateNodeCliRequest(google.protobuf.message.Message):
+class RegisterNodeRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     PUBLIC_KEY_FIELD_NUMBER: builtins.int
     public_key: builtins.bytes
@@ -245,9 +245,9 @@ class CreateNodeCliRequest(google.protobuf.message.Message):
         public_key: builtins.bytes = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["public_key",b"public_key"]) -> None: ...
-global___CreateNodeCliRequest = CreateNodeCliRequest
+global___RegisterNodeRequest = RegisterNodeRequest
 
-class CreateNodeCliResponse(google.protobuf.message.Message):
+class RegisterNodeResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODE_ID_FIELD_NUMBER: builtins.int
     node_id: builtins.int
@@ -258,9 +258,9 @@ class CreateNodeCliResponse(google.protobuf.message.Message):
     def HasField(self, field_name: typing_extensions.Literal["_node_id",b"_node_id","node_id",b"node_id"]) -> builtins.bool: ...
     def ClearField(self, field_name: typing_extensions.Literal["_node_id",b"_node_id","node_id",b"node_id"]) -> None: ...
     def WhichOneof(self, oneof_group: typing_extensions.Literal["_node_id",b"_node_id"]) -> typing.Optional[typing_extensions.Literal["node_id"]]: ...
-global___CreateNodeCliResponse = CreateNodeCliResponse
+global___RegisterNodeResponse = RegisterNodeResponse
 
-class DeleteNodeCliRequest(google.protobuf.message.Message):
+class UnregisterNodeRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODE_ID_FIELD_NUMBER: builtins.int
     node_id: builtins.int
@@ -269,15 +269,15 @@ class DeleteNodeCliRequest(google.protobuf.message.Message):
         node_id: builtins.int = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["node_id",b"node_id"]) -> None: ...
-global___DeleteNodeCliRequest = DeleteNodeCliRequest
+global___UnregisterNodeRequest = UnregisterNodeRequest
 
-class DeleteNodeCliResponse(google.protobuf.message.Message):
+class UnregisterNodeResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     def __init__(self,
         ) -> None: ...
-global___DeleteNodeCliResponse = DeleteNodeCliResponse
+global___UnregisterNodeResponse = UnregisterNodeResponse
 
-class ListNodesCliRequest(google.protobuf.message.Message):
+class ListNodesRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     DRY_RUN_FIELD_NUMBER: builtins.int
     dry_run: builtins.bool
@@ -286,9 +286,9 @@ class ListNodesCliRequest(google.protobuf.message.Message):
         dry_run: builtins.bool = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["dry_run",b"dry_run"]) -> None: ...
-global___ListNodesCliRequest = ListNodesCliRequest
+global___ListNodesRequest = ListNodesRequest
 
-class ListNodesCliResponse(google.protobuf.message.Message):
+class ListNodesResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
     NODES_INFO_FIELD_NUMBER: builtins.int
     NOW_FIELD_NUMBER: builtins.int
@@ -301,4 +301,4 @@ class ListNodesCliResponse(google.protobuf.message.Message):
         now: typing.Text = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions.Literal["nodes_info",b"nodes_info","now",b"now"]) -> None: ...
-global___ListNodesCliResponse = ListNodesCliResponse
+global___ListNodesResponse = ListNodesResponse

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