flwr-nightly 1.12.0.dev20240906__py3-none-any.whl → 1.12.0.dev20240913__py3-none-any.whl

flwr/client/client_app.py

@@ -16,7 +16,7 @@
 
 
 import inspect
-from typing import Callable, List, Optional
+from typing import Callable, Optional
 
 from flwr.client.client import Client
 from flwr.client.message_handler.message_handler import (
@@ -41,11 +41,11 @@ def _alert_erroneous_client_fn() -> None:
 
 def _inspect_maybe_adapt_client_fn_signature(client_fn: ClientFnExt) -> ClientFnExt:
     client_fn_args = inspect.signature(client_fn).parameters
-    first_arg = list(client_fn_args.keys())[0]
 
     if len(client_fn_args) != 1:
         _alert_erroneous_client_fn()
 
+    first_arg = list(client_fn_args.keys())[0]
     first_arg_type = client_fn_args[first_arg].annotation
 
     if first_arg_type is str or first_arg == "cid":
@@ -109,9 +109,9 @@ class ClientApp:
     def __init__(
         self,
         client_fn: Optional[ClientFnExt] = None,  # Only for backward compatibility
-        mods: Optional[List[Mod]] = None,
+        mods: Optional[list[Mod]] = None,
     ) -> None:
-        self._mods: List[Mod] = mods if mods is not None else []
+        self._mods: list[Mod] = mods if mods is not None else []
 
         # Create wrapper function for `handle`
         self._call: Optional[ClientAppCallable] = None
@@ -263,7 +263,7 @@ def _registration_error(fn_name: str) -> ValueError:
         >>> class FlowerClient(NumPyClient):
         >>>     # ...
         >>>
-        >>> def client_fn(cid) -> Client:
+        >>> def client_fn(context: Context):
         >>>     return FlowerClient().to_client()
         >>>
         >>> app = ClientApp(

flwr/client/clientapp/app.py

@@ -17,7 +17,7 @@
 import argparse
 import time
 from logging import DEBUG, ERROR, INFO
-from typing import Optional, Tuple
+from typing import Optional
 
 import grpc
 
@@ -196,7 +196,7 @@ def get_token(stub: grpc.Channel) -> Optional[int]:
 
 def pull_message(
     stub: grpc.Channel, token: int
-) -> Tuple[Message, Context, Run, Optional[Fab]]:
+) -> tuple[Message, Context, Run, Optional[Fab]]:
     """Pull message from SuperNode to ClientApp."""
     log(INFO, "Pulling ClientAppInputs for token %s", token)
     try:

flwr/client/dpfedavg_numpy_client.py

@@ -16,7 +16,6 @@
 
 
 import copy
-from typing import Dict, Tuple
 
 import numpy as np
 
@@ -39,7 +38,7 @@ class DPFedAvgNumPyClient(NumPyClient):
         super().__init__()
         self.client = client
 
-    def get_properties(self, config: Config) -> Dict[str, Scalar]:
+    def get_properties(self, config: Config) -> dict[str, Scalar]:
         """Get client properties using the given Numpy client.
 
         Parameters
@@ -58,7 +57,7 @@ class DPFedAvgNumPyClient(NumPyClient):
         """
         return self.client.get_properties(config)
 
-    def get_parameters(self, config: Dict[str, Scalar]) -> NDArrays:
+    def get_parameters(self, config: dict[str, Scalar]) -> NDArrays:
         """Return the current local model parameters.
 
         Parameters
@@ -76,8 +75,8 @@ class DPFedAvgNumPyClient(NumPyClient):
         return self.client.get_parameters(config)
 
     def fit(
-        self, parameters: NDArrays, config: Dict[str, Scalar]
-    ) -> Tuple[NDArrays, int, Dict[str, Scalar]]:
+        self, parameters: NDArrays, config: dict[str, Scalar]
+    ) -> tuple[NDArrays, int, dict[str, Scalar]]:
         """Train the provided parameters using the locally held dataset.
 
         This method first updates the local model using the original parameters
@@ -153,8 +152,8 @@ class DPFedAvgNumPyClient(NumPyClient):
         return updated_params, num_examples, metrics
 
     def evaluate(
-        self, parameters: NDArrays, config: Dict[str, Scalar]
-    ) -> Tuple[float, int, Dict[str, Scalar]]:
+        self, parameters: NDArrays, config: dict[str, Scalar]
+    ) -> tuple[float, int, dict[str, Scalar]]:
         """Evaluate the provided parameters using the locally held dataset.
 
         Parameters

flwr/client/grpc_adapter_client/connection.py

@@ -15,9 +15,10 @@
 """Contextmanager for a GrpcAdapter channel to the Flower server."""
 
 
+from collections.abc import Iterator
 from contextlib import contextmanager
 from logging import ERROR
-from typing import Callable, Iterator, Optional, Tuple, Union
+from typing import Callable, Optional, Union
 
 from cryptography.hazmat.primitives.asymmetric import ec
 
@@ -38,10 +39,10 @@ def grpc_adapter(  # pylint: disable=R0913
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,  # pylint: disable=W0613
     root_certificates: Optional[Union[bytes, str]] = None,
     authentication_keys: Optional[  # pylint: disable=unused-argument
-        Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
+        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
     ] = None,
 ) -> Iterator[
-    Tuple[
+    tuple[
         Callable[[], Optional[Message]],
         Callable[[Message], None],
         Optional[Callable[[], Optional[int]]],

flwr/client/grpc_client/connection.py

@@ -16,11 +16,12 @@
 
 
 import uuid
+from collections.abc import Iterator
 from contextlib import contextmanager
 from logging import DEBUG, ERROR
 from pathlib import Path
 from queue import Queue
-from typing import Callable, Iterator, Optional, Tuple, Union, cast
+from typing import Callable, Optional, Union, cast
 
 from cryptography.hazmat.primitives.asymmetric import ec
 
@@ -66,10 +67,10 @@ def grpc_connection(  # pylint: disable=R0913, R0915
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,
     root_certificates: Optional[Union[bytes, str]] = None,
     authentication_keys: Optional[  # pylint: disable=unused-argument
-        Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
+        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
     ] = None,
 ) -> Iterator[
-    Tuple[
+    tuple[
         Callable[[], Optional[Message]],
         Callable[[Message], None],
         Optional[Callable[[], Optional[int]]],

flwr/client/grpc_rere_client/client_interceptor.py

@@ -17,8 +17,9 @@
 
 import base64
 import collections
+from collections.abc import Sequence
 from logging import WARNING
-from typing import Any, Callable, Optional, Sequence, Tuple, Union
+from typing import Any, Callable, Optional, Union
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -53,7 +54,7 @@ Request = Union[
 
 
 def _get_value_from_tuples(
-    key_string: str, tuples: Sequence[Tuple[str, Union[str, bytes]]]
+    key_string: str, tuples: Sequence[tuple[str, Union[str, bytes]]]
 ) -> bytes:
     value = next((value for key, value in tuples if key == key_string), "")
     if isinstance(value, str):
@@ -130,13 +131,12 @@ class AuthenticateClientInterceptor(grpc.UnaryUnaryClientInterceptor):  # type:
             if self.shared_secret is None:
                 raise RuntimeError("Failure to compute hmac")
 
+            message_bytes = request.SerializeToString(deterministic=True)
             metadata.append(
                 (
                     _AUTH_TOKEN_HEADER,
                     base64.urlsafe_b64encode(
-                        compute_hmac(
-                            self.shared_secret, request.SerializeToString(True)
-                        )
+                        compute_hmac(self.shared_secret, message_bytes)
                     ),
                 )
             )

flwr/client/grpc_rere_client/connection.py

@@ -17,11 +17,12 @@
 
 import random
 import threading
+from collections.abc import Iterator, Sequence
 from contextlib import contextmanager
 from copy import copy
 from logging import DEBUG, ERROR
 from pathlib import Path
-from typing import Callable, Iterator, Optional, Sequence, Tuple, Type, Union, cast
+from typing import Callable, Optional, Union, cast
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -77,11 +78,11 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,  # pylint: disable=W0613
     root_certificates: Optional[Union[bytes, str]] = None,
     authentication_keys: Optional[
-        Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
+        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
     ] = None,
-    adapter_cls: Optional[Union[Type[FleetStub], Type[GrpcAdapter]]] = None,
+    adapter_cls: Optional[Union[type[FleetStub], type[GrpcAdapter]]] = None,
 ) -> Iterator[
-    Tuple[
+    tuple[
         Callable[[], Optional[Message]],
         Callable[[Message], None],
         Optional[Callable[[], Optional[int]]],

flwr/client/grpc_rere_client/grpc_adapter.py

@@ -17,7 +17,7 @@
 
 import sys
 from logging import DEBUG
-from typing import Any, Type, TypeVar, cast
+from typing import Any, TypeVar, cast
 
 import grpc
 from google.protobuf.message import Message as GrpcMessage
@@ -59,7 +59,7 @@ class GrpcAdapter:
         self.stub = GrpcAdapterStub(channel)
 
     def _send_and_receive(
-        self, request: GrpcMessage, response_type: Type[T], **kwargs: Any
+        self, request: GrpcMessage, response_type: type[T], **kwargs: Any
     ) -> T:
         # Serialize request
         container_req = MessageContainer(

flwr/client/message_handler/message_handler.py

@@ -15,7 +15,7 @@
 """Client-side message handler."""
 
 from logging import WARN
-from typing import Optional, Tuple, cast
+from typing import Optional, cast
 
 from flwr.client.client import (
     maybe_call_evaluate,
@@ -52,7 +52,7 @@ class UnknownServerMessage(Exception):
     """Exception indicating that the received message is unknown."""
 
 
-def handle_control_message(message: Message) -> Tuple[Optional[Message], int]:
+def handle_control_message(message: Message) -> tuple[Optional[Message], int]:
     """Handle control part of the incoming message.
 
     Parameters
