flwr-nightly 1.26.0.dev20260109__tar.gz → 1.26.0.dev20260112__tar.gz

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.26.0.dev20260109
+Version: 1.26.0.dev20260112
 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.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/py/flwr/cli/auth_plugin/oidc_cli_plugin.py

@@ -17,6 +17,7 @@
 
 import json
 import time
+import webbrowser
 from collections.abc import Sequence
 from pathlib import Path
 from typing import Any
@@ -75,11 +76,17 @@ class OidcCliPlugin(CliAuthPlugin):
         LoginError
             If authentication times out.
         """
+        # Prompt user to login via browser
+        webbrowser.open(login_details.verification_uri_complete)
         typer.secho(
-            "Please log into your Flower account here: "
+            "A browser window has been opened for you to "
+            "log into your Flower account.\n"
+            "If it did not open automatically, use this URL:\n"
             f"{login_details.verification_uri_complete}",
             fg=typer.colors.BLUE,
         )
+
+        # Wait for user to complete login
         start_time = time.time()
         time.sleep(login_details.interval)
 

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/py/flwr/cli/utils.py

@@ -25,6 +25,7 @@ from typing import Any, cast
 
 import grpc
 import pathspec
+import tomli
 import typer
 
 from flwr.common.constant import (
@@ -47,6 +48,9 @@ from flwr.common.grpc import (
     create_channel,
     on_channel_state_change,
 )
+from flwr.supercore.constant import FLOWER_CONFIG_FILE, SuperLinkConnectionTomlKey
+from flwr.supercore.typing import SuperLinkConnection
+from flwr.supercore.utils import get_flwr_home
 
 from .auth_plugin import CliAuthPlugin, get_cli_plugin_class
 from .cli_account_auth_interceptor import CliAccountAuthInterceptor
@@ -620,3 +624,119 @@ def validate_credentials_content(creds_path: Path) -> str:
         raise typer.Exit(code=1)
 
     return creds[ACCESS_TOKEN_KEY]
+
+
+def parse_superlink_connection(
+    conn_dict: dict[str, Any], name: str
+) -> SuperLinkConnection:
+    """Parse SuperLink connection configuration from a TOML dictionary.
+
+    Parameters
+    ----------
+    conn_dict : dict[str, Any]
+        The TOML configuration dictionary for the connection.
+    name : str
+        The name of the connection.
+
+    Returns
+    -------
+    SuperLinkConnection
+        The parsed SuperLink connection configuration.
+    """
+    # Check required fields
+    address = conn_dict.get(SuperLinkConnectionTomlKey.ADDRESS)
+    root_certificates = conn_dict.get(SuperLinkConnectionTomlKey.ROOT_CERTIFICATES)
+    insecure = conn_dict.get(SuperLinkConnectionTomlKey.INSECURE)
+    enable_account_auth = conn_dict.get(SuperLinkConnectionTomlKey.ENABLE_ACCOUNT_AUTH)
+    if not (
+        isinstance(address, str)
+        # root-certificates is optional in TOML (can be missing)
+        and isinstance(root_certificates, (str, type(None)))
+        and isinstance(insecure, bool)
+        and isinstance(enable_account_auth, bool)
+    ):
+        raise ValueError("Invalid SuperLink connection format.")
+
+    # Build and return SuperLinkConnection
+    return SuperLinkConnection(
+        name=name,
+        address=address,
+        root_certificates=root_certificates,
+        insecure=insecure,
+        enable_account_auth=enable_account_auth,
+    )
+
+
+def read_superlink_connection(
+    connection_name: str | None = None,
+) -> SuperLinkConnection | None:
+    """Read a SuperLink connection from the Flower configuration file.
+
+    Parameters
+    ----------
+    connection_name : str | None
+        The name of the SuperLink connection to load. If None, the default connection
+        will be loaded.
+
+    Returns
+    -------
+    SuperLinkConnection | None
+        The SuperLink connection, or None if the config file is missing or the
+        requested connection (or default) cannot be found.
+
+    Raises
+    ------
+    typer.Exit
+        Raised if the configuration file is corrupted, or if the requested
+        connection (or default) cannot be found.
+    """
+    config_path = get_flwr_home() / FLOWER_CONFIG_FILE
+    if not config_path.exists():
+        return None
+
+    try:
+        with config_path.open("rb") as file:
+            toml_dict = tomli.load(file)
+
+        superlink_config = toml_dict.get(SuperLinkConnectionTomlKey.SUPERLINK, {})
+
+        # Load the default SuperLink connection when not provided
+        if connection_name is None:
+            connection_name = superlink_config.get(SuperLinkConnectionTomlKey.DEFAULT)
+
+        # Exit when no connection name is available
+        if connection_name is None:
+            typer.secho(
+                "❌ No SuperLink connection set. A SuperLink connection needs to be "
+                "provided or one must be set as default in the Flower "
+                f"configuration file ({config_path}). Specify a default SuperLink "
+                "connection by adding: \n\n[superlink]\ndefault = 'connection_name'\n\n"
+                f"to the Flower configuration file ({config_path}).",
+                fg=typer.colors.RED,
+                err=True,
+            )
+            raise typer.Exit(code=1)
+
+        # Try to find the connection in the superlink dict
+        connection_config = superlink_config.get(connection_name)
+
+        if not connection_config:
+            error_msg = (
+                f"❌ {'Default ' if connection_name else ''} SuperLink connection "
+            )
+            error_msg += (
+                f"'{connection_name}' not found in Flower Config ({config_path})"
+            )
+
+            typer.secho(error_msg, fg=typer.colors.RED, err=True)
+            raise typer.Exit(code=1)
+
+        return parse_superlink_connection(connection_config, name=connection_name)
+
+    except (tomli.TOMLDecodeError, KeyError, ValueError) as err:
+        typer.secho(
+            f"❌ SuperLink connection is corrupted: {err}",
+            fg=typer.colors.RED,
+            err=True,
+        )
+        raise typer.Exit(code=1) from err

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/py/flwr/supercore/constant.py

@@ -75,3 +75,18 @@ class NodeStatus:
     def __new__(cls) -> NodeStatus:
         """Prevent instantiation."""
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
+
+
+# CLI connection configuration file name
+FLOWER_CONFIG_FILE = "config.toml"
+
+
+class SuperLinkConnectionTomlKey:
+    """TOML keys for SuperLink connection configuration."""
+
+    SUPERLINK = "superlink"
+    DEFAULT = "default"
+    ADDRESS = "address"
+    ROOT_CERTIFICATES = "root-certificates"
+    INSECURE = "insecure"
+    ENABLE_ACCOUNT_AUTH = "enable-account-auth"

flwr_nightly-1.26.0.dev20260112/py/flwr/supercore/typing.py

@@ -0,0 +1,29 @@
+# Copyright 2025 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.
+# ==============================================================================
+"""Flower type definitions for infrastructure."""
+
+
+from dataclasses import dataclass
+
+
+@dataclass
+class SuperLinkConnection:
+    """SuperLink connection configuration for CLI commands."""
+
+    name: str
+    address: str
+    root_certificates: str | None
+    insecure: bool
+    enable_account_auth: bool

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/py/flwr/supercore/utils.py

@@ -16,10 +16,13 @@
 
 
 import json
+import os
 import re
+from pathlib import Path
 
 import requests
 
+from flwr.common.constant import FLWR_DIR, FLWR_HOME
 from flwr.supercore.version import package_version as flwr_version
 
 from .constant import APP_ID_PATTERN, APP_VERSION_PATTERN
@@ -62,6 +65,17 @@ def int64_to_uint64(signed: int) -> int:
     return signed
 
 
+def get_flwr_home() -> Path:
+    """Get the Flower home directory path.
+
+    Returns FLWR_HOME environment variable if set, otherwise returns a default
+    subdirectory in the user's home directory.
+    """
+    if flwr_home := os.getenv(FLWR_HOME):
+        return Path(flwr_home)
+    return Path.home() / FLWR_DIR
+
+
 def parse_app_spec(app_spec: str) -> tuple[str, str | None]:
     """Parse app specification string into app ID and version.
 

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/py/flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -251,16 +251,18 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
             )
             raise RuntimeError("This line should never be reached.")
 
+        # Record message processing end time
+        state.record_message_processing_end(
+            message_id=request.messages_list[0].metadata.reply_to_message_id
+        )
+
         # Store Message object to descendants mapping and preregister objects
         objects_to_push: set[str] = set()
         for object_tree in request.message_object_trees:
             objects_to_push |= set(store.preregister(run_id, object_tree))
+
         # Save the message to the state
         state.store_message(message_from_proto(request.messages_list[0]))
-        # Record message processing end time
-        state.record_message_processing_end(
-            message_id=request.messages_list[0].metadata.reply_to_message_id
-        )
         return PushAppMessagesResponse(objects_to_push=objects_to_push)
 
     def SendAppHeartbeat(

{flwr_nightly-1.26.0.dev20260109 → flwr_nightly-1.26.0.dev20260112}/pyproject.toml

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