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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250814
+Version: 1.21.0.dev20250817
 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

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

@@ -60,6 +60,11 @@ def add_args_flwr_app_common(parser: argparse.ArgumentParser) -> 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",
+        help="This flag is deprecated and will be removed in a future release.",
+    )
 
 
 def try_obtain_root_certificates(

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

@@ -34,6 +34,7 @@ from flwr.common.config import (
 )
 from flwr.common.constant import (
     SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
+    ExecPluginType,
     Status,
     SubStatus,
 )
@@ -61,9 +62,12 @@ from flwr.proto.appio_pb2 import (  # pylint: disable=E0611
     PushAppOutputsRequest,
 )
 from flwr.proto.run_pb2 import UpdateRunStatusRequest  # pylint: disable=E0611
+from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub
 from flwr.server.grid.grpc_grid import GrpcGrid
 from flwr.server.run_serverapp import run as run_
 from flwr.supercore.app_utils import simple_get_token, start_parent_process_monitor
+from flwr.supercore.superexec.plugin import ServerAppExecPlugin
+from flwr.supercore.superexec.run_superexec import run_with_deprecation_warning
 
 
 def flwr_serverapp() -> None:
@@ -74,14 +78,27 @@ def flwr_serverapp() -> None:
 
     args = _parse_args_run_flwr_serverapp().parse_args()
 
-    log(INFO, "Start `flwr-serverapp` process")
-
     if not args.insecure:
         flwr_exit(
             ExitCode.COMMON_TLS_NOT_SUPPORTED,
             "`flwr-serverapp` does not support TLS yet.",
         )
 
+    # Disallow long-running `flwr-serverapp` processes
+    if args.token is None:
+        run_with_deprecation_warning(
+            cmd="flwr-serverapp",
+            plugin_type=ExecPluginType.SERVER_APP,
+            plugin_class=ServerAppExecPlugin,
+            stub_class=ServerAppIoStub,
+            appio_api_address=args.serverappio_api_address,
+            flwr_dir=args.flwr_dir,
+            parent_pid=args.parent_pid,
+            warn_run_once=args.run_once,
+        )
+        return
+
+    log(INFO, "Start `flwr-serverapp` process")
     log(
         DEBUG,
         "`flwr-serverapp` will attempt to connect to SuperLink's "
@@ -287,11 +304,5 @@ 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(
-        "--run-once",
-        action="store_true",
-        help="When set, this process will start a single ServerApp for a pending Run. "
-        "If there is no pending Run, the process will exit.",
-    )
     add_args_flwr_app_common(parser=parser)
     return parser

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

@@ -35,6 +35,7 @@ from flwr.common.config import (
 )
 from flwr.common.constant import (
     SIMULATIONIO_API_DEFAULT_CLIENT_ADDRESS,
+    ExecPluginType,
     Status,
     SubStatus,
 )
@@ -66,10 +67,13 @@ from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     GetFederationOptionsResponse,
     UpdateRunStatusRequest,
 )
+from flwr.proto.simulationio_pb2_grpc import SimulationIoStub
 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
+from flwr.supercore.superexec.plugin import SimulationExecPlugin
+from flwr.supercore.superexec.run_superexec import run_with_deprecation_warning
 
 
 def flwr_simulation() -> None:
@@ -80,14 +84,27 @@ def flwr_simulation() -> None:
 
     args = _parse_args_run_flwr_simulation().parse_args()
 
-    log(INFO, "Starting Flower Simulation")
-
     if not args.insecure:
         flwr_exit(
             ExitCode.COMMON_TLS_NOT_SUPPORTED,
-            "`flwr-simulation` does not support TLS yet. ",
+            "`flwr-simulation` does not support TLS yet.",
+        )
+
+    # Disallow long-running `flwr-simulation` processes
+    if args.token is None:
+        run_with_deprecation_warning(
+            cmd="flwr-simulation",
+            plugin_type=ExecPluginType.SIMULATION,
+            plugin_class=SimulationExecPlugin,
+            stub_class=SimulationIoStub,
+            appio_api_address=args.simulationio_api_address,
+            flwr_dir=args.flwr_dir,
+            parent_pid=args.parent_pid,
+            warn_run_once=args.run_once,
         )
+        return
 
+    log(INFO, "Starting Flower Simulation")
     log(
         DEBUG,
         "Starting isolated `Simulation` connected to SuperLink SimulationAppIo API "
@@ -309,11 +326,5 @@ def _parse_args_run_flwr_simulation() -> argparse.ArgumentParser:
         help="Address of SuperLink's SimulationIO API (IPv4, IPv6, or a domain name)."
         f"By default, it is set to {SIMULATIONIO_API_DEFAULT_CLIENT_ADDRESS}.",
     )
-    parser.add_argument(
-        "--run-once",
-        action="store_true",
-        help="When set, this process will start a single simulation "
-        "for a pending Run. If no pending run the process will exit. ",
-    )
     add_args_flwr_app_common(parser=parser)
     return parser

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

@@ -64,9 +64,7 @@ def start_parent_process_monitor(
         while True:
             time.sleep(0.2)
             if not _pid_exists(parent_pid):
-                # This works on Unix-like systems and Windows
-                # Avoid `os.kill` on Windows
-                signal.raise_signal(signal.SIGTERM)
+                os.kill(os.getpid(), signal.SIGKILL)
 
     threading.Thread(target=monitor, daemon=True).start()
 

{flwr_nightly-1.21.0.dev20250814 → flwr_nightly-1.21.0.dev20250817}/py/flwr/supercore/superexec/run_superexec.py

@@ -16,11 +16,13 @@
 
 
 import time
-from typing import Optional
+from logging import WARN
+from typing import Optional, Union
 
 from flwr.common.config import get_flwr_dir
 from flwr.common.exit_handlers import register_exit_handlers
 from flwr.common.grpc import create_channel, on_channel_state_change
+from flwr.common.logger import log
 from flwr.common.retry_invoker import _make_simple_grpc_retry_invoker, _wrap_stub
 from flwr.common.serde import run_from_proto
 from flwr.common.telemetry import EventType
@@ -31,6 +33,8 @@ from flwr.proto.appio_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
 from flwr.proto.run_pb2 import GetRunRequest  # pylint: disable=E0611
+from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub
+from flwr.proto.simulationio_pb2_grpc import SimulationIoStub
 from flwr.supercore.app_utils import start_parent_process_monitor
 
 from .plugin import ExecPlugin
@@ -38,7 +42,9 @@ from .plugin import ExecPlugin
 
 def run_superexec(
     plugin_class: type[ExecPlugin],
-    stub_class: type[ClientAppIoStub],
+    stub_class: Union[
+        type[ClientAppIoStub], type[ServerAppIoStub], type[SimulationIoStub]
+    ],
     appio_api_address: str,
     flwr_dir: Optional[str] = None,
     parent_pid: Optional[int] = None,
@@ -120,3 +126,48 @@ def run_superexec(
             time.sleep(1)
     finally:
         channel.close()
+
+
+def run_with_deprecation_warning(  # pylint: disable=R0913, R0917
+    cmd: str,
+    plugin_type: str,
+    plugin_class: type[ExecPlugin],
+    stub_class: Union[
+        type[ClientAppIoStub], type[ServerAppIoStub], type[SimulationIoStub]
+    ],
+    appio_api_address: str,
+    flwr_dir: Optional[str],
+    parent_pid: Optional[int],
+    warn_run_once: bool,
+) -> None:
+    """Log a deprecation warning and run the equivalent `flower-superexec` command.
+
+    Used for legacy long-running `flwr-*` commands (i.e., without `--token`) that will
+    be removed in favor of `flower-superexec`.
+    """
+    log(
+        WARN,
+        "Directly executing `%s` is DEPRECATED and will be prohibited "
+        "in a future release. Please use `flower-superexec` instead.",
+        cmd,
+    )
+    log(WARN, "For now, the following command is being run automatically:")
+    new_cmd = f"flower-superexec --insecure --plugin-type {plugin_type} "
+    new_cmd += f"--appio-api-address {appio_api_address} "
+    if flwr_dir is not None:
+        new_cmd += f"--flwr-dir {flwr_dir} "
+    if parent_pid is not None:
+        new_cmd += f"--parent-pid {parent_pid}"
+    log(WARN, new_cmd)
+
+    # Warn about unsupported `--run-once` flag
+    if warn_run_once:
+        log(WARN, "`flower-superexec` does not support the `--run-once` flag.")
+
+    run_superexec(
+        plugin_class=plugin_class,
+        stub_class=stub_class,
+        appio_api_address=appio_api_address,
+        flwr_dir=flwr_dir,
+        parent_pid=parent_pid,
+    )

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

@@ -19,9 +19,12 @@ import argparse
 from logging import DEBUG, INFO
 
 from flwr.common.args import add_args_flwr_app_common
-from flwr.common.constant import CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS
+from flwr.common.constant import CLIENTAPPIO_API_DEFAULT_CLIENT_ADDRESS, ExecPluginType
 from flwr.common.exit import ExitCode, flwr_exit
 from flwr.common.logger import log
+from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
+from flwr.supercore.superexec.plugin import ClientAppExecPlugin
+from flwr.supercore.superexec.run_superexec import run_with_deprecation_warning
 from flwr.supercore.utils import mask_string
 from flwr.supernode.runtime.run_clientapp import run_clientapp
 
@@ -35,6 +38,20 @@ def flwr_clientapp() -> None:
             "flwr-clientapp does not support TLS yet.",
         )
 
+    # Disallow long-running `flwr-clientapp` processes
+    if args.token is None:
+        run_with_deprecation_warning(
+            cmd="flwr-clientapp",
+            plugin_type=ExecPluginType.CLIENT_APP,
+            plugin_class=ClientAppExecPlugin,
+            stub_class=ClientAppIoStub,
+            appio_api_address=args.clientappio_api_address,
+            flwr_dir=args.flwr_dir,
+            parent_pid=args.parent_pid,
+            warn_run_once=args.run_once,
+        )
+        return
+
     log(INFO, "Start `flwr-clientapp` process")
     log(
         DEBUG,
@@ -45,7 +62,6 @@ def flwr_clientapp() -> None:
     )
     run_clientapp(
         clientappio_api_address=args.clientappio_api_address,
-        run_once=(args.token is not None) or args.run_once,
         token=args.token,
         flwr_dir=args.flwr_dir,
         certificates=None,
@@ -65,11 +81,5 @@ 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(
-        "--run-once",
-        action="store_true",
-        help="When set, this process will start a single ClientApp for a pending "
-        "message. If there is no pending message, the process will exit.",
-    )
     add_args_flwr_app_common(parser=parser)
     return parser

{flwr_nightly-1.21.0.dev20250814 → flwr_nightly-1.21.0.dev20250817}/py/flwr/supernode/runtime/run_clientapp.py

@@ -62,14 +62,13 @@ from flwr.proto.appio_pb2 import (  # pylint: disable=E0611
 )
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
-from flwr.supercore.app_utils import simple_get_token, start_parent_process_monitor
+from flwr.supercore.app_utils import start_parent_process_monitor
 from flwr.supercore.utils import mask_string
 
 
 def run_clientapp(  # pylint: disable=R0913, R0914, R0917
     clientappio_api_address: str,
-    run_once: bool,
-    token: Optional[str] = None,
+    token: str,
     flwr_dir: Optional[str] = None,
     certificates: Optional[bytes] = None,
     parent_pid: Optional[int] = None,
@@ -92,76 +91,55 @@ def run_clientapp(  # pylint: disable=R0913, R0914, R0917
         stub = ClientAppIoStub(channel)
         _wrap_stub(stub, _make_simple_grpc_retry_invoker())
 
-        while True:
-            # If token is not set, loop until token is received from SuperNode
-            if token is None:
-                log(DEBUG, "[flwr-clientapp] Request token")
-                token = simple_get_token(stub)
-
-            # Pull Message, Context, Run and (optional) FAB from SuperNode
-            message, context, run, fab = pull_clientappinputs(stub=stub, token=token)
-
-            # Install FAB, if provided
-            if fab:
-                log(DEBUG, "[flwr-clientapp] Start FAB installation.")
-                install_from_fab(fab.content, flwr_dir=flwr_dir_, skip_prompt=True)
-
-            load_client_app_fn = get_load_client_app_fn(
-                default_app_ref="",
-                app_path=None,
-                multi_app=True,
-                flwr_dir=str(flwr_dir_),
-            )
+        # Pull Message, Context, Run and (optional) FAB from SuperNode
+        message, context, run, fab = pull_clientappinputs(stub=stub, token=token)
 
-            try:
-                # Load ClientApp
-                log(DEBUG, "[flwr-clientapp] Start `ClientApp` Loading.")
-                client_app: ClientApp = load_client_app_fn(
-                    run.fab_id, run.fab_version, fab.hash_str if fab else ""
-                )
+        # Install FAB, if provided
+        if fab:
+            log(DEBUG, "[flwr-clientapp] Start FAB installation.")
+            install_from_fab(fab.content, flwr_dir=flwr_dir_, skip_prompt=True)
 
-                # Execute ClientApp
-                reply_message = client_app(message=message, context=context)
+        load_client_app_fn = get_load_client_app_fn(
+            default_app_ref="",
+            app_path=None,
+            multi_app=True,
+            flwr_dir=str(flwr_dir_),
+        )
 
-            except Exception as ex:  # pylint: disable=broad-exception-caught
-                # Don't update/change NodeState
+        try:
+            # Load ClientApp
+            log(DEBUG, "[flwr-clientapp] Start `ClientApp` Loading.")
+            client_app: ClientApp = load_client_app_fn(
+                run.fab_id, run.fab_version, fab.hash_str if fab else ""
+            )
 
-                e_code = ErrorCode.CLIENT_APP_RAISED_EXCEPTION
-                # Ex fmt: "<class 'ZeroDivisionError'>:<'division by zero'>"
-                reason = str(type(ex)) + ":<'" + str(ex) + "'>"
-                exc_entity = "ClientApp"
-                if isinstance(ex, LoadClientAppError):
-                    reason = (
-                        "An exception was raised when attempting to load `ClientApp`"
-                    )
-                    e_code = ErrorCode.LOAD_CLIENT_APP_EXCEPTION
+            # Execute ClientApp
+            reply_message = client_app(message=message, context=context)
 
-                log(ERROR, "%s raised an exception", exc_entity, exc_info=ex)
+        except Exception as ex:  # pylint: disable=broad-exception-caught
+            # Don't update/change NodeState
 
-                # Create error message
-                reply_message = Message(
-                    Error(code=e_code, reason=reason), reply_to=message
-                )
+            e_code = ErrorCode.CLIENT_APP_RAISED_EXCEPTION
+            # Ex fmt: "<class 'ZeroDivisionError'>:<'division by zero'>"
+            reason = str(type(ex)) + ":<'" + str(ex) + "'>"
+            exc_entity = "ClientApp"
+            if isinstance(ex, LoadClientAppError):
+                reason = "An exception was raised when attempting to load `ClientApp`"
+                e_code = ErrorCode.LOAD_CLIENT_APP_EXCEPTION
 
-            # Push Message and Context to SuperNode
-            _ = push_clientappoutputs(
-                stub=stub, token=token, message=reply_message, context=context
-            )
+            log(ERROR, "%s raised an exception", exc_entity, exc_info=ex)
 
-            del client_app, message, context, run, fab, reply_message
-            gc.collect()
+            # Create error message
+            reply_message = Message(Error(code=e_code, reason=reason), reply_to=message)
 
-            # Reset token to `None` to prevent flwr-clientapp from trying to pull the
-            # same inputs again
-            token = None
+        # Push Message and Context to SuperNode
+        _ = push_clientappoutputs(
+            stub=stub, token=token, message=reply_message, context=context
+        )
 
-            # Stop the loop if `flwr-clientapp` is expected to process only a single
-            # message
-            if run_once:
-                break
+        del client_app, message, context, run, fab, reply_message
+        gc.collect()
 
-    except KeyboardInterrupt:
-        log(INFO, "Closing connection")
     except grpc.RpcError as e:
         log(ERROR, "GRPC error occurred: %s", str(e))
     finally:

{flwr_nightly-1.21.0.dev20250814 → flwr_nightly-1.21.0.dev20250817}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.21.0.dev20250814"
+version = "1.21.0.dev20250817"
 description = "Flower: A Friendly Federated AI Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]