@@ -147,7 +147,7 @@ def handle_legacy_message_from_msgtype(
 
 def _reconnect(
     reconnect_msg: ServerMessage.ReconnectIns,
-) -> Tuple[ClientMessage, int]:
+) -> tuple[ClientMessage, int]:
     # Determine the reason for sending DisconnectRes message
     reason = Reason.ACK
     sleep_duration = None

flwr/client/mod/secure_aggregation/secaggplus_mod.py

@@ -18,7 +18,7 @@
 import os
 from dataclasses import dataclass, field
 from logging import DEBUG, WARNING
-from typing import Any, Dict, List, Tuple, cast
+from typing import Any, cast
 
 from flwr.client.typing import ClientAppCallable
 from flwr.common import (
@@ -91,11 +91,11 @@ class SecAggPlusState:
     # Random seed for generating the private mask
     rd_seed: bytes = b""
 
-    rd_seed_share_dict: Dict[int, bytes] = field(default_factory=dict)
-    sk1_share_dict: Dict[int, bytes] = field(default_factory=dict)
+    rd_seed_share_dict: dict[int, bytes] = field(default_factory=dict)
+    sk1_share_dict: dict[int, bytes] = field(default_factory=dict)
     # The dict of the shared secrets from sk2
-    ss2_dict: Dict[int, bytes] = field(default_factory=dict)
-    public_keys_dict: Dict[int, Tuple[bytes, bytes]] = field(default_factory=dict)
+    ss2_dict: dict[int, bytes] = field(default_factory=dict)
+    public_keys_dict: dict[int, tuple[bytes, bytes]] = field(default_factory=dict)
 
     def __init__(self, **kwargs: ConfigsRecordValues) -> None:
         for k, v in kwargs.items():
@@ -104,8 +104,8 @@ class SecAggPlusState:
             new_v: Any = v
             if k.endswith(":K"):
                 k = k[:-2]
-                keys = cast(List[int], v)
-                values = cast(List[bytes], kwargs[f"{k}:V"])
+                keys = cast(list[int], v)
+                values = cast(list[bytes], kwargs[f"{k}:V"])
                 if len(values) > len(keys):
                     updated_values = [
                         tuple(values[i : i + 2]) for i in range(0, len(values), 2)
@@ -115,17 +115,17 @@ class SecAggPlusState:
                     new_v = dict(zip(keys, values))
             self.__setattr__(k, new_v)
 
-    def to_dict(self) -> Dict[str, ConfigsRecordValues]:
+    def to_dict(self) -> dict[str, ConfigsRecordValues]:
         """Convert the state to a dictionary."""
         ret = vars(self)
         for k in list(ret.keys()):
             if isinstance(ret[k], dict):
                 # Replace dict with two lists
-                v = cast(Dict[str, Any], ret.pop(k))
+                v = cast(dict[str, Any], ret.pop(k))
                 ret[f"{k}:K"] = list(v.keys())
                 if k == "public_keys_dict":
-                    v_list: List[bytes] = []
-                    for b1_b2 in cast(List[Tuple[bytes, bytes]], v.values()):
+                    v_list: list[bytes] = []
+                    for b1_b2 in cast(list[tuple[bytes, bytes]], v.values()):
                         v_list.extend(b1_b2)
                     ret[f"{k}:V"] = v_list
                 else:
@@ -276,7 +276,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
                 )
             if not isinstance(configs[key], list) or any(
                 elm
-                for elm in cast(List[Any], configs[key])
+                for elm in cast(list[Any], configs[key])
                 # pylint: disable-next=unidiomatic-typecheck
                 if type(elm) is not expected_type
             ):
@@ -299,7 +299,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
                 )
             if not isinstance(configs[key], list) or any(
                 elm
-                for elm in cast(List[Any], configs[key])
+                for elm in cast(list[Any], configs[key])
                 # pylint: disable-next=unidiomatic-typecheck
                 if type(elm) is not expected_type
             ):
