flwr-nightly 1.21.0.dev20250729__py3-none-any.whl → 1.21.0.dev20250731__py3-none-any.whl

flwr/server/app.py

@@ -73,8 +73,8 @@ 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.superexec.app import load_executor
-from flwr.superexec.exec_grpc import run_exec_api_grpc
+from flwr.superlink.executor import load_executor
+from flwr.superlink.servicer.exec import run_exec_api_grpc
 
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer
 from .superlink.fleet.grpc_rere.fleet_servicer import FleetServicer

flwr/superexec/deployment.py

@@ -12,180 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Deployment engine executor."""
+"""Deployment engine executor for backward compatibility."""
 
 
-import hashlib
-from logging import ERROR, INFO
-from pathlib import Path
-from typing import Optional
-
-from typing_extensions import override
-
-from flwr.cli.config_utils import get_fab_metadata
-from flwr.common import ConfigRecord, Context, RecordDict
-from flwr.common.constant import (
-    SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
-    Status,
-    SubStatus,
-)
-from flwr.common.logger import log
-from flwr.common.typing import Fab, RunStatus, UserConfig
-from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
-from flwr.supercore.ffs import Ffs, FfsFactory
-
-from .executor import Executor
-
-
-class DeploymentEngine(Executor):
-    """Deployment engine executor.
-
-    Parameters
-    ----------
-    serverappio_api_address: str (default: "127.0.0.1:9091")
-        Address of the SuperLink to connect to.
-    root_certificates: Optional[str] (default: None)
-        Specifies the path to the PEM-encoded root certificate file for
-        establishing secure HTTPS connections.
-    flwr_dir: Optional[str] (default: None)
-        The path containing installed Flower Apps.
-    """
-
-    def __init__(
-        self,
-        serverappio_api_address: str = SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
-        root_certificates: Optional[str] = None,
-        flwr_dir: Optional[str] = None,
-    ) -> None:
-        self.serverappio_api_address = serverappio_api_address
-        if root_certificates is None:
-            self.root_certificates = None
-            self.root_certificates_bytes = None
-        else:
-            self.root_certificates = root_certificates
-            self.root_certificates_bytes = Path(root_certificates).read_bytes()
-        self.flwr_dir = flwr_dir
-        self.linkstate_factory: Optional[LinkStateFactory] = None
-        self.ffs_factory: Optional[FfsFactory] = None
-
-    @override
-    def initialize(
-        self, linkstate_factory: LinkStateFactory, ffs_factory: FfsFactory
-    ) -> None:
-        """Initialize the executor with the necessary factories."""
-        self.linkstate_factory = linkstate_factory
-        self.ffs_factory = ffs_factory
-
-    @property
-    def linkstate(self) -> LinkState:
-        """Return the LinkState."""
-        if self.linkstate_factory is None:
-            raise RuntimeError("Executor is not initialized.")
-        return self.linkstate_factory.state()
-
-    @property
-    def ffs(self) -> Ffs:
-        """Return the Flower File Storage (FFS)."""
-        if self.ffs_factory is None:
-            raise RuntimeError("Executor is not initialized.")
-        return self.ffs_factory.ffs()
-
-    @override
-    def set_config(
-        self,
-        config: UserConfig,
-    ) -> None:
-        """Set executor config arguments.
-
-        Parameters
-        ----------
-        config : UserConfig
-            A dictionary for configuration values.
-            Supported configuration key/value pairs:
-            - "superlink": str
-                The address of the SuperLink ServerAppIo API.
-            - "root-certificates": str
-                The path to the root certificates.
-            - "flwr-dir": str
-                The path to the Flower directory.
-        """
-        if not config:
-            return
-        if superlink_address := config.get("superlink"):
-            if not isinstance(superlink_address, str):
-                raise ValueError("The `superlink` value should be of type `str`.")
-            self.serverappio_api_address = superlink_address
-        if root_certificates := config.get("root-certificates"):
-            if not isinstance(root_certificates, str):
-                raise ValueError(
-                    "The `root-certificates` value should be of type `str`."
-                )
-            self.root_certificates = root_certificates
-            self.root_certificates_bytes = Path(str(root_certificates)).read_bytes()
-        if flwr_dir := config.get("flwr-dir"):
-            if not isinstance(flwr_dir, str):
-                raise ValueError("The `flwr-dir` value should be of type `str`.")
-            self.flwr_dir = str(flwr_dir)
-
-    def _create_run(
-        self,
-        fab: Fab,
-        override_config: UserConfig,
-        flwr_aid: Optional[str],
-    ) -> int:
-        fab_hash = self.ffs.put(fab.content, {})
-        if fab_hash != fab.hash_str:
-            raise RuntimeError(
-                f"FAB ({fab.hash_str}) hash from request doesn't match contents"
-            )
-        fab_id, fab_version = get_fab_metadata(fab.content)
-
-        run_id = self.linkstate.create_run(
-            fab_id, fab_version, fab_hash, override_config, ConfigRecord(), flwr_aid
-        )
-        return run_id
-
-    def _create_context(self, run_id: int) -> None:
-        """Register a Context for a Run."""
-        # Create an empty context for the Run
-        context = Context(
-            run_id=run_id, node_id=0, node_config={}, state=RecordDict(), run_config={}
-        )
-
-        # Register the context at the LinkState
-        self.linkstate.set_serverapp_context(run_id=run_id, context=context)
-
-    @override
-    def start_run(
-        self,
-        fab_file: bytes,
-        override_config: UserConfig,
-        federation_options: ConfigRecord,
-        flwr_aid: Optional[str],
-    ) -> Optional[int]:
-        """Start run using the Flower Deployment Engine."""
-        run_id = None
-        try:
-
-            # Call SuperLink to create run
-            run_id = self._create_run(
-                Fab(hashlib.sha256(fab_file).hexdigest(), fab_file),
-                override_config,
-                flwr_aid,
-            )
-
-            # Register context for the Run
-            self._create_context(run_id=run_id)
-            log(INFO, "Created run %s", str(run_id))
-
-            return run_id
-        # pylint: disable-next=broad-except
-        except Exception as e:
-            log(ERROR, "Could not start run: %s", str(e))
-            if run_id:
-                run_status = RunStatus(Status.FINISHED, SubStatus.FAILED, str(e))
-                self.linkstate.update_run_status(run_id, new_status=run_status)
-            return None
-
+from flwr.superlink.executor import DeploymentEngine
 
 executor = DeploymentEngine()

flwr/superexec/simulation.py

@@ -12,118 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Simulation engine executor."""
+"""Simulation engine executor for backward compatibility."""
 
 
-import hashlib
-from logging import ERROR, INFO
-from typing import Optional
-
-from typing_extensions import override
-
-from flwr.cli.config_utils import get_fab_metadata
-from flwr.common import ConfigRecord, Context, RecordDict
-from flwr.common.logger import log
-from flwr.common.typing import Fab, UserConfig
-from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
-from flwr.supercore.ffs import Ffs, FfsFactory
-
-from .executor import Executor
-
-
-class SimulationEngine(Executor):
-    """Simulation engine executor."""
-
-    def __init__(
-        self,
-    ) -> None:
-        self.linkstate_factory: Optional[LinkStateFactory] = None
-        self.ffs_factory: Optional[FfsFactory] = None
-
-    @override
-    def initialize(
-        self, linkstate_factory: LinkStateFactory, ffs_factory: FfsFactory
-    ) -> None:
-        """Initialize the executor with the necessary factories."""
-        self.linkstate_factory = linkstate_factory
-        self.ffs_factory = ffs_factory
-
-    @property
-    def linkstate(self) -> LinkState:
-        """Return the LinkState."""
-        if self.linkstate_factory is None:
-            raise RuntimeError("Executor is not initialized.")
-        return self.linkstate_factory.state()
-
-    @property
-    def ffs(self) -> Ffs:
-        """Return the Flower File Storage (FFS)."""
-        if self.ffs_factory is None:
-            raise RuntimeError("Executor is not initialized.")
-        return self.ffs_factory.ffs()
-
-    @override
-    def set_config(
-        self,
-        config: UserConfig,
-    ) -> None:
-        """Set executor config arguments."""
-
-    # pylint: disable=too-many-locals
-    @override
-    def start_run(
-        self,
-        fab_file: bytes,
-        override_config: UserConfig,
-        federation_options: ConfigRecord,
-        flwr_aid: Optional[str],
-    ) -> Optional[int]:
-        """Start run using the Flower Simulation Engine."""
-        try:
-            # Check that num-supernodes is set
-            if "num-supernodes" not in federation_options:
-                raise ValueError(
-                    "Federation options doesn't contain key `num-supernodes`."
-                )
-
-            # Create run
-            fab = Fab(hashlib.sha256(fab_file).hexdigest(), fab_file)
-            fab_hash = self.ffs.put(fab.content, {})
-            if fab_hash != fab.hash_str:
-                raise RuntimeError(
-                    f"FAB ({fab.hash_str}) hash from request doesn't match contents"
-                )
-            fab_id, fab_version = get_fab_metadata(fab.content)
-
-            run_id = self.linkstate.create_run(
-                fab_id,
-                fab_version,
-                fab_hash,
-                override_config,
-                federation_options,
-                flwr_aid,
-            )
-
-            # Create an empty context for the Run
-            context = Context(
-                run_id=run_id,
-                node_id=0,
-                node_config={},
-                state=RecordDict(),
-                run_config={},
-            )
-
-            # Register the context at the LinkState
-            self.linkstate.set_serverapp_context(run_id=run_id, context=context)
-
-            log(INFO, "Created run %s", str(run_id))
-
-            return run_id
-
-        # pylint: disable-next=broad-except
-        except Exception as e:
-            log(ERROR, "Could not start run: %s", str(e))
-            return None
-
+from flwr.superlink.executor import SimulationEngine
 
 executor = SimulationEngine()

