flwr-nightly 1.21.0.dev20250812__tar.gz → 1.21.0.dev20250814__tar.gz

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250812
+Version: 1.21.0.dev20250814
 Summary: Flower: A Friendly Federated AI Framework
 License: Apache-2.0
 Keywords: Artificial Intelligence,Federated AI,Federated Analytics,Federated Evaluation,Federated Learning,Flower,Machine Learning
@@ -172,8 +172,9 @@ Flower Baselines is a collection of community-contributed projects that reproduc
 - [FedOpt](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/flwr_baselines/publications/adaptive_federated_optimization)
 
 Please refer to the [Flower Baselines Documentation](https://flower.ai/docs/baselines/) for a detailed categorization of baselines and for additional info including:
-* [How to use Flower Baselines](https://flower.ai/docs/baselines/how-to-use-baselines.html)
-* [How to contribute a new Flower Baseline](https://flower.ai/docs/baselines/how-to-contribute-baselines.html)
+
+- [How to use Flower Baselines](https://flower.ai/docs/baselines/how-to-use-baselines.html)
+- [How to contribute a new Flower Baseline](https://flower.ai/docs/baselines/how-to-contribute-baselines.html)
 
 ## Flower Usage Examples
 

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/README.md

@@ -116,8 +116,9 @@ Flower Baselines is a collection of community-contributed projects that reproduc
 - [FedOpt](https://github.com/adap/flower/tree/main/baselines/flwr_baselines/flwr_baselines/publications/adaptive_federated_optimization)
 
 Please refer to the [Flower Baselines Documentation](https://flower.ai/docs/baselines/) for a detailed categorization of baselines and for additional info including:
-* [How to use Flower Baselines](https://flower.ai/docs/baselines/how-to-use-baselines.html)
-* [How to contribute a new Flower Baseline](https://flower.ai/docs/baselines/how-to-contribute-baselines.html)
+
+- [How to use Flower Baselines](https://flower.ai/docs/baselines/how-to-use-baselines.html)
+- [How to contribute a new Flower Baseline](https://flower.ai/docs/baselines/how-to-contribute-baselines.html)
 
 ## Flower Usage Examples
 

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/common/args.py

@@ -28,6 +28,12 @@ from flwr.common.logger import log
 
 def add_args_flwr_app_common(parser: argparse.ArgumentParser) -> None:
     """Add common Flower arguments for flwr-*app to the provided parser."""
+    parser.add_argument(
+        "--token",
+        type=str,
+        required=False,
+        help="Unique token generated by AppIo API for each app execution",
+    )
     parser.add_argument(
         "--flwr-dir",
         default=None,
@@ -47,6 +53,13 @@ def add_args_flwr_app_common(parser: argparse.ArgumentParser) -> None:
         "is not encrypted. By default, the server runs with HTTPS enabled. "
         "Use this flag only if you understand the risks.",
     )
+    parser.add_argument(
+        "--parent-pid",
+        type=int,
+        default=None,
+        help="The PID of the parent process. When set, the process will terminate "
+        "when the parent process exits.",
+    )
 
 
 def try_obtain_root_certificates(

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/proto/simulationio_pb2.py

@@ -20,7 +20,7 @@ from flwr.proto import fab_pb2 as flwr_dot_proto_dot_fab__pb2
 from flwr.proto import appio_pb2 as flwr_dot_proto_dot_appio__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x66lwr/proto/simulationio.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x14\x66lwr/proto/log.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x16\x66lwr/proto/appio.proto2\xc1\x06\n\x0cSimulationIo\x12_\n\x10ListAppsToLaunch\x12#.flwr.proto.ListAppsToLaunchRequest\x1a$.flwr.proto.ListAppsToLaunchResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12V\n\rPullAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12Y\n\x0ePushAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12\\\n\x0fUpdateRunStatus\x12\".flwr.proto.UpdateRunStatusRequest\x1a#.flwr.proto.UpdateRunStatusResponse\"\x00\x12G\n\x08PushLogs\x12\x1b.flwr.proto.PushLogsRequest\x1a\x1c.flwr.proto.PushLogsResponse\"\x00\x12k\n\x14GetFederationOptions\x12\'.flwr.proto.GetFederationOptionsRequest\x1a(.flwr.proto.GetFederationOptionsResponse\"\x00\x12S\n\x0cGetRunStatus\x12\x1f.flwr.proto.GetRunStatusRequest\x1a .flwr.proto.GetRunStatusResponse\"\x00\x12_\n\x10SendAppHeartbeat\x12#.flwr.proto.SendAppHeartbeatRequest\x1a$.flwr.proto.SendAppHeartbeatResponse\"\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x66lwr/proto/simulationio.proto\x12\nflwr.proto\x1a\x1a\x66lwr/proto/heartbeat.proto\x1a\x14\x66lwr/proto/log.proto\x1a\x18\x66lwr/proto/message.proto\x1a\x14\x66lwr/proto/run.proto\x1a\x14\x66lwr/proto/fab.proto\x1a\x16\x66lwr/proto/appio.proto2\x84\x07\n\x0cSimulationIo\x12_\n\x10ListAppsToLaunch\x12#.flwr.proto.ListAppsToLaunchRequest\x1a$.flwr.proto.ListAppsToLaunchResponse\"\x00\x12S\n\x0cRequestToken\x12\x1f.flwr.proto.RequestTokenRequest\x1a .flwr.proto.RequestTokenResponse\"\x00\x12\x41\n\x06GetRun\x12\x19.flwr.proto.GetRunRequest\x1a\x1a.flwr.proto.GetRunResponse\"\x00\x12V\n\rPullAppInputs\x12 .flwr.proto.PullAppInputsRequest\x1a!.flwr.proto.PullAppInputsResponse\"\x00\x12Y\n\x0ePushAppOutputs\x12!.flwr.proto.PushAppOutputsRequest\x1a\".flwr.proto.PushAppOutputsResponse\"\x00\x12\\\n\x0fUpdateRunStatus\x12\".flwr.proto.UpdateRunStatusRequest\x1a#.flwr.proto.UpdateRunStatusResponse\"\x00\x12G\n\x08PushLogs\x12\x1b.flwr.proto.PushLogsRequest\x1a\x1c.flwr.proto.PushLogsResponse\"\x00\x12k\n\x14GetFederationOptions\x12\'.flwr.proto.GetFederationOptionsRequest\x1a(.flwr.proto.GetFederationOptionsResponse\"\x00\x12S\n\x0cGetRunStatus\x12\x1f.flwr.proto.GetRunStatusRequest\x1a .flwr.proto.GetRunStatusResponse\"\x00\x12_\n\x10SendAppHeartbeat\x12#.flwr.proto.SendAppHeartbeatRequest\x1a$.flwr.proto.SendAppHeartbeatResponse\"\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -28,5 +28,5 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flwr.proto.simulationio_pb2
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
   _globals['_SIMULATIONIO']._serialized_start=190
-  _globals['_SIMULATIONIO']._serialized_end=1023
+  _globals['_SIMULATIONIO']._serialized_end=1090
 # @@protoc_insertion_point(module_scope)

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/proto/simulationio_pb2_grpc.py

@@ -27,6 +27,11 @@ class SimulationIoStub(object):
                 request_serializer=flwr_dot_proto_dot_appio__pb2.RequestTokenRequest.SerializeToString,
                 response_deserializer=flwr_dot_proto_dot_appio__pb2.RequestTokenResponse.FromString,
                 )
+        self.GetRun = channel.unary_unary(
+                '/flwr.proto.SimulationIo/GetRun',
+                request_serializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
+                response_deserializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
+                )
         self.PullAppInputs = channel.unary_unary(
                 '/flwr.proto.SimulationIo/PullAppInputs',
                 request_serializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.SerializeToString,
@@ -81,6 +86,13 @@ class SimulationIoServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def GetRun(self, request, context):
+        """Get run details
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def PullAppInputs(self, request, context):
         """Pull Simulation inputs
         """
@@ -143,6 +155,11 @@ def add_SimulationIoServicer_to_server(servicer, server):
                     request_deserializer=flwr_dot_proto_dot_appio__pb2.RequestTokenRequest.FromString,
                     response_serializer=flwr_dot_proto_dot_appio__pb2.RequestTokenResponse.SerializeToString,
             ),
+            'GetRun': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetRun,
+                    request_deserializer=flwr_dot_proto_dot_run__pb2.GetRunRequest.FromString,
+                    response_serializer=flwr_dot_proto_dot_run__pb2.GetRunResponse.SerializeToString,
+            ),
             'PullAppInputs': grpc.unary_unary_rpc_method_handler(
                     servicer.PullAppInputs,
                     request_deserializer=flwr_dot_proto_dot_appio__pb2.PullAppInputsRequest.FromString,
@@ -222,6 +239,23 @@ class SimulationIo(object):
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def GetRun(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/GetRun',
+            flwr_dot_proto_dot_run__pb2.GetRunRequest.SerializeToString,
+            flwr_dot_proto_dot_run__pb2.GetRunResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def PullAppInputs(request,
             target,

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/proto/simulationio_pb2_grpc.pyi

@@ -21,6 +21,11 @@ class SimulationIoStub:
         flwr.proto.appio_pb2.RequestTokenResponse]
     """Request token for a run"""
 
+    GetRun: grpc.UnaryUnaryMultiCallable[
+        flwr.proto.run_pb2.GetRunRequest,
+        flwr.proto.run_pb2.GetRunResponse]
+    """Get run details"""
+
     PullAppInputs: grpc.UnaryUnaryMultiCallable[
         flwr.proto.appio_pb2.PullAppInputsRequest,
         flwr.proto.appio_pb2.PullAppInputsResponse]
@@ -74,6 +79,14 @@ class SimulationIoServicer(metaclass=abc.ABCMeta):
         """Request token for a run"""
         pass
 
+    @abc.abstractmethod
+    def GetRun(self,
+        request: flwr.proto.run_pb2.GetRunRequest,
+        context: grpc.ServicerContext,
+    ) -> flwr.proto.run_pb2.GetRunResponse:
+        """Get run details"""
+        pass
+
     @abc.abstractmethod
     def PullAppInputs(self,
         request: flwr.proto.appio_pb2.PullAppInputsRequest,

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/server/app.py

@@ -18,9 +18,8 @@
 import argparse
 import csv
 import importlib.util
-import multiprocessing
-import multiprocessing.context
 import os
+import subprocess
 import sys
 import threading
 from collections.abc import Sequence
@@ -55,6 +54,7 @@ from flwr.common.constant import (
     TRANSPORT_TYPE_GRPC_RERE,
     TRANSPORT_TYPE_REST,
     EventLogWriterType,
+    ExecPluginType,
 )
 from flwr.common.event_log_plugin import EventLogWriterPlugin
 from flwr.common.exit import ExitCode, flwr_exit
@@ -69,8 +69,6 @@ from flwr.proto.fleet_pb2_grpc import (  # pylint: disable=E0611
 )
 from flwr.proto.grpcadapter_pb2_grpc import add_GrpcAdapterServicer_to_server
 from flwr.server.fleet_event_log_interceptor import FleetEventLogInterceptor
-from flwr.server.serverapp.app import flwr_serverapp
-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
@@ -219,10 +217,10 @@ def run_superlink() -> None:
 
     # Determine Exec plugin
     # If simulation is used, don't start ServerAppIo and Fleet APIs
-    sim_exec = executor.__class__.__qualname__ == "SimulationEngine"
+    is_simulation = executor.__class__.__qualname__ == "SimulationEngine"
     bckg_threads: list[threading.Thread] = []
 
-    if sim_exec:
+    if is_simulation:
         simulationio_server: grpc.Server = run_simulationio_api_grpc(
             address=simulationio_address,
             state_factory=state_factory,
@@ -340,25 +338,18 @@ def run_superlink() -> None:
         io_address = (
             f"{CLIENT_OCTET}:{_port}" if _octet == SERVER_OCTET else serverappio_address
         )
-        address_arg = (
-            "--simulationio-api-address" if sim_exec else "--serverappio-api-address"
-        )
-        address = simulationio_address if sim_exec else io_address
-        cmd = "flwr-simulation" if sim_exec else "flwr-serverapp"
-
-        # Scheduler thread
-        scheduler_th = threading.Thread(
-            target=_flwr_scheduler,
-            args=(
-                state_factory,
-                address_arg,
-                address,
-                cmd,
-            ),
-            daemon=True,
-        )
-        scheduler_th.start()
-        bckg_threads.append(scheduler_th)
+        command = ["flower-superexec", "--insecure"]
+        command += [
+            "--appio-api-address",
+            simulationio_address if is_simulation else io_address,
+        ]
+        command += [
+            "--plugin-type",
+            ExecPluginType.SIMULATION if is_simulation else ExecPluginType.SERVER_APP,
+        ]
+        command += ["--parent-pid", str(os.getpid())]
+        # pylint: disable-next=consider-using-with
+        subprocess.Popen(command)
 
     # Graceful shutdown
     register_exit_handlers(
@@ -376,75 +367,6 @@ def run_superlink() -> None:
     flwr_exit(ExitCode.SUPERLINK_THREAD_CRASH)
 
 
-def _run_flwr_command(args: list[str], main_pid: int) -> None:
-    # Monitor the main process in case of SIGKILL
-    def main_process_monitor() -> None:
-        while True:
-            sleep(1)
-            if os.getppid() != main_pid:
-                os.kill(os.getpid(), 9)
-
-    threading.Thread(target=main_process_monitor, daemon=True).start()
-
-    # Run the command
-    sys.argv = args
-    if args[0] == "flwr-serverapp":
-        flwr_serverapp()
-    elif args[0] == "flwr-simulation":
-        flwr_simulation()
-    else:
-        raise ValueError(f"Unknown command: {args[0]}")
-
-
-def _flwr_scheduler(
-    state_factory: LinkStateFactory,
-    io_api_arg: str,
-    io_api_address: str,
-    cmd: str,
-) -> None:
-    log(DEBUG, "Started %s scheduler thread.", cmd)
-    state = state_factory.state()
-    run_id_to_proc: dict[int, multiprocessing.context.SpawnProcess] = {}
-
-    # Use the "spawn" start method for multiprocessing.
-    mp_spawn_context = multiprocessing.get_context("spawn")
-
-    # Periodically check for a pending run in the LinkState
-    while True:
-        sleep(0.1)
-        pending_run_id = state.get_pending_run_id()
-
-        if pending_run_id and pending_run_id not in run_id_to_proc:
-
-            log(
-                INFO,
-                "Launching %s subprocess. Connects to SuperLink on %s",
-                cmd,
-                io_api_address,
-            )
-            # Start subprocess
-            command = [
-                cmd,
-                "--run-once",
-                io_api_arg,
-                io_api_address,
-                "--insecure",
-            ]
-
-            proc = mp_spawn_context.Process(
-                target=_run_flwr_command, args=(command, os.getpid()), daemon=True
-            )
-            proc.start()
-
-            # Store the process
-            run_id_to_proc[pending_run_id] = proc
-
-        # Clean up finished processes
-        for run_id, proc in list(run_id_to_proc.items()):
-            if not proc.is_alive():
-                del run_id_to_proc[run_id]
-
-
 def _format_address(address: str) -> tuple[str, str, int]:
     parsed_address = parse_address(address)
     if not parsed_address:

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/server/serverapp/app.py

@@ -92,7 +92,7 @@ def flwr_serverapp() -> None:
         serverappio_api_address=args.serverappio_api_address,
         log_queue=log_queue,
         token=args.token,
-        run_once=args.run_once,
+        run_once=(args.token is not None) or args.run_once,
         flwr_dir=args.flwr_dir,
         certificates=None,
         parent_pid=args.parent_pid,
@@ -287,19 +287,6 @@ def _parse_args_run_flwr_serverapp() -> argparse.ArgumentParser:
         help="Address of SuperLink's ServerAppIo API (IPv4, IPv6, or a domain name)."
         f"By default, it is set to {SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS}.",
     )
-    parser.add_argument(
-        "--token",
-        type=str,
-        required=False,
-        help="Unique token generated by SuperNode for each ServerApp execution",
-    )
-    parser.add_argument(
-        "--parent-pid",
-        type=int,
-        default=None,
-        help="The PID of the parent process. When set, the process will terminate "
-        "when the parent process exits.",
-    )
     parser.add_argument(
         "--run-once",
         action="store_true",

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/server/superlink/fleet/vce/backend/raybackend.py

@@ -161,6 +161,7 @@ class RayBackend(Backend):
                 "Call the backend's `build()` method before processing messages."
             )
 
+        future = None
         try:
             # Submit a task to the pool
             future = self.pool.submit(
@@ -183,7 +184,8 @@ class RayBackend(Backend):
                 self.__class__.__name__,
             )
             # add actor back into pool
-            self.pool.add_actor_back_to_pool(future)
+            if future is not None:
+                self.pool.add_actor_back_to_pool(future)
             raise ex
 
     def terminate(self) -> None:

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -23,7 +23,6 @@ from concurrent.futures import ThreadPoolExecutor
 from logging import DEBUG, ERROR, INFO, WARN
 from pathlib import Path
 from queue import Empty, Queue
-from time import sleep
 from typing import Callable, Optional
 from uuid import uuid4
 
@@ -153,7 +152,7 @@ def add_messages_to_queue(
             message_ins_list = state.get_message_ins(node_id=node_id, limit=1)
             for msg in message_ins_list:
                 queue.put(msg)
-        sleep(0.1)
+        f_stop.wait(0.1)
 
 
 def put_message_into_state(
@@ -182,6 +181,7 @@ def run_api(
     messageins_queue: Queue[Message] = Queue()
     messageres_queue: Queue[Message] = Queue()
 
+    backend = None
     try:
 
         # Instantiate backend
@@ -236,16 +236,16 @@ def run_api(
         log(ERROR, traceback.format_exc())
         log(WARN, "Stopping Simulation Engine.")
 
-        # Manually trigger stopping event
-        f_stop.set()
-
         # Raise exception
         raise RuntimeError("Simulation Engine crashed.") from ex
 
     finally:
+        # Manually trigger stopping event
+        f_stop.set()
 
         # Terminate backend
-        backend.terminate()
+        if backend is not None:
+            backend.terminate()
 
 
 # pylint: disable=too-many-arguments,unused-argument,too-many-locals,too-many-branches

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/server/superlink/simulation/simulationio_servicer.py

@@ -55,6 +55,8 @@ from flwr.proto.log_pb2 import (  # pylint: disable=E0611
 from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     GetFederationOptionsRequest,
     GetFederationOptionsResponse,
+    GetRunRequest,
+    GetRunResponse,
     GetRunStatusRequest,
     GetRunStatusResponse,
     UpdateRunStatusRequest,
@@ -111,6 +113,23 @@ class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):
         # Return the token
         return RequestTokenResponse(token=token or "")
 
+    def GetRun(
+        self, request: GetRunRequest, context: grpc.ServicerContext
+    ) -> GetRunResponse:
+        """Get run information."""
+        log(DEBUG, "SimulationIoServicer.GetRun")
+
+        # Init state
+        state = self.state_factory.state()
+
+        # Retrieve run information
+        run = state.get_run(request.run_id)
+
+        if run is None:
+            return GetRunResponse()
+
+        return GetRunResponse(run=run_to_proto(run))
+
     def PullAppInputs(
         self, request: PullAppInputsRequest, context: ServicerContext
     ) -> PullAppInputsResponse:
@@ -120,14 +139,11 @@ class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):
         state = self.state_factory.state()
         ffs = self.ffs_factory.ffs()
 
+        # Validate the token
+        run_id = self._verify_token(request.token, context)
+
         # Lock access to LinkState, preventing obtaining the same pending run_id
         with self.lock:
-            # Attempt getting the run_id of a pending run
-            run_id = state.get_pending_run_id()
-            # If there's no pending run, return an empty response
-            if run_id is None:
-                return PullAppInputsResponse()
-
             # Retrieve Context, Run and Fab for the run_id
             serverapp_ctxt = state.get_serverapp_context(run_id)
             run = state.get_run(run_id)
@@ -154,6 +170,11 @@ class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):
     ) -> PushAppOutputsResponse:
         """Push Simulation process outputs."""
         log(DEBUG, "SimultionIoServicer.PushAppOutputs")
+
+        # Validate the token
+        run_id = self._verify_token(request.token, context)
+
+        # Init access to LinkState
         state = self.state_factory.state()
 
         # Abort if the run is not running
@@ -166,6 +187,9 @@ class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):
         )
 
         state.set_serverapp_context(request.run_id, context_from_proto(request.context))
+
+        # Remove the token
+        state.delete_token(run_id)
         return PushAppOutputsResponse()
 
     def UpdateRunStatus(
@@ -248,3 +272,15 @@ class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):
         )
 
         return SendAppHeartbeatResponse(success=success)
+
+    def _verify_token(self, token: str, context: grpc.ServicerContext) -> int:
+        """Verify the token and return the associated run ID."""
+        state = self.state_factory.state()
+        run_id = state.get_run_id_by_token(token)
+        if run_id is None or not state.verify_token(run_id, token):
+            context.abort(
+                grpc.StatusCode.PERMISSION_DENIED,
+                "Invalid token.",
+            )
+            raise RuntimeError("This line should never be reached.")
+        return run_id

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/simulation/app.py

@@ -19,7 +19,6 @@ import argparse
 import gc
 from logging import DEBUG, ERROR, INFO
 from queue import Queue
-from time import sleep
 from typing import Optional
 
 from flwr.cli.config_utils import get_fab_metadata
@@ -70,6 +69,7 @@ from flwr.proto.run_pb2 import (  # pylint: disable=E0611
 from flwr.server.superlink.fleet.vce.backend.backend import BackendConfig
 from flwr.simulation.run_simulation import _run_simulation
 from flwr.simulation.simulationio_connection import SimulationIoConnection
+from flwr.supercore.app_utils import simple_get_token, start_parent_process_monitor
 
 
 def flwr_simulation() -> None:
@@ -97,23 +97,31 @@ def flwr_simulation() -> None:
     run_simulation_process(
         simulationio_api_address=args.simulationio_api_address,
         log_queue=log_queue,
-        run_once=args.run_once,
+        run_once=(args.token is not None) or args.run_once,
+        token=args.token,
         flwr_dir_=args.flwr_dir,
         certificates=None,
+        parent_pid=args.parent_pid,
     )
 
     # Restore stdout/stderr
     restore_output()
 
 
-def run_simulation_process(  # pylint: disable=R0914, disable=W0212, disable=R0915
+def run_simulation_process(  # pylint: disable=R0913, R0914, R0915, R0917, W0212
     simulationio_api_address: str,
     log_queue: Queue[Optional[str]],
     run_once: bool,
+    token: Optional[str] = None,
     flwr_dir_: Optional[str] = None,
     certificates: Optional[bytes] = None,
+    parent_pid: Optional[int] = None,
 ) -> None:
     """Run Flower Simulation process."""
+    # Start monitoring the parent process if a PID is provided
+    if parent_pid is not None:
+        start_parent_process_monitor(parent_pid)
+
     conn = SimulationIoConnection(
         simulationio_service_address=simulationio_api_address,
         root_certificates=certificates,
@@ -123,18 +131,19 @@ def run_simulation_process(  # pylint: disable=R0914, disable=W0212, disable=R09
     flwr_dir = get_flwr_dir(flwr_dir_)
     log_uploader = None
     heartbeat_sender = None
+    run_status = None
 
     while True:
 
         try:
+            # If token is not set, loop until token is received from SuperNode
+            if token is None:
+                log(DEBUG, "[flwr-simulation] Request token")
+                token = simple_get_token(conn._stub)
+
             # Pull SimulationInputs from LinkState
-            req = PullAppInputsRequest()
+            req = PullAppInputsRequest(token=token)
             res: PullAppInputsResponse = conn._stub.PullAppInputs(req)
-            if not res.HasField("run"):
-                sleep(3)
-                run_status = None
-                continue
-
             context = context_from_proto(res.context)
             run = run_from_proto(res.run)
             fab = fab_from_proto(res.fab)
@@ -240,7 +249,9 @@ def run_simulation_process(  # pylint: disable=R0914, disable=W0212, disable=R09
 
             # Send resulting context
             context_proto = context_to_proto(updated_context)
-            out_req = PushAppOutputsRequest(run_id=run.run_id, context=context_proto)
+            out_req = PushAppOutputsRequest(
+                token=token, run_id=run.run_id, context=context_proto
+            )
             _ = conn._stub.PushAppOutputs(out_req)
 
             run_status = RunStatus(Status.FINISHED, SubStatus.COMPLETED, "")
@@ -269,12 +280,16 @@ def run_simulation_process(  # pylint: disable=R0914, disable=W0212, disable=R09
                         run_id=run.run_id, run_status=run_status_proto
                     )
                 )
+                run_status = None
 
             # Clean up the Context if it exists
             try:
                 del updated_context
             except NameError:
                 pass
+
+            # Remove the token
+            token = None
             gc.collect()
 
         # Stop the loop if `flwr-simulation` is expected to process a single run

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/supercore/app_utils.py

@@ -29,6 +29,7 @@ from flwr.proto.appio_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
 from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub
+from flwr.proto.simulationio_pb2_grpc import SimulationIoStub
 
 if os.name == "nt":
     from ctypes import windll  # type: ignore
@@ -70,7 +71,9 @@ def start_parent_process_monitor(
     threading.Thread(target=monitor, daemon=True).start()
 
 
-def simple_get_token(stub: Union[ClientAppIoStub, ServerAppIoStub]) -> str:
+def simple_get_token(
+    stub: Union[ClientAppIoStub, ServerAppIoStub, SimulationIoStub]
+) -> str:
     """Get a token from SuperLink/SuperNode.
 
     This shall be removed once the SuperExec is fully implemented.

{flwr_nightly-1.21.0.dev20250812 → flwr_nightly-1.21.0.dev20250814}/py/flwr/supernode/cli/flwr_clientapp.py

@@ -65,19 +65,6 @@ def _parse_args_run_flwr_clientapp() -> argparse.ArgumentParser:
         help="Address of SuperNode's ClientAppIo API (IPv4, IPv6, or a domain name)."
         f"By default, it is set to {CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS}.",
     )
-    parser.add_argument(
-        "--token",
-        type=str,
-        required=False,
-        help="Unique token generated by SuperNode for each ClientApp execution",
-    )
-    parser.add_argument(
-        "--parent-pid",
-        type=int,
-        default=None,
-        help="The PID of the parent process. When set, the process will terminate "
-        "when the parent process exits.",
-    )
     parser.add_argument(
         "--run-once",
         action="store_true",