flwr-nightly 1.21.0.dev20250802__py3-none-any.whl → 1.21.0.dev20250805__py3-none-any.whl

flwr/proto/{exec_pb2_grpc.py → control_pb2_grpc.py}

@@ -2,10 +2,10 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from flwr.proto import exec_pb2 as flwr_dot_proto_dot_exec__pb2
+from flwr.proto import control_pb2 as flwr_dot_proto_dot_control__pb2
 
 
-class ExecStub(object):
+class ControlStub(object):
     """Missing associated documentation comment in .proto file."""
 
     def __init__(self, channel):
@@ -15,38 +15,38 @@ class ExecStub(object):
             channel: A grpc.Channel.
         """
         self.StartRun = channel.unary_unary(
-                '/flwr.proto.Exec/StartRun',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.StartRunRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.StartRunResponse.FromString,
+                '/flwr.proto.Control/StartRun',
+                request_serializer=flwr_dot_proto_dot_control__pb2.StartRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.StartRunResponse.FromString,
                 )
         self.StopRun = channel.unary_unary(
-                '/flwr.proto.Exec/StopRun',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.StopRunRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.StopRunResponse.FromString,
+                '/flwr.proto.Control/StopRun',
+                request_serializer=flwr_dot_proto_dot_control__pb2.StopRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.StopRunResponse.FromString,
                 )
         self.StreamLogs = channel.unary_stream(
-                '/flwr.proto.Exec/StreamLogs',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.StreamLogsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.StreamLogsResponse.FromString,
+                '/flwr.proto.Control/StreamLogs',
+                request_serializer=flwr_dot_proto_dot_control__pb2.StreamLogsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.StreamLogsResponse.FromString,
                 )
         self.ListRuns = channel.unary_unary(
-                '/flwr.proto.Exec/ListRuns',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.ListRunsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.ListRunsResponse.FromString,
+                '/flwr.proto.Control/ListRuns',
+                request_serializer=flwr_dot_proto_dot_control__pb2.ListRunsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.ListRunsResponse.FromString,
                 )
         self.GetLoginDetails = channel.unary_unary(
-                '/flwr.proto.Exec/GetLoginDetails',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsResponse.FromString,
+                '/flwr.proto.Control/GetLoginDetails',
+                request_serializer=flwr_dot_proto_dot_control__pb2.GetLoginDetailsRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.GetLoginDetailsResponse.FromString,
                 )
         self.GetAuthTokens = channel.unary_unary(
-                '/flwr.proto.Exec/GetAuthTokens',
-                request_serializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensRequest.SerializeToString,
-                response_deserializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensResponse.FromString,
+                '/flwr.proto.Control/GetAuthTokens',
+                request_serializer=flwr_dot_proto_dot_control__pb2.GetAuthTokensRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_control__pb2.GetAuthTokensResponse.FromString,
                 )
 
 
-class ExecServicer(object):
+class ControlServicer(object):
     """Missing associated documentation comment in .proto file."""
 
     def StartRun(self, request, context):
@@ -92,46 +92,46 @@ class ExecServicer(object):
         raise NotImplementedError('Method not implemented!')
 
 
-def add_ExecServicer_to_server(servicer, server):
+def add_ControlServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'StartRun': grpc.unary_unary_rpc_method_handler(
                     servicer.StartRun,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.StartRunRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.StartRunResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.StartRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.StartRunResponse.SerializeToString,
             ),
             'StopRun': grpc.unary_unary_rpc_method_handler(
                     servicer.StopRun,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.StopRunRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.StopRunResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.StopRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.StopRunResponse.SerializeToString,
             ),
             'StreamLogs': grpc.unary_stream_rpc_method_handler(
                     servicer.StreamLogs,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.StreamLogsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.StreamLogsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.StreamLogsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.StreamLogsResponse.SerializeToString,
             ),
             'ListRuns': grpc.unary_unary_rpc_method_handler(
                     servicer.ListRuns,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.ListRunsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.ListRunsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.ListRunsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.ListRunsResponse.SerializeToString,
             ),
             'GetLoginDetails': grpc.unary_unary_rpc_method_handler(
                     servicer.GetLoginDetails,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.GetLoginDetailsResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.GetLoginDetailsRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.GetLoginDetailsResponse.SerializeToString,
             ),
             'GetAuthTokens': grpc.unary_unary_rpc_method_handler(
                     servicer.GetAuthTokens,
-                    request_deserializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensRequest.FromString,
-                    response_serializer=flwr_dot_proto_dot_exec__pb2.GetAuthTokensResponse.SerializeToString,
+                    request_deserializer=flwr_dot_proto_dot_control__pb2.GetAuthTokensRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_control__pb2.GetAuthTokensResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'flwr.proto.Exec', rpc_method_handlers)
+            'flwr.proto.Control', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
 
 
  # This class is part of an EXPERIMENTAL API.
-class Exec(object):
+class Control(object):
     """Missing associated documentation comment in .proto file."""
 
     @staticmethod
@@ -145,9 +145,9 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/StartRun',
-            flwr_dot_proto_dot_exec__pb2.StartRunRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.StartRunResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/StartRun',
+            flwr_dot_proto_dot_control__pb2.StartRunRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.StartRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -162,9 +162,9 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/StopRun',
-            flwr_dot_proto_dot_exec__pb2.StopRunRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.StopRunResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/StopRun',
+            flwr_dot_proto_dot_control__pb2.StopRunRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.StopRunResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -179,9 +179,9 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_stream(request, target, '/flwr.proto.Exec/StreamLogs',
-            flwr_dot_proto_dot_exec__pb2.StreamLogsRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.StreamLogsResponse.FromString,
+        return grpc.experimental.unary_stream(request, target, '/flwr.proto.Control/StreamLogs',
+            flwr_dot_proto_dot_control__pb2.StreamLogsRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.StreamLogsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -196,9 +196,9 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/ListRuns',
-            flwr_dot_proto_dot_exec__pb2.ListRunsRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.ListRunsResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/ListRuns',
+            flwr_dot_proto_dot_control__pb2.ListRunsRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.ListRunsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -213,9 +213,9 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/GetLoginDetails',
-            flwr_dot_proto_dot_exec__pb2.GetLoginDetailsRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.GetLoginDetailsResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/GetLoginDetails',
+            flwr_dot_proto_dot_control__pb2.GetLoginDetailsRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.GetLoginDetailsResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
@@ -230,8 +230,8 @@ class Exec(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Exec/GetAuthTokens',
-            flwr_dot_proto_dot_exec__pb2.GetAuthTokensRequest.SerializeToString,
-            flwr_dot_proto_dot_exec__pb2.GetAuthTokensResponse.FromString,
+        return grpc.experimental.unary_unary(request, target, '/flwr.proto.Control/GetAuthTokens',
+            flwr_dot_proto_dot_control__pb2.GetAuthTokensRequest.SerializeToString,
+            flwr_dot_proto_dot_control__pb2.GetAuthTokensResponse.FromString,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)

flwr/proto/{exec_pb2_grpc.pyi → control_pb2_grpc.pyi}

@@ -3,91 +3,91 @@
 isort:skip_file
 """
 import abc
