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

flwr/client/grpc_rere_client/grpc_adapter.py

@@ -15,7 +15,8 @@
 """GrpcAdapter implementation."""
 
 
-import sys
+import signal
+import time
 from logging import DEBUG
 from typing import Any, TypeVar, cast
 
@@ -62,6 +63,7 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PushObjectResponse,
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
+from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
 
 T = TypeVar("T", bound=GrpcMessage)
 
@@ -108,7 +110,9 @@ class GrpcAdapter:
                 DEBUG,
                 'Received shutdown signal: exit flag is set to ``"true"``. Exiting...',
             )
-            sys.exit(0)
+            signal.raise_signal(signal.SIGTERM)
+            # Give some time to handle the signal
+            time.sleep(FORCE_EXIT_TIMEOUT_SECONDS + 1)
 
         # Check the grpc_message_name of the response
         if container_res.grpc_message_name != response_type.__qualname__:

flwr/client/grpc_rere_client/node_auth_client_interceptor.py

@@ -15,7 +15,8 @@
 """Flower client interceptor."""
 
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import grpc
 from cryptography.hazmat.primitives.asymmetric import ec

flwr/client/message_handler/message_handler.py

@@ -16,7 +16,7 @@
 
 
 from logging import WARN
-from typing import Optional, cast
+from typing import cast
 
 from flwr.client.client import (
     maybe_call_evaluate,
@@ -53,7 +53,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[Message | None, int]:
     """Handle control part of the incoming message.
 
     Parameters

flwr/client/mod/secure_aggregation/secaggplus_mod.py

@@ -112,9 +112,9 @@ class SecAggPlusState:
                     updated_values = [
                         tuple(values[i : i + 2]) for i in range(0, len(values), 2)
                     ]
-                    new_v = dict(zip(keys, updated_values))
+                    new_v = dict(zip(keys, updated_values, strict=True))
                 else:
-                    new_v = dict(zip(keys, values))
+                    new_v = dict(zip(keys, values, strict=True))
             self.__setattr__(k, new_v)
 
     def to_dict(self) -> dict[str, ConfigRecordValues]:
@@ -426,7 +426,7 @@ def _collect_masked_vectors(
         raise ValueError("Not enough available neighbour clients.")
 
     # Decrypt ciphertexts, verify their sources, and store shares.
-    for src, ciphertext in zip(srcs, ciphertexts):
+    for src, ciphertext in zip(srcs, ciphertexts, strict=True):
         shared_key = state.ss2_dict[src]
         plaintext = decrypt(shared_key, ciphertext)
         actual_src, dst, rd_seed_share, sk1_share = share_keys_plaintext_separate(

flwr/client/numpy_client.py

@@ -16,7 +16,7 @@
 
 
 from abc import ABC
-from typing import Callable
+from collections.abc import Callable
 
 from flwr.client.client import Client
 from flwr.common import (

flwr/client/rest_client/connection.py

@@ -15,10 +15,10 @@
 """Contextmanager for a REST request-response channel to the Flower server."""
 
 
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from contextlib import contextmanager
 from logging import ERROR, WARN
-from typing import Callable, Optional, TypeVar, Union
+from typing import TypeVar
 
 from cryptography.hazmat.primitives.asymmetric import ec
 from google.protobuf.message import Message as GrpcMessage
@@ -27,7 +27,6 @@ from requests.exceptions import ConnectionError as RequestsConnectionError
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH
 from flwr.common.constant import HEARTBEAT_DEFAULT_INTERVAL
 from flwr.common.exit import ExitCode, flwr_exit
-from flwr.common.heartbeat import HeartbeatSender
 from flwr.common.inflatable_protobuf_utils import (
     make_confirm_message_received_fn_protobuf,
     make_pull_object_fn_protobuf,
@@ -73,6 +72,7 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
+from flwr.supercore.heartbeat import HeartbeatSender
 from flwr.supercore.primitives.asymmetric import generate_key_pairs, public_key_to_bytes
 
 try:
@@ -103,16 +103,14 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     insecure: bool,  # pylint: disable=unused-argument
     retry_invoker: RetryInvoker,
     max_message_length: int = GRPC_MAX_MESSAGE_LENGTH,  # pylint: disable=W0613
-    root_certificates: Optional[
-        Union[bytes, str]
-    ] = None,  # pylint: disable=unused-argument
-    authentication_keys: Optional[  # pylint: disable=unused-argument
-        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey]
-    ] = None,
+    root_certificates: bytes | str | None = None,  # pylint: disable=unused-argument
+    authentication_keys: (
+        tuple[ec.EllipticCurvePrivateKey, ec.EllipticCurvePublicKey] | None
+    ) = None,
 ) -> Iterator[
     tuple[
         int,
-        Callable[[], Optional[tuple[Message, ObjectTree]]],
+        Callable[[], tuple[Message, ObjectTree] | None],
         Callable[[Message, ObjectTree], set[str]],
         Callable[[int], Run],
         Callable[[str, int], Fab],
@@ -172,7 +170,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     # Otherwise any server can fake its identity
     # Please refer to:
     # https://requests.readthedocs.io/en/latest/user/advanced/#ssl-cert-verification
-    verify: Union[bool, str] = True
+    verify: bool | str = True
     if isinstance(root_certificates, str):
         verify = root_certificates
     elif isinstance(root_certificates, bytes):
@@ -192,7 +190,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
     node_pk = public_key_to_bytes(authentication_keys[1])
 
     # Shared variables for inner functions
-    node: Optional[Node] = None
+    node: Node | None = None
 
     # Remove should_giveup from RetryInvoker as REST does not support gRPC status codes
     retry_invoker.should_giveup = None
@@ -203,7 +201,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
 
     def _request(
         req: GrpcMessage, res_type: type[T], api_path: str, retry: bool = True
-    ) -> Optional[T]:
+    ) -> T | None:
         # Serialize the request
         req_bytes = req.SerializeToString()
 
@@ -369,7 +367,7 @@ def http_request_response(  # pylint: disable=R0913,R0914,R0915,R0917
         # Cleanup
         node = None
 
-    def receive() -> Optional[tuple[Message, ObjectTree]]:
+    def receive() -> tuple[Message, ObjectTree] | None:
         """Pull a message with its ObjectTree from SuperLink."""
         # Get Node
         if node is None:

flwr/client/run_info_store.py

@@ -17,7 +17,6 @@
 
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 from flwr.common import Context, RecordDict
 from flwr.common.config import (
@@ -52,10 +51,10 @@ class DeprecatedRunInfoStore:
     def register_context(
         self,
         run_id: int,
-        run: Optional[Run] = None,
-        flwr_path: Optional[Path] = None,
-        app_dir: Optional[str] = None,
-        fab: Optional[Fab] = None,
+        run: Run | None = None,
+        flwr_path: Path | None = None,
+        app_dir: str | None = None,
+        fab: Fab | None = None,
     ) -> None:
         """Register new run context for this node."""
         if run_id not in self.run_infos:

flwr/client/typing.py

@@ -15,7 +15,7 @@
 """Custom types for Flower clients."""
 
 
-from typing import Callable
+from collections.abc import Callable
 
 from flwr.common import Context, Message
 

flwr/clientapp/client_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.app.metadata import validate_message_type
 from flwr.client.client import Client
@@ -109,14 +108,14 @@ class ClientApp:
 
     def __init__(
         self,
-        client_fn: Optional[ClientFnExt] = None,  # Only for backward compatibility
-        mods: Optional[list[Mod]] = None,
+        client_fn: ClientFnExt | None = None,  # Only for backward compatibility
+        mods: list[Mod] | None = None,
     ) -> None:
         self._mods: list[Mod] = mods if mods is not None else []
         self._registered_funcs: dict[str, ClientAppCallable] = {}
 
         # Create wrapper function for `handle`
-        self._call: Optional[ClientAppCallable] = None
+        self._call: ClientAppCallable | None = None
         if client_fn is not None:
 
             client_fn = _inspect_maybe_adapt_client_fn_signature(client_fn)
@@ -163,7 +162,7 @@ class ClientApp:
             raise ValueError(f"No {category} function registered with name '{action}'")
 
     def train(
-        self, action: str = DEFAULT_ACTION, *, mods: Optional[list[Mod]] = None
+        self, action: str = DEFAULT_ACTION, *, mods: list[Mod] | None = None
     ) -> Callable[[ClientAppCallable], ClientAppCallable]:
         """Register a train function with the ``ClientApp``.
 
@@ -218,7 +217,7 @@ class ClientApp:
         return _get_decorator(self, MessageType.TRAIN, action, mods)
 
     def evaluate(
-        self, action: str = DEFAULT_ACTION, *, mods: Optional[list[Mod]] = None
+        self, action: str = DEFAULT_ACTION, *, mods: list[Mod] | None = None
     ) -> Callable[[ClientAppCallable], ClientAppCallable]:
         """Register an evaluate function with the ``ClientApp``.
 
@@ -273,7 +272,7 @@ class ClientApp:
         return _get_decorator(self, MessageType.EVALUATE, action, mods)
 
     def query(
-        self, action: str = DEFAULT_ACTION, *, mods: Optional[list[Mod]] = None
+        self, action: str = DEFAULT_ACTION, *, mods: list[Mod] | None = None
     ) -> Callable[[ClientAppCallable], ClientAppCallable]:
         """Register a query function with the ``ClientApp``.
 
@@ -355,7 +354,7 @@ class ClientApp:
         """
 
         def lifespan_decorator(
-            lifespan_fn: Callable[[Context], Iterator[None]]
+            lifespan_fn: Callable[[Context], Iterator[None]],
         ) -> Callable[[Context], Iterator[None]]:
             """Register the lifespan fn with the ServerApp object."""
 
@@ -398,7 +397,7 @@ class LoadClientAppError(Exception):
 
 
 def _get_decorator(
-    app: ClientApp, category: str, action: str, mods: Optional[list[Mod]]
+    app: ClientApp, category: str, action: str, mods: list[Mod] | None
 ) -> Callable[[ClientAppCallable], ClientAppCallable]:
     """Get the decorator for the given category and action."""
     # pylint: disable=protected-access

flwr/clientapp/mod/centraldp_mods.py

@@ -15,7 +15,6 @@
 """Clipping modifiers for central DP with client-side clipping."""
 
 
-from collections import OrderedDict
 from logging import ERROR, INFO
 from typing import cast
 
@@ -105,14 +104,14 @@ def fixedclipping_mod(
     )
     # Replace outgoing ArrayRecord's Array while preserving their keys
     out_msg.content.array_records[new_array_record_key] = ArrayRecord(
-        OrderedDict(
-            {
-                k: Array(v)
-                for k, v in zip(
-                    client_to_server_arrecord.keys(), client_to_server_ndarrays
-                )
-            }
-        )
+        {
+            k: Array(v)
+            for k, v in zip(
+                client_to_server_arrecord.keys(),
+                client_to_server_ndarrays,
+                strict=True,
+            )
+        }
     )
     return out_msg
 
@@ -192,14 +191,14 @@ def adaptiveclipping_mod(
     )
     # Replace outgoing ArrayRecord's Array while preserving their keys
     out_msg.content.array_records[new_array_record_key] = ArrayRecord(
-        OrderedDict(
-            {
-                k: Array(v)
-                for k, v in zip(
-                    client_to_server_arrecord.keys(), client_to_server_ndarrays
-                )
-            }
-        )
+        {
+            k: Array(v)
+            for k, v in zip(
+                client_to_server_arrecord.keys(),
+                client_to_server_ndarrays,
+                strict=True,
+            )
+        }
     )
     # Add to the MetricRecords the norm bit (recall reply messages only contain
     # one MetricRecord)

flwr/clientapp/mod/localdp_mod.py

@@ -15,7 +15,6 @@
 """Local DP modifier."""
 
 
-from collections import OrderedDict
 from logging import INFO
 
 import numpy as np
@@ -157,13 +156,13 @@ class LocalDpMod:
 
         # Replace outgoing ArrayRecord's Array while preserving their keys
         out_msg.content[new_array_record_key] = ArrayRecord(
-            OrderedDict(
-                {
-                    k: Array(v)
-                    for k, v in zip(
-                        client_to_server_arrecord.keys(), client_to_server_ndarrays
-                    )
-                }
-            )
+            {
+                k: Array(v)
+                for k, v in zip(
+                    client_to_server_arrecord.keys(),
+                    client_to_server_ndarrays,
+                    strict=True,
+                )
+            }
         )
         return out_msg

flwr/clientapp/typing.py

@@ -15,7 +15,7 @@
 """Custom types for Flower clients."""
 
 
-from typing import Callable
+from collections.abc import Callable
 
 from flwr.common import Context, Message
 

flwr/clientapp/utils.py

@@ -15,9 +15,9 @@
 """Flower ClientApp loading utils."""
 
 
+from collections.abc import Callable
 from logging import DEBUG
 from pathlib import Path
-from typing import Callable, Optional
 
 from flwr.clientapp.client_app import ClientApp, LoadClientAppError
 from flwr.common.config import (
@@ -32,9 +32,9 @@ from flwr.common.object_ref import load_app, validate
 
 def get_load_client_app_fn(
     default_app_ref: str,
-    app_path: Optional[str],
+    app_path: str | None,
     multi_app: bool,
-    flwr_dir: Optional[str] = None,
+    flwr_dir: str | None = None,
 ) -> Callable[[str, str, str], ClientApp]:
     """Get the load_client_app_fn function.
 

flwr/common/address.py

@@ -18,14 +18,13 @@
 import re
 import socket
 from ipaddress import ip_address
-from typing import Optional
 
 import grpc
 
 IPV6: int = 6
 
 
-def parse_address(address: str) -> Optional[tuple[str, int, Optional[bool]]]:
+def parse_address(address: str) -> tuple[str, int, bool | None] | None:
     """Parse an IP address into host, port, and version.
 
     Parameters

flwr/common/args.py

@@ -20,7 +20,6 @@ import sys
 from logging import DEBUG, ERROR, INFO, WARN
 from os.path import isfile
 from pathlib import Path
-from typing import Optional, Union
 
 from flwr.common.constant import TRANSPORT_TYPE_REST
 from flwr.common.logger import log
@@ -70,9 +69,9 @@ def add_args_flwr_app_common(parser: argparse.ArgumentParser) -> None:
 def try_obtain_root_certificates(
     args: argparse.Namespace,
     grpc_server_address: str,
-) -> Optional[Union[bytes, str]]:
+) -> bytes | str | None:
     """Validate and return the root certificates."""
-    root_cert_path: Optional[str] = args.root_certificates
+    root_cert_path: str | None = args.root_certificates
     if args.insecure:
         if root_cert_path is not None:
             sys.exit(
@@ -111,7 +110,7 @@ def try_obtain_root_certificates(
 
 def try_obtain_server_certificates(
     args: argparse.Namespace,
-) -> Optional[tuple[bytes, bytes, bytes]]:
+) -> tuple[bytes, bytes, bytes] | None:
     """Validate and return the CA cert, server cert, and server private key."""
     if args.insecure:
         log(

flwr/common/config.py

@@ -20,7 +20,7 @@ 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
@@ -39,7 +39,7 @@ 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 +55,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 +73,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 +134,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 +146,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 +165,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 +203,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 +242,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 +266,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 +280,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 +316,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 +365,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

@@ -88,6 +88,7 @@ FAB_INCLUDE_PATTERNS = (
 )
 # 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
 )
@@ -227,6 +228,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."""
@@ -319,5 +322,5 @@ class ExecPluginType:
 
 
 # Constants for No-op auth plugins
-NOOP_FLWR_AID = "<none>"
-NOOP_ACCOUNT_NAME = "sys_noauth"
+NOOP_FLWR_AID = "<id:none>"
+NOOP_ACCOUNT_NAME = "<name:none>"

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."""