flwr/superlink/executor/__init__.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.
+# ==============================================================================
+"""Executor for Exec API."""
+
+
+from .app import load_executor
+from .deployment import DeploymentEngine
+from .executor import Executor
+from .simulation import SimulationEngine
+
+__all__ = [
+    "DeploymentEngine",
+    "Executor",
+    "SimulationEngine",
+    "load_executor",
+]

flwr/{superexec → superlink/executor}/app.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Flower SuperExec app."""
+"""Function for loading executor."""
 
 
 import argparse

flwr/superlink/executor/deployment.py

@@ -0,0 +1,188 @@
+# 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.
+# ==============================================================================
+"""Deployment engine executor."""
+
+
+import hashlib
+from logging import ERROR, INFO
+from pathlib import Path
+from typing import Optional
+
+from typing_extensions import override
+
+from flwr.cli.config_utils import get_fab_metadata
+from flwr.common import ConfigRecord, Context, RecordDict
+from flwr.common.constant import (
+    SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
+    Status,
+    SubStatus,
+)
+from flwr.common.logger import log
+from flwr.common.typing import Fab, RunStatus, UserConfig
+from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
+
+from .executor import Executor
+
+
+class DeploymentEngine(Executor):
+    """Deployment engine executor.
+
+    Parameters
+    ----------
+    serverappio_api_address: str (default: "127.0.0.1:9091")
+        Address of the SuperLink to connect to.
+    root_certificates: Optional[str] (default: None)
+        Specifies the path to the PEM-encoded root certificate file for
+        establishing secure HTTPS connections.
+    flwr_dir: Optional[str] (default: None)
+        The path containing installed Flower Apps.
+    """
+
+    def __init__(
+        self,
+        serverappio_api_address: str = SERVERAPPIO_API_DEFAULT_CLIENT_ADDRESS,
+        root_certificates: Optional[str] = None,
+        flwr_dir: Optional[str] = None,
+    ) -> None:
+        self.serverappio_api_address = serverappio_api_address
+        if root_certificates is None:
+            self.root_certificates = None
+            self.root_certificates_bytes = None
+        else:
+            self.root_certificates = root_certificates
+            self.root_certificates_bytes = Path(root_certificates).read_bytes()
+        self.flwr_dir = flwr_dir
+        self.linkstate_factory: Optional[LinkStateFactory] = None
+        self.ffs_factory: Optional[FfsFactory] = None
+
+    @override
+    def initialize(
+        self, linkstate_factory: LinkStateFactory, ffs_factory: FfsFactory
+    ) -> None:
+        """Initialize the executor with the necessary factories."""
+        self.linkstate_factory = linkstate_factory
+        self.ffs_factory = ffs_factory
+
+    @property
+    def linkstate(self) -> LinkState:
+        """Return the LinkState."""
+        if self.linkstate_factory is None:
+            raise RuntimeError("Executor is not initialized.")
+        return self.linkstate_factory.state()
+
+    @property
+    def ffs(self) -> Ffs:
+        """Return the Flower File Storage (FFS)."""
+        if self.ffs_factory is None:
+            raise RuntimeError("Executor is not initialized.")
+        return self.ffs_factory.ffs()
+
+    @override
+    def set_config(
+        self,
+        config: UserConfig,
+    ) -> None:
+        """Set executor config arguments.
+
+        Parameters
+        ----------
+        config : UserConfig
+            A dictionary for configuration values.
+            Supported configuration key/value pairs:
+            - "superlink": str
+                The address of the SuperLink ServerAppIo API.
+            - "root-certificates": str
+                The path to the root certificates.
+            - "flwr-dir": str
+                The path to the Flower directory.
+        """
+        if not config:
+            return
+        if superlink_address := config.get("superlink"):
+            if not isinstance(superlink_address, str):
+                raise ValueError("The `superlink` value should be of type `str`.")
+            self.serverappio_api_address = superlink_address
+        if root_certificates := config.get("root-certificates"):
+            if not isinstance(root_certificates, str):
+                raise ValueError(
+                    "The `root-certificates` value should be of type `str`."
+                )
+            self.root_certificates = root_certificates
+            self.root_certificates_bytes = Path(str(root_certificates)).read_bytes()
+        if flwr_dir := config.get("flwr-dir"):
+            if not isinstance(flwr_dir, str):
+                raise ValueError("The `flwr-dir` value should be of type `str`.")
+            self.flwr_dir = str(flwr_dir)
+
+    def _create_run(
+        self,
+        fab: Fab,
+        override_config: UserConfig,
+        flwr_aid: Optional[str],
+    ) -> int:
+        fab_hash = self.ffs.put(fab.content, {})
+        if fab_hash != fab.hash_str:
+            raise RuntimeError(
+                f"FAB ({fab.hash_str}) hash from request doesn't match contents"
+            )
+        fab_id, fab_version = get_fab_metadata(fab.content)
+
+        run_id = self.linkstate.create_run(
+            fab_id, fab_version, fab_hash, override_config, ConfigRecord(), flwr_aid
+        )
+        return run_id
+
+    def _create_context(self, run_id: int) -> None:
+        """Register a Context for a Run."""
+        # Create an empty context for the Run
+        context = Context(
+            run_id=run_id, node_id=0, node_config={}, state=RecordDict(), run_config={}
+        )
+
+        # Register the context at the LinkState
+        self.linkstate.set_serverapp_context(run_id=run_id, context=context)
+
+    @override
+    def start_run(
+        self,
+        fab_file: bytes,
+        override_config: UserConfig,
+        federation_options: ConfigRecord,
+        flwr_aid: Optional[str],
+    ) -> Optional[int]:
+        """Start run using the Flower Deployment Engine."""
+        run_id = None
+        try:
+
+            # Call SuperLink to create run
+            run_id = self._create_run(
+                Fab(hashlib.sha256(fab_file).hexdigest(), fab_file),
+                override_config,
+                flwr_aid,
+            )
+
+            # Register context for the Run
+            self._create_context(run_id=run_id)
+            log(INFO, "Created run %s", str(run_id))
+
+            return run_id
+        # pylint: disable-next=broad-except
+        except Exception as e:
+            log(ERROR, "Could not start run: %s", str(e))
+            if run_id:
+                run_status = RunStatus(Status.FINISHED, SubStatus.FAILED, str(e))
+                self.linkstate.update_run_status(run_id, new_status=run_status)
+            return None

flwr/superlink/executor/simulation.py

@@ -0,0 +1,126 @@
+# 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.
+# ==============================================================================
+"""Simulation engine executor."""
+
+
+import hashlib
+from logging import ERROR, INFO
+from typing import Optional
+
+from typing_extensions import override
+
+from flwr.cli.config_utils import get_fab_metadata
+from flwr.common import ConfigRecord, Context, RecordDict
+from flwr.common.logger import log
+from flwr.common.typing import Fab, UserConfig
+from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
+
+from .executor import Executor
+
+
+class SimulationEngine(Executor):
+    """Simulation engine executor."""
+
+    def __init__(
+        self,
+    ) -> None:
+        self.linkstate_factory: Optional[LinkStateFactory] = None
+        self.ffs_factory: Optional[FfsFactory] = None
+
+    @override
+    def initialize(
+        self, linkstate_factory: LinkStateFactory, ffs_factory: FfsFactory
+    ) -> None:
+        """Initialize the executor with the necessary factories."""
+        self.linkstate_factory = linkstate_factory
+        self.ffs_factory = ffs_factory
+
+    @property
+    def linkstate(self) -> LinkState:
+        """Return the LinkState."""
+        if self.linkstate_factory is None:
+            raise RuntimeError("Executor is not initialized.")
+        return self.linkstate_factory.state()
+
+    @property
+    def ffs(self) -> Ffs:
+        """Return the Flower File Storage (FFS)."""
+        if self.ffs_factory is None:
+            raise RuntimeError("Executor is not initialized.")
+        return self.ffs_factory.ffs()
+
+    @override
+    def set_config(
+        self,
+        config: UserConfig,
+    ) -> None:
+        """Set executor config arguments."""
+
+    # pylint: disable=too-many-locals
+    @override
+    def start_run(
+        self,
+        fab_file: bytes,
+        override_config: UserConfig,
+        federation_options: ConfigRecord,
+        flwr_aid: Optional[str],
+    ) -> Optional[int]:
+        """Start run using the Flower Simulation Engine."""
+        try:
+            # Check that num-supernodes is set
+            if "num-supernodes" not in federation_options:
+                raise ValueError(
+                    "Federation options doesn't contain key `num-supernodes`."
+                )
+
+            # Create run
+            fab = Fab(hashlib.sha256(fab_file).hexdigest(), fab_file)
+            fab_hash = self.ffs.put(fab.content, {})
+            if fab_hash != fab.hash_str:
+                raise RuntimeError(
+                    f"FAB ({fab.hash_str}) hash from request doesn't match contents"
+                )
+            fab_id, fab_version = get_fab_metadata(fab.content)
+
+            run_id = self.linkstate.create_run(
+                fab_id,
+                fab_version,
+                fab_hash,
+                override_config,
+                federation_options,
+                flwr_aid,
+            )
+
+            # Create an empty context for the Run
+            context = Context(
+                run_id=run_id,
+                node_id=0,
+                node_config={},
+                state=RecordDict(),
+                run_config={},
+            )
+
+            # Register the context at the LinkState
+            self.linkstate.set_serverapp_context(run_id=run_id, context=context)
+
+            log(INFO, "Created run %s", str(run_id))
+
+            return run_id
+
+        # pylint: disable-next=broad-except
+        except Exception as e:
+            log(ERROR, "Could not start run: %s", str(e))
+            return None

flwr/superlink/servicer/__init__.py

@@ -0,0 +1,15 @@
+# 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.
+# ==============================================================================
+"""Flower SuperLink servicers."""

flwr/superlink/servicer/exec/__init__.py

@@ -0,0 +1,22 @@
+# 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.
+# ==============================================================================
+"""Exec API Servicer."""
+
+
+from .exec_grpc import run_exec_api_grpc
+
+__all__ = [
+    "run_exec_api_grpc",
+]

flwr/{superexec → superlink/servicer/exec}/exec_event_log_interceptor.py

@@ -49,7 +49,7 @@ class ExecEventLogInterceptor(grpc.ServerInterceptor):  # type: ignore
             return continuation(handler_call_details)
 
         # One of the method handlers in
-        # `flwr.superexec.exec_servicer.ExecServicer`
+        # `flwr.superlink.servicer.exec.ExecServicer`
         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)

flwr/{superexec → superlink/servicer/exec}/exec_grpc.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""SuperExec gRPC API."""
+"""Exec API server."""
 
 
 from logging import INFO