-import flwr.proto.exec_pb2
+import flwr.proto.control_pb2
 import grpc
 import typing
 
-class ExecStub:
+class ControlStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     StartRun: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.exec_pb2.StartRunRequest,
-        flwr.proto.exec_pb2.StartRunResponse]
+        flwr.proto.control_pb2.StartRunRequest,
+        flwr.proto.control_pb2.StartRunResponse]
     """Start run upon request"""
 
     StopRun: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.exec_pb2.StopRunRequest,
-        flwr.proto.exec_pb2.StopRunResponse]
+        flwr.proto.control_pb2.StopRunRequest,
+        flwr.proto.control_pb2.StopRunResponse]
     """Stop run upon request"""
 
     StreamLogs: grpc.UnaryStreamMultiCallable[
-        flwr.proto.exec_pb2.StreamLogsRequest,
-        flwr.proto.exec_pb2.StreamLogsResponse]
+        flwr.proto.control_pb2.StreamLogsRequest,
+        flwr.proto.control_pb2.StreamLogsResponse]
     """Start log stream upon request"""
 
     ListRuns: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.exec_pb2.ListRunsRequest,
-        flwr.proto.exec_pb2.ListRunsResponse]
+        flwr.proto.control_pb2.ListRunsRequest,
+        flwr.proto.control_pb2.ListRunsResponse]
     """flwr ls command"""
 
     GetLoginDetails: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.exec_pb2.GetLoginDetailsRequest,
