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

flwr/proto/{driver_pb2_grpc.py → serverappio_pb2_grpc.py}

@@ -2,13 +2,13 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from flwr.proto import driver_pb2 as flwr_dot_proto_dot_driver__pb2
 from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 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 serverappio_pb2 as flwr_dot_proto_dot_serverappio__pb2
 
 
-class DriverStub(object):
+class ServerAppIoStub(object):
     """Missing associated documentation comment in .proto file."""
 
     def __init__(self, channel):
@@ -18,58 +18,58 @@ class DriverStub(object):
             channel: A grpc.Channel.
         """
         self.CreateRun = channel.unary_unary(
-                '/flwr.proto.Driver/CreateRun',
+                '/flwr.proto.ServerAppIo/CreateRun',
                 request_serializer=flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
                 )
         self.GetNodes = channel.unary_unary(
-                '/flwr.proto.Driver/GetNodes',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.GetNodesRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.GetNodesResponse.FromString,
+                '/flwr.proto.ServerAppIo/GetNodes',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesResponse.FromString,
                 )
         self.PushTaskIns = channel.unary_unary(
-                '/flwr.proto.Driver/PushTaskIns',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.PushTaskInsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.PushTaskInsResponse.FromString,
+                '/flwr.proto.ServerAppIo/PushTaskIns',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.FromString,
                 )
         self.PullTaskRes = channel.unary_unary(
-                '/flwr.proto.Driver/PullTaskRes',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.PullTaskResRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.PullTaskResResponse.FromString,
+                '/flwr.proto.ServerAppIo/PullTaskRes',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.FromString,
                 )
         self.GetRun = channel.unary_unary(
-                '/flwr.proto.Driver/GetRun',
+                '/flwr.proto.ServerAppIo/GetRun',
                 request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
                 )
         self.GetFab = channel.unary_unary(
-                '/flwr.proto.Driver/GetFab',
+                '/flwr.proto.ServerAppIo/GetFab',
                 request_serializer=flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString,
                 )
         self.PullServerAppInputs = channel.unary_unary(
-                '/flwr.proto.Driver/PullServerAppInputs',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.PullServerAppInputsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.PullServerAppInputsResponse.FromString,
+                '/flwr.proto.ServerAppIo/PullServerAppInputs',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsResponse.FromString,
                 )
         self.PushServerAppOutputs = channel.unary_unary(
-                '/flwr.proto.Driver/PushServerAppOutputs',
-                request_serializer=flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsResponse.FromString,
+                '/flwr.proto.ServerAppIo/PushServerAppOutputs',
+                request_serializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsResponse.FromString,
                 )
         self.UpdateRunStatus = channel.unary_unary(
-                '/flwr.proto.Driver/UpdateRunStatus',
+                '/flwr.proto.ServerAppIo/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.Driver/PushLogs',
+                '/flwr.proto.ServerAppIo/PushLogs',
                 request_serializer=flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString,
                 )
 
 
-class DriverServicer(object):
+class ServerAppIoServicer(object):
     """Missing associated documentation comment in .proto file."""
 
     def CreateRun(self, request, context):
@@ -143,7 +143,7 @@ class DriverServicer(object):
         raise NotImplementedError('Method not implemented!')
 
 
-def add_DriverServicer_to_server(servicer, server):
+def add_ServerAppIoServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'CreateRun': grpc.unary_unary_rpc_method_handler(
                     servicer.CreateRun,
@@ -152,18 +152,18 @@ def add_DriverServicer_to_server(servicer, server):
             ),
             'GetNodes': grpc.unary_unary_rpc_method_handler(
                     servicer.GetNodes,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.GetNodesRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.GetNodesResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.GetNodesResponse.SerializeToString,
             ),
             'PushTaskIns': grpc.unary_unary_rpc_method_handler(
                     servicer.PushTaskIns,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.PushTaskInsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.PushTaskInsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.SerializeToString,
             ),
             'PullTaskRes': grpc.unary_unary_rpc_method_handler(
                     servicer.PullTaskRes,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.PullTaskResRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.PullTaskResResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.SerializeToString,
             ),
             'GetRun': grpc.unary_unary_rpc_method_handler(
                     servicer.GetRun,
@@ -177,13 +177,13 @@ def add_DriverServicer_to_server(servicer, server):
             ),
             'PullServerAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullServerAppInputs,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.PullServerAppInputsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.PullServerAppInputsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsResponse.SerializeToString,
             ),
             'PushServerAppOutputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PushServerAppOutputs,
-                    request_deserializer=flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsResponse.SerializeToString,
             ),
             'UpdateRunStatus': grpc.unary_unary_rpc_method_handler(
                     servicer.UpdateRunStatus,
@@ -197,12 +197,12 @@ def add_DriverServicer_to_server(servicer, server):
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'flwr.proto.Driver', rpc_method_handlers)
+            'flwr.proto.ServerAppIo', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
 
 
  # This class is part of an EXPERIMENTAL API.
-class Driver(object):
+class ServerAppIo(object):
     """Missing associated documentation comment in .proto file."""
 
     @staticmethod
@@ -216,7 +216,7 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/CreateRun',
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/CreateRun',
             flwr_dot_proto_dot_run__pb2.CreateRunRequest.SerializeToString,
             flwr_dot_proto_dot_run__pb2.CreateRunResponse.FromString,
             options, channel_credentials,
@@ -233,9 +233,9 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/GetNodes',
-            flwr_dot_proto_dot_driver__pb2.GetNodesRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.GetNodesResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetNodes',
+            flwr_dot_proto_dot_serverappio__pb2.GetNodesRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.GetNodesResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -250,9 +250,9 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/PushTaskIns',
-            flwr_dot_proto_dot_driver__pb2.PushTaskInsRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.PushTaskInsResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushTaskIns',
+            flwr_dot_proto_dot_serverappio__pb2.PushTaskInsRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PushTaskInsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -267,9 +267,9 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/PullTaskRes',
-            flwr_dot_proto_dot_driver__pb2.PullTaskResRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.PullTaskResResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PullTaskRes',
+            flwr_dot_proto_dot_serverappio__pb2.PullTaskResRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PullTaskResResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -284,7 +284,7 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/GetRun',
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetRun',
             flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
             flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
             options, channel_credentials,
@@ -301,7 +301,7 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/GetFab',
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/GetFab',
             flwr_dot_proto_dot_fab__pb2.GetFabRequest.SerializeToString,
             flwr_dot_proto_dot_fab__pb2.GetFabResponse.FromString,
             options, channel_credentials,
@@ -318,9 +318,9 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/PullServerAppInputs',
-            flwr_dot_proto_dot_driver__pb2.PullServerAppInputsRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.PullServerAppInputsResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PullServerAppInputs',
+            flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PullServerAppInputsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -335,9 +335,9 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/PushServerAppOutputs',
-            flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsRequest.SerializeToString,
-            flwr_dot_proto_dot_driver__pb2.PushServerAppOutputsResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushServerAppOutputs',
+            flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsRequest.SerializeToString,
+            flwr_dot_proto_dot_serverappio__pb2.PushServerAppOutputsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -352,7 +352,7 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/UpdateRunStatus',
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/UpdateRunStatus',
             flwr_dot_proto_dot_run__pb2.UpdateRunStatusRequest.SerializeToString,
             flwr_dot_proto_dot_run__pb2.UpdateRunStatusResponse.FromString,
             options, channel_credentials,
@@ -369,7 +369,7 @@ class Driver(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Driver/PushLogs',
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.ServerAppIo/PushLogs',
             flwr_dot_proto_dot_log__pb2.PushLogsRequest.SerializeToString,
             flwr_dot_proto_dot_log__pb2.PushLogsResponse.FromString,
             options, channel_credentials,

flwr/proto/{driver_pb2_grpc.pyi → serverappio_pb2_grpc.pyi}

@@ -3,13 +3,13 @@
 isort:skip_file
 """
 import abc
