flwr-nightly 1.20.0.dev20250728__py3-none-any.whl → 1.21.0.dev20250730__py3-none-any.whl

flwr/cli/new/templates/app/pyproject.baseline.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.7.1",
     "torchvision==0.22.1",

flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets>=0.5.0",
     "torch==2.4.0",
     "trl==0.8.1",

flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets>=0.5.0",
     "torch==2.7.1",
     "transformers>=4.30.0,<5.0",

flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "jax==0.4.30",
     "jaxlib==0.4.30",
     "scikit-learn==1.6.1",

flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets[vision]>=0.5.0",
     "mlx==0.26.5",
 ]

flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "numpy>=2.0.2",
 ]
 

flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets[vision]>=0.5.0",
     "torch==2.7.1",
     "torchvision==0.22.1",

flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets[vision]>=0.5.0",
     "scikit-learn>=1.6.1",
 ]

flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -14,7 +14,7 @@ description = ""
 license = "Apache-2.0"
 # Dependencies for your Flower App
 dependencies = [
-    "flwr[simulation]>=1.20.0",
+    "flwr[simulation]>=1.21.0",
     "flwr-datasets[vision]>=0.5.0",
     "tensorflow>=2.11.1,<2.18.0",
 ]

flwr/common/inflatable_utils.py

@@ -34,6 +34,7 @@ from .constant import (
     PULL_MAX_TIME,
     PULL_MAX_TRIES_PER_OBJECT,
 )
