flwr-nightly 1.23.0.dev20251016__tar.gz → 1.23.0.dev20251017__tar.gz

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.23.0.dev20251016
+Version: 1.23.0.dev20251017
 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.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/common/exit/exit_code.py

@@ -41,8 +41,8 @@ class ExitCode:
 
     # SuperNode-specific exit codes (300-399)
     SUPERNODE_REST_ADDRESS_INVALID = 300
-    SUPERNODE_NODE_AUTH_KEYS_REQUIRED = 301
-    SUPERNODE_NODE_AUTH_KEYS_INVALID = 302
+    # SUPERNODE_NODE_AUTH_KEYS_REQUIRED = 301 --- DELETED ---
+    SUPERNODE_NODE_AUTH_KEY_INVALID = 302
 
     # SuperExec-specific exit codes (400-499)
     SUPEREXEC_INVALID_PLUGIN_CONFIG = 400
@@ -105,14 +105,9 @@ EXIT_CODE_HELP = {
         "When using the REST API, please provide `https://` or "
         "`http://` before the server address (e.g. `http://127.0.0.1:8080`)"
     ),
-    ExitCode.SUPERNODE_NODE_AUTH_KEYS_REQUIRED: (
-        "Node authentication requires file paths to both "
-        "'--auth-supernode-private-key' and '--auth-supernode-public-key' "
-        "to be provided (providing only one of them is not sufficient)."
-    ),
-    ExitCode.SUPERNODE_NODE_AUTH_KEYS_INVALID: (
-        "Node authentication requires elliptic curve private and public key pair. "
-        "Please ensure that the file path points to a valid private/public key "
+    ExitCode.SUPERNODE_NODE_AUTH_KEY_INVALID: (
+        "Node authentication requires elliptic curve private key. "
+        "Please ensure that the file path points to a valid private key "
         "file and try again."
     ),
     # SuperExec-specific exit codes (400-499)

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/server/app.py

@@ -71,8 +71,8 @@ from flwr.superlink.artifact_provider import ArtifactProvider
 from flwr.superlink.auth_plugin import (
     ControlAuthnPlugin,
     ControlAuthzPlugin,
-    get_control_authn_plugins,
-    get_control_authz_plugins,
+    NoOpControlAuthnPlugin,
+    NoOpControlAuthzPlugin,
 )
 from flwr.superlink.servicer.control import run_control_api_grpc
 
@@ -93,6 +93,8 @@ P = TypeVar("P", ControlAuthnPlugin, ControlAuthzPlugin)
 try:
     from flwr.ee import (
         add_ee_args_superlink,
+        get_control_authn_ee_plugins,
+        get_control_authz_ee_plugins,
         get_control_event_log_writer_plugins,
         get_ee_artifact_provider,
         get_fleet_event_log_writer_plugins,
@@ -119,6 +121,26 @@ except ImportError:
             "No event log writer plugins are currently supported."
         )
 
+    def get_control_authn_ee_plugins() -> dict[str, type[ControlAuthnPlugin]]:
+        """Return all Control API authentication plugins for EE."""
+        return {}
+
+    def get_control_authz_ee_plugins() -> dict[str, type[ControlAuthzPlugin]]:
+        """Return all Control API authorization plugins for EE."""
+        return {}
+
+
+def get_control_authn_plugins() -> dict[str, type[ControlAuthnPlugin]]:
+    """Return all Control API authentication plugins."""
+    ee_dict: dict[str, type[ControlAuthnPlugin]] = get_control_authn_ee_plugins()
+    return ee_dict | {AuthnType.NOOP: NoOpControlAuthnPlugin}
+
+
+def get_control_authz_plugins() -> dict[str, type[ControlAuthzPlugin]]:
+    """Return all Control API authorization plugins."""
+    ee_dict: dict[str, type[ControlAuthzPlugin]] = get_control_authz_ee_plugins()
+    return ee_dict | {AuthzType.NOOP: NoOpControlAuthzPlugin}
+
 
 # pylint: disable=too-many-branches, too-many-locals, too-many-statements
 def run_superlink() -> None:

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/server/superlink/linkstate/in_memory_linkstate.py

@@ -441,9 +441,18 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             return node.public_key
 
     def get_node_id_by_public_key(self, public_key: bytes) -> Optional[int]:
-        """Get `node_id` for the specified `public_key`."""
+        """Get `node_id` for the specified `public_key` if it exists and is not
+        deleted."""
         with self.lock:
-            return self.node_public_key_to_node_id.get(public_key)
+            node_id = self.node_public_key_to_node_id.get(public_key)
+
+            if node_id is None:
+                return None
+
+            node_info = self.nodes[node_id]
+            if node_info.status == NodeStatus.DELETED:
+                return None
+            return node_id
 
     # pylint: disable=too-many-arguments,too-many-positional-arguments
     def create_run(

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/server/superlink/linkstate/linkstate.py

@@ -151,7 +151,7 @@ class LinkState(CoreState):  # pylint: disable=R0904
 
     @abc.abstractmethod
     def get_node_id_by_public_key(self, public_key: bytes) -> Optional[int]:
-        """Get `node_id` for the specified `public_key`.
+        """Get `node_id` for the specified `public_key` if it exists and is not deleted.
 
         Parameters
         ----------
@@ -161,7 +161,8 @@ class LinkState(CoreState):  # pylint: disable=R0904
         Returns
         -------
         Optional[int]
-            The `node_id` associated with the specified `public_key`.
+            The `node_id` associated with the specified `public_key` if it exists
+            and is not deleted; otherwise, `None`.
         """
 
     @abc.abstractmethod

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/server/superlink/linkstate/sqlite_linkstate.py

@@ -785,7 +785,8 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         return cast(bytes, rows[0]["public_key"])
 
     def get_node_id_by_public_key(self, public_key: bytes) -> Optional[int]:
-        """Get `node_id` for the specified `public_key`."""
+        """Get `node_id` for the specified `public_key` if it exists and is not
+        deleted."""
         query = "SELECT node_id FROM node WHERE public_key = ? AND status != ?;"
         rows = self.query(query, (public_key, NodeStatus.DELETED))
 

flwr_nightly-1.23.0.dev20251017/py/flwr/superlink/auth_plugin/__init__.py

@@ -0,0 +1,26 @@
+# 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.
+# ==============================================================================
+"""Account auth plugin for ControlServicer."""
+
+
+from .auth_plugin import ControlAuthnPlugin, ControlAuthzPlugin
+from .noop_auth_plugin import NoOpControlAuthnPlugin, NoOpControlAuthzPlugin
+
+__all__ = [
+    "ControlAuthnPlugin",
+    "ControlAuthzPlugin",
+    "NoOpControlAuthnPlugin",
+    "NoOpControlAuthzPlugin",
+]

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/py/flwr/supernode/cli/flower_supernode.py

@@ -22,10 +22,7 @@ from typing import Optional
 
 from cryptography.exceptions import UnsupportedAlgorithm
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.serialization import (
-    load_ssh_private_key,
-    load_ssh_public_key,
-)
+from cryptography.hazmat.primitives.serialization import load_ssh_private_key
 
 from flwr.common import EventType, event
 from flwr.common.args import try_obtain_root_certificates
@@ -188,12 +185,12 @@ def _parse_args_common(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--auth-supernode-private-key",
         type=str,
-        help="The SuperNode's private key (as a path str) to enable authentication.",
+        help="Path to the SuperNode's private key to enable authentication.",
     )
     parser.add_argument(
         "--auth-supernode-public-key",
         type=str,
-        help="The SuperNode's public key (as a path str) to enable authentication.",
+        help="This argument is deprecated and will be removed in a future release.",
     )
     parser.add_argument(
         "--node-config",
@@ -207,12 +204,9 @@ def _parse_args_common(parser: argparse.ArgumentParser) -> None:
 def _try_setup_client_authentication(
     args: argparse.Namespace,
 ) -> Optional[tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]]:
-    if not args.auth_supernode_private_key and not args.auth_supernode_public_key:
+    if not args.auth_supernode_private_key:
         return None
 
-    if not args.auth_supernode_private_key or not args.auth_supernode_public_key:
-        flwr_exit(ExitCode.SUPERNODE_NODE_AUTH_KEYS_REQUIRED)
-
     try:
         ssh_private_key = load_ssh_private_key(
             Path(args.auth_supernode_private_key).read_bytes(),
@@ -222,23 +216,15 @@ def _try_setup_client_authentication(
             raise ValueError()
     except (ValueError, UnsupportedAlgorithm):
         flwr_exit(
-            ExitCode.SUPERNODE_NODE_AUTH_KEYS_INVALID,
+            ExitCode.SUPERNODE_NODE_AUTH_KEY_INVALID,
             "Unable to parse the private key file.",
         )
 
-    try:
-        ssh_public_key = load_ssh_public_key(
-            Path(args.auth_supernode_public_key).read_bytes()
-        )
-        if not isinstance(ssh_public_key, ec.EllipticCurvePublicKey):
-            raise ValueError()
-    except (ValueError, UnsupportedAlgorithm):
-        flwr_exit(
-            ExitCode.SUPERNODE_NODE_AUTH_KEYS_INVALID,
-            "Unable to parse the public key file.",
+    if args.auth_supernode_public_key:
+        log(
+            WARN,
+            "The `--auth-supernode-public-key` flag is deprecated and will be "
+            "removed in a future release. The public key is now derived from the "
+            "private key provided by `--auth-supernode-private-key`.",
         )
-
-    return (
-        ssh_private_key,
-        ssh_public_key,
-    )
+    return ssh_private_key, ssh_private_key.public_key()

{flwr_nightly-1.23.0.dev20251016 → flwr_nightly-1.23.0.dev20251017}/pyproject.toml

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

flwr_nightly-1.23.0.dev20251016/py/flwr/superlink/auth_plugin/__init__.py

@@ -1,55 +0,0 @@
-# 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.
-# ==============================================================================
-"""Account auth plugin for ControlServicer."""
-
-
-from flwr.common.constant import AuthnType, AuthzType
-
-from .auth_plugin import ControlAuthnPlugin, ControlAuthzPlugin
-from .noop_auth_plugin import NoOpControlAuthnPlugin, NoOpControlAuthzPlugin
-
-try:
-    from flwr.ee import get_control_authn_ee_plugins, get_control_authz_ee_plugins
-except ImportError:
-
-    def get_control_authn_ee_plugins() -> dict[str, type[ControlAuthnPlugin]]:
-        """Return all Control API authentication plugins for EE."""
-        return {}
-
-    def get_control_authz_ee_plugins() -> dict[str, type[ControlAuthzPlugin]]:
-        """Return all Control API authorization plugins for EE."""
-        return {}
-
-
-def get_control_authn_plugins() -> dict[str, type[ControlAuthnPlugin]]:
-    """Return all Control API authentication plugins."""
-    ee_dict: dict[str, type[ControlAuthnPlugin]] = get_control_authn_ee_plugins()
-    return ee_dict | {AuthnType.NOOP: NoOpControlAuthnPlugin}
-
-
-def get_control_authz_plugins() -> dict[str, type[ControlAuthzPlugin]]:
-    """Return all Control API authorization plugins."""
-    ee_dict: dict[str, type[ControlAuthzPlugin]] = get_control_authz_ee_plugins()
-    return ee_dict | {AuthzType.NOOP: NoOpControlAuthzPlugin}
-
-
-__all__ = [
-    "ControlAuthnPlugin",
-    "ControlAuthzPlugin",
-    "NoOpControlAuthnPlugin",
-    "NoOpControlAuthzPlugin",
-    "get_control_authn_plugins",
-    "get_control_authz_plugins",
-]