-        flwr.proto.exec_pb2.GetLoginDetailsResponse]
+        flwr.proto.control_pb2.GetLoginDetailsRequest,
+        flwr.proto.control_pb2.GetLoginDetailsResponse]
     """Get login details upon request"""
 
     GetAuthTokens: grpc.UnaryUnaryMultiCallable[
-        flwr.proto.exec_pb2.GetAuthTokensRequest,
-        flwr.proto.exec_pb2.GetAuthTokensResponse]
+        flwr.proto.control_pb2.GetAuthTokensRequest,
+        flwr.proto.control_pb2.GetAuthTokensResponse]
     """Get auth tokens upon request"""
 
 
-class ExecServicer(metaclass=abc.ABCMeta):
+class ControlServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def StartRun(self,
-        request: flwr.proto.exec_pb2.StartRunRequest,
+        request: flwr.proto.control_pb2.StartRunRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.exec_pb2.StartRunResponse:
+    ) -> flwr.proto.control_pb2.StartRunResponse:
         """Start run upon request"""
         pass
 
     @abc.abstractmethod
     def StopRun(self,
-        request: flwr.proto.exec_pb2.StopRunRequest,
+        request: flwr.proto.control_pb2.StopRunRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.exec_pb2.StopRunResponse:
+    ) -> flwr.proto.control_pb2.StopRunResponse:
         """Stop run upon request"""
         pass
 
     @abc.abstractmethod
     def StreamLogs(self,
-        request: flwr.proto.exec_pb2.StreamLogsRequest,
+        request: flwr.proto.control_pb2.StreamLogsRequest,
         context: grpc.ServicerContext,
-    ) -> typing.Iterator[flwr.proto.exec_pb2.StreamLogsResponse]:
+    ) -> typing.Iterator[flwr.proto.control_pb2.StreamLogsResponse]:
         """Start log stream upon request"""
         pass
 
     @abc.abstractmethod
     def ListRuns(self,
-        request: flwr.proto.exec_pb2.ListRunsRequest,
+        request: flwr.proto.control_pb2.ListRunsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.exec_pb2.ListRunsResponse:
+    ) -> flwr.proto.control_pb2.ListRunsResponse:
         """flwr ls command"""
         pass
 
     @abc.abstractmethod
     def GetLoginDetails(self,
-        request: flwr.proto.exec_pb2.GetLoginDetailsRequest,
+        request: flwr.proto.control_pb2.GetLoginDetailsRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.exec_pb2.GetLoginDetailsResponse:
+    ) -> flwr.proto.control_pb2.GetLoginDetailsResponse:
         """Get login details upon request"""
         pass
 
     @abc.abstractmethod
     def GetAuthTokens(self,
-        request: flwr.proto.exec_pb2.GetAuthTokensRequest,
+        request: flwr.proto.control_pb2.GetAuthTokensRequest,
         context: grpc.ServicerContext,
-    ) -> flwr.proto.exec_pb2.GetAuthTokensResponse:
+    ) -> flwr.proto.control_pb2.GetAuthTokensResponse:
         """Get auth tokens upon request"""
         pass
 
 
-def add_ExecServicer_to_server(servicer: ExecServicer, server: grpc.Server) -> None: ...
+def add_ControlServicer_to_server(servicer: ControlServicer, server: grpc.Server) -> None: ...

flwr/server/app.py

@@ -37,13 +37,13 @@ from cryptography.hazmat.primitives.serialization import load_ssh_public_key
 from flwr.common import GRPC_MAX_MESSAGE_LENGTH, EventType, event
 from flwr.common.address import parse_address
 from flwr.common.args import try_obtain_server_certificates
