flwr-nightly 1.23.0.dev20251002__tar.gz → 1.23.0.dev20251004__tar.gz

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.23.0.dev20251002
+Version: 1.23.0.dev20251004
 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.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/app.py

@@ -47,7 +47,8 @@ app.command()(run)
 app.command()(build)
 app.command()(install)
 app.command()(log)
-app.command()(ls)
+app.command("list")(ls)
+app.command(hidden=True)(ls)
 app.command()(stop)
 app.command()(login)
 app.command()(pull)

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/auth_plugin/__init__.py

@@ -15,7 +15,7 @@
 """Flower account auth plugins."""
 
 
-from flwr.common.constant import AuthType
+from flwr.common.constant import AuthnType
 
 from .auth_plugin import CliAuthPlugin, LoginError
 from .noop_auth_plugin import NoOpCliAuthPlugin
@@ -24,7 +24,7 @@ from .oidc_cli_plugin import OidcCliPlugin
 
 def get_cli_auth_plugins() -> dict[str, type[CliAuthPlugin]]:
     """Return all CLI authentication plugins."""
-    return {AuthType.NOOP: NoOpCliAuthPlugin, AuthType.OIDC: OidcCliPlugin}
+    return {AuthnType.NOOP: NoOpCliAuthPlugin, AuthnType.OIDC: OidcCliPlugin}
 
 
 __all__ = [

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/auth_plugin/oidc_cli_plugin.py

@@ -25,9 +25,9 @@ import typer
 
 from flwr.common.constant import (
     ACCESS_TOKEN_KEY,
-    AUTH_TYPE_JSON_KEY,
+    AUTHN_TYPE_JSON_KEY,
     REFRESH_TOKEN_KEY,
-    AuthType,
+    AuthnType,
 )
 from flwr.common.typing import AccountAuthCredentials, AccountAuthLoginDetails
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
@@ -88,7 +88,7 @@ class OidcCliPlugin(CliAuthPlugin):
         self.access_token = credentials.access_token
         self.refresh_token = credentials.refresh_token
         json_dict = {
-            AUTH_TYPE_JSON_KEY: AuthType.OIDC,
+            AUTHN_TYPE_JSON_KEY: AuthnType.OIDC,
             ACCESS_TOKEN_KEY: credentials.access_token,
             REFRESH_TOKEN_KEY: credentials.refresh_token,
         }

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/login/login.py

@@ -73,7 +73,7 @@ def login(  # pylint: disable=R0914
     )
     exit_if_no_address(federation_config, "login")
 
-    # Check if `enable-user-auth` is set to `true`
+    # Check if `enable-account-auth` is set to `true`
 
     if not account_auth_enabled(federation_config):
         typer.secho(
@@ -103,13 +103,13 @@ def login(  # pylint: disable=R0914
         login_response: GetLoginDetailsResponse = stub.GetLoginDetails(login_request)
 
     # Get the auth plugin
-    auth_type = login_response.auth_type
+    authn_type = login_response.authn_type
     auth_plugin = try_obtain_cli_auth_plugin(
-        app, federation, federation_config, auth_type
+        app, federation, federation_config, authn_type
     )
     if auth_plugin is None:
         typer.secho(
-            f'❌ Authentication type "{auth_type}" not found',
+            f'❌ Authentication type "{authn_type}" not found',
             fg=typer.colors.RED,
             bold=True,
         )
@@ -117,7 +117,7 @@ def login(  # pylint: disable=R0914
 
     # Login
     details = AccountAuthLoginDetails(
-        auth_type=login_response.auth_type,
+        authn_type=login_response.authn_type,
         device_code=login_response.device_code,
         verification_uri_complete=login_response.verification_uri_complete,
         expires_in=login_response.expires_in,

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/ls.py

@@ -19,7 +19,7 @@ import io
 import json
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated, Optional, cast
 
 import typer
 from rich.console import Console
@@ -50,6 +50,7 @@ _RunListType = tuple[int, str, str, str, str, str, str, str, str]
 
 
 def ls(  # pylint: disable=too-many-locals, too-many-branches, R0913, R0917
+    ctx: typer.Context,
     app: Annotated[
         Path,
         typer.Argument(help="Path of the Flower project"),
@@ -102,6 +103,9 @@ def ls(  # pylint: disable=too-many-locals, too-many-branches, R0913, R0917
 
     All timestamps follow ISO 8601, UTC and are formatted as ``YYYY-MM-DD HH:MM:SSZ``.
     """
+    # Resolve command used (list or ls)
+    command_name = cast(str, ctx.command.name) if ctx.command else "list"
+
     suppress_output = output_format == CliOutputFormat.JSON
     captured_output = io.StringIO()
     try:
@@ -116,7 +120,7 @@ def ls(  # pylint: disable=too-many-locals, too-many-branches, R0913, R0917
         federation, federation_config = validate_federation_in_project_config(
             federation, config, federation_config_overrides
         )
-        exit_if_no_address(federation_config, "ls")
+        exit_if_no_address(federation_config, command_name)
         channel = None
         try:
             if runs and run_id is not None:
@@ -216,7 +220,7 @@ def _to_table(run_list: list[_RunListType]) -> Table:
 
     # Add columns
     table.add_column(
-        Text("Run ID", justify="center"), style="bright_white", overflow="fold"
+        Text("Run ID", justify="center"), style="bright_white", no_wrap=True
     )
     table.add_column(Text("FAB", justify="center"), style="dim white")
     table.add_column(Text("Status", justify="center"))

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/cli/utils.py

@@ -27,7 +27,7 @@ import grpc
 import typer
 
 from flwr.common.constant import (
-    AUTH_TYPE_JSON_KEY,
+    AUTHN_TYPE_JSON_KEY,
     CREDENTIALS_DIR,
     FLWR_DIR,
     NO_ACCOUNT_AUTH_MESSAGE,
@@ -234,22 +234,22 @@ def try_obtain_cli_auth_plugin(
     root_dir: Path,
     federation: str,
     federation_config: dict[str, Any],
-    auth_type: Optional[str] = None,
+    authn_type: Optional[str] = None,
 ) -> Optional[CliAuthPlugin]:
-    """Load the CLI-side account auth plugin for the given auth type."""
+    """Load the CLI-side account auth plugin for the given authn type."""
     # Check if account auth is enabled
     if not account_auth_enabled(federation_config):
         return None
 
     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
-    if auth_type is None:
+    # Get the authn type from the config if not provided
+    # authn_type will be None for all CLI commands except login
+    if authn_type is None:
         try:
             with config_path.open("r", encoding="utf-8") as file:
                 json_file = json.load(file)
-            auth_type = json_file[AUTH_TYPE_JSON_KEY]
+            authn_type = json_file[AUTHN_TYPE_JSON_KEY]
         except (FileNotFoundError, KeyError):
             typer.secho(
                 "❌ Missing or invalid credentials for account authentication. "
@@ -262,10 +262,10 @@ def try_obtain_cli_auth_plugin(
     # Retrieve auth plugin class and instantiate it
     try:
         all_plugins: dict[str, type[CliAuthPlugin]] = get_cli_auth_plugins()
-        auth_plugin_class = all_plugins[auth_type]
+        auth_plugin_class = all_plugins[authn_type]
         return auth_plugin_class(config_path)
     except KeyError:
-        typer.echo(f"❌ Unknown account authentication type: {auth_type}")
+        typer.echo(f"❌ Unknown account authentication type: {authn_type}")
         raise typer.Exit(code=1) from None
     except ImportError:
         typer.echo("❌ No authentication plugins are currently supported.")

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/common/constant.py

@@ -111,8 +111,8 @@ MAX_RETRY_DELAY = 20  # Maximum delay duration between two consecutive retries.
 
 # 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
+AUTHN_TYPE_JSON_KEY = "authn-type"  # For key name in JSON file
+AUTHN_TYPE_YAML_KEY = "authn_type"  # For key name in YAML file
 ACCESS_TOKEN_KEY = "flwr-oidc-access-token"
 REFRESH_TOKEN_KEY = "flwr-oidc-refresh-token"
 
@@ -245,13 +245,13 @@ class CliOutputFormat:
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
 
 
-class AuthType:
+class AuthnType:
     """Account authentication types."""
 
     NOOP = "noop"
     OIDC = "oidc"
 
-    def __new__(cls) -> AuthType:
+    def __new__(cls) -> AuthnType:
         """Prevent instantiation."""
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
 

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/common/typing.py

@@ -275,7 +275,7 @@ class InvalidRunStatusException(BaseException):
 class AccountAuthLoginDetails:
     """Account authentication login details."""
 
-    auth_type: str
+    authn_type: str
     device_code: str
     verification_uri_complete: str
     expires_in: int

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/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\"\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')
+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(\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)
@@ -49,31 +49,31 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _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
+  _globals['_GETLOGINDETAILSRESPONSE']._serialized_end=976
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_start=978
+  _globals['_GETAUTHTOKENSREQUEST']._serialized_end=1021
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_start=1023
+  _globals['_GETAUTHTOKENSRESPONSE']._serialized_end=1091
+  _globals['_STOPRUNREQUEST']._serialized_start=1093
+  _globals['_STOPRUNREQUEST']._serialized_end=1125
+  _globals['_STOPRUNRESPONSE']._serialized_start=1127
+  _globals['_STOPRUNRESPONSE']._serialized_end=1161
+  _globals['_PULLARTIFACTSREQUEST']._serialized_start=1163
+  _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=1444
+  _globals['_LISTNODESCLIRESPONSE']._serialized_start=1446
+  _globals['_LISTNODESCLIRESPONSE']._serialized_end=1523
+  _globals['_CONTROL']._serialized_start=1526
+  _globals['_CONTROL']._serialized_end=2363
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/proto/control_pb2.pyi

@@ -144,25 +144,25 @@ global___GetLoginDetailsRequest = GetLoginDetailsRequest
 
 class GetLoginDetailsResponse(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
-    AUTH_TYPE_FIELD_NUMBER: builtins.int
+    AUTHN_TYPE_FIELD_NUMBER: builtins.int
     DEVICE_CODE_FIELD_NUMBER: builtins.int
     VERIFICATION_URI_COMPLETE_FIELD_NUMBER: builtins.int
     EXPIRES_IN_FIELD_NUMBER: builtins.int
     INTERVAL_FIELD_NUMBER: builtins.int
-    auth_type: typing.Text
+    authn_type: typing.Text
     device_code: typing.Text
     verification_uri_complete: typing.Text
     expires_in: builtins.int
     interval: builtins.int
     def __init__(self,
         *,
-        auth_type: typing.Text = ...,
+        authn_type: typing.Text = ...,
         device_code: typing.Text = ...,
         verification_uri_complete: typing.Text = ...,
         expires_in: builtins.int = ...,
         interval: builtins.int = ...,
         ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["auth_type",b"auth_type","device_code",b"device_code","expires_in",b"expires_in","interval",b"interval","verification_uri_complete",b"verification_uri_complete"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["authn_type",b"authn_type","device_code",b"device_code","expires_in",b"expires_in","interval",b"interval","verification_uri_complete",b"verification_uri_complete"]) -> None: ...
 global___GetLoginDetailsResponse = GetLoginDetailsResponse
 
 class GetAuthTokensRequest(google.protobuf.message.Message):

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/server/app.py

@@ -38,7 +38,7 @@ from flwr.common.address import parse_address
 from flwr.common.args import try_obtain_server_certificates
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import (
-    AUTH_TYPE_YAML_KEY,
+    AUTHN_TYPE_YAML_KEY,
     AUTHZ_TYPE_YAML_KEY,
     CLIENT_OCTET,
     CONTROL_API_DEFAULT_SERVER_ADDRESS,
@@ -193,7 +193,7 @@ def run_superlink() -> None:
     # provided
     verify_tls_cert = not getattr(args, "disable_oidc_tls_cert_verification", None)
 
-    auth_plugin: Optional[ControlAuthnPlugin] = None
+    authn_plugin: Optional[ControlAuthnPlugin] = None
     authz_plugin: Optional[ControlAuthzPlugin] = None
     event_log_plugin: Optional[EventLogWriterPlugin] = None
     # Load the auth plugin if the args.account_auth_config is provided
@@ -205,7 +205,7 @@ def run_superlink() -> None:
         )
         args.account_auth_config = cfg_path
     if cfg_path := getattr(args, "account_auth_config", None):
-        auth_plugin, authz_plugin = _try_obtain_control_auth_plugins(
+        authn_plugin, authz_plugin = _try_obtain_control_auth_plugins(
             Path(cfg_path), verify_tls_cert
         )
         # Enable event logging if the args.enable_event_log is True
@@ -236,7 +236,7 @@ def run_superlink() -> None:
         objectstore_factory=objectstore_factory,
         certificates=certificates,
         is_simulation=is_simulation,
-        auth_plugin=auth_plugin,
+        authn_plugin=authn_plugin,
         authz_plugin=authz_plugin,
         event_log_plugin=event_log_plugin,
         artifact_provider=artifact_provider,
@@ -478,10 +478,21 @@ def _try_obtain_control_auth_plugins(
         except NotImplementedError:
             sys.exit(f"No {section} plugins are currently supported.")
 
+    # Warn deprecated authn_type key
+    if "authn_type" in config["authentication"]:
+        log(
+            WARN,
+            "The `authn_type` key in the authentication configuration is deprecated. "
+            "Use `%s` instead.",
+            AUTHN_TYPE_YAML_KEY,
+        )
+        authn_type = config["authentication"].pop("authn_type")
+        config["authentication"][AUTHN_TYPE_YAML_KEY] = authn_type
+
     # Load authentication plugin
-    auth_plugin = _load_plugin(
+    authn_plugin = _load_plugin(
         section="authentication",
-        yaml_key=AUTH_TYPE_YAML_KEY,
+        yaml_key=AUTHN_TYPE_YAML_KEY,
         loader=get_control_authn_plugins,
     )
 
@@ -492,7 +503,7 @@ def _try_obtain_control_auth_plugins(
         loader=get_control_authz_plugins,
     )
 
-    return auth_plugin, authz_plugin
+    return authn_plugin, authz_plugin
 
 
 def _try_obtain_control_event_log_writer_plugin() -> Optional[EventLogWriterPlugin]:

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/superlink/auth_plugin/noop_auth_plugin.py

@@ -20,7 +20,7 @@ from collections.abc import Sequence
 from pathlib import Path
 from typing import Optional, Union
 
-from flwr.common.constant import NOOP_ACCOUNT_NAME, NOOP_FLWR_AID, AuthType
+from flwr.common.constant import NOOP_ACCOUNT_NAME, NOOP_FLWR_AID, AuthnType
 from flwr.common.typing import (
     AccountAuthCredentials,
     AccountAuthLoginDetails,
@@ -50,7 +50,7 @@ class NoOpControlAuthnPlugin(ControlAuthnPlugin):
         # This allows the `flwr login` command to load the NoOp plugin accordingly,
         # which then raises a LoginError when attempting to login.
         return AccountAuthLoginDetails(
-            auth_type=AuthType.NOOP,  # No operation auth type
+            authn_type=AuthnType.NOOP,  # No operation authn type
             device_code="",
             verification_uri_complete="",
             expires_in=0,

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/superlink/servicer/control/control_account_auth_interceptor.py

@@ -55,10 +55,10 @@ class ControlAccountAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
 
     def __init__(
         self,
-        auth_plugin: ControlAuthnPlugin,
+        authn_plugin: ControlAuthnPlugin,
         authz_plugin: ControlAuthzPlugin,
     ):
-        self.auth_plugin = auth_plugin
+        self.authn_plugin = authn_plugin
         self.authz_plugin = authz_plugin
 
     def intercept_service(
@@ -97,7 +97,7 @@ class ControlAccountAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
                 return call(request, context)  # type: ignore
 
             # For other requests, check if the account is authenticated
-            valid_tokens, account_info = self.auth_plugin.validate_tokens_in_metadata(
+            valid_tokens, account_info = self.authn_plugin.validate_tokens_in_metadata(
                 metadata
             )
             if valid_tokens:
@@ -120,7 +120,7 @@ class ControlAccountAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
                 return call(request, context)  # type: ignore
 
             # If the account is not authenticated, refresh tokens
-            tokens, account_info = self.auth_plugin.refresh_tokens(metadata)
+            tokens, account_info = self.authn_plugin.refresh_tokens(metadata)
             if tokens is not None:
                 if account_info is None:
                     context.abort(

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/superlink/servicer/control/control_grpc.py

@@ -54,7 +54,7 @@ def run_control_api_grpc(
     objectstore_factory: ObjectStoreFactory,
     certificates: Optional[tuple[bytes, bytes, bytes]],
     is_simulation: bool,
-    auth_plugin: Optional[ControlAuthnPlugin] = None,
+    authn_plugin: Optional[ControlAuthnPlugin] = None,
     authz_plugin: Optional[ControlAuthzPlugin] = None,
     event_log_plugin: Optional[EventLogWriterPlugin] = None,
     artifact_provider: Optional[ArtifactProvider] = None,
@@ -69,14 +69,14 @@ def run_control_api_grpc(
         ffs_factory=ffs_factory,
         objectstore_factory=objectstore_factory,
         is_simulation=is_simulation,
-        auth_plugin=auth_plugin,
+        authn_plugin=authn_plugin,
         artifact_provider=artifact_provider,
     )
     interceptors: list[grpc.ServerInterceptor] = []
     if license_plugin is not None:
         interceptors.append(ControlLicenseInterceptor(license_plugin))
-    if auth_plugin is not None and authz_plugin is not None:
-        interceptors.append(ControlAccountAuthInterceptor(auth_plugin, authz_plugin))
+    if authn_plugin is not None and authz_plugin is not None:
+        interceptors.append(ControlAccountAuthInterceptor(authn_plugin, authz_plugin))
     # Event log interceptor must be added after account auth interceptor
     if event_log_plugin is not None:
         interceptors.append(ControlEventLogInterceptor(event_log_plugin))
@@ -90,7 +90,7 @@ def run_control_api_grpc(
         interceptors=interceptors or None,
     )
 
-    if auth_plugin is None:
+    if authn_plugin is None:
         log(INFO, "Flower Deployment Runtime: Starting Control API on %s", address)
     else:
         log(

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/py/flwr/superlink/servicer/control/control_servicer.py

@@ -83,14 +83,14 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
         ffs_factory: FfsFactory,
         objectstore_factory: ObjectStoreFactory,
         is_simulation: bool,
-        auth_plugin: Optional[ControlAuthnPlugin] = None,
+        authn_plugin: Optional[ControlAuthnPlugin] = None,
         artifact_provider: Optional[ArtifactProvider] = None,
     ) -> None:
         self.linkstate_factory = linkstate_factory
         self.ffs_factory = ffs_factory
         self.objectstore_factory = objectstore_factory
         self.is_simulation = is_simulation
-        self.auth_plugin = auth_plugin
+        self.authn_plugin = authn_plugin
         self.artifact_provider = artifact_provider
 
     def StartRun(  # pylint: disable=too-many-locals
@@ -109,7 +109,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             )
             return StartRunResponse()
 
-        flwr_aid = shared_account_info.get().flwr_aid if self.auth_plugin else None
+        flwr_aid = shared_account_info.get().flwr_aid if self.authn_plugin else None
         override_config = user_config_from_proto(request.override_config)
         federation_options = config_record_from_proto(request.federation_options)
         fab_file = request.fab.content
@@ -184,7 +184,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
 
         # If account auth is enabled, check if `flwr_aid` matches the run's `flwr_aid`
-        if self.auth_plugin:
+        if self.authn_plugin:
             flwr_aid = shared_account_info.get().flwr_aid
             _check_flwr_aid_in_run(
                 flwr_aid=flwr_aid, run=cast(Run, run), context=context
@@ -224,7 +224,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
 
         # Build a set of run IDs for `flwr ls --runs`
         if not request.HasField("run_id"):
-            if self.auth_plugin:
+            if self.authn_plugin:
                 # If no `run_id` is specified and account auth is enabled,
                 # return run IDs for the authenticated account
                 flwr_aid = shared_account_info.get().flwr_aid
@@ -250,7 +250,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
 
             # If account auth is enabled,
             # check if `flwr_aid` matches the run's `flwr_aid`
-            if self.auth_plugin:
+            if self.authn_plugin:
                 flwr_aid = shared_account_info.get().flwr_aid
                 _check_flwr_aid_in_run(
                     flwr_aid=flwr_aid, run=cast(Run, run), context=context
@@ -278,7 +278,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
 
         # If account auth is enabled, check if `flwr_aid` matches the run's `flwr_aid`
-        if self.auth_plugin:
+        if self.authn_plugin:
             flwr_aid = shared_account_info.get().flwr_aid
             _check_flwr_aid_in_run(
                 flwr_aid=flwr_aid, run=cast(Run, run), context=context
@@ -312,7 +312,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
     ) -> GetLoginDetailsResponse:
         """Start login."""
         log(INFO, "ControlServicer.GetLoginDetails")
-        if self.auth_plugin is None:
+        if self.authn_plugin is None:
             context.abort(
                 grpc.StatusCode.UNIMPLEMENTED,
                 NO_ACCOUNT_AUTH_MESSAGE,
@@ -320,14 +320,14 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             raise grpc.RpcError()  # This line is unreachable
 
         # Get login details
-        details = self.auth_plugin.get_login_details()
+        details = self.authn_plugin.get_login_details()
 
         # Return empty response if details is None
         if details is None:
             return GetLoginDetailsResponse()
 
         return GetLoginDetailsResponse(
-            auth_type=details.auth_type,
+            authn_type=details.authn_type,
             device_code=details.device_code,
             verification_uri_complete=details.verification_uri_complete,
             expires_in=details.expires_in,
@@ -339,7 +339,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
     ) -> GetAuthTokensResponse:
         """Get auth token."""
         log(INFO, "ControlServicer.GetAuthTokens")
-        if self.auth_plugin is None:
+        if self.authn_plugin is None:
             context.abort(
                 grpc.StatusCode.UNIMPLEMENTED,
                 NO_ACCOUNT_AUTH_MESSAGE,
@@ -347,7 +347,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             raise grpc.RpcError()  # This line is unreachable
 
         # Get auth tokens
-        credentials = self.auth_plugin.get_auth_tokens(request.device_code)
+        credentials = self.authn_plugin.get_auth_tokens(request.device_code)
 
         # Return empty response if credentials is None
         if credentials is None:
@@ -391,7 +391,7 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             )
 
         # Check if `flwr_aid` matches the run's `flwr_aid` when account auth is enabled
-        if self.auth_plugin:
+        if self.authn_plugin:
             flwr_aid = shared_account_info.get().flwr_aid
             _check_flwr_aid_in_run(flwr_aid=flwr_aid, run=run, context=context)
 

{flwr_nightly-1.23.0.dev20251002 → flwr_nightly-1.23.0.dev20251004}/pyproject.toml

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