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

flwr/proto/transport_pb2_grpc.py

@@ -1,9 +1,29 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
+import warnings
 
 from flwr.proto import transport_pb2 as flwr_dot_proto_dot_transport__pb2
 
+GRPC_GENERATED_VERSION = '1.70.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in flwr/proto/transport_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
 
 class FlowerServiceStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -18,7 +38,7 @@ class FlowerServiceStub(object):
                 '/flwr.proto.FlowerService/Join',
                 request_serializer=flwr_dot_proto_dot_transport__pb2.ClientMessage.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_transport__pb2.ServerMessage.FromString,
-                )
+                _registered_method=True)
 
 
 class FlowerServiceServicer(object):
@@ -42,6 +62,7 @@ def add_FlowerServiceServicer_to_server(servicer, server):
     generic_handler = grpc.method_handlers_generic_handler(
             'flwr.proto.FlowerService', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('flwr.proto.FlowerService', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -59,8 +80,18 @@ class FlowerService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.stream_stream(request_iterator, target, '/flwr.proto.FlowerService/Join',
+        return grpc.experimental.stream_stream(
+            request_iterator,
+            target,
+            '/flwr.proto.FlowerService/Join',
             flwr_dot_proto_dot_transport__pb2.ClientMessage.SerializeToString,
             flwr_dot_proto_dot_transport__pb2.ServerMessage.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

flwr/proto/transport_pb2_grpc.pyi

@@ -1,25 +1,55 @@
 """
 @generated by mypy-protobuf.  Do not edit manually!
 isort:skip_file
+Copyright 2020 Flower Labs GmbH. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==============================================================================
 """
+
 import abc
+import collections.abc
 import flwr.proto.transport_pb2
 import grpc
+import grpc.aio
 import typing
 
+_T = typing.TypeVar("_T")
+
+class _MaybeAsyncIterator(collections.abc.AsyncIterator[_T], collections.abc.Iterator[_T], metaclass=abc.ABCMeta): ...
+
+class _ServicerContext(grpc.ServicerContext, grpc.aio.ServicerContext):  # type: ignore[misc, type-arg]
+    ...
+
 class FlowerServiceStub:
-    def __init__(self, channel: grpc.Channel) -> None: ...
+    def __init__(self, channel: typing.Union[grpc.Channel, grpc.aio.Channel]) -> None: ...
     Join: grpc.StreamStreamMultiCallable[
         flwr.proto.transport_pb2.ClientMessage,
-        flwr.proto.transport_pb2.ServerMessage]
+        flwr.proto.transport_pb2.ServerMessage,
+    ]
 
+class FlowerServiceAsyncStub:
+    Join: grpc.aio.StreamStreamMultiCallable[
+        flwr.proto.transport_pb2.ClientMessage,
+        flwr.proto.transport_pb2.ServerMessage,
+    ]
 
 class FlowerServiceServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
-    def Join(self,
-        request_iterator: typing.Iterator[flwr.proto.transport_pb2.ClientMessage],
-        context: grpc.ServicerContext,
-    ) -> typing.Iterator[flwr.proto.transport_pb2.ServerMessage]: ...
-
+    def Join(
+        self,
+        request_iterator: _MaybeAsyncIterator[flwr.proto.transport_pb2.ClientMessage],
+        context: _ServicerContext,
+    ) -> typing.Union[collections.abc.Iterator[flwr.proto.transport_pb2.ServerMessage], collections.abc.AsyncIterator[flwr.proto.transport_pb2.ServerMessage]]: ...
 
-def add_FlowerServiceServicer_to_server(servicer: FlowerServiceServicer, server: grpc.Server) -> None: ...
+def add_FlowerServiceServicer_to_server(servicer: FlowerServiceServicer, server: typing.Union[grpc.Server, grpc.aio.Server]) -> None: ...

flwr/server/app.py

@@ -21,11 +21,11 @@ import os
 import subprocess
 import sys
 import threading
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from logging import INFO, WARN
 from pathlib import Path
 from time import sleep
-from typing import Callable, Optional, TypeVar, cast
+from typing import TypeVar, cast
 
 import grpc
 import yaml
@@ -75,6 +75,7 @@ from flwr.superlink.auth_plugin import (
     NoOpControlAuthnPlugin,
     NoOpControlAuthzPlugin,
 )
+from flwr.superlink.federation import FederationManager, NoOpFederationManager
 from flwr.superlink.servicer.control import run_control_api_grpc
 
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer
@@ -97,6 +98,7 @@ try:
         get_control_authz_ee_plugins,
         get_control_event_log_writer_plugins,
         get_ee_artifact_provider,
+        get_ee_federation_manager,
         get_fleet_event_log_writer_plugins,
     )
 except ImportError:
@@ -129,6 +131,11 @@ except ImportError:
         """Return all Control API authorization plugins for EE."""
         return {}
 
+    # pylint: disable-next=unused-argument
+    def get_ee_federation_manager(config_path: str) -> FederationManager:
+        """Return the EE FederationManager."""
+        raise NotImplementedError("No federation manager is currently supported.")
+
 
 def get_control_authn_plugins() -> dict[str, type[ControlAuthnPlugin]]:
     """Return all Control API authentication plugins."""
@@ -142,6 +149,14 @@ def get_control_authz_plugins() -> dict[str, type[ControlAuthzPlugin]]:
     return ee_dict | {AuthzType.NOOP: NoOpControlAuthzPlugin}
 
 
+def get_federation_manager(config_path: str | None = None) -> FederationManager:
+    """Return the FederationManager."""
+    if config_path is None:
+        return NoOpFederationManager()
+    federation_manager: FederationManager = get_ee_federation_manager(config_path)
+    return federation_manager
+
+
 # pylint: disable=too-many-branches, too-many-locals, too-many-statements
 def run_superlink() -> None:
     """Run Flower SuperLink (ServerAppIo API and Fleet API)."""
@@ -209,9 +224,9 @@ def run_superlink() -> None:
     # provided
     verify_tls_cert = not getattr(args, "disable_oidc_tls_cert_verification", None)
 
-    authn_plugin: Optional[ControlAuthnPlugin] = None
-    authz_plugin: Optional[ControlAuthzPlugin] = None
-    event_log_plugin: Optional[EventLogWriterPlugin] = None
+    authn_plugin: ControlAuthnPlugin | None = None
+    authz_plugin: ControlAuthzPlugin | None = None
+    event_log_plugin: EventLogWriterPlugin | None = None
     # Load the auth plugin if the args.account_auth_config is provided
     if cfg_path := getattr(args, "user_auth_config", None):
         log(
@@ -281,15 +296,21 @@ def run_superlink() -> None:
             f" to the Flower documentation for more information: {url_v}{page}",
         )
 
+    # Load Federation Manager
+    fed_config_path = getattr(args, "federations_config", None)
+    federation_manager = get_federation_manager(fed_config_path)
+
+    # Initialize ObjectStoreFactory
+    objectstore_factory = ObjectStoreFactory(args.database)
+
     # Initialize StateFactory
-    state_factory = LinkStateFactory(args.database)
+    state_factory = LinkStateFactory(
+        args.database, federation_manager, objectstore_factory
+    )
 
     # Initialize FfsFactory
     ffs_factory = FfsFactory(args.storage_dir)
 
-    # Initialize ObjectStoreFactory
-    objectstore_factory = ObjectStoreFactory(args.database)
-
     # Start Control API
     is_simulation = args.simulation
     control_server: grpc.Server = run_control_api_grpc(
@@ -458,7 +479,7 @@ def _format_address(address: str) -> tuple[str, str, int]:
 
 
 def _load_control_auth_plugins(
-    config_path: Optional[str], verify_tls_cert: bool
+    config_path: str | None, verify_tls_cert: bool
 ) -> tuple[ControlAuthnPlugin, ControlAuthzPlugin]:
     """Obtain Control API authentication and authorization plugins."""
     # Load NoOp plugins if no config path is provided
@@ -517,7 +538,7 @@ def _load_control_auth_plugins(
     return authn_plugin, authz_plugin
 
 
-def _try_obtain_control_event_log_writer_plugin() -> Optional[EventLogWriterPlugin]:
+def _try_obtain_control_event_log_writer_plugin() -> EventLogWriterPlugin | None:
     """Return an instance of the event log writer plugin."""
     try:
         all_plugins: dict[str, type[EventLogWriterPlugin]] = (
@@ -531,7 +552,7 @@ def _try_obtain_control_event_log_writer_plugin() -> Optional[EventLogWriterPlug
         sys.exit("No event log writer plugins are currently supported.")
 
 
-def _try_obtain_fleet_event_log_writer_plugin() -> Optional[EventLogWriterPlugin]:
+def _try_obtain_fleet_event_log_writer_plugin() -> EventLogWriterPlugin | None:
     """Return an instance of the Fleet Servicer event log writer plugin."""
     try:
         all_plugins: dict[str, type[EventLogWriterPlugin]] = (
@@ -551,8 +572,8 @@ def _run_fleet_api_grpc_rere(  # pylint: disable=R0913, R0917
     ffs_factory: FfsFactory,
     objectstore_factory: ObjectStoreFactory,
     enable_supernode_auth: bool,
-    certificates: Optional[tuple[bytes, bytes, bytes]],
-    interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
+    certificates: tuple[bytes, bytes, bytes] | None,
+    interceptors: Sequence[grpc.ServerInterceptor] | None = None,
 ) -> grpc.Server:
     """Run Fleet API (gRPC, request-response)."""
     # Create Fleet API gRPC server
@@ -585,7 +606,7 @@ def _run_fleet_api_grpc_adapter(
     state_factory: LinkStateFactory,
     ffs_factory: FfsFactory,
     objectstore_factory: ObjectStoreFactory,
-    certificates: Optional[tuple[bytes, bytes, bytes]],
+    certificates: tuple[bytes, bytes, bytes] | None,
 ) -> grpc.Server:
     """Run Fleet API (GrpcAdapter)."""
     # Create Fleet API gRPC server
@@ -618,8 +639,8 @@ def _run_fleet_api_grpc_adapter(
 def _run_fleet_api_rest(
     host: str,
     port: int,
-    ssl_keyfile: Optional[str],
-    ssl_certfile: Optional[str],
+    ssl_keyfile: str | None,
+    ssl_certfile: str | None,
     state_factory: LinkStateFactory,
     ffs_factory: FfsFactory,
     objectstore_factory: ObjectStoreFactory,

flwr/server/client_manager.py

@@ -19,7 +19,6 @@ import random
 import threading
 from abc import ABC, abstractmethod
 from logging import INFO
-from typing import Optional
 
 from flwr.common.logger import log
 
@@ -80,8 +79,8 @@ class ClientManager(ABC):
     def sample(
         self,
         num_clients: int,
-        min_num_clients: Optional[int] = None,
-        criterion: Optional[Criterion] = None,
+        min_num_clients: int | None = None,
+        criterion: Criterion | None = None,
     ) -> list[ClientProxy]:
         """Sample a number of Flower ClientProxy instances."""
 
@@ -179,8 +178,8 @@ class SimpleClientManager(ClientManager):
     def sample(
         self,
         num_clients: int,
-        min_num_clients: Optional[int] = None,
-        criterion: Optional[Criterion] = None,
+        min_num_clients: int | None = None,
+        criterion: Criterion | None = None,
     ) -> list[ClientProxy]:
         """Sample a number of Flower ClientProxy instances."""
         # Block until at least num_clients are connected.

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):