-import flwr.proto.driver_pb2
 import flwr.proto.fab_pb2
 import flwr.proto.log_pb2
 import flwr.proto.run_pb2
+import flwr.proto.serverappio_pb2
 import grpc
 
-class DriverStub:
+class ServerAppIoStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     CreateRun: grpc.UnaryUnaryMultiCallable[
         flwr.proto.run_pb2.CreateRunRequest,
@@ -17,18 +17,18 @@ class DriverStub:
     """Request run_id"""
 
     GetNodes: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.GetNodesRequest,
-        flwr.proto.driver_pb2.GetNodesResponse]
+        flwr.proto.serverappio_pb2.GetNodesRequest,
+        flwr.proto.serverappio_pb2.GetNodesResponse]
     """Return a set of nodes"""
 
     PushTaskIns: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.PushTaskInsRequest,
-        flwr.proto.driver_pb2.PushTaskInsResponse]
+        flwr.proto.serverappio_pb2.PushTaskInsRequest,
+        flwr.proto.serverappio_pb2.PushTaskInsResponse]
     """Create one or more tasks"""
 
     PullTaskRes: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.PullTaskResRequest,
-        flwr.proto.driver_pb2.PullTaskResResponse]
+        flwr.proto.serverappio_pb2.PullTaskResRequest,
+        flwr.proto.serverappio_pb2.PullTaskResResponse]
     """Get task results"""
 
     GetRun: grpc.UnaryUnaryMultiCallable[
@@ -42,13 +42,13 @@ class DriverStub:
     """Get FAB"""
 
     PullServerAppInputs: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.PullServerAppInputsRequest,
-        flwr.proto.driver_pb2.PullServerAppInputsResponse]
+        flwr.proto.serverappio_pb2.PullServerAppInputsRequest,
+        flwr.proto.serverappio_pb2.PullServerAppInputsResponse]
     """Pull ServerApp inputs"""
 
     PushServerAppOutputs: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.driver_pb2.PushServerAppOutputsRequest,