@@ -314,7 +314,7 @@ def check_configs(stage: str, configs: ConfigsRecord) -> None:
 
 def _setup(
     state: SecAggPlusState, configs: ConfigsRecord
-) -> Dict[str, ConfigsRecordValues]:
+) -> dict[str, ConfigsRecordValues]:
     # Assigning parameter values to object fields
     sec_agg_param_dict = configs
     state.sample_num = cast(int, sec_agg_param_dict[Key.SAMPLE_NUMBER])
@@ -350,8 +350,8 @@ def _setup(
 # pylint: disable-next=too-many-locals
 def _share_keys(
     state: SecAggPlusState, configs: ConfigsRecord
-) -> Dict[str, ConfigsRecordValues]:
-    named_bytes_tuples = cast(Dict[str, Tuple[bytes, bytes]], configs)
+) -> dict[str, ConfigsRecordValues]:
+    named_bytes_tuples = cast(dict[str, tuple[bytes, bytes]], configs)
     key_dict = {int(sid): (pk1, pk2) for sid, (pk1, pk2) in named_bytes_tuples.items()}
     log(DEBUG, "Node %d: starting stage 1...", state.nid)
     state.public_keys_dict = key_dict
@@ -361,7 +361,7 @@ def _share_keys(
         raise ValueError("Available neighbours number smaller than threshold")
 
     # Check if all public keys are unique
-    pk_list: List[bytes] = []
+    pk_list: list[bytes] = []
     for pk1, pk2 in state.public_keys_dict.values():
         pk_list.append(pk1)
         pk_list.append(pk2)
@@ -415,11 +415,11 @@ def _collect_masked_vectors(
     configs: ConfigsRecord,
     num_examples: int,
     updated_parameters: Parameters,
-) -> Dict[str, ConfigsRecordValues]:
+) -> dict[str, ConfigsRecordValues]:
     log(DEBUG, "Node %d: starting stage 2...", state.nid)
