flwr-nightly 1.20.0.dev20250728__tar.gz → 1.21.0.dev20250730__tar.gz

{flwr_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/PKG-INFO

@@ -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 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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_nightly-1.20.0.dev20250728 → flwr_nightly-1.21.0.dev20250730}/py/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 → flwr_nightly-1.21.0.dev20250730}/pyproject.toml

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