flwr 1.24.0__py3-none-any.whl → 1.26.0__py3-none-any.whl

flwr/__init__.py

@@ -17,7 +17,7 @@
 
 import importlib
 
-from flwr.common.version import package_version as _package_version
+from flwr.supercore.version import package_version as _package_version
 
 from . import app, clientapp, serverapp
 

flwr/app/__init__.py

@@ -15,7 +15,6 @@
 """Public Flower App APIs."""
 
 
-from flwr.common.constant import MessageType
 from flwr.common.context import Context
 from flwr.common.message import Message
 from flwr.common.record import (
@@ -27,7 +26,9 @@ from flwr.common.record import (
 )
 
 from .error import Error
+from .message_type import MessageType
 from .metadata import Metadata
+from .user_config import UserConfig, UserConfigValue
 
 __all__ = [
     "Array",
@@ -40,4 +41,6 @@ __all__ = [
     "Metadata",
     "MetricRecord",
     "RecordDict",
+    "UserConfig",
+    "UserConfigValue",
 ]

flwr/app/message_type.py

@@ -0,0 +1,29 @@
+# Copyright 2026 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""MessageType constants."""
+
+from __future__ import annotations
+
+
+class MessageType:
+    """Message type."""
+
+    TRAIN = "train"
+    EVALUATE = "evaluate"
+    QUERY = "query"
+
+    def __new__(cls) -> MessageType:
+        """Prevent instantiation."""
+        raise TypeError(f"{cls.__name__} cannot be instantiated.")

flwr/app/metadata.py

@@ -19,7 +19,10 @@ from __future__ import annotations
 
 from typing import cast
 
-from ..common.constant import MessageType, MessageTypeLegacy
+from flwr.app.message_type import MessageType
+from flwr.supercore.constant import SYSTEM_MESSAGE_TYPE
+
+from ..common.constant import MessageTypeLegacy
 
 
 class Metadata:  # pylint: disable=too-many-instance-attributes
@@ -194,7 +197,7 @@ def validate_message_type(message_type: str) -> bool:
         MessageType.TRAIN,
         MessageType.EVALUATE,
         MessageType.QUERY,
-        MessageType.SYSTEM,
+        SYSTEM_MESSAGE_TYPE,
     }
     if message_type in valid_types:
         return True

flwr/app/user_config.py

@@ -0,0 +1,19 @@
+# Copyright 2026 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""UserConfig type definition."""
+
+
+UserConfigValue = bool | float | int | str
+UserConfig = dict[str, UserConfigValue]

flwr/cli/app.py

@@ -14,16 +14,19 @@
 # ==============================================================================
 """Flower command line interface."""
 
+
+from typing import Any, TypedDict
+
 import typer
 from typer.main import get_command
 
-from flwr.common.version import package_version
+from flwr.supercore.version import package_version
 
 from .app_cmd import publish as app_publish
 from .app_cmd import review as app_review
 from .build import build
+from .config import ls as config_list
 from .federation import ls as federation_list
-from .federation import show as federation_show
 from .install import install
 from .log import log
 from .login import login
@@ -36,6 +39,15 @@ from .supernode import ls as supernode_list
 from .supernode import register as supernode_register
 from .supernode import unregister as supernode_unregister
 
+
+class CommandKwargs(TypedDict):
+    """Keywords for typer command to make mypy happy."""
+
+    context_settings: dict[str, Any]
+
+
+ALLOW_EXTRAS: CommandKwargs = {"context_settings": {"allow_extra_args": True}}
+
 app = typer.Typer(
     help=typer.style(
         "flwr is the Flower command line interface.",
@@ -50,21 +62,21 @@ app.command()(new)
 app.command()(run)
 app.command()(build)
 app.command()(install)
-app.command()(log)
-app.command("list")(ls)
-app.command(hidden=True)(ls)
-app.command()(stop)
-app.command()(login)
-app.command()(pull)
+app.command(**ALLOW_EXTRAS)(log)
+app.command("list", **ALLOW_EXTRAS)(ls)
+app.command(hidden=True, **ALLOW_EXTRAS)(ls)
+app.command(**ALLOW_EXTRAS)(stop)
+app.command(**ALLOW_EXTRAS)(login)
+app.command(**ALLOW_EXTRAS)(pull)
 
 # Create supernode command group
 supernode_app = typer.Typer(help="Manage SuperNodes")
-supernode_app.command()(supernode_register)
-supernode_app.command()(supernode_unregister)
+supernode_app.command(**ALLOW_EXTRAS)(supernode_register)
+supernode_app.command(**ALLOW_EXTRAS)(supernode_unregister)
 # Make it appear as "list"
-supernode_app.command("list")(supernode_list)
+supernode_app.command("list", **ALLOW_EXTRAS)(supernode_list)
 # Hide "ls" command (left as alias)
-supernode_app.command(hidden=True)(supernode_list)
+supernode_app.command(hidden=True, **ALLOW_EXTRAS)(supernode_list)
 app.add_typer(supernode_app, name="supernode")
 
 # Create app command group
@@ -76,18 +88,24 @@ app.add_typer(app_app, name="app")
 # Create federation command group
 federation_app = typer.Typer(help="Manage Federations")
 # Make it appear as "list"
-federation_app.command("list")(federation_list)
+federation_app.command("list", **ALLOW_EXTRAS)(federation_list)
 # Hide "ls" command (left as alias)
-federation_app.command(hidden=True)(federation_list)
+federation_app.command(hidden=True, **ALLOW_EXTRAS)(federation_list)
 app.add_typer(federation_app, name="federation")
-federation_app.command()(federation_show)
+
+# Create config command group
+config_app = typer.Typer(help="Manage Configuration")
+config_app.command("list")(config_list)
+# Hide "ls" command (left as alias)
+config_app.command(hidden=True)(config_list)
+app.add_typer(config_app, name="config")
 
 typer_click_object = get_command(app)
 
 
 @app.callback(invoke_without_command=True)
-def version_callback(
-    ver: bool = typer.Option(
+def main(
+    version: bool = typer.Option(
         None,
         "-V",
         "--version",
@@ -95,8 +113,8 @@ def version_callback(
         help="Show the version and exit.",
     ),
 ) -> None:
-    """Print version."""
-    if ver:
+    """Flower CLI."""
+    if version:
         typer.secho(f"Flower version: {package_version}", fg="blue")
         raise typer.Exit()
 

flwr/cli/app_cmd/publish.py

@@ -19,12 +19,11 @@ from contextlib import ExitStack
 from pathlib import Path
 from typing import IO, Annotated
 
+import click
 import requests
 import typer
 from requests import Response
 
-from flwr.common.constant import FAB_CONFIG_FILE
-from flwr.common.version import package_version as flwr_version
 from flwr.supercore.constant import (
     APP_PUBLISH_EXCLUDE_PATTERNS,
     APP_PUBLISH_INCLUDE_PATTERNS,
@@ -34,17 +33,17 @@ from flwr.supercore.constant import (
     MAX_TOTAL_BYTES,
     MIME_MAP,
     PLATFORM_API_URL,
+    SUPERGRID_ADDRESS,
     UTF8,
 )
+from flwr.supercore.version import package_version as flwr_version
 
 from ..auth_plugin.oidc_cli_plugin import OidcCliPlugin
-from ..config_utils import (
-    load_and_validate,
-    process_loaded_project_config,
-    validate_federation_in_project_config,
+from ..utils import (
+    build_pathspec,
+    load_cli_auth_plugin_from_connection,
+    load_gitignore_patterns,
 )
-from ..constant import FEDERATION_CONFIG_HELP_MESSAGE
-from ..utils import build_pathspec, load_cli_auth_plugin, load_gitignore_patterns
 
 
 # pylint: disable=too-many-locals
@@ -55,43 +54,16 @@ def publish(
             help="Project directory to upload (defaults to current directory)."
         ),
     ] = Path("."),
-    federation: Annotated[
-        str | None,
-        typer.Argument(
-            help="Name of the federation used for login before publishing app."
-        ),
-    ] = None,
-    federation_config_overrides: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--federation-config",
-            help=FEDERATION_CONFIG_HELP_MESSAGE,
-        ),
-    ] = None,
 ) -> None:
     """Publish a Flower App to the Flower Platform.
 
     This command uploads your app project to the Flower Platform. Files are filtered
     based on .gitignore patterns and allowed file extensions.
     """
-    # Load configs
-    pyproject_path = app / FAB_CONFIG_FILE if app else None
-    config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
-    config = process_loaded_project_config(config, errors, warnings)
-    federation, federation_config = validate_federation_in_project_config(
-        federation, config, federation_config_overrides
-    )
-
-    # Load the authentication plugin
-    auth_plugin = load_cli_auth_plugin(app, federation, federation_config)
+    auth_plugin = load_cli_auth_plugin_from_connection(SUPERGRID_ADDRESS)
     auth_plugin.load_tokens()
     if not isinstance(auth_plugin, OidcCliPlugin) or not auth_plugin.access_token:
-        typer.secho(
-            "❌ Please log in before publishing app.",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1)
+        raise click.ClickException("Please log in before publishing app.")
 
     # Load token from the plugin
     token = auth_plugin.access_token
@@ -106,19 +78,17 @@ def publish(
         try:
             resp = _post_files(files_param, token)
         except requests.RequestException as err:
-            typer.secho(f"❌ Network error: {err}", fg=typer.colors.RED, err=True)
-            raise typer.Exit(code=1) from err
+            raise click.ClickException(f"Network error: {err}") from err
 
     if resp.ok:
         typer.secho("🎊 Upload successful", fg=typer.colors.GREEN, bold=True)
         return  # success
 
     # Error path:
-    msg = f"❌ Upload failed with status {resp.status_code}"
+    msg = f"Upload failed with status {resp.status_code}"
     if resp.text:
         msg += f": {resp.text}"
-    typer.secho(msg, fg=typer.colors.RED, err=True)
-    raise typer.Exit(code=1)
+    raise click.ClickException(msg)
 
 
 def _depth_of(relative_path_to_root: Path) -> int:
@@ -162,14 +132,9 @@ def _collect_file_paths(root: Path) -> list[Path]:
 
         # Check max depth
         if _depth_of(relative_path) > MAX_DIR_DEPTH:
-            typer.secho(
-                f"Error: '{path}' "
-                f"exceeds the maximum directory depth "
-                f"of {MAX_DIR_DEPTH}.",
-                fg=typer.colors.RED,
-                err=True,
+            raise click.ClickException(
+                f"'{path}' exceeds the maximum directory depth of {MAX_DIR_DEPTH}."
             )
-            raise typer.Exit(code=2)
 
         file_paths.append(path)
 
@@ -184,21 +149,15 @@ def _validate_files(file_paths: list[Path]) -> None:
     Checks file count, individual file size, total size, and UTF-8 encoding.
     """
     if len(file_paths) == 0:
-        typer.secho(
+        raise click.ClickException(
             "Nothing to upload: no files matched after applying .gitignore and "
-            "allowed extensions.",
-            fg=typer.colors.RED,
-            err=True,
+            "allowed extensions."
         )
-        raise typer.Exit(code=2)
 
     if len(file_paths) > MAX_FILE_COUNT:
-        typer.secho(
-            f"Too many files: {len(file_paths)} > allowed maximum of {MAX_FILE_COUNT}.",
-            fg=typer.colors.RED,
-            err=True,
+        raise click.ClickException(
+            f"Too many files: {len(file_paths)} > allowed maximum of {MAX_FILE_COUNT}."
         )
-        raise typer.Exit(code=2)
 
     # Calculate files size
     total_size = 0
@@ -208,34 +167,25 @@ def _validate_files(file_paths: list[Path]) -> None:
 
         # Check single file size
         if file_size > MAX_FILE_BYTES:
-            typer.secho(
+            raise click.ClickException(
                 f"File too large: '{path.as_posix()}' is {file_size:,} bytes, "
-                f"exceeding the per-file limit of {MAX_FILE_BYTES:,} bytes.",
-                fg=typer.colors.RED,
-                err=True,
+                f"exceeding the per-file limit of {MAX_FILE_BYTES:,} bytes."
             )
-            raise typer.Exit(code=2)
 
         # Ensure we can decode as UTF-8.
         try:
             path.read_text(encoding=UTF8)
         except UnicodeDecodeError as err:
-            typer.secho(
-                f"Encoding error: '{path}' is not UTF-8 encoded.",
-                fg=typer.colors.RED,
-                err=True,
-            )
-            raise typer.Exit(code=2) from err
+            raise click.ClickException(
+                f"Encoding error: '{path}' is not UTF-8 encoded."
+            ) from err
 
     # Check total files size
     if total_size > MAX_TOTAL_BYTES:
-        typer.secho(
+        raise click.ClickException(
             "Total size of all files is too large: "
-            f"{total_size:,} bytes > {MAX_TOTAL_BYTES:,} bytes.",
-            fg=typer.colors.RED,
-            err=True,
+            f"{total_size:,} bytes > {MAX_TOTAL_BYTES:,} bytes."
         )
-        raise typer.Exit(code=2)
 
     # Print validation passed prompt
     typer.echo(typer.style("✅ Validation passed", fg=typer.colors.GREEN, bold=True))

flwr/cli/app_cmd/review.py

@@ -21,6 +21,7 @@ import re
 from pathlib import Path
 from typing import Annotated
 
+import click
 import requests
 import typer
 from cryptography.exceptions import UnsupportedAlgorithm
@@ -28,24 +29,18 @@ from cryptography.hazmat.primitives.asymmetric import ed25519
 
 from flwr.common import now
 from flwr.common.config import get_flwr_dir
-from flwr.common.constant import FAB_CONFIG_FILE
-from flwr.common.version import package_version as flwr_version
-from flwr.supercore.constant import PLATFORM_API_URL
+from flwr.supercore.constant import PLATFORM_API_URL, SUPERGRID_ADDRESS
 from flwr.supercore.primitives.asymmetric_ed25519 import (
     create_message_to_sign,
     load_private_key,
     sign_message,
 )
+from flwr.supercore.utils import parse_app_spec, request_download_link
+from flwr.supercore.version import package_version as flwr_version
 
 from ..auth_plugin.oidc_cli_plugin import OidcCliPlugin
-from ..config_utils import (
-    load_and_validate,
-    process_loaded_project_config,
-    validate_federation_in_project_config,
-)
-from ..constant import FEDERATION_CONFIG_HELP_MESSAGE
 from ..install import install_from_fab
-from ..utils import load_cli_auth_plugin, parse_app_spec, request_download_link
+from ..utils import load_cli_auth_plugin_from_connection
 
 TRY_AGAIN_MESSAGE = "Please try again or press CTRL+C to abort.\n"
 
@@ -59,63 +54,38 @@ def review(
             "Version is optional; defaults to the latest."
         ),
     ],
-    app_dir_login: Annotated[
-        Path,
-        typer.Argument(
-            help="Project directory to used for login before reviewing app."
-        ),
-    ] = Path("."),
-    federation: Annotated[
-        str | None,
-        typer.Argument(
-            help="Name of the federation used for login before reviewing app."
-        ),
-    ] = None,
-    federation_config_overrides: Annotated[
-        list[str] | None,
-        typer.Option(
-            "--federation-config",
-            help=FEDERATION_CONFIG_HELP_MESSAGE,
-        ),
-    ] = None,
 ) -> None:
     """Download a FAB for <APP-ID>, unpack it for manual review, and upon confirmation
     sign & submit the review to the Platform."""
-    # Load configs
-    pyproject_path = app_dir_login / FAB_CONFIG_FILE if app_dir_login else None
-    config, errors, warnings = load_and_validate(pyproject_path, check_module=False)
-    config = process_loaded_project_config(config, errors, warnings)
-    federation, federation_config = validate_federation_in_project_config(
-        federation, config, federation_config_overrides
-    )
+    auth_plugin = load_cli_auth_plugin_from_connection(SUPERGRID_ADDRESS)
 
-    # Load the authentication plugin
-    auth_plugin = load_cli_auth_plugin(app_dir_login, federation, federation_config)
     auth_plugin.load_tokens()
     if not isinstance(auth_plugin, OidcCliPlugin) or not auth_plugin.access_token:
-        typer.secho(
-            "❌ Please log in before reviewing app.",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1)
+        raise click.ClickException("Please log in before reviewing app.")
 
     # Load token from the plugin
     token = auth_plugin.access_token
 
     # Validate app version and ID format
-    app_id, app_version = parse_app_spec(app_spec)
+    try:
+        app_id, app_version = parse_app_spec(app_spec)
+    except ValueError as e:
+        raise click.ClickException(str(e)) from e
 
     # Download FAB
     typer.secho("Downloading FAB... ", fg=typer.colors.BLUE)
     url = f"{PLATFORM_API_URL}/hub/fetch-fab"
-    presigned_url = request_download_link(app_id, app_version, url, "fab_url")
-    fab_bytes = _download_fab(presigned_url)
+    try:
+        presigned_url, _ = request_download_link(app_id, app_version, url, "fab_url")
+
+        fab_bytes = _download_fab(presigned_url)
 
-    # Unpack FAB
-    typer.secho("Unpacking FAB... ", fg=typer.colors.BLUE)
-    review_dir = _create_review_dir()
-    review_app_path = install_from_fab(fab_bytes, review_dir)
+        # Unpack FAB
+        typer.secho("Unpacking FAB... ", fg=typer.colors.BLUE)
+        review_dir = _create_review_dir()
+        review_app_path = install_from_fab(fab_bytes, review_dir)
+    except ValueError as e:
+        raise click.ClickException(str(e)) from e
 
     # Extract app version
     version_pattern = re.compile(r"\b(\d+\.\d+\.\d+)\b")
@@ -194,12 +164,7 @@ def _download_fab(url: str) -> bytes:
         r = requests.get(url, timeout=60)
         r.raise_for_status()
     except requests.RequestException as e:
-        typer.secho(
-            f"❌ FAB download failed: {e}",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(f"FAB download failed: {e}") from e
     return r.content
 
 
@@ -233,20 +198,14 @@ def _submit_review(
     try:
         resp = requests.post(url, headers=headers, json=payload, timeout=120)
     except requests.RequestException as e:
-        typer.secho(
-            f"❌ Network error while submitting review: {e}",
-            fg=typer.colors.RED,
-            err=True,
-        )
-        raise typer.Exit(code=1) from e
+        raise click.ClickException(f"Network error while submitting review: {e}") from e
 
     if resp.ok:
         typer.secho("🎊 Review submitted", fg=typer.colors.GREEN, bold=True)
         return
 
     # Error path:
-    msg = f"❌ Review submission failed (HTTP {resp.status_code})"
+    msg = f"Review submission failed (HTTP {resp.status_code})"
     if resp.text:
         msg += f": {resp.text}"
-    typer.secho(msg, fg=typer.colors.RED, err=True)
-    raise typer.Exit(code=1)
+    raise click.ClickException(msg)

flwr/cli/auth_plugin/auth_plugin.py

@@ -17,7 +17,6 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Sequence
-from pathlib import Path
 
 from flwr.common.typing import AccountAuthCredentials, AccountAuthLoginDetails
 from flwr.proto.control_pb2_grpc import ControlStub
@@ -35,8 +34,8 @@ class CliAuthPlugin(ABC):
 
     Parameters
     ----------
-    credentials_path : Path
-        Path to the Flower account's authentication credentials file.
+    host : str
+        The address of the SuperLink Control API server.
     """
 
     @staticmethod
@@ -66,20 +65,16 @@ class CliAuthPlugin(ABC):
         """
 
     @abstractmethod
-    def __init__(self, credentials_path: Path):
+    def __init__(self, host: str):
         """Abstract constructor."""
 
     @abstractmethod
     def store_tokens(self, credentials: AccountAuthCredentials) -> None:
-        """Store authentication tokens to the `credentials_path`.
-
-        The credentials, including tokens, will be saved as a JSON file
-        at `credentials_path`.
-        """
+        """Store authentication tokens to the credential store."""
 
     @abstractmethod
     def load_tokens(self) -> None:
-        """Load authentication tokens from the `credentials_path`."""
+        """Load authentication tokens from the credential store."""
 
     @abstractmethod
     def write_tokens_to_metadata(

flwr/cli/auth_plugin/noop_auth_plugin.py

@@ -16,7 +16,6 @@
 
 
 from collections.abc import Sequence
-from pathlib import Path
 
 from flwr.common.typing import AccountAuthCredentials, AccountAuthLoginDetails
 from flwr.proto.control_pb2_grpc import ControlStub
@@ -57,7 +56,7 @@ class NoOpCliAuthPlugin(CliAuthPlugin):
         """
         raise LoginError("Account authentication is not enabled on this SuperLink.")
 
-    def __init__(self, credentials_path: Path) -> None:
+    def __init__(self, host: str = "") -> None:
         pass
 
     def store_tokens(self, credentials: AccountAuthCredentials) -> None: