flwr 1.21.0__py3-none-any.whl → 1.23.0__py3-none-any.whl

flwr/superlink/servicer/control/control_servicer.py

@@ -17,7 +17,7 @@
 
 import hashlib
 import time
-from collections.abc import Generator
+from collections.abc import Generator, Sequence
 from logging import ERROR, INFO
 from typing import Any, Optional, cast
 
@@ -25,11 +25,16 @@ 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,
+    HEARTBEAT_DEFAULT_INTERVAL,
     LOG_STREAM_INTERVAL,
-    NO_USER_AUTH_MESSAGE,
+    NO_ACCOUNT_AUTH_MESSAGE,
+    NO_ARTIFACT_PROVIDER_MESSAGE,
+    NODE_NOT_FOUND_MESSAGE,
+    PUBLIC_KEY_ALREADY_IN_USE_MESSAGE,
+    PUBLIC_KEY_NOT_VALID,
+    PULL_UNFINISHED_RUN_MESSAGE,
     RUN_ID_NOT_FOUND_MESSAGE,
     Status,
     SubStatus,
@@ -47,20 +52,32 @@ from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     GetAuthTokensResponse,
     GetLoginDetailsRequest,
     GetLoginDetailsResponse,
+    ListNodesRequest,
+    ListNodesResponse,
     ListRunsRequest,
     ListRunsResponse,
+    PullArtifactsRequest,
+    PullArtifactsResponse,
+    RegisterNodeRequest,
+    RegisterNodeResponse,
     StartRunRequest,
     StartRunResponse,
     StopRunRequest,
     StopRunResponse,
     StreamLogsRequest,
     StreamLogsResponse,
+    UnregisterNodeRequest,
+    UnregisterNodeResponse,
 )
+from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
+from flwr.supercore.primitives.asymmetric import bytes_to_public_key, uses_nist_ec_curve
+from flwr.superlink.artifact_provider import ArtifactProvider
+from flwr.superlink.auth_plugin import ControlAuthnPlugin
 
-from .control_user_auth_interceptor import shared_account_info
+from .control_account_auth_interceptor import shared_account_info
 
 
 class ControlServicer(control_pb2_grpc.ControlServicer):
@@ -72,15 +89,17 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
         ffs_factory: FfsFactory,
         objectstore_factory: ObjectStoreFactory,
         is_simulation: bool,
-        auth_plugin: Optional[ControlAuthPlugin] = None,
+        authn_plugin: ControlAuthnPlugin,
+        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(
+    def StartRun(  # pylint: disable=too-many-locals
         self, request: StartRunRequest, context: grpc.ServicerContext
     ) -> StartRunResponse:
         """Create run ID."""
@@ -96,7 +115,8 @@ 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
+        _check_flwr_aid_exists(flwr_aid, context)
         override_config = user_config_from_proto(request.override_config)
         federation_options = config_record_from_proto(request.federation_options)
         fab_file = request.fab.content
@@ -109,7 +129,11 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
                 )
 
             # Create run
-            fab = Fab(hashlib.sha256(fab_file).hexdigest(), fab_file)
+            fab = Fab(
+                hashlib.sha256(fab_file).hexdigest(),
+                fab_file,
+                dict(request.fab.verifications),
+            )
             fab_hash = ffs.put(fab.content, {})
             if fab_hash != fab.hash_str:
                 raise RuntimeError(
@@ -126,11 +150,20 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
                 flwr_aid,
             )
 
+            # Initialize node config
+            node_config = {}
+            if self.artifact_provider is not None:
+                node_config = {
+                    "output_dir": self.artifact_provider.output_dir,
+                    "tmp_dir": self.artifact_provider.tmp_dir,
+                }
+
             # Create an empty context for the Run
             context = Context(
                 run_id=run_id,
                 node_id=0,
-                node_config={},
+                # Dict is invariant in mypy
+                node_config=node_config,  # type: ignore[arg-type]
                 state=RecordDict(),
                 run_config={},
             )
@@ -161,12 +194,9 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
         if not run:
             context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
 
-        # If user auth is enabled, check if `flwr_aid` matches the run's `flwr_aid`
-        if self.auth_plugin:
-            flwr_aid = shared_account_info.get().flwr_aid
-            _check_flwr_aid_in_run(
-                flwr_aid=flwr_aid, run=cast(Run, run), context=context
-            )
+        # Check if `flwr_aid` matches the run's `flwr_aid`
+        flwr_aid = shared_account_info.get().flwr_aid
+        _check_flwr_aid_in_run(flwr_aid=flwr_aid, run=cast(Run, run), context=context)
 
         after_timestamp = request.after_timestamp + 1e-6
         while context.is_active():
@@ -202,20 +232,11 @@ 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 no `run_id` is specified and user auth is enabled,
-                # return run IDs for the authenticated user
-                flwr_aid = shared_account_info.get().flwr_aid
-                if flwr_aid is None:
-                    context.abort(
-                        grpc.StatusCode.PERMISSION_DENIED,
-                        "️⛔️ User authentication is enabled, but `flwr_aid` is None",
-                    )
-                run_ids = state.get_run_ids(flwr_aid=flwr_aid)
-            else:
-                # If no `run_id` is specified and no user auth is enabled,
-                # return all run IDs
-                run_ids = state.get_run_ids(None)
+            # 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
+            _check_flwr_aid_exists(flwr_aid, context)
+            run_ids = state.get_run_ids(flwr_aid=flwr_aid)
         # Build a set of run IDs for `flwr ls --run-id <run_id>`
         else:
             # Retrieve run ID and run
@@ -225,13 +246,11 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             # Exit if `run_id` not found
             if not run:
                 context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
+                raise grpc.RpcError()  # This line is unreachable
 
-            # If user auth is enabled, check if `flwr_aid` matches the run's `flwr_aid`
-            if self.auth_plugin:
-                flwr_aid = shared_account_info.get().flwr_aid
-                _check_flwr_aid_in_run(
-                    flwr_aid=flwr_aid, run=cast(Run, run), context=context
-                )
+            # Check if `flwr_aid` matches the run's `flwr_aid`
+            flwr_aid = shared_account_info.get().flwr_aid
+            _check_flwr_aid_in_run(flwr_aid=flwr_aid, run=run, context=context)
 
             run_ids = {run_id}
 
@@ -253,13 +272,11 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
         # Exit if `run_id` not found
         if not run:
             context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
+            raise grpc.RpcError()  # This line is unreachable
 
-        # If user auth is enabled, check if `flwr_aid` matches the run's `flwr_aid`
-        if self.auth_plugin:
-            flwr_aid = shared_account_info.get().flwr_aid
-            _check_flwr_aid_in_run(
-                flwr_aid=flwr_aid, run=cast(Run, run), context=context
-            )
+        # Check if `flwr_aid` matches the run's `flwr_aid`
+        flwr_aid = shared_account_info.get().flwr_aid
+        _check_flwr_aid_in_run(flwr_aid=flwr_aid, run=run, context=context)
 
         run_status = state.get_run_status({run_id})[run_id]
         if run_status.status == Status.FINISHED:
@@ -289,22 +306,22 @@ 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_USER_AUTH_MESSAGE,
+                NO_ACCOUNT_AUTH_MESSAGE,
             )
             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,
@@ -316,15 +333,15 @@ 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_USER_AUTH_MESSAGE,
+                NO_ACCOUNT_AUTH_MESSAGE,
             )
             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:
@@ -335,6 +352,132 @@ class ControlServicer(control_pb2_grpc.ControlServicer):
             refresh_token=credentials.refresh_token,
         )
 
