flwr-nightly 1.21.0.dev20250809__tar.gz → 1.21.0.dev20250811__tar.gz

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250809
+Version: 1.21.0.dev20250811
 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.dev20250809 → flwr_nightly-1.21.0.dev20250811}/py/flwr/common/constant.py

@@ -265,6 +265,8 @@ class ExecPluginType:
     """SuperExec plugin types."""
 
     CLIENT_APP = "clientapp"
+    SERVER_APP = "serverapp"
+    SIMULATION = "simulation"
 
     def __new__(cls) -> ExecPluginType:
         """Prevent instantiation."""

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/py/flwr/supercore/app_utils.py

@@ -16,6 +16,7 @@
 
 
 import os
+import signal
 import threading
 import time
 from typing import Union
@@ -29,6 +30,29 @@ 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
 
+if os.name == "nt":
+    from ctypes import windll  # type: ignore
+
+
+def _pid_exists(pid: int) -> bool:
+    """Check if a process with the given PID exists.
+
+    This works on Unix-like systems and Windows.
+    """
+    # Use `ctypes` to check if the process exists on Windows
+    if os.name == "nt":
+        handle = windll.kernel32.OpenProcess(0x1000, False, pid)
+        if handle:
+            windll.kernel32.CloseHandle(handle)
+            return True
+        return False
+    # Use `os.kill` on Unix-like systems
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        return False
+    return True
+
 
 def start_parent_process_monitor(
     parent_pid: int,
@@ -38,8 +62,10 @@ def start_parent_process_monitor(
     def monitor() -> None:
         while True:
             time.sleep(0.2)
-            if os.getppid() != parent_pid:
-                os.kill(os.getpid(), 9)
+            if not _pid_exists(parent_pid):
+                # This works on Unix-like systems and Windows
+                # Avoid `os.kill` on Windows
+                signal.raise_signal(signal.SIGTERM)
 
     threading.Thread(target=monitor, daemon=True).start()
 

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/py/flwr/supercore/cli/flower_superexec.py

@@ -22,7 +22,14 @@ from flwr.common import EventType, event
 from flwr.common.constant import ExecPluginType
 from flwr.common.logger import log
 from flwr.proto.clientappio_pb2_grpc import ClientAppIoStub
-from flwr.supercore.superexec.plugin import ClientAppExecPlugin, ExecPlugin
+from flwr.proto.serverappio_pb2_grpc import ServerAppIoStub
+from flwr.proto.simulationio_pb2_grpc import SimulationIoStub
+from flwr.supercore.superexec.plugin import (
+    ClientAppExecPlugin,
+    ExecPlugin,
+    ServerAppExecPlugin,
+    SimulationExecPlugin,
+)
 from flwr.supercore.superexec.run_superexec import run_superexec
 
 
@@ -43,6 +50,7 @@ def flower_superexec() -> None:
         stub_class=stub_class,  # type: ignore
         appio_api_address=args.appio_api_address,
         flwr_dir=args.flwr_dir,
+        parent_pid=args.parent_pid,
     )
 
 
@@ -79,6 +87,13 @@ def _parse_args() -> argparse.ArgumentParser:
             - `$HOME/.flwr/` in all other cases
         """,
     )
+    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.",
+    )
     return parser
 
 
@@ -88,4 +103,8 @@ def _get_plugin_and_stub_class(
     """Get the plugin class and stub class based on the plugin type."""
     if plugin_type == ExecPluginType.CLIENT_APP:
         return ClientAppExecPlugin, ClientAppIoStub
+    if plugin_type == ExecPluginType.SERVER_APP:
+        return ServerAppExecPlugin, ServerAppIoStub
+    if plugin_type == ExecPluginType.SIMULATION:
+        return SimulationExecPlugin, SimulationIoStub
     raise ValueError(f"Unknown plugin type: {plugin_type}")

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/py/flwr/supercore/superexec/plugin/__init__.py

@@ -18,9 +18,11 @@
 from .clientapp_exec_plugin import ClientAppExecPlugin
 from .exec_plugin import ExecPlugin
 from .serverapp_exec_plugin import ServerAppExecPlugin
+from .simulation_exec_plugin import SimulationExecPlugin
 
 __all__ = [
     "ClientAppExecPlugin",
     "ExecPlugin",
     "ServerAppExecPlugin",
+    "SimulationExecPlugin",
 ]

flwr_nightly-1.21.0.dev20250811/py/flwr/supercore/superexec/plugin/simulation_exec_plugin.py

@@ -0,0 +1,28 @@
+# Copyright 2025 Flower Labs GmbH. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Simple Flower SuperExec plugin for simulation processes."""
+
+
+from .base_exec_plugin import BaseExecPlugin
+
+
+class SimulationExecPlugin(BaseExecPlugin):
+    """Simple Flower SuperExec plugin for simulation processes.
+
+    The plugin always selects the first candidate run ID.
+    """
+
+    command = "flwr-simulation"
+    appio_api_address_arg = "--simulationio-api-address"

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/py/flwr/supercore/superexec/run_superexec.py

@@ -31,6 +31,7 @@ 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.supercore.app_utils import start_parent_process_monitor
 
 from .plugin import ExecPlugin
 
@@ -40,6 +41,7 @@ def run_superexec(
     stub_class: type[ClientAppIoStub],
     appio_api_address: str,
     flwr_dir: Optional[str] = None,
+    parent_pid: Optional[int] = None,
 ) -> None:
     """Run Flower SuperExec.
 
@@ -53,7 +55,14 @@ def run_superexec(
         The address of the AppIO API.
     flwr_dir : Optional[str] (default: None)
         The Flower directory.
+    parent_pid : Optional[int] (default: None)
+        The PID of the parent process. If provided, the SuperExec will terminate
+        when the parent process exits.
     """
+    # Start monitoring the parent process if a PID is provided
+    if parent_pid is not None:
+        start_parent_process_monitor(parent_pid)
+
     # Create the channel to the AppIO API
     # No TLS support for now, so insecure connection
     channel = create_channel(

{flwr_nightly-1.21.0.dev20250809 → flwr_nightly-1.21.0.dev20250811}/pyproject.toml

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