+from .exit_handlers import add_exit_handler
 from .inflatable import (
     InflatableObject,
     UnexpectedObjectContentError,
@@ -61,6 +62,34 @@ inflatable_class_registry: dict[str, type[InflatableObject]] = {
 T = TypeVar("T", bound=InflatableObject)
 
 
+# Allow thread pool executors to be shut down gracefully
+_thread_pool_executors: set[concurrent.futures.ThreadPoolExecutor] = set()
+_lock = threading.Lock()
+
+
+def _shutdown_thread_pool_executors() -> None:
+    """Shutdown all thread pool executors gracefully."""
+    with _lock:
+        for executor in _thread_pool_executors:
+            executor.shutdown(wait=False, cancel_futures=True)
+        _thread_pool_executors.clear()
+
+
+def _track_executor(executor: concurrent.futures.ThreadPoolExecutor) -> None:
+    """Track a thread pool executor for graceful shutdown."""
+    with _lock:
+        _thread_pool_executors.add(executor)
+
+
+def _untrack_executor(executor: concurrent.futures.ThreadPoolExecutor) -> None:
+    """Untrack a thread pool executor."""
+    with _lock:
+        _thread_pool_executors.discard(executor)
+
+
+add_exit_handler(_shutdown_thread_pool_executors)
+
+
 class ObjectUnavailableError(Exception):
     """Exception raised when an object has been pre-registered but is not yet
     available."""
@@ -165,7 +194,16 @@ def push_object_contents_from_iterable(
     # Push all object contents concurrently
     num_workers = get_num_workers(max_concurrent_pushes)
     with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
-        list(executor.map(push, object_contents))
+        # Ensure that the thread pool executors are tracked for graceful shutdown
+        _track_executor(executor)
+
+        # Submit push tasks for each object content
+        executor.map(push, object_contents)  # Non-blocking map
+
+        # The context manager will block until all submitted tasks have completed
+
+    # Remove the executor from the list of tracked executors
+    _untrack_executor(executor)
 
 
 def pull_objects(  # pylint: disable=too-many-arguments,too-many-locals
@@ -262,13 +300,18 @@ def pull_objects(  # pylint: disable=too-many-arguments,too-many-locals
     # Submit all pull tasks concurrently
     num_workers = get_num_workers(max_concurrent_pulls)
     with concurrent.futures.ThreadPoolExecutor(max_workers=num_workers) as executor:
-        futures = {
-            executor.submit(pull_with_retries, obj_id): obj_id for obj_id in object_ids
-        }
+        # Ensure that the thread pool executors are tracked for graceful shutdown
+        _track_executor(executor)
+
+        # Submit pull tasks for each object ID
+        executor.map(pull_with_retries, object_ids)  # Non-blocking map
+
+        # The context manager will block until all submitted tasks have completed
 
-        # Wait for completion
-        concurrent.futures.wait(futures)
+    # Remove the executor from the list of tracked executors
+    _untrack_executor(executor)
 
+    # If an error occurred during pulling, raise it
     if err_to_raise is not None:
         raise err_to_raise
 

flwr/server/serverapp/app.py

@@ -16,6 +16,7 @@
 
 
 import argparse
+import gc
 from logging import DEBUG, ERROR, INFO
 from pathlib import Path
 from queue import Queue
@@ -115,6 +116,7 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
     run_status = None
     heartbeat_sender = None
     grid = None
+    context = None
     while True:
 
         try:
@@ -248,6 +250,10 @@ def run_serverapp(  # pylint: disable=R0914, disable=W0212, disable=R0915
             if grid:
                 grid.close()
 
+            # Clean up the Context
+            context = None
+            gc.collect()
+
             event(
                 EventType.FLWR_SERVERAPP_RUN_LEAVE,
                 event_details={"run-id-hash": hash_run_id, "success": success},

flwr/simulation/app.py

@@ -16,6 +16,7 @@
 
 
 import argparse
+import gc
 from logging import DEBUG, ERROR, INFO
 from queue import Queue
 from time import sleep
@@ -271,6 +272,13 @@ def run_simulation_process(  # pylint: disable=R0914, disable=W0212, disable=R09
                     )
                 )
 
+            # Clean up the Context if it exists
+            try:
+                del updated_context
+            except NameError:
+                pass
+            gc.collect()
+
         # Stop the loop if `flwr-simulation` is expected to process a single run
         if run_once:
             break

{flwr_nightly-1.20.0.dev20250728.dist-info → flwr_nightly-1.21.0.dev20250730.dist-info}/METADATA

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

@@ -61,15 +61,15 @@ flwr/cli/new/templates/app/code/task.pytorch.py.tpl,sha256=XlJqA4Ix_PloO_zJLhjiN
 flwr/cli/new/templates/app/code/task.sklearn.py.tpl,sha256=vHdhtMp0FHxbYafXyhDT9aKmmmA0Jvpx5Oum1Yu9lWY,1850
 flwr/cli/new/templates/app/code/task.tensorflow.py.tpl,sha256=SKXAZdgBnPpbAbJ90Rb7oQ5ilnopBx_j_JNFoUDeEAI,1732
 flwr/cli/new/templates/app/code/utils.baseline.py.tpl,sha256=YkHAgppUeD2BnBoGfVB6dEvBfjuIPGsU1gw4CiUi3qA,40
-flwr/cli/new/templates/app/pyproject.baseline.toml.tpl,sha256=SHhqI-Qg-ufOjkEKJtUtigwbpZRDg-EN0U64puJlsPE,3180
-flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl,sha256=iPylV_q02Nsfp1sfgX6VkB-U4ezgOfL3nc8mlKjNMxw,2497
-flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl,sha256=-DFFc6AuJOGA2lELLiwahDOG7iQjQ2OOXC7XcZ_fqWQ,2019
-flwr/cli/new/templates/app/pyproject.jax.toml.tpl,sha256=UEMslvDDoeNwcyMqcYon4t_OmdR3Q8o0I4yAj1cWpBo,1471
-flwr/cli/new/templates/app/pyproject.mlx.toml.tpl,sha256=Mcr05KhDdg5G-QatS8c4A6H8RPH2Br6YjV7Z5gjkQXA,1542
-flwr/cli/new/templates/app/pyproject.numpy.toml.tpl,sha256=_UrN9JddlNv97OkSjViJIkO0WUoMUTaZkbCLbs7Dg2A,1409
-flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl,sha256=2Bkk42w4djEpBfCnOyFzSkCy6QklGnGR0mu7jtRZ8xo,1508
-flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl,sha256=FXuh0UjbXUg488FZmP9GTXZiiSAIbr7L3SxSqkjokhw,1484
-flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl,sha256=kjTToUNkLHn7OXNypG3WPEgt2g_DqoKPdm37x8ScFHw,1508
+flwr/cli/new/templates/app/pyproject.baseline.toml.tpl,sha256=o7WJPF7lH_azNTiUrvTtLfXKyAY3_xTzwvUpkp3suUI,3180
+flwr/cli/new/templates/app/pyproject.flowertune.toml.tpl,sha256=zDNuDkvgVI7SNK7RLSlaFs2LhSW1-THDKNBJVw1_y78,2497
+flwr/cli/new/templates/app/pyproject.huggingface.toml.tpl,sha256=dsjlA0aS-U7xzB7YCYMOGVb7a0XJTB5bsemFzwUPkPg,2019
+flwr/cli/new/templates/app/pyproject.jax.toml.tpl,sha256=BHGb2N57Xm2scO1mqDSNgK_aiI68mRh6u4Y9TLL5bZE,1471
+flwr/cli/new/templates/app/pyproject.mlx.toml.tpl,sha256=O6eN6Zqx2ieh-WbaiMYmxfhCrLKJjwymn_nhUDEOldM,1542
+flwr/cli/new/templates/app/pyproject.numpy.toml.tpl,sha256=oMTI8qXSgQsGlZextUpkWFvNOMlnWbzn2EocPSwDrtw,1409
+flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl,sha256=bu65oSrM85fP_H0-RlMS2i8XgL_8O5TfSHLW87lb30s,1508
+flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl,sha256=mAEPeBfGyrINgRuP6-nX_KJNTQjC4E5N1Nrcddxiffs,1484
+flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl,sha256=mK8wOWqoQOVxZG6-OVwA2ChmKxexC7TfQV0ztPE4BWY,1508
 flwr/cli/run/__init__.py,sha256=RPyB7KbYTFl6YRiilCch6oezxrLQrl1kijV7BMGkLbA,790
 flwr/cli/run/run.py,sha256=psmr215gkV0e0QtX9NFp7KUwKSA_ZwekdJmoL1zFyfw,8478
 flwr/cli/stop.py,sha256=l8DcRkA---CESVJgc7iTHLWIBAPGxWIfoem8qSU3lZQ,4972
@@ -124,7 +124,7 @@ flwr/common/grpc.py,sha256=y70hUFvXkIf3l03xOhlb7qhS6W1UJZRSZqCdB0ir0v8,10381
 flwr/common/heartbeat.py,sha256=SyEpNDnmJ0lni0cWO67rcoJVKasCLmkNHm3dKLeNrLU,5749
 flwr/common/inflatable.py,sha256=GDL9oBKs16_yyVdlH6kBf493O5xll_h9V7XB5Mpx1Hc,9524
 flwr/common/inflatable_protobuf_utils.py,sha256=JtRqp-fV47goDM2y8JRQ7AmwwjeGaWexwoMWLcxX5gE,5056
-flwr/common/inflatable_utils.py,sha256=tYNrsdUWIw94p1oBPojg2wlD_-tnspWU2tbmIRafB6U,17401
+flwr/common/inflatable_utils.py,sha256=OcNW8_CfHNuJhHekwRtnrDJZ4vbhujw2w7SG7Y0TuSI,18955
 flwr/common/logger.py,sha256=JbRf6E2vQxXzpDBq1T8IDUJo_usu3gjWEBPQ6uKcmdg,13049
 flwr/common/message.py,sha256=xAL7iZN5-n-xPQpgoSFvxNrzs8fmiiPfoU0DjNQEhRw,19953
 flwr/common/object_ref.py,sha256=p3SfTeqo3Aj16SkB-vsnNn01zswOPdGNBitcbRnqmUk,9134
@@ -250,7 +250,7 @@ flwr/server/server.py,sha256=39m4FSN2T-uVA-no9nstN0eWW0co-IUUAIMmpd3V7Jc,17893
 flwr/server/server_app.py,sha256=8uagoZX-3CY3tazPqkIV9jY-cN0YrRRrDmVe23o0AV0,9515
 flwr/server/server_config.py,sha256=e_6ddh0riwOJsdNn2BFev344uMWfDk9n7dyjNpPgm1w,1349
 flwr/server/serverapp/__init__.py,sha256=xcC0T_MQSMS9cicUzUUpMNCOsF2d8Oh_8jvnoBLuZvo,800
-flwr/server/serverapp/app.py,sha256=GetSKAsDlNlJFazregZ_Vu63SIIL9KrZXEvSjND7qA0,9407
+flwr/server/serverapp/app.py,sha256=k0wAdZiMAEz7WsUigxv038I5Eel3vXwuSqGGj2HtX3c,9524
 flwr/server/serverapp_components.py,sha256=dfSqmrsVy3arKXpl3ZIBQWdV8rehfIms8aJooyzdmEM,2118
 flwr/server/strategy/__init__.py,sha256=HhsSWMWaC7oCb2g7Kqn1MBKdrfvgi8VxACy9ZL706Q0,2836
 flwr/server/strategy/aggregate.py,sha256=smlKKy-uFUuuFR12vlclucnwSQWRz78R79-Km4RWqbw,13978
@@ -322,7 +322,7 @@ flwr/server/workflow/secure_aggregation/secagg_workflow.py,sha256=b_pKk7gmbahwyj
 flwr/server/workflow/secure_aggregation/secaggplus_workflow.py,sha256=DkayCsnlAya6Y2PZsueLgoUCMRtV-GbnW08RfWx_SXM,29460
 flwr/serverapp/__init__.py,sha256=HPvC_ZvMS7GCM7ALVrG_Wwm4bSDr4DZETeC561v3T9w,719
 flwr/simulation/__init__.py,sha256=Gg6OsP1Z-ixc3-xxzvl7j7rz2Fijy9rzyEPpxgAQCeM,1556
-flwr/simulation/app.py,sha256=Uy3lPwAvfZECkWPLcC0oDXTwY14e4ou8itIcBltjmWE,10437
+flwr/simulation/app.py,sha256=hP7vP29qZOA_3dipzUdmkRXP25eS8RlF1MT-S09t3oc,10625
 flwr/simulation/legacy_app.py,sha256=nMISQqW0otJL1-2Kfd94O6BLlGS2IEmEPKTM2WGKrIs,15861
 flwr/simulation/ray_transport/__init__.py,sha256=ogd-0AMv2U-wBZ1r3sHWaDIOIrVqr88Xi6C8o4Dviy0,734
 flwr/simulation/ray_transport/ray_actor.py,sha256=JN3xTqFIr5Z750k92CcA_uavzOHhSWDwE2WCaecvpks,19147
@@ -374,7 +374,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.20.0.dev20250728.dist-info/METADATA,sha256=-zyMPgvOSZXpWwguchnub0MLUqMNBwguXF_FngYI2Vw,15966
-flwr_nightly-1.20.0.dev20250728.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-flwr_nightly-1.20.0.dev20250728.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
-flwr_nightly-1.20.0.dev20250728.dist-info/RECORD,,
+flwr_nightly-1.21.0.dev20250730.dist-info/METADATA,sha256=H636xLDJ-N3ab4OnF9d7Scj16WrGekbgQAonr7E0s34,15966
+flwr_nightly-1.21.0.dev20250730.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+flwr_nightly-1.21.0.dev20250730.dist-info/entry_points.txt,sha256=jNpDXGBGgs21RqUxelF_jwGaxtqFwm-MQyfz-ZqSjrA,367
+flwr_nightly-1.21.0.dev20250730.dist-info/RECORD,,