flwr-nightly 1.19.0.dev20250616__tar.gz → 1.20.0.dev20250617__tar.gz

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: flwr-nightly
-Version: 1.19.0.dev20250616
+Version: 1.20.0.dev20250617
 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.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.6.0",
     "torchvision==0.21.0",

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets>=0.5.0",
     "torch==2.4.0",
     "trl==0.8.1",

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets>=0.5.0",
     "torch==2.5.1",
     "transformers>=4.30.0,<5.0",

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.21.1",
 ]

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "numpy>=2.0.2",
 ]
 

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.5.1",
     "torchvision==0.20.1",

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -8,7 +8,7 @@ version = "1.0.0"
 description = ""
 license = "Apache-2.0"
 dependencies = [
-    "flwr[simulation]>=1.19.0",
+    "flwr[simulation]>=1.20.0",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/cli/run/run.py

@@ -150,50 +150,57 @@ def _run_with_exec_api(
     stream: bool,
     output_format: str,
 ) -> None:
-    auth_plugin = try_obtain_cli_auth_plugin(app, federation, federation_config)
-    channel = init_channel(app, federation_config, auth_plugin)
-    stub = ExecStub(channel)
+    channel = None
+    try:
+        auth_plugin = try_obtain_cli_auth_plugin(app, federation, federation_config)
+        channel = init_channel(app, federation_config, auth_plugin)
+        stub = ExecStub(channel)
 
-    fab_bytes, fab_hash, config = build_fab(app)
-    fab_id, fab_version = get_metadata_from_config(config)
+        fab_bytes, fab_hash, config = build_fab(app)
+        fab_id, fab_version = get_metadata_from_config(config)
 
-    fab = Fab(fab_hash, fab_bytes)
+        fab = Fab(fab_hash, fab_bytes)
 
-    # Construct a `ConfigRecord` out of a flattened `UserConfig`
-    fed_config = flatten_dict(federation_config.get("options", {}))
-    c_record = user_config_to_configrecord(fed_config)
+        # Construct a `ConfigRecord` out of a flattened `UserConfig`
+        fed_config = flatten_dict(federation_config.get("options", {}))
+        c_record = user_config_to_configrecord(fed_config)
 
-    req = StartRunRequest(
-        fab=fab_to_proto(fab),
-        override_config=user_config_to_proto(parse_config_args(config_overrides)),
-        federation_options=config_record_to_proto(c_record),
-    )
-    with flwr_cli_grpc_exc_handler():
-        res = stub.StartRun(req)
-
-    if res.HasField("run_id"):
-        typer.secho(f"🎊 Successfully started run {res.run_id}", fg=typer.colors.GREEN)
-    else:
-        typer.secho("❌ Failed to start run", fg=typer.colors.RED)
-        raise typer.Exit(code=1)
-
-    if output_format == CliOutputFormat.JSON:
-        run_output = json.dumps(
-            {
-                "success": res.HasField("run_id"),
-                "run-id": res.run_id if res.HasField("run_id") else None,
-                "fab-id": fab_id,
-                "fab-name": fab_id.rsplit("/", maxsplit=1)[-1],
-                "fab-version": fab_version,
-                "fab-hash": fab_hash[:8],
-                "fab-filename": get_fab_filename(config, fab_hash),
-            }
+        req = StartRunRequest(
+            fab=fab_to_proto(fab),
+            override_config=user_config_to_proto(parse_config_args(config_overrides)),
+            federation_options=config_record_to_proto(c_record),
         )
-        restore_output()
-        Console().print_json(run_output)
+        with flwr_cli_grpc_exc_handler():
+            res = stub.StartRun(req)
 
-    if stream:
-        start_stream(res.run_id, channel, CONN_REFRESH_PERIOD)
+        if res.HasField("run_id"):
+            typer.secho(
+                f"🎊 Successfully started run {res.run_id}", fg=typer.colors.GREEN
+            )
+        else:
+            typer.secho("❌ Failed to start run", fg=typer.colors.RED)
+            raise typer.Exit(code=1)
+
+        if output_format == CliOutputFormat.JSON:
+            run_output = json.dumps(
+                {
+                    "success": res.HasField("run_id"),
+                    "run-id": res.run_id if res.HasField("run_id") else None,
+                    "fab-id": fab_id,
+                    "fab-name": fab_id.rsplit("/", maxsplit=1)[-1],
+                    "fab-version": fab_version,
+                    "fab-hash": fab_hash[:8],
+                    "fab-filename": get_fab_filename(config, fab_hash),
+                }
+            )
+            restore_output()
+            Console().print_json(run_output)
+
+        if stream:
+            start_stream(res.run_id, channel, CONN_REFRESH_PERIOD)
+    finally:
+        if channel:
+            channel.close()
 
 
 def _run_without_exec_api(

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/app.py

@@ -71,11 +71,11 @@ 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.superexec.app import load_executor
 from flwr.superexec.exec_grpc import run_exec_api_grpc
 
-from .superlink.ffs.ffs_factory import FfsFactory
 from .superlink.fleet.grpc_adapter.grpc_adapter_servicer import GrpcAdapterServicer
 from .superlink.fleet.grpc_rere.fleet_servicer import FleetServicer
 from .superlink.fleet.grpc_rere.server_interceptor import AuthenticateServerInterceptor

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/fleet/grpc_rere/fleet_servicer.py

@@ -48,10 +48,10 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PushObjectResponse,
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.fleet.message_handler import message_handler
 from flwr.server.superlink.linkstate import LinkStateFactory
 from flwr.server.superlink.utils import abort_grpc_context
+from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 
 

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/fleet/message_handler/message_handler.py

@@ -58,9 +58,9 @@ from flwr.proto.run_pb2 import (  # pylint: disable=E0611
     GetRunResponse,
     Run,
 )
-from flwr.server.superlink.ffs.ffs import Ffs
 from flwr.server.superlink.linkstate import LinkState
 from flwr.server.superlink.utils import check_abort
+from flwr.supercore.ffs import Ffs
 from flwr.supercore.object_store import NoObjectInStoreError, ObjectStore
 
 from ...utils import store_mapping_and_register_objects

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/fleet/rest_rere/rest_api.py

@@ -47,10 +47,9 @@ from flwr.proto.message_pb2 import (  # pylint: disable=E0611
     PushObjectResponse,
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
-from flwr.server.superlink.ffs.ffs import Ffs
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.fleet.message_handler import message_handler
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
 
 try:

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/serverappio/serverappio_grpc.py

@@ -26,8 +26,8 @@ from flwr.common.logger import log
 from flwr.proto.serverappio_pb2_grpc import (  # pylint: disable=E0611
     add_ServerAppIoServicer_to_server,
 )
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
+from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 
 from .serverappio_servicer import ServerAppIoServicer

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/serverappio/serverappio_servicer.py

@@ -81,11 +81,10 @@ from flwr.proto.serverappio_pb2 import (  # pylint: disable=E0611
     PushServerAppOutputsRequest,
     PushServerAppOutputsResponse,
 )
-from flwr.server.superlink.ffs.ffs import Ffs
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
 from flwr.server.superlink.utils import abort_if
 from flwr.server.utils.validator import validate_message
+from flwr.supercore.ffs import Ffs, FfsFactory
 from flwr.supercore.object_store import NoObjectInStoreError, ObjectStoreFactory
 
 from ..utils import store_mapping_and_register_objects

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/simulation/simulationio_grpc.py

@@ -26,8 +26,8 @@ from flwr.common.logger import log
 from flwr.proto.simulationio_pb2_grpc import (  # pylint: disable=E0611
     add_SimulationIoServicer_to_server,
 )
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
+from flwr.supercore.ffs import FfsFactory
 
 from .simulationio_servicer import SimulationIoServicer
 

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/server/superlink/simulation/simulationio_servicer.py

@@ -56,9 +56,9 @@ from flwr.proto.simulationio_pb2 import (  # pylint: disable=E0611
     PushSimulationOutputsRequest,
     PushSimulationOutputsResponse,
 )
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
 from flwr.server.superlink.utils import abort_if
+from flwr.supercore.ffs import FfsFactory
 
 
 class SimulationIoServicer(simulationio_pb2_grpc.SimulationIoServicer):

{flwr_nightly-1.19.0.dev20250616/py/flwr/server/superlink → flwr_nightly-1.20.0.dev20250617/py/flwr/supercore}/ffs/disk_ffs.py

@@ -20,7 +20,7 @@ import json
 from pathlib import Path
 from typing import Optional
 
-from flwr.server.superlink.ffs.ffs import Ffs
+from .ffs import Ffs
 
 
 class DiskFfs(Ffs):  # pylint: disable=R0904

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/superexec/deployment.py

@@ -31,9 +31,8 @@ from flwr.common.constant import (
 )
 from flwr.common.logger import log
 from flwr.common.typing import Fab, RunStatus, UserConfig
-from flwr.server.superlink.ffs import Ffs
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
 
 from .executor import Executor
 

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/superexec/exec_grpc.py

@@ -27,8 +27,8 @@ from flwr.common.grpc import generic_create_grpc_server
 from flwr.common.logger import log
 from flwr.common.typing import UserConfig
 from flwr.proto.exec_pb2_grpc import add_ExecServicer_to_server
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
+from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.superexec.exec_event_log_interceptor import ExecEventLogInterceptor
 from flwr.superexec.exec_user_auth_interceptor import ExecUserAuthInterceptor

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/superexec/exec_servicer.py

@@ -52,8 +52,8 @@ from flwr.proto.exec_pb2 import (  # pylint: disable=E0611
     StreamLogsRequest,
     StreamLogsResponse,
 )
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
 
 from .exec_user_auth_interceptor import shared_account_info

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/superexec/executor.py

@@ -22,8 +22,8 @@ from typing import Optional
 
 from flwr.common import ConfigRecord
 from flwr.common.typing import UserConfig
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkStateFactory
+from flwr.supercore.ffs import FfsFactory
 
 
 @dataclass

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/superexec/simulation.py

@@ -25,9 +25,8 @@ 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.ffs import Ffs
-from flwr.server.superlink.ffs.ffs_factory import FfsFactory
 from flwr.server.superlink.linkstate import LinkState, LinkStateFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
 
 from .executor import Executor
 

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/supernode/nodestate/in_memory_nodestate.py

@@ -51,8 +51,9 @@ class InMemoryNodeState(NodeState):  # pylint: disable=too-many-instance-attribu
         # Store run ID to Context mapping
         self.ctx_store: dict[int, Context] = {}
         self.lock_ctx_store = Lock()
-        # Store run ID to token mapping
+        # Store run ID to token mapping and token to run ID mapping
         self.token_store: dict[int, str] = {}
+        self.token_to_run_id: dict[str, int] = {}
         self.lock_token_store = Lock()
 
     def set_node_id(self, node_id: Optional[int]) -> None:
@@ -177,6 +178,7 @@ class InMemoryNodeState(NodeState):  # pylint: disable=too-many-instance-attribu
             if run_id in self.token_store:
                 raise ValueError("Token already created for this run ID")
             self.token_store[run_id] = token
+            self.token_to_run_id[token] = run_id
         return token
 
     def verify_token(self, run_id: int, token: str) -> bool:
@@ -187,4 +189,11 @@ class InMemoryNodeState(NodeState):  # pylint: disable=too-many-instance-attribu
     def delete_token(self, run_id: int) -> None:
         """Delete the token for the given run ID."""
         with self.lock_token_store:
-            self.token_store.pop(run_id, None)
+            token = self.token_store.pop(run_id, None)
+            if token is not None:
+                self.token_to_run_id.pop(token, None)
+
+    def get_run_id_by_token(self, token: str) -> Optional[int]:
+        """Get the run ID associated with a given token."""
+        with self.lock_token_store:
+            return self.token_to_run_id.get(token)

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/supernode/nodestate/nodestate.py

@@ -210,3 +210,18 @@ class NodeState(ABC):
         run_id : int
             The ID of the run for which to delete the token.
         """
+
+    @abstractmethod
+    def get_run_id_by_token(self, token: str) -> Optional[int]:
+        """Get the run ID associated with a given token.
+
+        Parameters
+        ----------
+        token : str
+            The token to look up.
+
+        Returns
+        -------
+        Optional[int]
+            The run ID if the token is valid, otherwise None.
+        """

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/py/flwr/supernode/start_client_internal.py

@@ -52,7 +52,7 @@ from flwr.common.logger import log
 from flwr.common.retry_invoker import RetryInvoker, RetryState, exponential
 from flwr.common.typing import Fab, Run, RunNotRunningException, UserConfig
 from flwr.proto.clientappio_pb2_grpc import add_ClientAppIoServicer_to_server
-from flwr.server.superlink.ffs import Ffs, FfsFactory
+from flwr.supercore.ffs import Ffs, FfsFactory
 from flwr.supercore.object_store import ObjectStore, ObjectStoreFactory
 from flwr.supernode.nodestate import NodeState, NodeStateFactory
 from flwr.supernode.servicer.clientappio import ClientAppInputs, ClientAppIoServicer

{flwr_nightly-1.19.0.dev20250616 → flwr_nightly-1.20.0.dev20250617}/pyproject.toml

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