flwr-nightly 1.23.0.dev20251001__py3-none-any.whl → 1.23.0.dev20251002__py3-none-any.whl

flwr/cli/utils.py

@@ -30,8 +30,8 @@ from flwr.common.constant import (
     AUTH_TYPE_JSON_KEY,
     CREDENTIALS_DIR,
     FLWR_DIR,
+    NO_ACCOUNT_AUTH_MESSAGE,
     NO_ARTIFACT_PROVIDER_MESSAGE,
-    NO_USER_AUTH_MESSAGE,
     PULL_UNFINISHED_RUN_MESSAGE,
     RUN_ID_NOT_FOUND_MESSAGE,
 )
@@ -42,7 +42,7 @@ from flwr.common.grpc import (
 )
 
 from .auth_plugin import CliAuthPlugin, get_cli_auth_plugins
-from .cli_user_auth_interceptor import CliUserAuthInterceptor
+from .cli_account_auth_interceptor import CliAccountAuthInterceptor
 from .config_utils import validate_certificate_in_federation_config
 
 
@@ -165,8 +165,8 @@ def get_sha256_hash(file_path_or_int: Union[Path, int]) -> str:
     return sha256.hexdigest()
 
 
-def get_user_auth_config_path(root_dir: Path, federation: str) -> Path:
-    """Return the path to the user auth config file.
+def get_account_auth_config_path(root_dir: Path, federation: str) -> Path:
+    """Return the path to the account auth config file.
 
     Additionally, a `.gitignore` file will be created in the Flower directory to
     include the `.credentials` folder to be excluded from git. If the `.gitignore`
@@ -216,18 +216,32 @@ def get_user_auth_config_path(root_dir: Path, federation: str) -> Path:
     return credentials_dir / f"{federation}.json"
 
 
+def account_auth_enabled(federation_config: dict[str, Any]) -> bool:
+    """Check if account authentication is enabled in the federation config."""
+    enabled: bool = federation_config.get("enable-user-auth", False)
+    enabled |= federation_config.get("enable-account-auth", False)
+    if "enable-user-auth" in federation_config:
+        typer.secho(
+            "`enable-user-auth` is deprecated and will be removed in a future "
+            "release. Please use `enable-account-auth` instead.",
+            fg=typer.colors.YELLOW,
+            bold=True,
+        )
+    return enabled
+
+
 def try_obtain_cli_auth_plugin(
     root_dir: Path,
     federation: str,
     federation_config: dict[str, Any],
     auth_type: Optional[str] = None,
 ) -> Optional[CliAuthPlugin]:
-    """Load the CLI-side user auth plugin for the given auth type."""
-    # Check if user auth is enabled
-    if not federation_config.get("enable-user-auth", False):
+    """Load the CLI-side account auth plugin for the given auth type."""
+    # Check if account auth is enabled
+    if not account_auth_enabled(federation_config):
         return None
 
-    config_path = get_user_auth_config_path(root_dir, federation)
+    config_path = get_account_auth_config_path(root_dir, federation)
 
     # Get the auth type from the config if not provided
     # auth_type will be None for all CLI commands except login