@@ -32,12 +32,12 @@ from flwr.server.superlink.linkstate import LinkStateFactory
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.license_plugin import LicensePlugin
 from flwr.supercore.object_store import ObjectStoreFactory
-from flwr.superexec.exec_event_log_interceptor import ExecEventLogInterceptor
-from flwr.superexec.exec_license_interceptor import ExecLicenseInterceptor
-from flwr.superexec.exec_user_auth_interceptor import ExecUserAuthInterceptor
 
+from ...executor import Executor
+from .exec_event_log_interceptor import ExecEventLogInterceptor
+from .exec_license_interceptor import ExecLicenseInterceptor
 from .exec_servicer import ExecServicer
-from .executor import Executor
+from .exec_user_auth_interceptor import ExecUserAuthInterceptor
 
 try:
     from flwr.ee import get_license_plugin

flwr/{superexec → superlink/servicer/exec}/exec_license_interceptor.py

@@ -47,7 +47,7 @@ class ExecLicenseInterceptor(grpc.ServerInterceptor):  # type: ignore
             return continuation(handler_call_details)
 
         # One of the method handlers in
-        # `flwr.superexec.exec_servicer.ExecServicer`
+        # `flwr.superlink.servicer.exec.ExecServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)
         return self._generic_license_unary_method_handler(method_handler)
 

