flwr-nightly 1.21.0.dev20250806__tar.gz → 1.21.0.dev20250808__tar.gz

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.21.0.dev20250806
+Version: 1.21.0.dev20250808
 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.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/server/superlink/linkstate/in_memory_linkstate.py

@@ -686,12 +686,12 @@ class InMemoryLinkState(LinkState):  # pylint: disable=R0902,R0904
             latest_timestamp = run.logs[-1][0] if index < len(run.logs) else 0.0
             return "".join(log for _, log in run.logs[index:]), latest_timestamp
 
-    def create_token(self, run_id: int) -> str:
+    def create_token(self, run_id: int) -> Optional[str]:
         """Create a token for the given run ID."""
         token = secrets.token_hex(FLWR_APP_TOKEN_LENGTH)  # Generate a random token
         with self.lock_token_store:
             if run_id in self.token_store:
-                raise ValueError("Token already created for this run ID")
+                return None  # Token already created for this run ID
             self.token_store[run_id] = token
             self.token_to_run_id[token] = run_id
         return token

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/server/superlink/linkstate/sqlite_linkstate.py

@@ -1148,7 +1148,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
 
         return message_ins
 
-    def create_token(self, run_id: int) -> str:
+    def create_token(self, run_id: int) -> Optional[str]:
         """Create a token for the given run ID."""
         token = secrets.token_hex(FLWR_APP_TOKEN_LENGTH)  # Generate a random token
         query = "INSERT INTO token_store (run_id, token) VALUES (:run_id, :token);"
@@ -1156,7 +1156,7 @@ class SqliteLinkState(LinkState):  # pylint: disable=R0904
         try:
             self.query(query, data)
         except sqlite3.IntegrityError:
-            raise ValueError("Token already created for this run ID") from None
+            return None  # Token already created for this run ID
         return token
 
     def verify_token(self, run_id: int, token: str) -> bool:

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/server/superlink/serverappio/serverappio_servicer.py

@@ -114,21 +114,35 @@ class ServerAppIoServicer(serverappio_pb2_grpc.ServerAppIoServicer):
         context: grpc.ServicerContext,
     ) -> ListAppsToLaunchResponse:
         """Get run IDs with pending messages."""
-        log(DEBUG, "ClientAppIo.ListAppsToLaunch")
+        log(DEBUG, "ServerAppIoServicer.ListAppsToLaunch")
 
-        context.abort(
-            grpc.StatusCode.UNIMPLEMENTED, "ListAppsToLaunch is not implemented"
-        )
-        raise NotImplementedError
+        # Initialize state connection
+        state = self.state_factory.state()
+
+        # Get IDs of runs in pending status
+        run_ids = state.get_run_ids(flwr_aid=None)
+        pending_run_ids = []
+        for run_id, status in state.get_run_status(run_ids).items():
+            if status.status == Status.PENDING:
+                pending_run_ids.append(run_id)
+
+        # Return run IDs
+        return ListAppsToLaunchResponse(run_ids=pending_run_ids)
 
     def RequestToken(
         self, request: RequestTokenRequest, context: grpc.ServicerContext
     ) -> RequestTokenResponse:
         """Request token."""
-        log(DEBUG, "ClientAppIo.RequestToken")
+        log(DEBUG, "ServerAppIoServicer.RequestToken")
+
+        # Initialize state connection
+        state = self.state_factory.state()
+
+        # Attempt to create a token for the provided run ID
+        token = state.create_token(request.run_id)
 