-from flwr.common.auth_plugin import ExecAuthPlugin, ExecAuthzPlugin
+from flwr.common.auth_plugin import ControlAuthPlugin, ControlAuthzPlugin
 from flwr.common.config import get_flwr_dir, parse_config_args
 from flwr.common.constant import (
     AUTH_TYPE_YAML_KEY,
     AUTHZ_TYPE_YAML_KEY,
     CLIENT_OCTET,
-    EXEC_API_DEFAULT_SERVER_ADDRESS,
+    CONTROL_API_DEFAULT_SERVER_ADDRESS,
     FLEET_API_GRPC_RERE_DEFAULT_ADDRESS,
     FLEET_API_REST_DEFAULT_ADDRESS,
     ISOLATION_MODE_PROCESS,
@@ -74,7 +74,7 @@ from flwr.simulation.app import flwr_simulation
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.superlink.executor import load_executor
-from flwr.superlink.servicer.exec import run_exec_api_grpc
+from flwr.superlink.servicer.control import run_control_api_grpc
 
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer
 from .superlink.fleet.grpc_rere.fleet_servicer import FleetServicer
@@ -85,15 +85,15 @@ from .superlink.simulation.simulationio_grpc import run_simulationio_api_grpc
 
 DATABASE = ":flwr-in-memory-state:"
 BASE_DIR = get_flwr_dir() / "superlink" / "ffs"
-P = TypeVar("P", ExecAuthPlugin, ExecAuthzPlugin)
+P = TypeVar("P", ControlAuthPlugin, ControlAuthzPlugin)
 
 
 try:
     from flwr.ee import (
         add_ee_args_superlink,
-        get_exec_auth_plugins,
-        get_exec_authz_plugins,
-        get_exec_event_log_writer_plugins,
+        get_control_auth_plugins,
+        get_control_authz_plugins,
+        get_control_event_log_writer_plugins,
         get_fleet_event_log_writer_plugins,
     )
 except ImportError:
@@ -102,16 +102,16 @@ except ImportError:
     def add_ee_args_superlink(parser: argparse.ArgumentParser) -> None:
         """Add EE-specific arguments to the parser."""
 
-    def get_exec_auth_plugins() -> dict[str, type[ExecAuthPlugin]]:
-        """Return all Exec API authentication plugins."""
+    def get_control_auth_plugins() -> dict[str, type[ControlAuthPlugin]]:
+        """Return all Control API authentication plugins."""
         raise NotImplementedError("No authentication plugins are currently supported.")
 
-    def get_exec_authz_plugins() -> dict[str, type[ExecAuthzPlugin]]:
-        """Return all Exec API authorization plugins."""
+    def get_control_authz_plugins() -> dict[str, type[ControlAuthzPlugin]]:
+        """Return all Control API authorization plugins."""
         raise NotImplementedError("No authorization plugins are currently supported.")
 
-    def get_exec_event_log_writer_plugins() -> dict[str, type[EventLogWriterPlugin]]:
-        """Return all Exec API event log writer plugins."""
+    def get_control_event_log_writer_plugins() -> dict[str, type[EventLogWriterPlugin]]:
+        """Return all Control API event log writer plugins."""
         raise NotImplementedError(
             "No event log writer plugins are currently supported."
         )
@@ -138,9 +138,37 @@ def run_superlink() -> None:
             WARN, "The `--flwr-dir` option is currently not in use and will be ignored."
         )
 
+    # Detect if both Control API and Exec API addresses were set explicitly
+    explicit_args = set()
+    for arg in sys.argv[1:]:
+        if arg.startswith("--"):
+            explicit_args.add(
+                arg.split("=")[0]
+            )  # handles both `--arg val` and `--arg=val`
+
+    control_api_set = "--control-api-address" in explicit_args
+    exec_api_set = "--exec-api-address" in explicit_args
+
+    if control_api_set and exec_api_set:
+        flwr_exit(
+            ExitCode.SUPERLINK_INVALID_ARGS,
+            "Both `--control-api-address` and `--exec-api-address` are set. "
+            "Please use only `--control-api-address` as `--exec-api-address` is "
+            "deprecated.",
+        )
+
+    # Warn deprecated `--exec-api-address` argument
+    if args.exec_api_address is not None:
+        log(
+            WARN,
+            "The `--exec-api-address` argument is deprecated and will be removed in a "
+            "future release. Use `--control-api-address` instead.",
+        )
+        args.control_api_address = args.exec_api_address
+
     # Parse IP addresses
     serverappio_address, _, _ = _format_address(args.serverappio_api_address)
