flwr-nightly 1.13.0.dev20241101__py3-none-any.whl → 1.13.0.dev20241104__py3-none-any.whl

flwr/proto/simulationio_pb2_grpc.py

@@ -0,0 +1,171 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+
+from flwr.proto import log_pb2 as flwr_dot_proto_dot_log__pb2
+from flwr.proto import run_pb2 as flwr_dot_proto_dot_run__pb2
+from flwr.proto import simulationio_pb2 as flwr_dot_proto_dot_simulationio__pb2
+
+
+class SimulationIoStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.PullSimulationInputs = channel.unary_unary(
+                '/flwr.proto.SimulationIo/PullSimulationInputs',
+                request_serializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsResponse.FromString,
+                )
+        self.PushSimulationOutputs = channel.unary_unary(
+                '/flwr.proto.SimulationIo/PushSimulationOutputs',
+                request_serializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsResponse.FromString,
+                )
+        self.UpdateRunStatus = channel.unary_unary(
+                '/flwr.proto.SimulationIo/UpdateRunStatus',
+                request_serializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString,
+                )
+        self.PushLogs = channel.unary_unary(
+                '/flwr.proto.SimulationIo/PushLogs',
+                request_serializer=flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString,
+                )
+
+
+class SimulationIoServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def PullSimulationInputs(self, request, context):
+        """Pull Simulation inputs
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def PushSimulationOutputs(self, request, context):
+        """Push Simulation outputs
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def UpdateRunStatus(self, request, context):
+        """Update the status of a given run
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def PushLogs(self, request, context):
+        """Push ServerApp logs
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_SimulationIoServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'PullSimulationInputs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PullSimulationInputs,
+                    request_deserializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsResponse.SerializeToString,
+            ),
+            'PushSimulationOutputs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushSimulationOutputs,
+                    request_deserializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsResponse.SerializeToString,
+            ),
+            'UpdateRunStatus': grpc.unary_unary_rpc_method_handler(
+                    servicer.UpdateRunStatus,
+                    request_deserializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.SerializeToString,
+            ),
+            'PushLogs': grpc.unary_unary_rpc_method_handler(
+                    servicer.PushLogs,
+                    request_deserializer=flwr_dot_proto_dot_log__pb2.PushLogsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_log__pb2.PushLogsResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'flwr.proto.SimulationIo', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class SimulationIo(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def PullSimulationInputs(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PullSimulationInputs',
+            flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsRequest.SerializeToString,
+            flwr_dot_proto_dot_simulationio__pb2.PullSimulationInputsResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PushSimulationOutputs(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PushSimulationOutputs',
+            flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsRequest.SerializeToString,
+            flwr_dot_proto_dot_simulationio__pb2.PushSimulationOutputsResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def UpdateRunStatus(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/UpdateRunStatus',
+            flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString,
+            flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+    @staticmethod
+    def PushLogs(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.SimulationIo/PushLogs',
+            flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString,
+            flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/simulationio_pb2_grpc.pyi

@@ -0,0 +1,68 @@
+"""
+@generated by mypy-protobuf.  Do not edit manually!
+isort:skip_file
+"""
+import abc
+import flwr.proto.log_pb2
+import flwr.proto.run_pb2
+import flwr.proto.simulationio_pb2
+import grpc
+
+class SimulationIoStub:
+    def __init__(self, channel: grpc.Channel) -> None: ...
+    PullSimulationInputs: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.simulationio_pb2.PullSimulationInputsRequest,
+        flwr.proto.simulationio_pb2.PullSimulationInputsResponse]
+    """Pull Simulation inputs"""
+
+    PushSimulationOutputs: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.simulationio_pb2.PushSimulationOutputsRequest,
+        flwr.proto.simulationio_pb2.PushSimulationOutputsResponse]
+    """Push Simulation outputs"""
+
+    UpdateRunStatus: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.run_pb2.UpdateRunStatusRequest,
+        flwr.proto.run_pb2.UpdateRunStatusResponse]
+    """Update the status of a given run"""
+
+    PushLogs: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.log_pb2.PushLogsRequest,
+        flwr.proto.log_pb2.PushLogsResponse]
+    """Push ServerApp logs"""
+
+
+class SimulationIoServicer(metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def PullSimulationInputs(self,
+        request: flwr.proto.simulationio_pb2.PullSimulationInputsRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.simulationio_pb2.PullSimulationInputsResponse:
+        """Pull Simulation inputs"""
+        pass
+
+    @abc.abstractmethod
+    def PushSimulationOutputs(self,
+        request: flwr.proto.simulationio_pb2.PushSimulationOutputsRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.simulationio_pb2.PushSimulationOutputsResponse:
+        """Push Simulation outputs"""
+        pass
+
+    @abc.abstractmethod
+    def UpdateRunStatus(self,
+        request: flwr.proto.run_pb2.UpdateRunStatusRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.run_pb2.UpdateRunStatusResponse:
+        """Update the status of a given run"""
+        pass
+
+    @abc.abstractmethod
+    def PushLogs(self,
+        request: flwr.proto.log_pb2.PushLogsRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.log_pb2.PushLogsResponse:
+        """Push ServerApp logs"""
+        pass
+
+
+def add_SimulationIoServicer_to_server(servicer: SimulationIoServicer, server: grpc.Server) -> None: ...

flwr/server/app.py

@@ -39,7 +39,6 @@ from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.address import parse_address
 from flwr.common.config import get_flwr_dir, parse_config_args
 from flwr.common.constant import (
-    DRIVER_API_DEFAULT_ADDRESS,
     EXEC_API_DEFAULT_ADDRESS,
     FLEET_API_GRPC_BIDI_DEFAULT_ADDRESS,
     FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,
@@ -47,6 +46,7 @@ from flwr.common.constant import (
     ISOLATION_MODE_PROCESS,
     ISOLATION_MODE_SUBPROCESS,
     MISSING_EXTRA_REST,
+    SERVERAPPIO_API_DEFAULT_ADDRESS,
     TRANSPORT_TYPE_GRPC_ADAPTER,
     TRANSPORT_TYPE_GRPC_RERE,
     TRANSPORT_TYPE_REST,
@@ -69,7 +69,7 @@ from .history import History
 from .server import Server, init_defaults, run_fl
 from .server_config import ServerConfig
 from .strategy import Strategy
-from .superlink.driver.driver_grpc import run_driver_api_grpc
+from .superlink.driver.serverappio_grpc import run_serverappio_api_grpc
 from .superlink.ffs.ffs_factory import FfsFactory
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer
 from .superlink.fleet.grpc_bidi.grpc_server import (
@@ -205,7 +205,7 @@ def start_server(  # pylint: disable=too-many-arguments,too-many-locals
 
 # pylint: disable=too-many-branches, too-many-locals, too-many-statements
 def run_superlink() -> None:
-    """Run Flower SuperLink (Driver API and Fleet API)."""
+    """Run Flower SuperLink (ServerAppIo API and Fleet API)."""
     args = _parse_args_run_superlink().parse_args()
 
     log(INFO, "Starting Flower SuperLink")
@@ -213,7 +213,7 @@ def run_superlink() -> None:
     event(EventType.RUN_SUPERLINK_ENTER)
 
     # Parse IP addresses
-    driver_address, _, _ = _format_address(args.driver_api_address)
+    serverappio_address, _, _ = _format_address(args.serverappio_api_address)
     exec_address, _, _ = _format_address(args.exec_api_address)
 
     # Obtain certificates
@@ -225,14 +225,14 @@ def run_superlink() -> None:
     # Initialize FfsFactory
     ffs_factory = FfsFactory(args.storage_dir)
 
-    # Start Driver API
-    driver_server: grpc.Server = run_driver_api_grpc(
-        address=driver_address,
+    # Start ServerAppIo API
+    serverappio_server: grpc.Server = run_serverappio_api_grpc(
+        address=serverappio_address,
         state_factory=state_factory,
         ffs_factory=ffs_factory,
         certificates=certificates,
     )
-    grpc_servers = [driver_server]
+    grpc_servers = [serverappio_server]
 
     # Start Fleet API
     bckg_threads = []
@@ -343,7 +343,7 @@ def run_superlink() -> None:
         # Scheduler thread
         scheduler_th = threading.Thread(
             target=_flwr_serverapp_scheduler,
-            args=(state_factory, args.driver_api_address, args.ssl_ca_certfile),
+            args=(state_factory, args.serverappio_api_address, args.ssl_ca_certfile),
         )
         scheduler_th.start()
         bckg_threads.append(scheduler_th)
@@ -361,12 +361,12 @@ def run_superlink() -> None:
             for thread in bckg_threads:
                 if not thread.is_alive():
                     sys.exit(1)
-        driver_server.wait_for_termination(timeout=1)
+        serverappio_server.wait_for_termination(timeout=1)
 
 
 def _flwr_serverapp_scheduler(
     state_factory: LinkStateFactory,
-    driver_api_address: str,
+    serverappio_api_address: str,
     ssl_ca_certfile: Optional[str],
 ) -> None:
     log(DEBUG, "Started flwr-serverapp scheduler thread.")
@@ -383,13 +383,13 @@ def _flwr_serverapp_scheduler(
             log(
                 INFO,
                 "Launching `flwr-serverapp` subprocess. Connects to SuperLink on %s",
-                driver_api_address,
+                serverappio_api_address,
             )
             # Start ServerApp subprocess
             command = [
                 "flwr-serverapp",
                 "--superlink",
-                driver_api_address,
+                serverappio_api_address,
             ]
             if ssl_ca_certfile:
                 command.append("--root-certificates")
@@ -621,7 +621,7 @@ def _run_fleet_api_rest(
     ffs_factory: FfsFactory,
     num_workers: int,
 ) -> None:
-    """Run Driver API (REST-based)."""
+    """Run ServerAppIo API (REST-based)."""
     try:
         import uvicorn
 
@@ -648,13 +648,13 @@ def _run_fleet_api_rest(
 
 
 def _parse_args_run_superlink() -> argparse.ArgumentParser:
-    """Parse command line arguments for both Driver API and Fleet API."""
+    """Parse command line arguments for both ServerAppIo API and Fleet API."""
     parser = argparse.ArgumentParser(
         description="Start a Flower SuperLink",
     )
 
     _add_args_common(parser=parser)
-    _add_args_driver_api(parser=parser)
+    _add_args_serverappio_api(parser=parser)
     _add_args_fleet_api(parser=parser)
     _add_args_exec_api(parser=parser)
 
@@ -733,11 +733,11 @@ def _add_args_common(parser: argparse.ArgumentParser) -> None:
     )
 
 
-def _add_args_driver_api(parser: argparse.ArgumentParser) -> None:
+def _add_args_serverappio_api(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
-        "--driver-api-address",
-        help="Driver API (gRPC) server address (IPv4, IPv6, or a domain name).",
-        default=DRIVER_API_DEFAULT_ADDRESS,
+        "--serverappio-api-address",
+        help="ServerAppIo API (gRPC) server address (IPv4, IPv6, or a domain name).",
+        default=SERVERAPPIO_API_DEFAULT_ADDRESS,
     )
 
 

flwr/server/driver/driver.py

@@ -24,7 +24,7 @@ from flwr.common.typing import Run
 
 
 class Driver(ABC):
-    """Abstract base Driver class for the Driver API."""
+    """Abstract base Driver class for the ServerAppIo API."""
 
     @abstractmethod
     def init_run(self, run_id: int) -> None:

flwr/server/driver/grpc_driver.py

@@ -23,7 +23,7 @@ from typing import Optional, cast
 import grpc
 
 from flwr.common import DEFAULT_TTL, Message, Metadata, RecordSet
-from flwr.common.constant import DRIVER_API_DEFAULT_ADDRESS
+from flwr.common.constant import SERVERAPPIO_API_DEFAULT_ADDRESS
 from flwr.common.grpc import create_channel
 from flwr.common.logger import log
 from flwr.common.serde import (
@@ -32,7 +32,9 @@ from flwr.common.serde import (
     user_config_from_proto,
 )
 from flwr.common.typing import Run
-from flwr.proto.driver_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.proto.serverappio_pb2 import (  # pylint: disable=E0611
     GetNodesRequest,
     GetNodesResponse,
     PullTaskResRequest,
@@ -40,9 +42,7 @@ from flwr.proto.driver_pb2 import (  # pylint: disable=E0611
     PushTaskInsRequest,
     PushTaskInsResponse,
 )
-from flwr.proto.driver_pb2_grpc import DriverStub  # 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.proto.serverappio_pb2_grpc import ServerAppIoStub  # pylint: disable=E0611
 from flwr.proto.task_pb2 import TaskIns  # pylint: disable=E0611
 
 from .driver import Driver
@@ -56,12 +56,12 @@ Call `connect()` on the `GrpcDriverStub` instance before calling any of the othe
 
 
 class GrpcDriver(Driver):
-    """`GrpcDriver` provides an interface to the Driver API.
+    """`GrpcDriver` provides an interface to the ServerAppIo API.
 
     Parameters
     ----------
-    driver_service_address : str (default: "[::]:9091")
-        The address (URL, IPv6, IPv4) of the SuperLink Driver API service.
+    serverappio_service_address : str (default: "[::]:9091")
+        The address (URL, IPv6, IPv4) of the SuperLink ServerAppIo API service.
     root_certificates : Optional[bytes] (default: None)
         The PEM-encoded root certificates as a byte string.
         If provided, a secure connection using the certificates will be
@@ -70,23 +70,23 @@ class GrpcDriver(Driver):
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
-        driver_service_address: str = DRIVER_API_DEFAULT_ADDRESS,
+        serverappio_service_address: str = SERVERAPPIO_API_DEFAULT_ADDRESS,
         root_certificates: Optional[bytes] = None,
     ) -> None:
-        self._addr = driver_service_address
+        self._addr = serverappio_service_address
         self._cert = root_certificates
         self._run: Optional[Run] = None
-        self._grpc_stub: Optional[DriverStub] = None
+        self._grpc_stub: Optional[ServerAppIoStub] = None
         self._channel: Optional[grpc.Channel] = None
         self.node = Node(node_id=0, anonymous=True)
 
     @property
     def _is_connected(self) -> bool:
-        """Check if connected to the Driver API server."""
+        """Check if connected to the ServerAppIo API server."""
         return self._channel is not None
 
     def _connect(self) -> None:
-        """Connect to the Driver API.
+        """Connect to the ServerAppIo API.
 
         This will not call GetRun.
         """
@@ -98,11 +98,11 @@ class GrpcDriver(Driver):
             insecure=(self._cert is None),
             root_certificates=self._cert,
         )
-        self._grpc_stub = DriverStub(self._channel)
+        self._grpc_stub = ServerAppIoStub(self._channel)
         log(DEBUG, "[Driver] Connected to %s", self._addr)
 
     def _disconnect(self) -> None:
-        """Disconnect from the Driver API."""
+        """Disconnect from the ServerAppIo API."""
         if not self._is_connected:
             log(DEBUG, "Already disconnected")
             return
@@ -137,11 +137,11 @@ class GrpcDriver(Driver):
         return Run(**vars(self._run))
 
     @property
-    def _stub(self) -> DriverStub:
-        """Driver stub."""
+    def _stub(self) -> ServerAppIoStub:
+        """ServerAppIo stub."""
         if not self._is_connected:
             self._connect()
-        return cast(DriverStub, self._grpc_stub)
+        return cast(ServerAppIoStub, self._grpc_stub)
 
     def _check_message(self, message: Message) -> None:
         # Check if the message is valid

flwr/server/driver/inmemory_driver.py

@@ -31,7 +31,7 @@ from .driver import Driver
 
 
 class InMemoryDriver(Driver):
-    """`InMemoryDriver` class provides an interface to the Driver API.
+    """`InMemoryDriver` class provides an interface to the ServerAppIo API.
 
     Parameters
     ----------

flwr/server/run_serverapp.py

@@ -31,7 +31,7 @@ from flwr.common.config import (
     get_project_config,
     get_project_dir,
 )
-from flwr.common.constant import DRIVER_API_DEFAULT_ADDRESS
+from flwr.common.constant import SERVERAPPIO_API_DEFAULT_ADDRESS
 from flwr.common.logger import log, update_console_handler, warn_deprecated_feature
 from flwr.common.object_ref import load_app
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
@@ -45,7 +45,6 @@ from .driver.grpc_driver import GrpcDriver
 from .server_app import LoadServerAppError, ServerApp
 
 
-# pylint: disable-next=too-many-arguments,too-many-positional-arguments
 def run(
     driver: Driver,
     context: Context,
@@ -107,18 +106,18 @@ def run_server_app() -> None:
             "app by executing `flwr new` and following the prompt."
         )
 
-    if args.server != DRIVER_API_DEFAULT_ADDRESS:
+    if args.server != SERVERAPPIO_API_DEFAULT_ADDRESS:
         warn = "Passing flag --server is deprecated. Use --superlink instead."
         warn_deprecated_feature(warn)
 
-        if args.superlink != DRIVER_API_DEFAULT_ADDRESS:
+        if args.superlink != SERVERAPPIO_API_DEFAULT_ADDRESS:
             # if `--superlink` also passed, then
             # warn user that this argument overrides what was passed with `--server`
             log(
                 WARN,
                 "Both `--server` and `--superlink` were passed. "
-                "`--server` will be ignored. Connecting to the Superlink Driver API "
-                "at %s.",
+                "`--server` will be ignored. Connecting to the "
+                "SuperLink ServerAppIo API at %s.",
                 args.superlink,
             )
         else:
@@ -171,7 +170,7 @@ def run_server_app() -> None:
     if app_path is None:
         # User provided `--run-id`, but not `app_dir`
         driver = GrpcDriver(
-            driver_service_address=args.superlink,
+            serverappio_service_address=args.superlink,
             root_certificates=root_certificates,
         )
         flwr_dir = get_flwr_dir(args.flwr_dir)
@@ -193,7 +192,7 @@ def run_server_app() -> None:
         # User provided `app_dir`, but not `--run-id`
         # Create run if run_id is not provided
         driver = GrpcDriver(
-            driver_service_address=args.superlink,
+            serverappio_service_address=args.superlink,
             root_certificates=root_certificates,
         )
         # Load config from the project directory
@@ -275,13 +274,14 @@ def _parse_args_run_server_app() -> argparse.ArgumentParser:
     )
     parser.add_argument(
         "--server",
-        default=DRIVER_API_DEFAULT_ADDRESS,
+        default=SERVERAPPIO_API_DEFAULT_ADDRESS,
         help="Server address",
     )
     parser.add_argument(
         "--superlink",
-        default=DRIVER_API_DEFAULT_ADDRESS,
-        help="SuperLink Driver API (gRPC-rere) address (IPv4, IPv6, or a domain name)",
+        default=SERVERAPPIO_API_DEFAULT_ADDRESS,
+        help="SuperLink ServerAppIo API (gRPC-rere) address "
+        "(IPv4, IPv6, or a domain name)",
     )
     parser.add_argument(
         "--run-id",

flwr/server/serverapp/app.py

@@ -47,12 +47,12 @@ from flwr.common.serde import (
     run_status_to_proto,
 )
 from flwr.common.typing import RunStatus
-from flwr.proto.driver_pb2 import (  # pylint: disable=E0611
+from flwr.proto.run_pb2 import UpdateRunStatusRequest  # pylint: disable=E0611
+from flwr.proto.serverappio_pb2 import (  # pylint: disable=E0611
     PullServerAppInputsRequest,
     PullServerAppInputsResponse,
     PushServerAppOutputsRequest,
 )
-from flwr.proto.run_pb2 import UpdateRunStatusRequest  # pylint: disable=E0611
 from flwr.server.driver.grpc_driver import GrpcDriver
 from flwr.server.run_serverapp import run as run_
 
@@ -63,8 +63,6 @@ def flwr_serverapp() -> None:
     log_queue: Queue[Optional[str]] = Queue()
     mirror_output_to_queue(log_queue)
 
-    log(INFO, "Starting Flower ServerApp")
-
     parser = argparse.ArgumentParser(
         description="Run a Flower ServerApp",
     )
@@ -106,6 +104,7 @@ def flwr_serverapp() -> None:
     )
     args = parser.parse_args()
 
+    log(INFO, "Starting Flower ServerApp")
     certificates = _try_obtain_certificates(args)
 
     log(
@@ -167,7 +166,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212
 ) -> None:
     """Run Flower ServerApp process."""
     driver = GrpcDriver(
-        driver_service_address=superlink,
+        serverappio_service_address=superlink,
         root_certificates=certificates,
     )
 

flwr/server/strategy/fedadam.py

@@ -170,8 +170,18 @@ class FedAdam(FedOpt):
             for x, y in zip(self.v_t, delta_t)
         ]
 
+        # Compute the bias-corrected learning rate, `eta_norm` for improving convergence
+        # in the early rounds of FL training. This `eta_norm` is `\alpha_t` in Kingma &
+        # Ba, 2014 (http://arxiv.org/abs/1412.6980) "Adam: A Method for Stochastic
+        # Optimization" in the formula line right before Section 2.1.
+        eta_norm = (
+            self.eta
+            * np.sqrt(1 - np.power(self.beta_2, server_round + 1.0))
+            / (1 - np.power(self.beta_1, server_round + 1.0))
+        )
+
         new_weights = [
-            x + self.eta * y / (np.sqrt(z) + self.tau)
+            x + eta_norm * y / (np.sqrt(z) + self.tau)
             for x, y, z in zip(self.current_weights, self.m_t, self.v_t)
         ]
 

flwr/server/superlink/driver/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower driver service."""
+"""Flower ServerAppIo service."""