flwr-nightly 1.23.0.dev20250925__tar.gz → 1.23.0.dev20250930__tar.gz

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/PKG-INFO

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

@@ -15,9 +15,9 @@
 """Flower user auth plugins."""
 
 
-from flwr.common.auth_plugin import CliAuthPlugin
 from flwr.common.constant import AuthType
 
+from .auth_plugin import CliAuthPlugin
 from .oidc_cli_plugin import OidcCliPlugin
 
 
@@ -27,5 +27,7 @@ def get_cli_auth_plugins() -> dict[str, type[CliAuthPlugin]]:
 
 
 __all__ = [
+    "CliAuthPlugin",
+    "OidcCliPlugin",
     "get_cli_auth_plugins",
 ]

flwr_nightly-1.23.0.dev20250930/py/flwr/cli/auth_plugin/auth_plugin.py

@@ -0,0 +1,83 @@
+# 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.
+# ==============================================================================
+"""Abstract classes for Flower User Auth Plugin."""
+
+
+from abc import ABC, abstractmethod
+from collections.abc import Sequence
+from pathlib import Path
+from typing import Optional, Union
+
+from flwr.common.typing import UserAuthCredentials, UserAuthLoginDetails
+from flwr.proto.control_pb2_grpc import ControlStub
+
+
+class CliAuthPlugin(ABC):
+    """Abstract Flower Auth Plugin class for CLI.
+
+    Parameters
+    ----------
+    credentials_path : Path
+        Path to the user's authentication credentials file.
+    """
+
+    @staticmethod
+    @abstractmethod
+    def login(
+        login_details: UserAuthLoginDetails,
+        control_stub: ControlStub,
+    ) -> UserAuthCredentials:
+        """Authenticate the user and retrieve authentication credentials.
+
+        Parameters
+        ----------
+        login_details : UserAuthLoginDetails
+            An object containing the user's login details.
+        control_stub : ControlStub
+            A stub for executing RPC calls to the server.
+
+        Returns
+        -------
+        UserAuthCredentials
+            The authentication credentials obtained after login.
+        """
+
+    @abstractmethod
+    def __init__(self, credentials_path: Path):
+        """Abstract constructor."""
+
+    @abstractmethod
+    def store_tokens(self, credentials: UserAuthCredentials) -> None:
+        """Store authentication tokens to the `credentials_path`.
+
+        The credentials, including tokens, will be saved as a JSON file
+        at `credentials_path`.
+        """
+
+    @abstractmethod
+    def load_tokens(self) -> None:
+        """Load authentication tokens from the `credentials_path`."""
+
+    @abstractmethod
+    def write_tokens_to_metadata(
+        self, metadata: Sequence[tuple[str, Union[str, bytes]]]
+    ) -> Sequence[tuple[str, Union[str, bytes]]]:
+        """Write authentication tokens to the provided metadata."""
+
+    @abstractmethod
+    def read_tokens_from_metadata(
+        self, metadata: Sequence[tuple[str, Union[str, bytes]]]
+    ) -> Optional[UserAuthCredentials]:
+        """Read authentication tokens from the provided metadata."""

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/cli/auth_plugin/oidc_cli_plugin.py

@@ -23,7 +23,6 @@ from typing import Any, Optional, Union
 
 import typer
 
-from flwr.common.auth_plugin import CliAuthPlugin
 from flwr.common.constant import (
     ACCESS_TOKEN_KEY,
     AUTH_TYPE_JSON_KEY,
@@ -37,6 +36,8 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.control_pb2_grpc import ControlStub
 
+from .auth_plugin import CliAuthPlugin
+
 
 class OidcCliPlugin(CliAuthPlugin):
     """Flower OIDC auth plugin for CLI."""

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/cli/cli_user_auth_interceptor.py

@@ -19,12 +19,13 @@ from typing import Any, Callable, Union
 
 import grpc
 
-from flwr.common.auth_plugin import CliAuthPlugin
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     StartRunRequest,
     StreamLogsRequest,
 )
 
+from .auth_plugin import CliAuthPlugin
+
 Request = Union[
     StartRunRequest,
     StreamLogsRequest,

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/cli/utils.py

@@ -26,8 +26,6 @@ from typing import Any, Callable, Optional, Union, cast
 import grpc
 import typer
 
-from flwr.cli.cli_user_auth_interceptor import CliUserAuthInterceptor
-from flwr.common.auth_plugin import CliAuthPlugin
 from flwr.common.constant import (
     AUTH_TYPE_JSON_KEY,
     CREDENTIALS_DIR,
@@ -43,7 +41,8 @@ from flwr.common.grpc import (
     on_channel_state_change,
 )
 
-from .auth_plugin import get_cli_auth_plugins
+from .auth_plugin import CliAuthPlugin, get_cli_auth_plugins
+from .cli_user_auth_interceptor import CliUserAuthInterceptor
 from .config_utils import validate_certificate_in_federation_config
 
 

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/server/app.py

@@ -36,7 +36,6 @@ from cryptography.hazmat.primitives.serialization import load_ssh_public_key
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.address import parse_address
 from flwr.common.args import try_obtain_server_certificates
-from flwr.common.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import (
     AUTH_TYPE_YAML_KEY,
@@ -72,6 +71,7 @@ from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.grpc_health import add_args_health, run_health_server_grpc_no_tls
 from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.superlink.artifact_provider import ArtifactProvider
+from flwr.superlink.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 from flwr.superlink.servicer.control import run_control_api_grpc
 
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer

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

@@ -0,0 +1,23 @@
+# 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 ControlAuthPlugin, ControlAuthzPlugin
+
+__all__ = [
+    "ControlAuthPlugin",
+    "ControlAuthzPlugin",
+]

{flwr_nightly-1.23.0.dev20250925/py/flwr/common → flwr_nightly-1.23.0.dev20250930/py/flwr/superlink}/auth_plugin/auth_plugin.py

@@ -20,10 +20,7 @@ from collections.abc import Sequence
 from pathlib import Path
 from typing import Optional, Union
 
-from flwr.common.typing import AccountInfo
-from flwr.proto.control_pb2_grpc import ControlStub
-
-from ..typing import UserAuthCredentials, UserAuthLoginDetails
+from flwr.common.typing import AccountInfo, UserAuthCredentials, UserAuthLoginDetails
 
 
 class ControlAuthPlugin(ABC):
@@ -88,62 +85,3 @@ class ControlAuthzPlugin(ABC):  # pylint: disable=too-few-public-methods
     @abstractmethod
     def verify_user_authorization(self, account_info: AccountInfo) -> bool:
         """Verify user authorization request."""
-
-
-class CliAuthPlugin(ABC):
-    """Abstract Flower Auth Plugin class for CLI.
-
-    Parameters
-    ----------
-    credentials_path : Path
-        Path to the user's authentication credentials file.
-    """
-
-    @staticmethod
-    @abstractmethod
-    def login(
-        login_details: UserAuthLoginDetails,
-        control_stub: ControlStub,
-    ) -> UserAuthCredentials:
-        """Authenticate the user and retrieve authentication credentials.
-
-        Parameters
-        ----------
-        login_details : UserAuthLoginDetails
-            An object containing the user's login details.
-        control_stub : ControlStub
-            A stub for executing RPC calls to the server.
-
-        Returns
-        -------
-        UserAuthCredentials
-            The authentication credentials obtained after login.
-        """
-
-    @abstractmethod
-    def __init__(self, credentials_path: Path):
-        """Abstract constructor."""
-
-    @abstractmethod
-    def store_tokens(self, credentials: UserAuthCredentials) -> None:
-        """Store authentication tokens to the `credentials_path`.
-
-        The credentials, including tokens, will be saved as a JSON file
-        at `credentials_path`.
-        """
-
-    @abstractmethod
-    def load_tokens(self) -> None:
-        """Load authentication tokens from the `credentials_path`."""
-
-    @abstractmethod
-    def write_tokens_to_metadata(
-        self, metadata: Sequence[tuple[str, Union[str, bytes]]]
-    ) -> Sequence[tuple[str, Union[str, bytes]]]:
-        """Write authentication tokens to the provided metadata."""
-
-    @abstractmethod
-    def read_tokens_from_metadata(
-        self, metadata: Sequence[tuple[str, Union[str, bytes]]]
-    ) -> Optional[UserAuthCredentials]:
-        """Read authentication tokens from the provided metadata."""

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/superlink/servicer/control/control_grpc.py

@@ -21,7 +21,6 @@ from typing import Optional
 import grpc
 
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
-from flwr.common.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 from flwr.common.event_log_plugin import EventLogWriterPlugin
 from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.grpc import generic_create_grpc_server
@@ -32,6 +31,7 @@ from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.license_plugin import LicensePlugin
 from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.superlink.artifact_provider import ArtifactProvider
+from flwr.superlink.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 
 from .control_event_log_interceptor import ControlEventLogInterceptor
 from .control_license_interceptor import ControlLicenseInterceptor

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/superlink/servicer/control/control_servicer.py

@@ -25,7 +25,6 @@ import grpc
 
 from flwr.cli.config_utils import get_fab_metadata
 from flwr.common import Context, RecordDict, now
-from flwr.common.auth_plugin import ControlAuthPlugin
 from flwr.common.constant import (
     FAB_MAX_SIZE,
     LOG_STREAM_INTERVAL,
@@ -64,6 +63,7 @@ from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
 from flwr.superlink.artifact_provider import ArtifactProvider
+from flwr.superlink.auth_plugin import ControlAuthPlugin
 
 from .control_user_auth_interceptor import shared_account_info
 

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/py/flwr/superlink/servicer/control/control_user_auth_interceptor.py

@@ -20,7 +20,6 @@ from typing import Any, Callable, Union
 
 import grpc
 
-from flwr.common.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 from flwr.common.typing import AccountInfo
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     GetAuthTokensRequest,
@@ -32,6 +31,7 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     StreamLogsRequest,
     StreamLogsResponse,
 )
+from flwr.superlink.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 
 Request = Union[
     StartRunRequest,

{flwr_nightly-1.23.0.dev20250925 → flwr_nightly-1.23.0.dev20250930}/pyproject.toml

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

flwr_nightly-1.23.0.dev20250925/py/flwr/common/auth_plugin/__init__.py

@@ -1,26 +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.
-# ==============================================================================
-"""Auth plugin components."""
-
-
-from .auth_plugin import CliAuthPlugin as CliAuthPlugin
-from .auth_plugin import ControlAuthPlugin as ControlAuthPlugin
-from .auth_plugin import ControlAuthzPlugin as ControlAuthzPlugin
-
-__all__ = [
-    "CliAuthPlugin",
-    "ControlAuthPlugin",
-    "ControlAuthzPlugin",
-]