-    exec_address, _, _ = _format_address(args.exec_api_address)
+    control_address, _, _ = _format_address(args.control_api_address)
     simulationio_address, _, _ = _format_address(args.simulationio_api_address)
 
     # Obtain certificates
@@ -150,17 +178,17 @@ def run_superlink() -> None:
     # provided
     verify_tls_cert = not getattr(args, "disable_oidc_tls_cert_verification", None)
 
-    auth_plugin: Optional[ExecAuthPlugin] = None
-    authz_plugin: Optional[ExecAuthzPlugin] = None
+    auth_plugin: Optional[ControlAuthPlugin] = None
+    authz_plugin: Optional[ControlAuthzPlugin] = None
     event_log_plugin: Optional[EventLogWriterPlugin] = None
     # Load the auth plugin if the args.user_auth_config is provided
     if cfg_path := getattr(args, "user_auth_config", None):
-        auth_plugin, authz_plugin = _try_obtain_exec_auth_plugins(
+        auth_plugin, authz_plugin = _try_obtain_control_auth_plugins(
             Path(cfg_path), verify_tls_cert
         )
         # Enable event logging if the args.enable_event_log is True
         if args.enable_event_log:
-            event_log_plugin = _try_obtain_exec_event_log_writer_plugin()
+            event_log_plugin = _try_obtain_control_event_log_writer_plugin()
 
     # Initialize StateFactory
     state_factory = LinkStateFactory(args.database)
@@ -171,10 +199,10 @@ def run_superlink() -> None:
     # Initialize ObjectStoreFactory
     objectstore_factory = ObjectStoreFactory()
 
-    # Start Exec API
+    # Start Control API
     executor = load_executor(args)
-    exec_server: grpc.Server = run_exec_api_grpc(
-        address=exec_address,
+    control_server: grpc.Server = run_control_api_grpc(
+        address=control_address,
         state_factory=state_factory,
         ffs_factory=ffs_factory,
         objectstore_factory=objectstore_factory,
@@ -187,7 +215,7 @@ def run_superlink() -> None:
         authz_plugin=authz_plugin,
         event_log_plugin=event_log_plugin,
     )
-    grpc_servers = [exec_server]
+    grpc_servers = [control_server]
 
     # Determine Exec plugin
     # If simulation is used, don't start ServerAppIo and Fleet APIs
@@ -470,10 +498,10 @@ def _try_load_public_keys_node_authentication(
     return node_public_keys
 
 
-def _try_obtain_exec_auth_plugins(
+def _try_obtain_control_auth_plugins(
     config_path: Path, verify_tls_cert: bool
-) -> tuple[ExecAuthPlugin, ExecAuthzPlugin]:
-    """Obtain Exec API authentication and authorization plugins."""
+) -> tuple[ControlAuthPlugin, ControlAuthzPlugin]:
+    """Obtain Control API authentication and authorization plugins."""
     # Load YAML file
     with config_path.open("r", encoding="utf-8") as file:
         config: dict[str, Any] = yaml.safe_load(file)
@@ -503,24 +531,24 @@ def _try_obtain_exec_auth_plugins(
     auth_plugin = _load_plugin(
         section="authentication",
         yaml_key=AUTH_TYPE_YAML_KEY,
-        loader=get_exec_auth_plugins,
+        loader=get_control_auth_plugins,
     )
 
     # Load authorization plugin
     authz_plugin = _load_plugin(
         section="authorization",
         yaml_key=AUTHZ_TYPE_YAML_KEY,
-        loader=get_exec_authz_plugins,
+        loader=get_control_authz_plugins,
     )
 
     return auth_plugin, authz_plugin
 
 
-def _try_obtain_exec_event_log_writer_plugin() -> Optional[EventLogWriterPlugin]:
+def _try_obtain_control_event_log_writer_plugin() -> Optional[EventLogWriterPlugin]:
     """Return an instance of the event log writer plugin."""
     try:
         all_plugins: dict[str, type[EventLogWriterPlugin]] = (
-            get_exec_event_log_writer_plugins()
+            get_control_event_log_writer_plugins()
         )
         plugin_class = all_plugins[EventLogWriterType.STDOUT]
         return plugin_class()
@@ -651,7 +679,7 @@ def _parse_args_run_superlink() -> argparse.ArgumentParser:
     add_ee_args_superlink(parser=parser)
     _add_args_serverappio_api(parser=parser)
     _add_args_fleet_api(parser=parser)
-    _add_args_exec_api(parser=parser)
+    _add_args_control_api(parser=parser)
     _add_args_simulationio_api(parser=parser)
 
     return parser
@@ -775,13 +803,19 @@ def _add_args_fleet_api(parser: argparse.ArgumentParser) -> None:
     )
 
 
-def _add_args_exec_api(parser: argparse.ArgumentParser) -> None:
-    """Add command line arguments for Exec API."""
+def _add_args_control_api(parser: argparse.ArgumentParser) -> None:
+    """Add command line arguments for Control API."""
+    parser.add_argument(
+        "--control-api-address",
+        help="Control API server address (IPv4, IPv6, or a domain name) "
+        f"By default, it is set to {CONTROL_API_DEFAULT_SERVER_ADDRESS}.",
+        default=CONTROL_API_DEFAULT_SERVER_ADDRESS,
+    )
     parser.add_argument(
         "--exec-api-address",
-        help="Exec API server address (IPv4, IPv6, or a domain name) "
-        f"By default, it is set to {EXEC_API_DEFAULT_SERVER_ADDRESS}.",
-        default=EXEC_API_DEFAULT_SERVER_ADDRESS,
+        help="This argument is deprecated and will be removed in a future release. "
+        "Use `--control-api-address` instead.",
+        default=None,
     )
     parser.add_argument(
         "--executor",

flwr/superlink/executor/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Executor for Exec API."""
+"""Executor for Control API."""
 
 
 from .app import load_executor

flwr/superlink/servicer/{exec → control}/__init__.py

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Exec API Servicer."""
+"""Control API Servicer."""
 
 
-from .exec_grpc import run_exec_api_grpc
+from .control_grpc import run_control_api_grpc
 
 __all__ = [
-    "run_exec_api_grpc",
+    "run_control_api_grpc",
 ]

flwr/superlink/servicer/{exec/exec_event_log_interceptor.py → control/control_event_log_interceptor.py}

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower Exec API event log interceptor."""
+"""Flower Control API event log interceptor."""
 
 
 from collections.abc import Iterator
@@ -24,11 +24,11 @@ from google.protobuf.message import Message as GrpcMessage
 from flwr.common.event_log_plugin.event_log_plugin import EventLogWriterPlugin
 from flwr.common.typing import LogEntry
 
-from .exec_user_auth_interceptor import shared_account_info
+from .control_user_auth_interceptor import shared_account_info
 
 
-class ExecEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
-    """Exec API interceptor for logging events."""
+class ControlEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
+    """Control API interceptor for logging events."""
 
     def __init__(self, log_plugin: EventLogWriterPlugin) -> None:
         self.log_plugin = log_plugin
@@ -44,12 +44,12 @@ class ExecEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
         Continue RPC call if event logger is enabled on the SuperLink, else, terminate
         RPC call by setting context to abort.
         """
-        # Only apply to Exec service
-        if not handler_call_details.method.startswith("/flwr.proto.Exec/"):
+        # Only apply to Control service
+        if not handler_call_details.method.startswith("/flwr.proto.Control/"):
             return continuation(handler_call_details)
 
         # One of the method handlers in
-        # `flwr.superlink.servicer.exec.ExecServicer`
+        # `flwr.superlink.servicer.control.ControlServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)
         method_name: str = handler_call_details.method
         return self._generic_event_log_unary_method_handler(method_handler, method_name)