-        flwr.proto.driver_pb2.PushServerAppOutputsResponse]
+        flwr.proto.serverappio_pb2.PushServerAppOutputsRequest,
+        flwr.proto.serverappio_pb2.PushServerAppOutputsResponse]
     """Push ServerApp outputs"""
 
     UpdateRunStatus: grpc.UnaryUnaryMultiCallable[
@@ -62,7 +62,7 @@ class DriverStub:
     """Push ServerApp logs"""
 
 
-class DriverServicer(metaclass=abc.ABCMeta):
+class ServerAppIoServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def CreateRun(self,
         request: flwr.proto.run_pb2.CreateRunRequest,
@@ -73,25 +73,25 @@ class DriverServicer(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def GetNodes(self,
-        request: flwr.proto.driver_pb2.GetNodesRequest,
+        request: flwr.proto.serverappio_pb2.GetNodesRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.GetNodesResponse:
+    ) -> flwr.proto.serverappio_pb2.GetNodesResponse:
         """Return a set of nodes"""
         pass
 
     @abc.abstractmethod
     def PushTaskIns(self,
-        request: flwr.proto.driver_pb2.PushTaskInsRequest,
+        request: flwr.proto.serverappio_pb2.PushTaskInsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.PushTaskInsResponse:
+    ) -> flwr.proto.serverappio_pb2.PushTaskInsResponse:
         """Create one or more tasks"""
         pass
 
     @abc.abstractmethod
     def PullTaskRes(self,
-        request: flwr.proto.driver_pb2.PullTaskResRequest,
+        request: flwr.proto.serverappio_pb2.PullTaskResRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.PullTaskResResponse:
+    ) -> flwr.proto.serverappio_pb2.PullTaskResResponse:
         """Get task results"""
         pass
 
@@ -113,17 +113,17 @@ class DriverServicer(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def PullServerAppInputs(self,
-        request: flwr.proto.driver_pb2.PullServerAppInputsRequest,
+        request: flwr.proto.serverappio_pb2.PullServerAppInputsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.PullServerAppInputsResponse:
+    ) -> flwr.proto.serverappio_pb2.PullServerAppInputsResponse:
         """Pull ServerApp inputs"""
         pass
 
     @abc.abstractmethod
     def PushServerAppOutputs(self,
-        request: flwr.proto.driver_pb2.PushServerAppOutputsRequest,
+        request: flwr.proto.serverappio_pb2.PushServerAppOutputsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.driver_pb2.PushServerAppOutputsResponse:
+    ) -> flwr.proto.serverappio_pb2.PushServerAppOutputsResponse:
         """Push ServerApp outputs"""
         pass
 
@@ -144,4 +144,4 @@ class DriverServicer(metaclass=abc.ABCMeta):
         pass
 
 
-def add_DriverServicer_to_server(servicer: DriverServicer, server: grpc.Server) -> None: ...
+def add_ServerAppIoServicer_to_server(servicer: ServerAppIoServicer, 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
     ----------