-    available_clients: List[int] = []
-    ciphertexts = cast(List[bytes], configs[Key.CIPHERTEXT_LIST])
-    srcs = cast(List[int], configs[Key.SOURCE_LIST])
+    available_clients: list[int] = []
+    ciphertexts = cast(list[bytes], configs[Key.CIPHERTEXT_LIST])
+    srcs = cast(list[int], configs[Key.SOURCE_LIST])
     if len(ciphertexts) + 1 < state.threshold:
         raise ValueError("Not enough available neighbour clients.")
 
@@ -467,7 +467,7 @@ def _collect_masked_vectors(
 
     quantized_parameters = factor_combine(q_ratio, quantized_parameters)
 
-    dimensions_list: List[Tuple[int, ...]] = [a.shape for a in quantized_parameters]
+    dimensions_list: list[tuple[int, ...]] = [a.shape for a in quantized_parameters]
 
     # Add private mask
     private_mask = pseudo_rand_gen(state.rd_seed, state.mod_range, dimensions_list)
@@ -499,11 +499,11 @@ def _collect_masked_vectors(
 
 def _unmask(
     state: SecAggPlusState, configs: ConfigsRecord
-) -> Dict[str, ConfigsRecordValues]:
+) -> dict[str, ConfigsRecordValues]:
     log(DEBUG, "Node %d: starting stage 3...", state.nid)
 
-    active_nids = cast(List[int], configs[Key.ACTIVE_NODE_ID_LIST])
-    dead_nids = cast(List[int], configs[Key.DEAD_NODE_ID_LIST])
+    active_nids = cast(list[int], configs[Key.ACTIVE_NODE_ID_LIST])
+    dead_nids = cast(list[int], configs[Key.DEAD_NODE_ID_LIST])
     # Send private mask seed share for every avaliable client (including itself)
     # Send first private key share for building pairwise mask for every dropped client
     if len(active_nids) < state.threshold:

flwr/client/mod/utils.py

@@ -15,13 +15,11 @@
 """Utility functions for mods."""
 
 
-from typing import List
-
 from flwr.client.typing import ClientAppCallable, Mod
 from flwr.common import Context, Message
 
 
-def make_ffn(ffn: ClientAppCallable, mods: List[Mod]) -> ClientAppCallable:
+def make_ffn(ffn: ClientAppCallable, mods: list[Mod]) -> ClientAppCallable:
     """."""
 
     def wrap_ffn(_ffn: ClientAppCallable, _mod: Mod) -> ClientAppCallable:

flwr/client/node_state.py

@@ -17,7 +17,7 @@
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Optional
 
 from flwr.common import Context, RecordSet
 from flwr.common.config import (
@@ -46,7 +46,7 @@ class NodeState:
     ) -> None:
         self.node_id = node_id
         self.node_config = node_config
-        self.run_infos: Dict[int, RunInfo] = {}
+        self.run_infos: dict[int, RunInfo] = {}
 
     # pylint: disable=too-many-arguments
     def register_context(

flwr/client/numpy_client.py

@@ -16,7 +16,7 @@
 
 
 from abc import ABC
-from typing import Callable, Dict, Tuple
+from typing import Callable
 
 from flwr.client.client import Client
 from flwr.common import (
@@ -73,7 +73,7 @@ class NumPyClient(ABC):
 
     _context: Context
 
-    def get_properties(self, config: Config) -> Dict[str, Scalar]:
+    def get_properties(self, config: Config) -> dict[str, Scalar]:
         """Return a client's set of properties.
 
         Parameters
@@ -93,7 +93,7 @@ class NumPyClient(ABC):
         _ = (self, config)
         return {}
 
-    def get_parameters(self, config: Dict[str, Scalar]) -> NDArrays:
+    def get_parameters(self, config: dict[str, Scalar]) -> NDArrays:
         """Return the current local model parameters.
 
         Parameters
@@ -112,8 +112,8 @@ class NumPyClient(ABC):
         return []
 
     def fit(
-        self, parameters: NDArrays, config: Dict[str, Scalar]
-    ) -> Tuple[NDArrays, int, Dict[str, Scalar]]:
+        self, parameters: NDArrays, config: dict[str, Scalar]
+    ) -> tuple[NDArrays, int, dict[str, Scalar]]:
         """Train the provided parameters using the locally held dataset.
 
         Parameters
@@ -141,8 +141,8 @@ class NumPyClient(ABC):
         return [], 0, {}
 
     def evaluate(
-        self, parameters: NDArrays, config: Dict[str, Scalar]
-    ) -> Tuple[float, int, Dict[str, Scalar]]:
+        self, parameters: NDArrays, config: dict[str, Scalar]
+    ) -> tuple[float, int, dict[str, Scalar]]:
         """Evaluate the provided parameters using the locally held dataset.
 
         Parameters
@@ -310,7 +310,7 @@ def _set_context(self: Client, context: Context) -> None:
 
 
 def _wrap_numpy_client(client: NumPyClient) -> Client:
-    member_dict: Dict[str, Callable] = {  # type: ignore
+    member_dict: dict[str, Callable] = {  # type: ignore
         "__init__": _constructor,
         "get_context": _get_context,
         "set_context": _set_context,

flwr/client/rest_client/connection.py

@@ -18,10 +18,11 @@
 import random
 import sys
 import threading
+from collections.abc import Iterator
 from contextlib import contextmanager
 from copy import copy
 from logging import ERROR, INFO, WARN
-from typing import Callable, Iterator, Optional, Tuple, Type, TypeVar, Union
+from typing import Callable, Optional, TypeVar, Union
 
 from cryptography.hazmat.primitives.asymmetric import ec
 from google.protobuf.message import Message as GrpcMessage
@@ -90,10 +91,10 @@ def http_request_response(  # pylint: disable=,R0913, R0914, R0915
         Union[bytes, str]
     ] = None,  # pylint: disable=unused-argument
     authentication_keys: Optional[  # pylint: disable=unused-argument
-        Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
+        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
     ] = None,
 ) -> Iterator[
-    Tuple[
+    tuple[
         Callable[[], Optional[Message]],
         Callable[[Message], None],
         Optional[Callable[[], Optional[int]]],
@@ -173,7 +174,7 @@ def http_request_response(  # pylint: disable=,R0913, R0914, R0915
     ###########################################################################
 
     def _request(
-        req: GrpcMessage, res_type: Type[T], api_path: str, retry: bool = True
+        req: GrpcMessage, res_type: type[T], api_path: str, retry: bool = True
     ) -> Optional[T]:
         # Serialize the request
         req_bytes = req.SerializeToString()

flwr/client/supernode/app.py

@@ -18,7 +18,7 @@ import argparse
 import sys
 from logging import DEBUG, ERROR, INFO, WARN
 from pathlib import Path
-from typing import Optional, Tuple
+from typing import Optional
 
 from cryptography.exceptions import UnsupportedAlgorithm
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -30,6 +30,7 @@ from cryptography.hazmat.primitives.serialization import (
 from flwr.common import EventType, event
 from flwr.common.config import parse_config_args
 from flwr.common.constant import (
+    FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,
     TRANSPORT_TYPE_GRPC_ADAPTER,
     TRANSPORT_TYPE_GRPC_RERE,
     TRANSPORT_TYPE_REST,
@@ -44,8 +45,6 @@ from ..app import (
 )
 from ..clientapp.utils import get_load_client_app_fn
 
-ADDRESS_FLEET_API_GRPC_RERE = "0.0.0.0:9092"
-
 
 def run_supernode() -> None:
     """Run Flower SuperNode."""
@@ -103,11 +102,11 @@ def run_client_app() -> None:
 
 def _warn_deprecated_server_arg(args: argparse.Namespace) -> None:
     """Warn about the deprecated argument `--server`."""
-    if args.server != ADDRESS_FLEET_API_GRPC_RERE:
+    if args.server != FLEET_API_GRPC_RERE_DEFAULT_ADDRESS:
         warn = "Passing flag --server is deprecated. Use --superlink instead."
         warn_deprecated_feature(warn)
 
-        if args.superlink != ADDRESS_FLEET_API_GRPC_RERE:
+        if args.superlink != FLEET_API_GRPC_RERE_DEFAULT_ADDRESS:
             # if `--superlink` also passed, then
             # warn user that this argument overrides what was passed with `--server`
             log(
@@ -247,12 +246,12 @@ def _parse_args_common(parser: argparse.ArgumentParser) -> None:
     )
     parser.add_argument(
         "--server",
-        default=ADDRESS_FLEET_API_GRPC_RERE,
+        default=FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,
         help="Server address",
     )
     parser.add_argument(
         "--superlink",
-        default=ADDRESS_FLEET_API_GRPC_RERE,
+        default=FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,
         help="SuperLink Fleet API (gRPC-rere) address (IPv4, IPv6, or a domain name)",
     )
     parser.add_argument(
@@ -292,7 +291,7 @@ def _parse_args_common(parser: argparse.ArgumentParser) -> None:
 
 def _try_setup_client_authentication(
     args: argparse.Namespace,
-) -> Optional[Tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]]:
+) -> Optional[tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]]:
     if not args.auth_supernode_private_key and not args.auth_supernode_public_key:
         return None
 

flwr/common/address.py

@@ -16,12 +16,12 @@
 
 import socket
 from ipaddress import ip_address
-from typing import Optional, Tuple
+from typing import Optional
 
 IPV6: int = 6
 
 
-def parse_address(address: str) -> Optional[Tuple[str, int, Optional[bool]]]:
+def parse_address(address: str) -> Optional[tuple[str, int, Optional[bool]]]:
     """Parse an IP address into host, port, and version.
 
     Parameters