-        context.abort(grpc.StatusCode.UNIMPLEMENTED, "RequestToken is not implemented")
-        raise NotImplementedError
+        # Return the token
+        return RequestTokenResponse(token=token or "")
 
     def GetNodes(
         self, request: GetNodesRequest, context: grpc.ServicerContext

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/supercore/corestate/corestate.py

@@ -23,7 +23,7 @@ class CoreState(ABC):
     """Abstract base class for core state."""
 
     @abstractmethod
-    def create_token(self, run_id: int) -> str:
+    def create_token(self, run_id: int) -> Optional[str]:
         """Create a token for the given run ID.
 
         Parameters
@@ -34,7 +34,8 @@ class CoreState(ABC):
         Returns
         -------
         str
-            A unique token associated with the run ID.
+            The newly generated token if one does not already exist
+            for the given run ID, otherwise None.
         """
 
     @abstractmethod

flwr_nightly-1.21.0.dev20250808/py/flwr/supercore/superexec/__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 SuperExec."""

flwr_nightly-1.21.0.dev20250808/py/flwr/supercore/superexec/plugin/__init__.py

@@ -0,0 +1,24 @@
+# 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 SuperExec plugins."""
+
+
+from .clientapp_exec_plugin import ClientAppExecPlugin
+from .exec_plugin import ExecPlugin
+
+__all__ = [
+    "ClientAppExecPlugin",
+    "ExecPlugin",
+]

flwr_nightly-1.21.0.dev20250806/py/flwr/supernode/scheduler/simple_clientapp_scheduler_plugin.py → flwr_nightly-1.21.0.dev20250808/py/flwr/supercore/superexec/plugin/clientapp_exec_plugin.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Simple Flower ClientApp Scheduler plugin."""
+"""Simple Flower SuperExec plugin for ClientApp."""
 
 
 import os
@@ -20,11 +20,11 @@ import subprocess
 from collections.abc import Sequence
 from typing import Optional
 
-from flwr.supercore.scheduler import SchedulerPlugin
+from .exec_plugin import ExecPlugin
 
 
-class SimpleClientAppSchedulerPlugin(SchedulerPlugin):
-    """Simple Flower ClientApp Scheduler plugin.
+class ClientAppExecPlugin(ExecPlugin):
+    """Simple Flower SuperExec plugin for ClientApp.
 
     The plugin always selects the first candidate run ID.
     """

flwr_nightly-1.21.0.dev20250806/py/flwr/supercore/scheduler/plugin.py → flwr_nightly-1.21.0.dev20250808/py/flwr/supercore/superexec/plugin/exec_plugin.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-"""Abstract base class SchedulerPlugin."""
+"""Abstract base class ExecPlugin."""
 
 
 from abc import ABC, abstractmethod
@@ -22,8 +22,8 @@ from typing import Callable, Optional
 from flwr.common.typing import Run
 
 
-class SchedulerPlugin(ABC):
-    """Abstract base class for Scheduler plugins."""
+class ExecPlugin(ABC):
+    """Abstract base class for SuperExec plugins."""
 
     def __init__(
         self,
@@ -59,7 +59,7 @@ class SchedulerPlugin(ABC):
 
         This method starts the application process using the given `token`.
         The `run_id` is used solely for bookkeeping purposes, allowing any
-        scheduler implementation to associate this launch with a specific run.
+        plugin implementation to associate this launch with a specific run.
 
         Parameters
         ----------

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/supernode/nodestate/in_memory_nodestate.py

@@ -171,12 +171,12 @@ class InMemoryNodeState(NodeState):  # pylint: disable=too-many-instance-attribu
             ret -= set(self.token_store.keys())
             return list(ret)
 
-    def create_token(self, run_id: int) -> str:
+    def create_token(self, run_id: int) -> Optional[str]:
         """Create a token for the given run ID."""
         token = secrets.token_hex(FLWR_APP_TOKEN_LENGTH)  # Generate a random token
         with self.lock_token_store:
             if run_id in self.token_store:
-                raise ValueError("Token already created for this run ID")
+                return None  # Token already created for this run ID
             self.token_store[run_id] = token
             self.token_to_run_id[token] = run_id
         return token

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/py/flwr/supernode/servicer/clientappio/clientappio_servicer.py

@@ -107,15 +107,10 @@ class ClientAppIoServicer(clientappio_pb2_grpc.ClientAppIoServicer):
         state = self.state_factory.state()
 
         # Attempt to create a token for the provided run ID
-        try:
-            token = state.create_token(request.run_id)
-        except ValueError:
-            # Return an empty token if A token already exists for this run ID,
-            # indicating the run is in progress
-            return RequestTokenResponse(token="")
+        token = state.create_token(request.run_id)
 
         # Return the token
-        return RequestTokenResponse(token=token)
+        return RequestTokenResponse(token=token or "")
 
     def GetRun(
         self, request: GetRunRequest, context: grpc.ServicerContext

{flwr_nightly-1.21.0.dev20250806 → flwr_nightly-1.21.0.dev20250808}/pyproject.toml

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

flwr_nightly-1.21.0.dev20250806/py/flwr/supercore/scheduler/__init__.py

@@ -1,22 +0,0 @@
-# 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 App Scheduler."""
-
-
-from .plugin import SchedulerPlugin
-
-__all__ = [
-    "SchedulerPlugin",
-]

flwr_nightly-1.21.0.dev20250806/py/flwr/supernode/scheduler/__init__.py

@@ -1,22 +0,0 @@
-# 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 ClientApp Scheduler."""
-
-
-from .simple_clientapp_scheduler_plugin import SimpleClientAppSchedulerPlugin
-
-__all__ = [
-    "SimpleClientAppSchedulerPlugin",
-]