flwr 1.22.0__py3-none-any.whl → 1.24.0__py3-none-any.whl

flwr/server/client_proxy.py

@@ -16,7 +16,6 @@
 
 
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from flwr.common import (
     DisconnectRes,
@@ -46,8 +45,8 @@ class ClientProxy(ABC):
     def get_properties(
         self,
         ins: GetPropertiesIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> GetPropertiesRes:
         """Return the client's properties."""
 
@@ -55,8 +54,8 @@ class ClientProxy(ABC):
     def get_parameters(
         self,
         ins: GetParametersIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> GetParametersRes:
         """Return the current local model parameters."""
 
@@ -64,8 +63,8 @@ class ClientProxy(ABC):
     def fit(
         self,
         ins: FitIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> FitRes:
         """Refine the provided parameters using the locally held dataset."""
 
@@ -73,8 +72,8 @@ class ClientProxy(ABC):
     def evaluate(
         self,
         ins: EvaluateIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> EvaluateRes:
         """Evaluate the provided parameters using the locally held dataset."""
 
@@ -82,7 +81,7 @@ class ClientProxy(ABC):
     def reconnect(
         self,
         ins: ReconnectIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> DisconnectRes:
         """Disconnect and (optionally) reconnect later."""

flwr/server/compat/app.py

@@ -16,7 +16,6 @@
 
 
 from logging import INFO
-from typing import Optional
 
 from flwr.common.logger import log
 from flwr.server.client_manager import ClientManager
@@ -32,10 +31,10 @@ from .app_utils import start_update_client_manager_thread
 def start_grid(  # pylint: disable=too-many-arguments, too-many-locals
     *,
     grid: Grid,
-    server: Optional[Server] = None,
-    config: Optional[ServerConfig] = None,
-    strategy: Optional[Strategy] = None,
-    client_manager: Optional[ClientManager] = None,
+    server: Server | None = None,
+    config: ServerConfig | None = None,
+    strategy: Strategy | None = None,
+    client_manager: ClientManager | None = None,
 ) -> History:
     """Start a Flower server.
 

flwr/server/compat/app_utils.py

@@ -16,7 +16,8 @@
 
 
 import threading
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from flwr.common.typing import RunNotRunningException
 

flwr/server/compat/grid_client_proxy.py

@@ -15,8 +15,6 @@
 """Flower ClientProxy implementation using Grid."""
 
 
-from typing import Optional
-
 from flwr import common
 from flwr.common import Message, MessageType, MessageTypeLegacy, RecordDict
 from flwr.common import recorddict_compat as compat
@@ -37,8 +35,8 @@ class GridClientProxy(ClientProxy):
     def get_properties(
         self,
         ins: common.GetPropertiesIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> common.GetPropertiesRes:
         """Return client's properties."""
         # Ins to RecordDict
@@ -53,8 +51,8 @@ class GridClientProxy(ClientProxy):
     def get_parameters(
         self,
         ins: common.GetParametersIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> common.GetParametersRes:
         """Return the current local model parameters."""
         # Ins to RecordDict
@@ -67,7 +65,7 @@ class GridClientProxy(ClientProxy):
         return compat.recorddict_to_getparametersres(in_recorddict, False)
 
     def fit(
-        self, ins: common.FitIns, timeout: Optional[float], group_id: Optional[int]
+        self, ins: common.FitIns, timeout: float | None, group_id: int | None
     ) -> common.FitRes:
         """Train model parameters on the locally held dataset."""
         # Ins to RecordDict
@@ -80,7 +78,7 @@ class GridClientProxy(ClientProxy):
         return compat.recorddict_to_fitres(in_recorddict, keep_input=False)
 
     def evaluate(
-        self, ins: common.EvaluateIns, timeout: Optional[float], group_id: Optional[int]
+        self, ins: common.EvaluateIns, timeout: float | None, group_id: int | None
     ) -> common.EvaluateRes:
         """Evaluate model parameters on the locally held dataset."""
         # Ins to RecordDict
@@ -95,8 +93,8 @@ class GridClientProxy(ClientProxy):
     def reconnect(
         self,
         ins: common.ReconnectIns,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> common.DisconnectRes:
         """Disconnect and (optionally) reconnect later."""
         return common.DisconnectRes(reason="")  # Nothing to do here (yet)
@@ -105,8 +103,8 @@ class GridClientProxy(ClientProxy):
         self,
         recorddict: RecordDict,
         message_type: str,
-        timeout: Optional[float],
-        group_id: Optional[int],
+        timeout: float | None,
+        group_id: int | None,
     ) -> RecordDict:
 
         # Create message

flwr/server/compat/legacy_context.py

@@ -16,7 +16,6 @@
 
 
 from dataclasses import dataclass
-from typing import Optional
 
 from flwr.common import Context
 
@@ -38,9 +37,9 @@ class LegacyContext(Context):
     def __init__(  # pylint: disable=too-many-arguments
         self,
         context: Context,
-        config: Optional[ServerConfig] = None,
-        strategy: Optional[Strategy] = None,
-        client_manager: Optional[ClientManager] = None,
+        config: ServerConfig | None = None,
+        strategy: Strategy | None = None,
+        client_manager: ClientManager | None = None,
     ) -> None:
         if config is None:
             config = ServerConfig()

flwr/server/fleet_event_log_interceptor.py

@@ -15,7 +15,8 @@
 """Flower Fleet API event log interceptor."""
 
 
-from typing import Any, Callable, cast
+from collections.abc import Callable
+from typing import Any, cast
 
 import grpc
 from google.protobuf.message import Message as GrpcMessage

flwr/server/grid/grid.py

@@ -17,7 +17,6 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Iterable
-from typing import Optional
 
 from flwr.common import Message, RecordDict
 from flwr.common.typing import Run
@@ -52,7 +51,7 @@ class Grid(ABC):
         message_type: str,
         dst_node_id: int,
         group_id: str,
-        ttl: Optional[float] = None,
+        ttl: float | None = None,
     ) -> Message:
         """Create a new message with specified parameters.
 
@@ -130,7 +129,7 @@ class Grid(ABC):
         self,
         messages: Iterable[Message],
         *,
-        timeout: Optional[float] = None,
+        timeout: float | None = None,
     ) -> Iterable[Message]:
         """Push messages to specified node IDs and pull the reply messages.
 

flwr/server/grid/grpc_grid.py

@@ -18,7 +18,7 @@
 import time
 from collections.abc import Iterable
 from logging import DEBUG, ERROR, WARNING
-from typing import Optional, cast
+from typing import cast
 
 import grpc
 
@@ -119,13 +119,13 @@ class GrpcGrid(Grid):
     def __init__(  # pylint: disable=too-many-arguments
         self,
         serverappio_service_address: str = SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
-        root_certificates: Optional[bytes] = None,
+        root_certificates: bytes | None = None,
     ) -> None:
         self._addr = serverappio_service_address
         self._cert = root_certificates
-        self._run: Optional[Run] = None
-        self._grpc_stub: Optional[ServerAppIoStub] = None
-        self._channel: Optional[grpc.Channel] = None
+        self._run: Run | None = None
+        self._grpc_stub: ServerAppIoStub | None = None
+        self._channel: grpc.Channel | None = None
         self.node = Node(node_id=SUPERLINK_NODE_ID)
         self._retry_invoker = _make_simple_grpc_retry_invoker()
         super().__init__()
@@ -200,7 +200,7 @@ class GrpcGrid(Grid):
         message_type: str,
         dst_node_id: int,
         group_id: str,
-        ttl: Optional[float] = None,
+        ttl: float | None = None,
     ) -> Message:
         """Create a new message with specified parameters.
 
@@ -313,7 +313,9 @@ class GrpcGrid(Grid):
             )
             # Pull Messages from store
             inflated_msgs: list[Message] = []
-            for msg_proto, msg_tree in zip(res.messages_list, res.message_object_trees):
+            for msg_proto, msg_tree in zip(
+                res.messages_list, res.message_object_trees, strict=True
+            ):
                 msg_id = msg_proto.metadata.message_id
                 try:
                     all_object_contents = pull_objects(
@@ -376,7 +378,7 @@ class GrpcGrid(Grid):
         self,
         messages: Iterable[Message],
         *,
-        timeout: Optional[float] = None,
+        timeout: float | None = None,
     ) -> Iterable[Message]:
         """Push messages to specified node IDs and pull the reply messages.
 

flwr/server/grid/inmemory_grid.py

@@ -17,7 +17,7 @@
 
 import time
 from collections.abc import Iterable
-from typing import Optional, cast
+from typing import cast
 from uuid import uuid4
 
 from flwr.common import Message, RecordDict
@@ -48,7 +48,7 @@ class InMemoryGrid(Grid):
         state_factory: LinkStateFactory,
         pull_interval: float = 0.1,
     ) -> None:
-        self._run: Optional[Run] = None
+        self._run: Run | None = None
         self.state = state_factory.state()
         self.pull_interval = pull_interval
         self.node = Node(node_id=SUPERLINK_NODE_ID)
@@ -81,7 +81,7 @@ class InMemoryGrid(Grid):
         message_type: str,
         dst_node_id: int,
         group_id: str,
-        ttl: Optional[float] = None,
+        ttl: float | None = None,
     ) -> Message:
         """Create a new message with specified parameters.
 
@@ -143,7 +143,7 @@ class InMemoryGrid(Grid):
         self,
         messages: Iterable[Message],
         *,
-        timeout: Optional[float] = None,
+        timeout: float | None = None,
     ) -> Iterable[Message]:
         """Push messages to specified node IDs and pull the reply messages.
 

flwr/server/run_serverapp.py

@@ -16,7 +16,6 @@
 
 
 from logging import DEBUG
-from typing import Optional
 
 from flwr.common import Context
 from flwr.common.logger import log
@@ -30,8 +29,8 @@ def run(
     grid: Grid,
     context: Context,
     server_app_dir: str,
-    server_app_attr: Optional[str] = None,
-    loaded_server_app: Optional[ServerApp] = None,
+    server_app_attr: str | None = None,
+    loaded_server_app: ServerApp | None = None,
 ) -> Context:
     """Run ServerApp with a given Grid."""
     if not (server_app_attr is None) ^ (loaded_server_app is None):

flwr/server/server.py

@@ -19,7 +19,6 @@ import concurrent.futures
 import io
 import timeit
 from logging import INFO, WARN
-from typing import Optional, Union
 
 from flwr.common import (
     Code,
@@ -43,15 +42,15 @@ from .server_config import ServerConfig
 
 FitResultsAndFailures = tuple[
     list[tuple[ClientProxy, FitRes]],
-    list[Union[tuple[ClientProxy, FitRes], BaseException]],
+    list[tuple[ClientProxy, FitRes] | BaseException],
 ]
 EvaluateResultsAndFailures = tuple[
     list[tuple[ClientProxy, EvaluateRes]],
-    list[Union[tuple[ClientProxy, EvaluateRes], BaseException]],
+    list[tuple[ClientProxy, EvaluateRes] | BaseException],
 ]
 ReconnectResultsAndFailures = tuple[
     list[tuple[ClientProxy, DisconnectRes]],
-    list[Union[tuple[ClientProxy, DisconnectRes], BaseException]],
+    list[tuple[ClientProxy, DisconnectRes] | BaseException],
 ]
 
 
@@ -62,16 +61,16 @@ class Server:
         self,
         *,
         client_manager: ClientManager,
-        strategy: Optional[Strategy] = None,
+        strategy: Strategy | None = None,
     ) -> None:
         self._client_manager: ClientManager = client_manager
         self.parameters: Parameters = Parameters(
             tensors=[], tensor_type="numpy.ndarray"
         )
         self.strategy: Strategy = strategy if strategy is not None else FedAvg()
-        self.max_workers: Optional[int] = None
+        self.max_workers: int | None = None
 
-    def set_max_workers(self, max_workers: Optional[int]) -> None:
+    def set_max_workers(self, max_workers: int | None) -> None:
         """Set the max_workers used by ThreadPoolExecutor."""
         self.max_workers = max_workers
 
@@ -84,7 +83,7 @@ class Server:
         return self._client_manager
 
     # pylint: disable=too-many-locals
-    def fit(self, num_rounds: int, timeout: Optional[float]) -> tuple[History, float]:
+    def fit(self, num_rounds: int, timeout: float | None) -> tuple[History, float]:
         """Run federated averaging for a number of rounds."""
         history = History()
 
@@ -161,10 +160,8 @@ class Server:
     def evaluate_round(
         self,
         server_round: int,
-        timeout: Optional[float],
-    ) -> Optional[
-        tuple[Optional[float], dict[str, Scalar], EvaluateResultsAndFailures]
-    ]:
+        timeout: float | None,
+    ) -> tuple[float | None, dict[str, Scalar], EvaluateResultsAndFailures] | None:
         """Validate current global model on a number of clients."""
         # Get clients and their respective instructions from strategy
         client_instructions = self.strategy.configure_evaluate(
@@ -198,7 +195,7 @@ class Server:
 
         # Aggregate the evaluation results
         aggregated_result: tuple[
-            Optional[float],
+            float | None,
             dict[str, Scalar],
         ] = self.strategy.aggregate_evaluate(server_round, results, failures)
 
@@ -208,10 +205,8 @@ class Server:
     def fit_round(
         self,
         server_round: int,
-        timeout: Optional[float],
-    ) -> Optional[
-        tuple[Optional[Parameters], dict[str, Scalar], FitResultsAndFailures]
-    ]:
+        timeout: float | None,
+    ) -> tuple[Parameters | None, dict[str, Scalar], FitResultsAndFailures] | None:
         """Perform a single round of federated averaging."""
         # Get clients and their respective instructions from strategy
         client_instructions = self.strategy.configure_fit(
@@ -246,14 +241,14 @@ class Server:
 
         # Aggregate training results
         aggregated_result: tuple[
-            Optional[Parameters],
+            Parameters | None,
             dict[str, Scalar],
         ] = self.strategy.aggregate_fit(server_round, results, failures)
 
         parameters_aggregated, metrics_aggregated = aggregated_result
         return parameters_aggregated, metrics_aggregated, (results, failures)
 
-    def disconnect_all_clients(self, timeout: Optional[float]) -> None:
+    def disconnect_all_clients(self, timeout: float | None) -> None:
         """Send shutdown signal to all clients."""
         all_clients = self._client_manager.all()
         clients = [all_clients[k] for k in all_clients.keys()]
@@ -266,11 +261,11 @@ class Server:
         )
 
     def _get_initial_parameters(
-        self, server_round: int, timeout: Optional[float]
+        self, server_round: int, timeout: float | None
     ) -> Parameters:
         """Get initial parameters from one of the available clients."""
         # Server-side parameter initialization
-        parameters: Optional[Parameters] = self.strategy.initialize_parameters(
+        parameters: Parameters | None = self.strategy.initialize_parameters(
             client_manager=self._client_manager
         )
         if parameters is not None:
@@ -297,8 +292,8 @@ class Server:
 
 def reconnect_clients(
     client_instructions: list[tuple[ClientProxy, ReconnectIns]],
-    max_workers: Optional[int],
-    timeout: Optional[float],
+    max_workers: int | None,
+    timeout: float | None,
 ) -> ReconnectResultsAndFailures:
     """Instruct clients to disconnect and never reconnect."""
     with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
@@ -313,7 +308,7 @@ def reconnect_clients(
 
     # Gather results
     results: list[tuple[ClientProxy, DisconnectRes]] = []
-    failures: list[Union[tuple[ClientProxy, DisconnectRes], BaseException]] = []
+    failures: list[tuple[ClientProxy, DisconnectRes] | BaseException] = []
     for future in finished_fs:
         failure = future.exception()
         if failure is not None:
@@ -327,7 +322,7 @@ def reconnect_clients(
 def reconnect_client(
     client: ClientProxy,
     reconnect: ReconnectIns,
-    timeout: Optional[float],
+    timeout: float | None,
 ) -> tuple[ClientProxy, DisconnectRes]:
     """Instruct client to disconnect and (optionally) reconnect later."""
     disconnect = client.reconnect(
@@ -340,8 +335,8 @@ def reconnect_client(
 
 def fit_clients(
     client_instructions: list[tuple[ClientProxy, FitIns]],
-    max_workers: Optional[int],
-    timeout: Optional[float],
+    max_workers: int | None,
+    timeout: float | None,
     group_id: int,
 ) -> FitResultsAndFailures:
     """Refine parameters concurrently on all selected clients."""
@@ -357,7 +352,7 @@ def fit_clients(
 
     # Gather results
     results: list[tuple[ClientProxy, FitRes]] = []
-    failures: list[Union[tuple[ClientProxy, FitRes], BaseException]] = []
+    failures: list[tuple[ClientProxy, FitRes] | BaseException] = []
     for future in finished_fs:
         _handle_finished_future_after_fit(
             future=future, results=results, failures=failures
@@ -366,7 +361,7 @@ def fit_clients(
 
 
 def fit_client(
-    client: ClientProxy, ins: FitIns, timeout: Optional[float], group_id: int
+    client: ClientProxy, ins: FitIns, timeout: float | None, group_id: int
 ) -> tuple[ClientProxy, FitRes]:
     """Refine parameters on a single client."""
     fit_res = client.fit(ins, timeout=timeout, group_id=group_id)
@@ -376,7 +371,7 @@ def fit_client(
 def _handle_finished_future_after_fit(
     future: concurrent.futures.Future,  # type: ignore
     results: list[tuple[ClientProxy, FitRes]],
-    failures: list[Union[tuple[ClientProxy, FitRes], BaseException]],
+    failures: list[tuple[ClientProxy, FitRes] | BaseException],
 ) -> None:
     """Convert finished future into either a result or a failure."""
     # Check if there was an exception
@@ -400,8 +395,8 @@ def _handle_finished_future_after_fit(
 
 def evaluate_clients(
     client_instructions: list[tuple[ClientProxy, EvaluateIns]],
-    max_workers: Optional[int],
-    timeout: Optional[float],
+    max_workers: int | None,
+    timeout: float | None,
     group_id: int,
 ) -> EvaluateResultsAndFailures:
     """Evaluate parameters concurrently on all selected clients."""
@@ -417,7 +412,7 @@ def evaluate_clients(
 
     # Gather results
     results: list[tuple[ClientProxy, EvaluateRes]] = []
-    failures: list[Union[tuple[ClientProxy, EvaluateRes], BaseException]] = []
+    failures: list[tuple[ClientProxy, EvaluateRes] | BaseException] = []
     for future in finished_fs:
         _handle_finished_future_after_evaluate(
             future=future, results=results, failures=failures
@@ -428,7 +423,7 @@ def evaluate_clients(
 def evaluate_client(
     client: ClientProxy,
     ins: EvaluateIns,
-    timeout: Optional[float],
+    timeout: float | None,
     group_id: int,
 ) -> tuple[ClientProxy, EvaluateRes]:
     """Evaluate parameters on a single client."""
@@ -439,7 +434,7 @@ def evaluate_client(
 def _handle_finished_future_after_evaluate(
     future: concurrent.futures.Future,  # type: ignore
     results: list[tuple[ClientProxy, EvaluateRes]],
-    failures: list[Union[tuple[ClientProxy, EvaluateRes], BaseException]],
+    failures: list[tuple[ClientProxy, EvaluateRes] | BaseException],
 ) -> None:
     """Convert finished future into either a result or a failure."""
     # Check if there was an exception
@@ -462,10 +457,10 @@ def _handle_finished_future_after_evaluate(
 
 
 def init_defaults(
-    server: Optional[Server],
-    config: Optional[ServerConfig],
-    strategy: Optional[Strategy],
-    client_manager: Optional[ClientManager],
+    server: Server | None,
+    config: ServerConfig | None,
+    strategy: Strategy | None,
+    client_manager: ClientManager | None,
 ) -> tuple[Server, ServerConfig]:
     """Create server instance if none was given."""
     if server is None:

flwr/server/server_app.py

@@ -16,9 +16,8 @@
 
 
 import inspect
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from contextlib import contextmanager
-from typing import Callable, Optional
 
 from flwr.common import Context
 from flwr.common.logger import warn_deprecated_feature_with_example
@@ -118,11 +117,11 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
     # pylint: disable=too-many-arguments,too-many-positional-arguments
     def __init__(
         self,
-        server: Optional[Server] = None,
-        config: Optional[ServerConfig] = None,
-        strategy: Optional[Strategy] = None,
-        client_manager: Optional[ClientManager] = None,
-        server_fn: Optional[ServerFn] = None,
+        server: Server | None = None,
+        config: ServerConfig | None = None,
+        strategy: Strategy | None = None,
+        client_manager: ClientManager | None = None,
+        server_fn: ServerFn | None = None,
     ) -> None:
         if any([server, config, strategy, client_manager]):
             warn_deprecated_feature_with_example(
@@ -148,7 +147,7 @@ class ServerApp:  # pylint: disable=too-many-instance-attributes
         self._strategy = strategy
         self._client_manager = client_manager
         self._server_fn = server_fn
-        self._main: Optional[ServerAppCallable] = None
+        self._main: ServerAppCallable | None = None
         self._lifespan = _empty_lifespan
 
     def __call__(self, grid: Grid, context: Context) -> None:

flwr/server/server_config.py

@@ -16,7 +16,6 @@
 
 
 from dataclasses import dataclass
-from typing import Optional
 
 
 @dataclass
@@ -28,7 +27,7 @@ class ServerConfig:
     """
 
     num_rounds: int = 1
-    round_timeout: Optional[float] = None
+    round_timeout: float | None = None
 
     def __repr__(self) -> str:
         """Return the string representation of the ServerConfig."""