@@ -238,7 +252,7 @@ def try_obtain_cli_auth_plugin(
             auth_type = json_file[AUTH_TYPE_JSON_KEY]
         except (FileNotFoundError, KeyError):
             typer.secho(
-                "❌ Missing or invalid credentials for user authentication. "
+                "❌ Missing or invalid credentials for account authentication. "
                 "Please run `flwr login` to authenticate.",
                 fg=typer.colors.RED,
                 bold=True,
@@ -251,7 +265,7 @@ def try_obtain_cli_auth_plugin(
         auth_plugin_class = all_plugins[auth_type]
         return auth_plugin_class(config_path)
     except KeyError:
-        typer.echo(f"❌ Unknown user authentication type: {auth_type}")
+        typer.echo(f"❌ Unknown account authentication type: {auth_type}")
         raise typer.Exit(code=1) from None
     except ImportError:
         typer.echo("❌ No authentication plugins are currently supported.")
@@ -266,13 +280,13 @@ def init_channel(
         app, federation_config
     )
 
-    # Initialize the CLI-side user auth interceptor
+    # Initialize the CLI-side account auth interceptor
     interceptors: list[grpc.UnaryUnaryClientInterceptor] = []
     if auth_plugin is not None:
         # Check if TLS is enabled. If not, raise an error
         if insecure:
             typer.secho(
-                "❌ User authentication requires TLS to be enabled. "
+                "❌ Account authentication requires TLS to be enabled. "
                 "Remove `insecure = true` from the federation configuration.",
                 fg=typer.colors.RED,
                 bold=True,
@@ -280,7 +294,7 @@ def init_channel(
             raise typer.Exit(code=1)
 
         auth_plugin.load_tokens()
-        interceptors.append(CliUserAuthInterceptor(auth_plugin))
+        interceptors.append(CliAccountAuthInterceptor(auth_plugin))
 
     # Create the gRPC channel
     channel = create_channel(
@@ -314,9 +328,9 @@ def flwr_cli_grpc_exc_handler() -> Iterator[None]:
             )
             raise typer.Exit(code=1) from None
         if e.code() == grpc.StatusCode.UNIMPLEMENTED:
-            if e.details() == NO_USER_AUTH_MESSAGE:  # pylint: disable=E1101
+            if e.details() == NO_ACCOUNT_AUTH_MESSAGE:  # pylint: disable=E1101
                 typer.secho(
-                    "❌ User authentication is not enabled on this SuperLink.",
+                    "❌ Account authentication is not enabled on this SuperLink.",
                     fg=typer.colors.RED,
                     bold=True,
                 )

flwr/client/__init__.py

@@ -15,10 +15,11 @@
 """Flower client."""
 
 
+from flwr.clientapp import ClientApp
+
 from ..compat.client.app import start_client as start_client  # Deprecated
 from ..compat.client.app import start_numpy_client as start_numpy_client  # Deprecated
 from .client import Client as Client
-from .client_app import ClientApp as ClientApp
 from .numpy_client import NumPyClient as NumPyClient
 from .typing import ClientFn as ClientFn
 from .typing import ClientFnExt as ClientFnExt

flwr/clientapp/__init__.py

@@ -15,9 +15,8 @@
 """Public Flower ClientApp APIs."""
 
 
-from flwr.client.client_app import ClientApp
-
 from . import mod
+from .client_app import ClientApp as ClientApp
 
 __all__ = [
     "ClientApp",

flwr/{client/clientapp → clientapp}/utils.py

@@ -19,7 +19,7 @@ from logging import DEBUG
 from pathlib import Path
 from typing import Callable, Optional
 
-from flwr.client.client_app import ClientApp, LoadClientAppError
+from flwr.clientapp.client_app import ClientApp, LoadClientAppError
 from flwr.common.config import (
     get_flwr_dir,
     get_metadata_from_config,

flwr/common/constant.py

@@ -109,14 +109,14 @@ LOG_UPLOAD_INTERVAL = 0.2  # Minimum interval between two log uploads
 # Retry configurations
 MAX_RETRY_DELAY = 20  # Maximum delay duration between two consecutive retries.
 
-# Constants for user authentication
+# Constants for account authentication
 CREDENTIALS_DIR = ".credentials"
 AUTH_TYPE_JSON_KEY = "auth-type"  # For key name in JSON file
 AUTH_TYPE_YAML_KEY = "auth_type"  # For key name in YAML file
 ACCESS_TOKEN_KEY = "flwr-oidc-access-token"
 REFRESH_TOKEN_KEY = "flwr-oidc-refresh-token"
 
-# Constants for user authorization
+# Constants for account authorization
 AUTHZ_TYPE_YAML_KEY = "authz_type"  # For key name in YAML file
 
 # Constants for node authentication
@@ -154,7 +154,7 @@ PULL_BACKOFF_CAP = 10  # Maximum backoff time for pulling objects
 
 # ControlServicer constants
 RUN_ID_NOT_FOUND_MESSAGE = "Run ID not found"
-NO_USER_AUTH_MESSAGE = "ControlServicer initialized without user authentication"
+NO_ACCOUNT_AUTH_MESSAGE = "ControlServicer initialized without account authentication"
 NO_ARTIFACT_PROVIDER_MESSAGE = "ControlServicer initialized without artifact provider"
 PULL_UNFINISHED_RUN_MESSAGE = "Cannot pull artifacts for an unfinished run"
 
@@ -246,8 +246,9 @@ class CliOutputFormat:
 
 
 class AuthType:
-    """User authentication types."""
+    """Account authentication types."""
 
+    NOOP = "noop"
     OIDC = "oidc"
 
     def __new__(cls) -> AuthType:
@@ -281,3 +282,8 @@ class ExecPluginType:
         """Return all SuperExec plugin types."""
         # Filter all constants (uppercase) of the class
         return [v for k, v in vars(ExecPluginType).items() if k.isupper()]
+
+
+# Constants for No-op auth plugins
+NOOP_FLWR_AID = "sys_noauth"
+NOOP_ACCOUNT_NAME = "sys_noauth"

flwr/common/typing.py

@@ -270,10 +270,10 @@ class InvalidRunStatusException(BaseException):
         self.message = message
 
 
-# OIDC user authentication types
+# OIDC account authentication types
 @dataclass
-class UserAuthLoginDetails:
-    """User authentication login details."""
+class AccountAuthLoginDetails:
+    """Account authentication login details."""
 
     auth_type: str
     device_code: str
@@ -283,8 +283,8 @@ class UserAuthLoginDetails:
 
 
 @dataclass
-class UserAuthCredentials:
-    """User authentication tokens."""
+class AccountAuthCredentials:
+    """Account authentication tokens."""
 
     access_token: str
     refresh_token: str

flwr/compat/client/app.py

@@ -28,11 +28,11 @@ from flwr.app.error import Error
 from flwr.cli.config_utils import get_fab_metadata
 from flwr.cli.install import install_from_fab
 from flwr.client.client import Client
-from flwr.client.client_app import ClientApp, LoadClientAppError
 from flwr.client.message_handler.message_handler import handle_control_message
 from flwr.client.numpy_client import NumPyClient
 from flwr.client.run_info_store import DeprecatedRunInfoStore
 from flwr.client.typing import ClientFnExt
+from flwr.clientapp.client_app import ClientApp, LoadClientAppError
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, Context, EventType, Message, event
 from flwr.common.address import parse_address
 from flwr.common.constant import (

flwr/proto/control_pb2.py

@@ -16,9 +16,10 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 from flwr.proto import recorddict_pb2 as flwr_dot_proto_dot_recorddict__pb2
 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\"\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\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_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_url2\xc0\x04\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\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\"\x8a\x01\n\x17GetLoginDetailsResponse\x12\x11\n\tauth_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(\t\"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')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -29,38 +30,50 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_options = b'8\001'
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._options = None
   _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_options = b'8\001'
-  _globals['_STARTRUNREQUEST']._serialized_start=142
-  _globals['_STARTRUNREQUEST']._serialized_end=392
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=319
-  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=392
-  _globals['_STARTRUNRESPONSE']._serialized_start=394
-  _globals['_STARTRUNRESPONSE']._serialized_end=444
-  _globals['_STREAMLOGSREQUEST']._serialized_start=446
-  _globals['_STREAMLOGSREQUEST']._serialized_end=506
-  _globals['_STREAMLOGSRESPONSE']._serialized_start=508
-  _globals['_STREAMLOGSRESPONSE']._serialized_end=574
-  _globals['_LISTRUNSREQUEST']._serialized_start=576
-  _globals['_LISTRUNSREQUEST']._serialized_end=625
-  _globals['_LISTRUNSRESPONSE']._serialized_start=628
-  _globals['_LISTRUNSRESPONSE']._serialized_end=785
-  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_start=722
-  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_end=785
-  _globals['_GETLOGINDETAILSREQUEST']._serialized_start=787
-  _globals['_GETLOGINDETAILSREQUEST']._serialized_end=811
-  _globals['_GETLOGINDETAILSRESPONSE']._serialized_start=814
-  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=952
-  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=954
-  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=997
-  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=999
-  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1067
-  _globals['_STOPRUNREQUEST']._serialized_start=1069
-  _globals['_STOPRUNREQUEST']._serialized_end=1101
-  _globals['_STOPRUNRESPONSE']._serialized_start=1103
-  _globals['_STOPRUNRESPONSE']._serialized_end=1137
-  _globals['_PULLARTIFACTSREQUEST']._serialized_start=1139
-  _globals['_PULLARTIFACTSREQUEST']._serialized_end=1177
-  _globals['_PULLARTIFACTSRESPONSE']._serialized_start=1179
-  _globals['_PULLARTIFACTSRESPONSE']._serialized_end=1228
-  _globals['_CONTROL']._serialized_start=1231
-  _globals['_CONTROL']._serialized_end=1807
+  _globals['_STARTRUNREQUEST']._serialized_start=165
+  _globals['_STARTRUNREQUEST']._serialized_end=415
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_start=342
+  _globals['_STARTRUNREQUEST_OVERRIDECONFIGENTRY']._serialized_end=415
+  _globals['_STARTRUNRESPONSE']._serialized_start=417
+  _globals['_STARTRUNRESPONSE']._serialized_end=467
+  _globals['_STREAMLOGSREQUEST']._serialized_start=469
+  _globals['_STREAMLOGSREQUEST']._serialized_end=529
+  _globals['_STREAMLOGSRESPONSE']._serialized_start=531
+  _globals['_STREAMLOGSRESPONSE']._serialized_end=597
+  _globals['_LISTRUNSREQUEST']._serialized_start=599
+  _globals['_LISTRUNSREQUEST']._serialized_end=648
+  _globals['_LISTRUNSRESPONSE']._serialized_start=651
+  _globals['_LISTRUNSRESPONSE']._serialized_end=808
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_start=745
+  _globals['_LISTRUNSRESPONSE_RUNDICTENTRY']._serialized_end=808
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_start=810
+  _globals['_GETLOGINDETAILSREQUEST']._serialized_end=834
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_start=837
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=975
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=977
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=1020
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=1022
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1090
+  _globals['_STOPRUNREQUEST']._serialized_start=1092
+  _globals['_STOPRUNREQUEST']._serialized_end=1124
+  _globals['_STOPRUNRESPONSE']._serialized_start=1126
+  _globals['_STOPRUNRESPONSE']._serialized_end=1160
+  _globals['_PULLARTIFACTSREQUEST']._serialized_start=1162
+  _globals['_PULLARTIFACTSREQUEST']._serialized_end=1200
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_start=1202
+  _globals['_PULLARTIFACTSRESPONSE']._serialized_end=1251
+  _globals['_CREATENODECLIREQUEST']._serialized_start=1253
+  _globals['_CREATENODECLIREQUEST']._serialized_end=1295
+  _globals['_CREATENODECLIRESPONSE']._serialized_start=1297
+  _globals['_CREATENODECLIRESPONSE']._serialized_end=1354
+  _globals['_DELETENODECLIREQUEST']._serialized_start=1356
+  _globals['_DELETENODECLIREQUEST']._serialized_end=1395
+  _globals['_DELETENODECLIRESPONSE']._serialized_start=1397
+  _globals['_DELETENODECLIRESPONSE']._serialized_end=1420
+  _globals['_LISTNODESCLIREQUEST']._serialized_start=1422
+  _globals['_LISTNODESCLIREQUEST']._serialized_end=1443
+  _globals['_LISTNODESCLIRESPONSE']._serialized_start=1445
+  _globals['_LISTNODESCLIRESPONSE']._serialized_end=1522
+  _globals['_CONTROL']._serialized_start=1525
+  _globals['_CONTROL']._serialized_end=2362
 # @@protoc_insertion_point(module_scope)

flwr/proto/control_pb2.pyi

@@ -4,6 +4,7 @@ isort:skip_file
 """
 import builtins
 import flwr.proto.fab_pb2
+import flwr.proto.node_pb2
 import flwr.proto.recorddict_pb2
 import flwr.proto.run_pb2
 import flwr.proto.transport_pb2
@@ -234,3 +235,65 @@ class PullArtifactsResponse(google.protobuf.message.Message):
     def ClearField(self, field_name: typing_extensions.Literal["_url",b"_url","url",b"url"]) -> None: ...
     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):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    PUBLIC_KEY_FIELD_NUMBER: builtins.int
+    public_key: typing.Text
+    def __init__(self,
+        *,
+        public_key: typing.Text = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["public_key",b"public_key"]) -> None: ...
+global___CreateNodeCliRequest = CreateNodeCliRequest
+
+class CreateNodeCliResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODE_ID_FIELD_NUMBER: builtins.int
+    node_id: builtins.int
+    def __init__(self,
+        *,
+        node_id: typing.Optional[builtins.int] = ...,
+        ) -> None: ...
+    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
+
+class DeleteNodeCliRequest(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___DeleteNodeCliRequest = DeleteNodeCliRequest
+
+class DeleteNodeCliResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___DeleteNodeCliResponse = DeleteNodeCliResponse
+
+class ListNodesCliRequest(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    def __init__(self,
+        ) -> None: ...
+global___ListNodesCliRequest = ListNodesCliRequest
+
+class ListNodesCliResponse(google.protobuf.message.Message):
+    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    NODES_INFO_FIELD_NUMBER: builtins.int
+    NOW_FIELD_NUMBER: builtins.int
+    @property
+    def nodes_info(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[flwr.proto.node_pb2.NodeInfo]: ...
+    now: typing.Text
+    def __init__(self,
+        *,
+        nodes_info: typing.Optional[typing.Iterable[flwr.proto.node_pb2.NodeInfo]] = ...,
+        now: typing.Text = ...,
+        ) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["nodes_info",b"nodes_info","now",b"now"]) -> None: ...
+global___ListNodesCliResponse = ListNodesCliResponse

flwr/proto/control_pb2_grpc.py

@@ -49,6 +49,21 @@ 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.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.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,
+                )
 
 
 class ControlServicer(object):
@@ -103,6 +118,27 @@ class ControlServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def CreateNodeCli(self, request, context):
+        """Add 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
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ListNodesCli(self, request, context):
+        """List SuperNodes
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_ControlServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -141,6 +177,21 @@ 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,
+            ),
+            '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,
+            ),
+            '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,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'flwr.proto.Control', rpc_method_handlers)
@@ -269,3 +320,54 @@ class Control(object):
             flwr_dot_proto_dot_control__pb2.PullArtifactsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def CreateNodeCli(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            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,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def DeleteNodeCli(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            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,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def ListNodesCli(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            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,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/control_pb2_grpc.pyi

@@ -44,6 +44,21 @@ 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]
+    """List SuperNodes"""
+
 
 class ControlServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
@@ -102,5 +117,29 @@ class ControlServicer(metaclass=abc.ABCMeta):
         """Pull artifacts generated during a run (flwr pull)"""
         pass
 
+    @abc.abstractmethod
+    def CreateNodeCli(self,
+        request: flwr.proto.control_pb2.CreateNodeCliRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.control_pb2.CreateNodeCliResponse:
+        """Add SuperNode"""
+        pass
+
+    @abc.abstractmethod
+    def DeleteNodeCli(self,
+        request: flwr.proto.control_pb2.DeleteNodeCliRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.control_pb2.DeleteNodeCliResponse:
+        """Remove SuperNode"""
+        pass
+
+    @abc.abstractmethod
+    def ListNodesCli(self,
+        request: flwr.proto.control_pb2.ListNodesCliRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.control_pb2.ListNodesCliResponse:
+        """List SuperNodes"""
+        pass
+
 
 def add_ControlServicer_to_server(servicer: ControlServicer, server: grpc.Server) -> None: ...

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\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\"\xb6\x01\n\x08NodeInfo\x12\x0f\n\x07node_id\x18\x01 \x01(\x04\x12\x11\n\towner_aid\x18\x02 \x01(\t\x12\x12\n\ncreated_at\x18\x03 \x01(\t\x12\x14\n\x0c\x61\x63tivated_at\x18\x04 \x01(\t\x12\x16\n\x0e\x64\x65\x61\x63tivated_at\x18\x05 \x01(\t\x12\x12\n\ndeleted_at\x18\x06 \x01(\t\x12\x14\n\x0conline_until\x18\x07 \x01(\x02\x12\x1a\n\x12heartbeat_interval\x18\x08 \x01(\x02\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -23,4 +23,6 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_NODE']._serialized_start=37
   _globals['_NODE']._serialized_end=60
+  _globals['_NODEINFO']._serialized_start=63
+  _globals['_NODEINFO']._serialized_end=245
 # @@protoc_insertion_point(module_scope)