flwr/{superexec → superlink/servicer/exec}/exec_servicer.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""SuperExec API servicer."""
+"""Exec API servicer."""
 
 
 import time
@@ -57,12 +57,12 @@ from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
 
+from ...executor.executor import Executor
 from .exec_user_auth_interceptor import shared_account_info
-from .executor import Executor
 
 
 class ExecServicer(exec_pb2_grpc.ExecServicer):
-    """SuperExec API servicer."""
+    """Exec API servicer."""
 
     def __init__(  # pylint: disable=R0913, R0917
         self,

flwr/{superexec → superlink/servicer/exec}/exec_user_auth_interceptor.py

@@ -77,7 +77,7 @@ class ExecUserAuthInterceptor(grpc.ServerInterceptor):  # type: ignore
             return continuation(handler_call_details)
 
         # One of the method handlers in
-        # `flwr.superexec.exec_servicer.ExecServicer`
+        # `flwr.superlink.servicer.exec.ExecServicer`
         method_handler: grpc.RpcMethodHandler = continuation(handler_call_details)
         return self._generic_auth_unary_method_handler(method_handler)
 

{flwr_nightly-1.21.0.dev20250729.dist-info → flwr_nightly-1.21.0.dev20250731.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250729
+Version: 1.21.0.dev20250731
 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.dev20250729.dist-info → flwr_nightly-1.21.0.dev20250731.dist-info}/RECORD

@@ -230,7 +230,7 @@ flwr/proto/transport_pb2_grpc.py,sha256=vLN3EHtx2aEEMCO4f1Upu-l27BPzd3-5pV-u8wPc
 flwr/proto/transport_pb2_grpc.pyi,sha256=AGXf8RiIiW2J5IKMlm_3qT3AzcDa4F3P5IqUjve_esA,766
 flwr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flwr/server/__init__.py,sha256=LQQHiuL2jy7TpNaKastRdGsexlxSt5ZWAQNVqitDnrY,1598
-flwr/server/app.py,sha256=o_-azG7qWnCF2aIThgkaLbxcksXfysSrCwDVPE8vFbc,29484
+flwr/server/app.py,sha256=LdEZVa0FzRTMQstBidH1MBXkrXRIH2sqIX-aj7Iah9A,29493
 flwr/server/client_manager.py,sha256=5jCGavVli7XdupvWWo7ru3PdFTlRU8IGvHFSSoUVLRs,6227
 flwr/server/client_proxy.py,sha256=sv0E9AldBYOvc3pusqFh-GnyreeMfsXQ1cuTtxTq_wY,2399
 flwr/server/compat/__init__.py,sha256=0IsttWvY15qO98_1GyzVC-vR1e_ZPXOdu2qUlOkYMPE,886
@@ -348,16 +348,21 @@ flwr/supercore/scheduler/__init__.py,sha256=E4GviiNJoZKz1dOao8ZGRHExsiM23GtOrkpM
 flwr/supercore/scheduler/plugin.py,sha256=kIv0JUrHP-ghrcGT-pbporL9A2mUz8PxASw6KgxCRv8,2460
 flwr/supercore/utils.py,sha256=ebuHMbeA8eXisX0oMPqBK3hk7uVnIE_yiqWVz8YbkpQ,1324
 flwr/superexec/__init__.py,sha256=YFqER0IJc1XEWfsX6AxZ9LSRq0sawPYrNYki-brvTIc,715
-flwr/superexec/app.py,sha256=U2jjOHb2LGWoU7vrl9_czTzre9O2mPxu3CPGUZ86sK4,1465
-flwr/superexec/deployment.py,sha256=cFxhFom-0zv93HLNjNcUdBy3Sf6JwshRoXPQtcZunF0,6797
-flwr/superexec/exec_event_log_interceptor.py,sha256=bHBpjRDh-GgLxELNP9ofES7hCEAR_M78wuJZ06vXRLg,5942
-flwr/superexec/exec_grpc.py,sha256=D7xPHEXjW4SXMb9_dWNZhbFFxUeKr8zE67LITZQbHU8,4148
-flwr/superexec/exec_license_interceptor.py,sha256=rpnQmHE9FR11EJ3Lwd4_ducvlSHj5hS_SHAMbbZwXlk,3328
-flwr/superexec/exec_servicer.py,sha256=c0nwdFBiS6CbKrRA7ffOpsgASOLeaRV_ICwxDfxNGAg,12498
-flwr/superexec/exec_user_auth_interceptor.py,sha256=InqJo9QQu2QQYYusxtmb3EtKdvJECQ1xtvwy5DVF-c0,6196
-flwr/superexec/executor.py,sha256=LaErHRJvNggjWV6FI6eajgKfnwOvSv2UqzFH253yDro,3265
-flwr/superexec/simulation.py,sha256=62rSLcS-1wnMsMsafSQuIDLs5ZS6Ail1spkZ-alNNTg,4156
+flwr/superexec/deployment.py,sha256=CEgWfkN_lH6Vci03RjwKLENw2z6kxNvUdVEErPbqYDY,830
+flwr/superexec/simulation.py,sha256=wR3ERp_UdWJCkkLdJD7Rk5uVpWJtOqHuyhbq7Sm2tGE,830
 flwr/superlink/__init__.py,sha256=GNSuJ4-N6Z8wun2iZNlXqENt5beUyzC0Gi_tN396bbM,707
+flwr/superlink/executor/__init__.py,sha256=5ZAe4Nj8DflRFTvhAsQ3nr2b-mvNuBisuxTuMwvWsCs,958
+flwr/superlink/executor/app.py,sha256=AALlkJKgGTeGOARf8G6TBEmO_WdOpmL4dHYpcGWX-Hc,1474
+flwr/superlink/executor/deployment.py,sha256=whB1k_DE37SqplisFt0nu190BtoqPKRX9Xz86fqm3FU,6765
+flwr/superlink/executor/executor.py,sha256=LaErHRJvNggjWV6FI6eajgKfnwOvSv2UqzFH253yDro,3265
+flwr/superlink/executor/simulation.py,sha256=fLy18Bdsfxpxu41vAtBzTy1QLl0iJAdW7UmicBUnRJQ,4124
+flwr/superlink/servicer/__init__.py,sha256=ZC-kILcUGeh6IxJsfu24cTzUqIGXmQfEKsGfhsnhBpM,717
+flwr/superlink/servicer/exec/__init__.py,sha256=_06QLcljT-Ihf_9peAkjMm9y1tEDmDRfic_vfGwJk0o,791
+flwr/superlink/servicer/exec/exec_event_log_interceptor.py,sha256=8sX0-GKYZwNftRr7hP0fBhy7LLzNzi9F4tcjrQ_a6Zo,5942
+flwr/superlink/servicer/exec/exec_grpc.py,sha256=7l7LmL2LZTd1Vd5b7M_lOaTO9-otvqgWUKQrgl5CPls,4105
+flwr/superlink/servicer/exec/exec_license_interceptor.py,sha256=cCK4pMaoEv6_pRs6psKsIuouLRGy9kkChQY3TcQDgg4,3328
+flwr/superlink/servicer/exec/exec_servicer.py,sha256=89B0fwA3CX_4Dd7151qsHdgyEYQEnOq4hTZloA_zO10,12499
+flwr/superlink/servicer/exec/exec_user_auth_interceptor.py,sha256=XMWX36JgVqsaIorQuenyIzImslCvg-UCC92yu44wneo,6196
 flwr/supernode/__init__.py,sha256=KgeCaVvXWrU3rptNR1y0oBp4YtXbAcrnCcJAiOoWkI4,707
 flwr/supernode/cli/__init__.py,sha256=JuEMr0-s9zv-PEWKuLB9tj1ocNfroSyNJ-oyv7ati9A,887
 flwr/supernode/cli/flower_supernode.py,sha256=fAkk9zGhoP8Sv05EkdXRiCtirTAzWkSZBqRoaDdgflk,8529
@@ -374,7 +379,7 @@ flwr/supernode/servicer/__init__.py,sha256=lucTzre5WPK7G1YLCfaqg3rbFWdNSb7ZTt-ca
 flwr/supernode/servicer/clientappio/__init__.py,sha256=7Oy62Y_oijqF7Dxi6tpcUQyOpLc_QpIRZ83NvwmB0Yg,813
 flwr/supernode/servicer/clientappio/clientappio_servicer.py,sha256=ClPoKco7Tjj_cxRPhZlQSrOvcGa8sJwGs26LUNZnI3Y,10608
 flwr/supernode/start_client_internal.py,sha256=VC7rV4QaX5Vk4Lw0DDodhwsKvGiHbr0mqrV0H77h1UI,21999
-flwr_nightly-1.21.0.dev20250729.dist-info/METADATA,sha256=GHFlQXdDz-wfpA4HvkHCNFyBN-mRXY1F85QgYuKUE_c,15966
-flwr_nightly-1.21.0.dev20250729.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.21.0.dev20250729.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.21.0.dev20250729.dist-info/RECORD,,
+flwr_nightly-1.21.0.dev20250731.dist-info/METADATA,sha256=ZA8ZpC8q5me0iPeqzlGiEug4ppSypQG9zoe75ICtLvY,15966
+flwr_nightly-1.21.0.dev20250731.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.21.0.dev20250731.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.21.0.dev20250731.dist-info/RECORD,,