flwr-nightly 1.9.0.dev20240509__tar.gz → 1.9.0.dev20240511__tar.gz

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/PKG-INFO

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

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/pyproject.toml

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

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/src/py/flwr/server/server.py

@@ -486,7 +486,7 @@ def run_fl(
 
     log(INFO, "")
     log(INFO, "[SUMMARY]")
-    log(INFO, "Run finished %s rounds in %.2fs", config.num_rounds, elapsed_time)
+    log(INFO, "Run finished %s round(s) in %.2fs", config.num_rounds, elapsed_time)
     for line in io.StringIO(str(hist)):
         log(INFO, "\t%s", line.strip("\n"))
     log(INFO, "")

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/src/py/flwr/server/superlink/driver/driver_servicer.py

@@ -16,7 +16,7 @@
 
 
 import time
-from logging import DEBUG, INFO
+from logging import DEBUG
 from typing import List, Optional, Set
 from uuid import UUID
 
@@ -62,7 +62,7 @@ class DriverServicer(driver_pb2_grpc.DriverServicer):
         self, request: CreateRunRequest, context: grpc.ServicerContext
     ) -> CreateRunResponse:
         """Create run ID."""
-        log(INFO, "DriverServicer.CreateRun")
+        log(DEBUG, "DriverServicer.CreateRun")
         state: State = self.state_factory.state()
         run_id = state.create_run(request.fab_id, request.fab_version)
         return CreateRunResponse(run_id=run_id)

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/src/py/flwr/server/superlink/fleet/vce/backend/raybackend.py

@@ -15,7 +15,7 @@
 """Ray backend for the Fleet API using the Simulation Engine."""
 
 import pathlib
-from logging import DEBUG, ERROR, INFO, WARNING
+from logging import DEBUG, ERROR, WARNING
 from typing import Callable, Dict, List, Tuple, Union
 
 import ray
@@ -45,7 +45,7 @@ class RayBackend(Backend):
         work_dir: str,
     ) -> None:
         """Prepare RayBackend by initialising Ray and creating the ActorPool."""
-        log(INFO, "Initialising: %s", self.__class__.__name__)
+        log(DEBUG, "Initialising: %s", self.__class__.__name__)
         log(DEBUG, "Backend config: %s", backend_config)
 
         if not pathlib.Path(work_dir).exists():

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/src/py/flwr/server/superlink/fleet/vce/vce_api.py

@@ -46,7 +46,7 @@ def _register_nodes(
     for i in range(num_nodes):
         node_id = state.create_node(ping_interval=PING_MAX_INTERVAL)
         nodes_mapping[node_id] = i
-    log(INFO, "Registered %i nodes", len(nodes_mapping))
+    log(DEBUG, "Registered %i nodes", len(nodes_mapping))
     return nodes_mapping
 
 

{flwr_nightly-1.9.0.dev20240509 → flwr_nightly-1.9.0.dev20240511}/src/py/flwr/server/workflow/default_workflows.py

@@ -88,7 +88,12 @@ class DefaultWorkflow:
         hist = context.history
         log(INFO, "")
         log(INFO, "[SUMMARY]")
-        log(INFO, "Run finished %s rounds in %.2fs", context.config.num_rounds, elapsed)
+        log(
+            INFO,
+            "Run finished %s round(s) in %.2fs",
+            context.config.num_rounds,
+            elapsed,
+        )
         for idx, line in enumerate(io.StringIO(str(hist))):
             if idx == 0:
                 log(INFO, "%s", line.strip("\n"))
@@ -250,8 +255,12 @@ def default_fit_workflow(  # pylint: disable=R0914
             compat.recordset_to_fitres(msg.content, False),
         )
         for msg in messages
+        if msg.has_content()
     ]
-    aggregated_result = context.strategy.aggregate_fit(current_round, results, [])
+    failures = [Exception(msg.error) for msg in messages if msg.has_error()]
+    aggregated_result = context.strategy.aggregate_fit(
+        current_round, results, failures  # type: ignore
+    )
     parameters_aggregated, metrics_aggregated = aggregated_result
 
     # Update the parameters and write history
@@ -265,6 +274,7 @@ def default_fit_workflow(  # pylint: disable=R0914
         )
 
 
+# pylint: disable-next=R0914
 def default_evaluate_workflow(driver: Driver, context: Context) -> None:
     """Execute the default workflow for a single evaluate round."""
     if not isinstance(context, LegacyContext):
@@ -329,8 +339,12 @@ def default_evaluate_workflow(driver: Driver, context: Context) -> None:
             compat.recordset_to_evaluateres(msg.content),
         )
         for msg in messages
+        if msg.has_content()
     ]
-    aggregated_result = context.strategy.aggregate_evaluate(current_round, results, [])
+    failures = [Exception(msg.error) for msg in messages if msg.has_error()]
+    aggregated_result = context.strategy.aggregate_evaluate(
+        current_round, results, failures  # type: ignore
+    )
 
     loss_aggregated, metrics_aggregated = aggregated_result