flwr-nightly 1.9.0.dev20240609__tar.gz → 1.10.0.dev20240611__tar.gz

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.9.0.dev20240609
+Version: 1.10.0.dev20240611
 Summary: Flower: A Friendly Federated Learning Framework
 Home-page: https://flower.ai
 License: Apache-2.0

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "flwr-nightly"
-version = "1.9.0.dev20240609"
+version = "1.10.0.dev20240611"
 description = "Flower: A Friendly Federated Learning Framework"
 license = "Apache-2.0"
 authors = ["The Flower Authors <hello@flower.ai>"]
@@ -105,7 +105,7 @@ jupyterlab = "==4.0.12"
 rope = "==1.11.0"
 semver = "==3.0.2"
 sphinx = "==6.2.1"
-sphinx-intl = "==2.1.0"
+sphinx-intl = "==2.2.0"
 myst-parser = "==1.0.0"
 sphinx-design = "==0.5.0"
 sphinx-copybutton = "==0.5.2"
@@ -113,7 +113,7 @@ sphinxcontrib-mermaid = "==0.9.2"
 sphinxcontrib-youtube = "==1.4.1"
 furo = "==2023.9.10"
 sphinx-reredirects = "==0.1.3"
-nbsphinx = "==0.9.3"
+nbsphinx = "==0.9.4"
 nbstripout = "==0.6.1"
 ruff = "==0.1.9"
 sphinx-argparse = "==0.4.0"

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.hf.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets>=0.0.2,<1.0.0",
     "torch==2.2.1",
     "transformers>=4.30.0,<5.0"

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.jax.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = {text = "Apache License (2.0)"}
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "jax==0.4.26",
     "jaxlib==0.4.26",
     "scikit-learn==1.4.2",

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.mlx.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets[vision]>=0.0.2,<1.0.0",
     "mlx==0.10.0",
     "numpy==1.24.4",

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.numpy.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "numpy>=1.21.0",
 ]
 

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.pytorch.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets[vision]>=0.0.2,<1.0.0",
     "torch==2.2.1",
     "torchvision==0.17.1",

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.sklearn.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets[vision]>=0.0.2,<1.0.0",
     "scikit-learn>=1.1.1",
 ]

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/cli/new/templates/app/pyproject.tensorflow.toml.tpl

@@ -11,7 +11,7 @@ authors = [
 ]
 license = { text = "Apache License (2.0)" }
 dependencies = [
-    "flwr[simulation]>=1.8.0,<2.0",
+    "flwr[simulation]>=1.9.0,<2.0",
     "flwr-datasets[vision]>=0.0.2,<1.0.0",
     "tensorflow>=2.11.1",
 ]

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/client/app.py

@@ -265,10 +265,10 @@ def _start_client_internal(
         transport, server_address
     )
 
-    run_tracker = _RunTracker()
-    _ = run_tracker
+    app_state_tracker = _AppStateTracker()
 
     def _on_sucess(retry_state: RetryState) -> None:
+        app_state_tracker.is_connected = True
         if retry_state.tries > 1:
             log(
                 INFO,
@@ -278,6 +278,7 @@ def _start_client_internal(
             )
 
     def _on_backoff(retry_state: RetryState) -> None:
+        app_state_tracker.is_connected = False
         if retry_state.tries == 1:
             log(WARN, "Connection attempt failed, retrying...")
         else:
@@ -308,7 +309,7 @@ def _start_client_internal(
 
     node_state = NodeState()
 
-    while True:
+    while not app_state_tracker.interrupt:
         sleep_duration: int = 0
         with connection(
             address,
@@ -325,8 +326,9 @@ def _start_client_internal(
             if create_node is not None:
                 create_node()  # pylint: disable=not-callable
 
-            while True:
-                if True:  # pylint: disable=using-constant-test
+            app_state_tracker.register_signal_handler()
+            while not app_state_tracker.interrupt:
+                try:
                     # Receive
                     message = receive()
                     if message is None:
@@ -397,7 +399,10 @@ def _start_client_internal(
                             e_code = ErrorCode.LOAD_CLIENT_APP_EXCEPTION
                             exc_entity = "SuperNode"
 
-                        log(ERROR, "%s raised an exception", exc_entity, exc_info=ex)
+                        if not app_state_tracker.interrupt:
+                            log(
+                                ERROR, "%s raised an exception", exc_entity, exc_info=ex
+                            )
 
                         # Create error message
                         reply_message = message.create_error_reply(
@@ -414,13 +419,19 @@ def _start_client_internal(
                     send(reply_message)
                     log(INFO, "Sent reply")
 
+                except StopIteration:
+                    sleep_duration = 0
+                    break
+
             # Unregister node
-            if delete_node is not None:
+            if delete_node is not None and app_state_tracker.is_connected:
                 delete_node()  # pylint: disable=not-callable
 
         if sleep_duration == 0:
             log(INFO, "Disconnect and shut down")
+            del app_state_tracker
             break
+
         # Sleep and reconnect afterwards
         log(
             INFO,
@@ -592,8 +603,9 @@ def _init_connection(transport: Optional[str], server_address: str) -> Tuple[
 
 
 @dataclass
-class _RunTracker:
+class _AppStateTracker:
     interrupt: bool = False
+    is_connected: bool = False
 
     def register_signal_handler(self) -> None:
         """Register handlers for exit signals."""

{flwr_nightly-1.9.0.dev20240609 → flwr_nightly-1.10.0.dev20240611}/src/py/flwr/client/grpc_rere_client/connection.py

@@ -193,8 +193,6 @@ def grpc_request_response(  # pylint: disable=R0913, R0914, R0915
 
         # Stop the ping-loop thread
         ping_stop_event.set()
-        if ping_thread is not None:
-            ping_thread.join()
 
         # Call FleetAPI
         delete_node_request = DeleteNodeRequest(node=node)