+    def PullArtifacts(
+        self, request: PullArtifactsRequest, context: grpc.ServicerContext
+    ) -> PullArtifactsResponse:
+        """Pull artifacts for a given run ID."""
+        log(INFO, "ControlServicer.PullArtifacts")
+
+        # Check if artifact provider is configured
+        if self.artifact_provider is None:
+            context.abort(
+                grpc.StatusCode.UNIMPLEMENTED,
+                NO_ARTIFACT_PROVIDER_MESSAGE,
+            )
+            raise grpc.RpcError()  # This line is unreachable
+
+        # Init link state
+        state = self.linkstate_factory.state()
+
+        # Retrieve run ID and run
+        run_id = request.run_id
+        run = state.get_run(run_id)
+
+        # Exit if `run_id` not found
+        if not run:
+            context.abort(grpc.StatusCode.NOT_FOUND, RUN_ID_NOT_FOUND_MESSAGE)
+            raise grpc.RpcError()  # This line is unreachable
+
+        # Exit if the run is not finished yet
+        if run.status.status != Status.FINISHED:
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION, PULL_UNFINISHED_RUN_MESSAGE
+            )
+
+        # Check if `flwr_aid` matches the run's `flwr_aid`
+        flwr_aid = shared_account_info.get().flwr_aid
+        _check_flwr_aid_in_run(flwr_aid=flwr_aid, run=run, context=context)
+
+        # Call artifact provider
+        download_url = self.artifact_provider.get_url(run_id)
+        return PullArtifactsResponse(url=download_url)
+
+    def RegisterNode(
+        self, request: RegisterNodeRequest, context: grpc.ServicerContext
+    ) -> RegisterNodeResponse:
+        """Add a SuperNode."""
+        log(INFO, "ControlServicer.RegisterNode")
+
+        # Verify public key
+        try:
+            # Attempt to deserialize public key
+            pub_key = bytes_to_public_key(request.public_key)
+            # Check if it's a NIST EC curve public key
+            if not uses_nist_ec_curve(pub_key):
+                err_msg = "The provided public key is not a NIST EC curve public key."
+                log(ERROR, "%s", err_msg)
+                raise ValueError(err_msg)
+        except (ValueError, AttributeError) as err:
+            log(ERROR, "%s", err)
+            context.abort(grpc.StatusCode.FAILED_PRECONDITION, PUBLIC_KEY_NOT_VALID)
+
+        # Init link state
+        state = self.linkstate_factory.state()
+        node_id = 0
+
+        flwr_aid = shared_account_info.get().flwr_aid
+        flwr_aid = _check_flwr_aid_exists(flwr_aid, context)
+        try:
+            node_id = state.create_node(
+                owner_aid=flwr_aid,
+                public_key=request.public_key,
+                heartbeat_interval=HEARTBEAT_DEFAULT_INTERVAL,
+            )
+
+        except ValueError:
+            # Public key already in use
+            log(ERROR, PUBLIC_KEY_ALREADY_IN_USE_MESSAGE)
+            context.abort(
+                grpc.StatusCode.FAILED_PRECONDITION, PUBLIC_KEY_ALREADY_IN_USE_MESSAGE
+            )
+        log(INFO, "[ControlServicer.RegisterNode] Created node_id=%s", node_id)
+
+        return RegisterNodeResponse(node_id=node_id)
+
+    def UnregisterNode(
+        self, request: UnregisterNodeRequest, context: grpc.ServicerContext
+    ) -> UnregisterNodeResponse:
+        """Remove a SuperNode."""
+        log(INFO, "ControlServicer.UnregisterNode")
+
+        # Init link state
+        state = self.linkstate_factory.state()
+
+        flwr_aid = shared_account_info.get().flwr_aid
+        flwr_aid = _check_flwr_aid_exists(flwr_aid, context)
+        try:
+            state.delete_node(owner_aid=flwr_aid, node_id=request.node_id)
+        except ValueError:
+            log(ERROR, NODE_NOT_FOUND_MESSAGE)
+            context.abort(grpc.StatusCode.NOT_FOUND, NODE_NOT_FOUND_MESSAGE)
+
+        return UnregisterNodeResponse()
+
+    def ListNodes(
+        self, request: ListNodesRequest, context: grpc.ServicerContext
+    ) -> ListNodesResponse:
+        """List all SuperNodes."""
+        log(INFO, "ControlServicer.ListNodes")
+
+        if self.is_simulation:
+            log(ERROR, "ListNodes is not available in simulation mode.")
+            context.abort(
+                grpc.StatusCode.UNIMPLEMENTED,
+                "ListNodes is not available in simulation mode.",
+            )
+            raise grpc.RpcError()  # This line is unreachable
+
+        nodes_info: Sequence[NodeInfo] = []
+        # Init link state
+        state = self.linkstate_factory.state()
+
+        flwr_aid = shared_account_info.get().flwr_aid
+        flwr_aid = _check_flwr_aid_exists(flwr_aid, context)
+        # Retrieve all nodes for the account
+        nodes_info = state.get_node_info(owner_aids=[flwr_aid])
+
+        return ListNodesResponse(nodes_info=nodes_info, now=now().isoformat())
+
 
 def _create_list_runs_response(
     run_ids: set[int], state: LinkState, store: ObjectStore
@@ -353,29 +496,35 @@ def _create_list_runs_response(
     )
 
 
-def _check_flwr_aid_in_run(
-    flwr_aid: Optional[str], run: Run, context: grpc.ServicerContext
-) -> None:
-    """Guard clause to check if `flwr_aid` matches the run's `flwr_aid`."""
-    # `flwr_aid` must not be None. Abort if it is None.
+def _check_flwr_aid_exists(
+    flwr_aid: Optional[str], context: grpc.ServicerContext
+) -> str:
+    """Guard clause to check if `flwr_aid` exists."""
     if flwr_aid is None:
         context.abort(
             grpc.StatusCode.PERMISSION_DENIED,
-            "️⛔️ User authentication is enabled, but `flwr_aid` is None",
+            "️⛔️ Failed to fetch the account information.",
         )
+        raise RuntimeError  # This line is unreachable
+    return flwr_aid
+
 
+def _check_flwr_aid_in_run(
+    flwr_aid: Optional[str], run: Run, context: grpc.ServicerContext
+) -> None:
+    """Guard clause to check if `flwr_aid` matches the run's `flwr_aid`."""
+    _check_flwr_aid_exists(flwr_aid, context)
     # `run.flwr_aid` must not be an empty string. Abort if it is empty.
     run_flwr_aid = run.flwr_aid
     if not run_flwr_aid:
         context.abort(
             grpc.StatusCode.PERMISSION_DENIED,
-            "⛔️ User authentication is enabled, but the run is not associated "
-            "with a `flwr_aid`.",
+            "⛔️ Run is not associated with a `flwr_aid`.",
         )
 
     # Exit if `flwr_aid` does not match the run's `flwr_aid`
     if run_flwr_aid != flwr_aid:
         context.abort(
             grpc.StatusCode.PERMISSION_DENIED,
-            "⛔️ Run ID does not belong to the user",
+            "⛔️ Run ID does not belong to the account",
         )

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
@@ -64,6 +61,13 @@ def flower_supernode() -> None:
     root_certificates = try_obtain_root_certificates(args, args.superlink)
     authentication_keys = _try_setup_client_authentication(args)
 
+    # Warn if authentication keys are provided but transport is not grpc-rere
+    if authentication_keys is not None and args.transport != TRANSPORT_TYPE_GRPC_RERE:
+        log(
+            WARN,
+            "SuperNode Authentication is only supported with the grpc-rere transport.",
+        )
+
     log(DEBUG, "Isolation mode: %s", args.isolation)
 
     start_client_internal(
@@ -188,12 +192,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 +211,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 +223,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/supernode/runtime/run_clientapp.py

@@ -23,8 +23,8 @@ import grpc
 
 from flwr.app.error import Error
 from flwr.cli.install import install_from_fab
-from flwr.client.client_app import ClientApp, LoadClientAppError
-from flwr.client.clientapp.utils import get_load_client_app_fn
+from flwr.clientapp.client_app import ClientApp, LoadClientAppError
+from flwr.clientapp.utils import get_load_client_app_fn
 from flwr.common import Context, Message
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import ErrorCode

flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -151,7 +151,7 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         # Retrieve context, run and fab for this run
         context = cast(Context, state.get_context(run_id))
         run = cast(Run, state.get_run(run_id))
-        fab = Fab(run.fab_hash, ffs.get(run.fab_hash)[0])  # type: ignore
+        fab = Fab(run.fab_hash, ffs.get(run.fab_hash)[0], ffs.get(run.fab_hash)[1])  # type: ignore
 
         return PullAppInputsResponse(
             context=context_to_proto(context),

flwr/supernode/start_client_internal.py

@@ -54,6 +54,7 @@ from flwr.common.logger import log
 from flwr.common.retry_invoker import RetryInvoker, _make_simple_grpc_retry_invoker
 from flwr.common.telemetry import EventType
 from flwr.common.typing import Fab, Run, RunNotRunningException, UserConfig
+from flwr.common.version import package_version
 from flwr.proto.clientappio_pb2_grpc import add_ClientAppIoServicer_to_server
 from flwr.proto.message_pb2 import ObjectTree  # pylint: disable=E0611
 from flwr.supercore.ffs import Ffs, FfsFactory
@@ -141,6 +142,19 @@ def start_client_internal(
     if insecure is None:
         insecure = root_certificates is None
 
+    # Insecure HTTP is incompatible with authentication
+    if insecure and authentication_keys is not None:
+        url_v = f"https://flower.ai/docs/framework/v{package_version}/en/"
+        page = "how-to-authenticate-supernodes.html"
+        flwr_exit(
+            ExitCode.SUPERNODE_STARTED_WITHOUT_TLS_BUT_NODE_AUTH_ENABLED,
+            "Insecure connection is enabled, but the SuperNode's private key is "
+            "provided for authentication. SuperNode authentication requires a "
+            "secure TLS connection with the SuperLink. Please enable TLS by "
+            "providing the certificate via `--root-certificates`. Please refer "
+            f"to the Flower documentation for more information: {url_v}{page}",
+        )
+
     # Initialize factories
     state_factory = NodeStateFactory()
     ffs_factory = FfsFactory(get_flwr_dir(flwr_path) / "supernode" / "ffs")  # type: ignore
@@ -193,21 +207,16 @@ def start_client_internal(
         max_wait_time=max_wait_time,
     ) as conn:
         (
+            node_id,
             receive,
             send,
-            create_node,
-            _,
             get_run,
             get_fab,
             pull_object,
             push_object,
             confirm_message_received,
         ) = conn
-
-        # Call create_node fn to register node
-        # and store node_id in state
-        if (node_id := create_node()) is None:
-            raise ValueError("Failed to register SuperNode with the SuperLink")
+        # Store node_id in state
         state.set_node_id(node_id)
 
         # pylint: disable=too-many-nested-blocks
@@ -443,10 +452,9 @@ def _init_connection(  # pylint: disable=too-many-positional-arguments
     max_wait_time: Optional[float] = None,
 ) -> Iterator[
     tuple[
+        int,
         Callable[[], Optional[tuple[Message, ObjectTree]]],
         Callable[[Message, ObjectTree], set[str]],
-        Callable[[], Optional[int]],
-        Callable[[], None],
         Callable[[int], Run],
         Callable[[str, int], Fab],
         Callable[[int, str], bytes],

{flwr-1.21.0.dist-info → flwr-1.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr
-Version: 1.21.0
+Version: 1.23.0
 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
@@ -102,25 +102,15 @@ Meet the Flower community on [flower.ai](https://flower.ai)!
 
 Flower's goal is to make federated learning accessible to everyone. This series of tutorials introduces the fundamentals of federated learning and how to implement them in Flower.
 
-0. **What is Federated Learning?**
+0. **[What is Federated Learning?](https://flower.ai/docs/framework/main/en/tutorial-series-what-is-federated-learning.html)**
 
-   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/framework/docs/source/tutorial-series-what-is-federated-learning.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/framework/docs/source/tutorial-series-what-is-federated-learning.ipynb))
+1. **[An Introduction to Federated Learning](https://flower.ai/docs/framework/main/en/tutorial-series-get-started-with-flower-pytorch.html)**
 
-1. **An Introduction to Federated Learning**
+2. **[Using Strategies in Federated Learning](https://flower.ai/docs/framework/main/en/tutorial-series-use-a-federated-learning-strategy-pytorch.html)**
 
-   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/framework/docs/source/tutorial-series-get-started-with-flower-pytorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/framework/docs/source/tutorial-series-get-started-with-flower-pytorch.ipynb))
+3. **[Customize a Flower Strategy](https://flower.ai/docs/framework/main/en/tutorial-series-build-a-strategy-from-scratch-pytorch.html)**
 
-2. **Using Strategies in Federated Learning**
-
-   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/framework/docs/source/tutorial-series-use-a-federated-learning-strategy-pytorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/framework/docs/source/tutorial-series-use-a-federated-learning-strategy-pytorch.ipynb))
-
-3. **Building Strategies for Federated Learning**
-
-   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/framework/docs/source/tutorial-series-build-a-strategy-from-scratch-pytorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/framework/docs/source/tutorial-series-build-a-strategy-from-scratch-pytorch.ipynb))
-
-4. **Custom Clients for Federated Learning**
-
-   [![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/adap/flower/blob/main/framework/docs/source/tutorial-series-customize-the-client-pytorch.ipynb) (or open the [Jupyter Notebook](https://github.com/adap/flower/blob/main/framework/docs/source/tutorial-series-customize-the-client-pytorch.ipynb))
+4. **[Communicate Custom Messages](https://flower.ai/docs/framework/main/en/tutorial-series-customize-the-client-pytorch.html)**
 
 Stay tuned, more tutorials are coming soon. Topics include **Privacy and Security in Federated Learning**, and **Scaling Federated Learning**.