flwr-nightly 1.23.0.dev20250930__py3-none-any.whl → 1.26.0.dev20260121__py3-none-any.whl

flwr/common/config.py

@@ -20,11 +20,12 @@ import re
 import zipfile
 from io import BytesIO
 from pathlib import Path
-from typing import IO, Any, Optional, TypeVar, Union, cast, get_args
+from typing import IO, Any, TypeVar, cast, get_args
 
 import tomli
 import typer
 
+from flwr.app.user_config import UserConfig, UserConfigValue
 from flwr.common.constant import (
     APP_DIR,
     FAB_CONFIG_FILE,
@@ -32,14 +33,14 @@ from flwr.common.constant import (
     FLWR_DIR,
     FLWR_HOME,
 )
-from flwr.common.typing import Run, UserConfig, UserConfigValue
+from flwr.common.typing import Run
 
 from . import ConfigRecord, object_ref
 
 T_dict = TypeVar("T_dict", bound=dict[str, Any])  # pylint: disable=invalid-name
 
 
-def get_flwr_dir(provided_path: Optional[str] = None) -> Path:
+def get_flwr_dir(provided_path: str | None = None) -> Path:
     """Return the Flower home directory based on env variables."""
     if provided_path is None or not Path(provided_path).is_dir():
         return Path(
@@ -55,7 +56,7 @@ def get_project_dir(
     fab_id: str,
     fab_version: str,
     fab_hash: str,
-    flwr_dir: Optional[Union[str, Path]] = None,
+    flwr_dir: str | Path | None = None,
 ) -> Path:
     """Return the project directory based on the given fab_id and fab_version."""
     # Check the fab_id
@@ -73,7 +74,7 @@ def get_project_dir(
     )
 
 
-def get_project_config(project_dir: Union[str, Path]) -> dict[str, Any]:
+def get_project_config(project_dir: str | Path) -> dict[str, Any]:
     """Return pyproject.toml in the given project directory."""
     # Load pyproject.toml file
     toml_path = Path(project_dir) / FAB_CONFIG_FILE
@@ -134,7 +135,7 @@ def get_fused_config_from_dir(
     return fuse_dicts(flat_default_config, override_config)
 
 
-def get_fused_config_from_fab(fab_file: Union[Path, bytes], run: Run) -> UserConfig:
+def get_fused_config_from_fab(fab_file: Path | bytes, run: Run) -> UserConfig:
     """Fuse default config in a `FAB` with overrides in a `Run`.
 
     This enables obtaining a run-config without having to install the FAB. This
@@ -146,7 +147,7 @@ def get_fused_config_from_fab(fab_file: Union[Path, bytes], run: Run) -> UserCon
     return fuse_dicts(flat_config_flat, run.override_config)
 
 
-def get_fused_config(run: Run, flwr_dir: Optional[Path]) -> UserConfig:
+def get_fused_config(run: Run, flwr_dir: Path | None) -> UserConfig:
     """Merge the overrides from a `Run` with the config from a FAB.
 
     Get the config using the fab_id and the fab_version, remove the nesting by adding
@@ -165,9 +166,7 @@ def get_fused_config(run: Run, flwr_dir: Optional[Path]) -> UserConfig:
     return get_fused_config_from_dir(project_dir, run.override_config)
 
 
-def flatten_dict(
-    raw_dict: Optional[dict[str, Any]], parent_key: str = ""
-) -> UserConfig:
+def flatten_dict(raw_dict: dict[str, Any] | None, parent_key: str = "") -> UserConfig:
     """Flatten dict by joining nested keys with a given separator."""
     if raw_dict is None:
         return {}
@@ -205,9 +204,7 @@ def unflatten_dict(flat_dict: dict[str, Any]) -> dict[str, Any]:
     return unflattened_dict
 
 
-def parse_config_args(
-    config: Optional[list[str]], flatten: bool = True
-) -> dict[str, Any]:
+def parse_config_args(config: list[str] | None, flatten: bool = True) -> dict[str, Any]:
     """Parse separator separated list of key-value pairs separated by '='."""
     overrides: UserConfig = {}
 
@@ -246,6 +243,7 @@ def parse_config_args(
                     "space-separated key-value pairs.",
                     fg=typer.colors.RED,
                     bold=True,
+                    err=True,
                 )
                 raise typer.Exit(code=1) from err
 
@@ -269,7 +267,7 @@ def user_config_to_configrecord(config: UserConfig) -> ConfigRecord:
     return c_record
 
 
-def get_fab_config(fab_file: Union[Path, bytes]) -> dict[str, Any]:
+def get_fab_config(fab_file: Path | bytes) -> dict[str, Any]:
     """Extract the config from a FAB file or path.
 
     Parameters
@@ -283,7 +281,7 @@ def get_fab_config(fab_file: Union[Path, bytes]) -> dict[str, Any]:
     Dict[str, Any]
         The `config` of the given Flower App Bundle.
     """
-    fab_file_archive: Union[Path, IO[bytes]]
+    fab_file_archive: Path | IO[bytes]
     if isinstance(fab_file, bytes):
         fab_file_archive = BytesIO(fab_file)
     elif isinstance(fab_file, Path):
@@ -319,7 +317,7 @@ def _validate_run_config(config_dict: dict[str, Any], errors: list[str]) -> None
 
 # pylint: disable=too-many-branches
 def validate_fields_in_config(
-    config: dict[str, Any]
+    config: dict[str, Any],
 ) -> tuple[bool, list[str], list[str]]:
     """Validate pyproject.toml fields."""
     errors = []
@@ -368,7 +366,7 @@ def validate_fields_in_config(
 def validate_config(
     config: dict[str, Any],
     check_module: bool = True,
-    project_dir: Optional[Union[str, Path]] = None,
+    project_dir: str | Path | None = None,
 ) -> tuple[bool, list[str], list[str]]:
     """Validate pyproject.toml."""
     is_valid, errors, warnings = validate_fields_in_config(config)

flwr/common/constant.py

@@ -17,13 +17,13 @@
 
 from __future__ import annotations
 
-TRANSPORT_TYPE_GRPC_BIDI = "grpc-bidi"
+import os
+
 TRANSPORT_TYPE_GRPC_RERE = "grpc-rere"
 TRANSPORT_TYPE_GRPC_ADAPTER = "grpc-adapter"
 TRANSPORT_TYPE_REST = "rest"
 TRANSPORT_TYPE_VCE = "vce"
 TRANSPORT_TYPES = [
-    TRANSPORT_TYPE_GRPC_BIDI,
     TRANSPORT_TYPE_GRPC_RERE,
     TRANSPORT_TYPE_REST,
     TRANSPORT_TYPE_VCE,
@@ -60,7 +60,9 @@ HEARTBEAT_DEFAULT_INTERVAL = 30
 HEARTBEAT_CALL_TIMEOUT = 5
 HEARTBEAT_BASE_MULTIPLIER = 0.8
 HEARTBEAT_RANDOM_RANGE = (-0.1, 0.1)
-HEARTBEAT_MAX_INTERVAL = 1e300
+HEARTBEAT_MIN_INTERVAL = 10
+HEARTBEAT_MAX_INTERVAL = 1800  # 30 minutes
+HEARTBEAT_INTERVAL_INF = 1e300  # Large value, disabling heartbeats
 HEARTBEAT_PATIENCE = 2
 RUN_FAILURE_DETAILS_NO_HEARTBEAT = "No heartbeat received from the run."
 
@@ -70,13 +72,24 @@ NODE_ID_NUM_BYTES = 8
 
 # Constants for FAB
 APP_DIR = "apps"
-FAB_ALLOWED_EXTENSIONS = {".py", ".toml", ".md"}
 FAB_CONFIG_FILE = "pyproject.toml"
 FAB_DATE = (2024, 10, 1, 0, 0, 0)
 FAB_HASH_TRUNCATION = 8
 FAB_MAX_SIZE = 10 * 1024 * 1024  # 10 MB
 FLWR_DIR = ".flwr"  # The default Flower directory: ~/.flwr/
 FLWR_HOME = "FLWR_HOME"  # If set, override the default Flower directory
+# FAB file include patterns (gitignore-style patterns)
+FAB_INCLUDE_PATTERNS = (
+    "**/*.py",
+    "**/*.toml",
+    "**/*.md",
+)
+# FAB file exclude patterns (gitignore-style patterns)
+FAB_EXCLUDE_PATTERNS = (
+    f"{FLWR_DIR}/**",  # Exclude the .flwr directory
+    "**/__pycache__/**",
+    FAB_CONFIG_FILE,  # Exclude the original pyproject.toml
+)
 
 # Constant for SuperLink
 SUPERLINK_NODE_ID = 1
@@ -109,14 +122,14 @@ LOG_UPLOAD_INTERVAL = 0.2  # Minimum interval between two log uploads
 # Retry configurations
 MAX_RETRY_DELAY = 20  # Maximum delay duration between two consecutive retries.
 
-# Constants for user authentication
+# Constants for account authentication
 CREDENTIALS_DIR = ".credentials"
-AUTH_TYPE_JSON_KEY = "auth-type"  # For key name in JSON file
-AUTH_TYPE_YAML_KEY = "auth_type"  # For key name in YAML file
+AUTHN_TYPE_JSON_KEY = "authn-type"  # For key name in JSON file
+AUTHN_TYPE_YAML_KEY = "authn_type"  # For key name in YAML file
 ACCESS_TOKEN_KEY = "flwr-oidc-access-token"
 REFRESH_TOKEN_KEY = "flwr-oidc-refresh-token"
 
-# Constants for user authorization
+# Constants for account authorization
 AUTHZ_TYPE_YAML_KEY = "authz_type"  # For key name in YAML file
 
 # Constants for node authentication
@@ -135,7 +148,9 @@ GC_THRESHOLD = 200_000_000  # 200 MB
 # Constants for Inflatable
 HEAD_BODY_DIVIDER = b"\x00"
 HEAD_VALUE_DIVIDER = " "
-MAX_ARRAY_CHUNK_SIZE = 20_971_520  # 20 MB
+FLWR_PRIVATE_MAX_ARRAY_CHUNK_SIZE = int(
+    os.getenv("FLWR_PRIVATE_MAX_ARRAY_CHUNK_SIZE", "5242880")
+)  # 5 MB
 
 # Constants for serialization
 INT64_MAX_VALUE = 9223372036854775807  # (1 << 63) - 1
@@ -144,8 +159,12 @@ INT64_MAX_VALUE = 9223372036854775807  # (1 << 63) - 1
 FLWR_APP_TOKEN_LENGTH = 128  # Length of the token used
 
 # Constants for object pushing and pulling
-MAX_CONCURRENT_PUSHES = 8  # Default maximum number of concurrent pushes
-MAX_CONCURRENT_PULLS = 8  # Default maximum number of concurrent pulls
+FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES = int(
+    os.getenv("FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PUSHES", "2")
+)  # Default maximum number of concurrent pushes
+FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS = int(
+    os.getenv("FLWR_PRIVATE_MAX_CONCURRENT_OBJ_PULLS", "2")
+)  # Default maximum number of concurrent pulls
 PULL_MAX_TIME = 7200  # Default maximum time to wait for pulling objects
 PULL_MAX_TRIES_PER_OBJECT = 500  # Default maximum number of tries to pull an object
 PULL_INITIAL_BACKOFF = 1  # Initial backoff time for pulling objects
@@ -154,22 +173,13 @@ PULL_BACKOFF_CAP = 10  # Maximum backoff time for pulling objects
 
 # ControlServicer constants
 RUN_ID_NOT_FOUND_MESSAGE = "Run ID not found"
-NO_USER_AUTH_MESSAGE = "ControlServicer initialized without user authentication"
+NO_ACCOUNT_AUTH_MESSAGE = "ControlServicer initialized without account authentication"
 NO_ARTIFACT_PROVIDER_MESSAGE = "ControlServicer initialized without artifact provider"
 PULL_UNFINISHED_RUN_MESSAGE = "Cannot pull artifacts for an unfinished run"
-
-
-class MessageType:
-    """Message type."""
-
-    TRAIN = "train"
-    EVALUATE = "evaluate"
-    QUERY = "query"
-    SYSTEM = "system"
-
-    def __new__(cls) -> MessageType:
-        """Prevent instantiation."""
-        raise TypeError(f"{cls.__name__} cannot be instantiated.")
+SUPERNODE_NOT_CREATED_FROM_CLI_MESSAGE = "Invalid SuperNode credentials"
+PUBLIC_KEY_ALREADY_IN_USE_MESSAGE = "Public key already in use"
+PUBLIC_KEY_NOT_VALID = "The provided public key is not valid"
+NODE_NOT_FOUND_MESSAGE = "Node ID not found for account"
 
 
 class MessageTypeLegacy:
@@ -203,6 +213,8 @@ class ErrorCode:
     REPLY_MESSAGE_UNAVAILABLE = 4
     NODE_UNAVAILABLE = 5
     MOD_FAILED_PRECONDITION = 6
+    INVALID_FAB = 7
+    CLIENT_APP_CRASHED = 8
 
     def __new__(cls) -> ErrorCode:
         """Prevent instantiation."""
@@ -245,12 +257,23 @@ class CliOutputFormat:
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
 
 
-class AuthType:
-    """User authentication types."""
+class AuthnType:
+    """Account authentication types."""
 
+    NOOP = "noop"
     OIDC = "oidc"
 
-    def __new__(cls) -> AuthType:
+    def __new__(cls) -> AuthnType:
+        """Prevent instantiation."""
+        raise TypeError(f"{cls.__name__} cannot be instantiated.")
+
+
+class AuthzType:
+    """Account authorization types."""
+
+    NOOP = "noop"
+
+    def __new__(cls) -> AuthzType:
         """Prevent instantiation."""
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
 
@@ -281,3 +304,8 @@ class ExecPluginType:
         """Return all SuperExec plugin types."""
         # Filter all constants (uppercase) of the class
         return [v for k, v in vars(ExecPluginType).items() if k.isupper()]
+
+
+# Constants for No-op auth plugins
+NOOP_FLWR_AID = "<id:none>"
+NOOP_ACCOUNT_NAME = "<name:none>"

flwr/common/context.py

@@ -17,8 +17,9 @@
 
 from dataclasses import dataclass
 
+from flwr.app.user_config import UserConfig
+
 from .record import RecordDict
-from .typing import UserConfig
 
 
 @dataclass

flwr/common/differential_privacy.py

@@ -16,7 +16,6 @@
 
 
 from logging import WARNING
-from typing import Optional
 
 import numpy as np
 
@@ -70,7 +69,7 @@ def compute_clip_model_update(
     """Compute model update (param1 - param2) and clip it.
 
     Then add the clipped value to param1."""
-    model_update = [np.subtract(x, y) for (x, y) in zip(param1, param2)]
+    model_update = [np.subtract(x, y) for (x, y) in zip(param1, param2, strict=True)]
     clip_inputs_inplace(model_update, clipping_norm)
 
     for i, _ in enumerate(param2):
@@ -98,7 +97,7 @@ def compute_adaptive_clip_model_update(
     model update = param1 - param2
     Return the norm_bit
     """
-    model_update = [np.subtract(x, y) for (x, y) in zip(param1, param2)]
+    model_update = [np.subtract(x, y) for (x, y) in zip(param1, param2, strict=True)]
     norm_bit = adaptive_clip_inputs_inplace(model_update, clipping_norm)
 
     for i, _ in enumerate(param2):
@@ -125,7 +124,7 @@ def add_gaussian_noise_to_params(
 def compute_adaptive_noise_params(
     noise_multiplier: float,
     num_sampled_clients: float,
-    clipped_count_stddev: Optional[float],
+    clipped_count_stddev: float | None,
 ) -> tuple[float, float]:
     """Compute noising parameters for the adaptive clipping.
 

flwr/common/event_log_plugin/event_log_plugin.py

@@ -16,7 +16,6 @@
 
 
 from abc import ABC, abstractmethod
-from typing import Optional, Union
 
 import grpc
 from google.protobuf.message import Message as GrpcMessage
@@ -36,7 +35,7 @@ class EventLogWriterPlugin(ABC):
         self,
         request: GrpcMessage,
         context: grpc.ServicerContext,
-        account_info: Optional[AccountInfo],
+        account_info: AccountInfo | None,
         method_name: str,
     ) -> LogEntry:
         """Compose pre-event log entry from the provided request and context."""
@@ -46,9 +45,9 @@ class EventLogWriterPlugin(ABC):
         self,
         request: GrpcMessage,
         context: grpc.ServicerContext,
-        account_info: Optional[AccountInfo],
+        account_info: AccountInfo | None,
         method_name: str,
-        response: Optional[Union[GrpcMessage, BaseException]],
+        response: GrpcMessage | BaseException | None,
     ) -> LogEntry:
         """Compose post-event log entry from the provided response and context."""
 

flwr/common/exit/exit.py

@@ -15,14 +15,16 @@
 """Unified exit function."""
 
 
-from __future__ import annotations
-
+import os
 import sys
+import threading
+import time
 from logging import ERROR, INFO
 from typing import Any, NoReturn
 
 from flwr.common import EventType, event
-from flwr.common.version import package_version
+from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
+from flwr.supercore.version import package_version
 
 from ..logger import log
 from .exit_code import EXIT_CODE_HELP
@@ -53,6 +55,10 @@ def flwr_exit(
     - `<message>`: Optional context or additional information about the exit.
     - `<short-help-message>`: A brief explanation for the given exit code.
     - `<help-page-url>`: A URL providing detailed documentation and resolution steps.
+
+    Notes
+    -----
+    This function MUST be called from the main thread.
     """
     is_error = not 0 <= code < 100  # 0-99 are success exit codes
 
@@ -84,6 +90,13 @@ def flwr_exit(
     # Trigger exit handlers
     trigger_exit_handlers()
 
+    # Start a daemon thread to force exit if graceful exit fails
+    def force_exit() -> None:
+        time.sleep(FORCE_EXIT_TIMEOUT_SECONDS)
+        os._exit(sys_exit_code)
+
+    threading.Thread(target=force_exit, daemon=True).start()
+
     # Exit
     sys.exit(sys_exit_code)
 

flwr/common/exit/exit_code.py

@@ -38,20 +38,29 @@ class ExitCode:
     SERVERAPP_STRATEGY_PRECONDITION_UNMET = 200
     SERVERAPP_EXCEPTION = 201
     SERVERAPP_STRATEGY_AGGREGATION_ERROR = 202
+    SERVERAPP_RUN_START_REJECTED = 203
 
     # 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
+    SUPERNODE_STARTED_WITHOUT_TLS_BUT_NODE_AUTH_ENABLED = 303
+    SUPERNODE_INVALID_TRUSTED_ENTITIES = 304
 
     # SuperExec-specific exit codes (400-499)
     SUPEREXEC_INVALID_PLUGIN_CONFIG = 400
 
+    # FlowerCLI-specific exit codes (500-599)
+    FLWRCLI_NODE_AUTH_PUBLIC_KEY_INVALID = 500
+
     # Common exit codes (600-699)
     COMMON_ADDRESS_INVALID = 600
     COMMON_MISSING_EXTRA_REST = 601
     COMMON_TLS_NOT_SUPPORTED = 602
 
+    # Simulation exit codes (700-799)
+    SIMULATION_EXCEPTION = 700
+
     def __new__(cls) -> ExitCode:
         """Prevent instantiation."""
         raise TypeError(f"{cls.__name__} cannot be instantiated.")
@@ -97,25 +106,41 @@ EXIT_CODE_HELP = {
         "The strategy encountered an error during aggregation. Please check the logs "
         "for more details."
     ),
+    ExitCode.SERVERAPP_RUN_START_REJECTED: (
+        "The SuperLink rejected the request to start the run. This may occur if the "
+        "run has been stopped, the run ID or FAB is invalid, or the run failed to "
+        "start within the allowed time."
+    ),
     # SuperNode-specific exit codes (300-399)
     ExitCode.SUPERNODE_REST_ADDRESS_INVALID: (
         "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."
     ),
+    ExitCode.SUPERNODE_STARTED_WITHOUT_TLS_BUT_NODE_AUTH_ENABLED: (
+        "The private key for SuperNode authentication was provided, but TLS is not "
+        "enabled. Node authentication can only be used when TLS is enabled."
+    ),
+    ExitCode.SUPERNODE_INVALID_TRUSTED_ENTITIES: (
+        "Failed to read the trusted entities YAML file. "
+        "Please ensure that a valid file is provided using "
+        "the `--trusted-entities` option."
+    ),
     # SuperExec-specific exit codes (400-499)
     ExitCode.SUPEREXEC_INVALID_PLUGIN_CONFIG: (
         "The YAML configuration for the SuperExec plugin is invalid."
     ),
+    # FlowerCLI-specific exit codes (500-599)
+    ExitCode.FLWRCLI_NODE_AUTH_PUBLIC_KEY_INVALID: (
+        "Node authentication requires a valid elliptic curve public key in the "
+        "SSH format and following a NIST standard elliptic curve (e.g. SECP384R1). "
+        "Please ensure that the file path points to a valid public key "
+        "file and try again."
+    ),
     # Common exit codes (600-699)
     ExitCode.COMMON_ADDRESS_INVALID: (
         "Please provide a valid URL, IPv4 or IPv6 address."
@@ -128,4 +153,8 @@ To use the REST API, install `flwr` with the `rest` extra:
     `pip install "flwr[rest]"`.
 """,
     ExitCode.COMMON_TLS_NOT_SUPPORTED: "Please use the '--insecure' flag.",
+    # Simulation exit codes (700-799)
+    ExitCode.SIMULATION_EXCEPTION: (
+        "An unhandled exception occurred when running the simulation."
+    ),
 }

flwr/common/exit/exit_handler.py

@@ -17,7 +17,7 @@
 
 import signal
 import threading
-from typing import Callable
+from collections.abc import Callable
 
 from .exit_code import ExitCode
 
@@ -58,5 +58,9 @@ def trigger_exit_handlers() -> None:
     """Trigger all registered exit handlers in LIFO order."""
     with _lock_handlers:
         for handler in reversed(registered_exit_handlers):
-            handler()
+            try:
+                handler()
+            except Exception:  # pylint: disable=broad-exception-caught
+                # Ignore exceptions in exit handlers
+                pass
         registered_exit_handlers.clear()

flwr/common/exit/signal_handler.py

@@ -16,9 +16,9 @@
 
 
 import signal
+from collections.abc import Callable
 from threading import Thread
 from types import FrameType
-from typing import Callable, Optional
 
 from grpc import Server
 
@@ -40,10 +40,10 @@ if hasattr(signal, "SIGQUIT"):
 
 def register_signal_handlers(
     event_type: EventType,
-    exit_message: Optional[str] = None,
-    grpc_servers: Optional[list[Server]] = None,
-    bckg_threads: Optional[list[Thread]] = None,
-    exit_handlers: Optional[list[Callable[[], None]]] = None,
+    exit_message: str | None = None,
+    grpc_servers: list[Server] | None = None,
+    bckg_threads: list[Thread] | None = None,
+    exit_handlers: list[Callable[[], None]] | None = None,
 ) -> None:
     """Register exit handlers for `SIGINT`, `SIGTERM` and `SIGQUIT` signals.
 

flwr/common/grpc.py

@@ -18,13 +18,14 @@
 import concurrent.futures
 import os
 import sys
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from logging import DEBUG, ERROR
-from typing import Any, Callable, Optional
+from typing import Any
 
 import grpc
 
-from .address import is_port_in_use
+from flwr.supercore.address import is_port_in_use
+
 from .logger import log
 
 GRPC_MAX_MESSAGE_LENGTH: int = 2_147_483_647  # == 2048 * 1024 * 1024 -1 (2GB)
@@ -46,9 +47,9 @@ if "GRPC_VERBOSITY" not in os.environ:
 def create_channel(
     server_address: str,
     insecure: bool,
-    root_certificates: Optional[bytes] = None,
+    root_certificates: bytes | None = None,
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,
-    interceptors: Optional[Sequence[grpc.UnaryUnaryClientInterceptor]] = None,
+    interceptors: Sequence[grpc.UnaryUnaryClientInterceptor] | None = None,
 ) -> grpc.Channel:
     """Create a gRPC channel, either secure or insecure."""
     # Check for conflicting parameters
@@ -104,8 +105,8 @@ def generic_create_grpc_server(  # pylint: disable=too-many-arguments, R0914, R0
     max_concurrent_workers: int = 1000,
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,
     keepalive_time_ms: int = 210000,
-    certificates: Optional[tuple[bytes, bytes, bytes]] = None,
-    interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
+    certificates: tuple[bytes, bytes, bytes] | None = None,
+    interceptors: Sequence[grpc.ServerInterceptor] | None = None,
 ) -> grpc.Server:
     """Create a gRPC server with a single servicer.
 

flwr/common/inflatable_protobuf_utils.py

@@ -15,7 +15,7 @@
 """InflatableObject gRPC utils."""
 
 
-from typing import Callable
+from collections.abc import Callable
 
 from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     ConfirmMessageReceivedRequest,