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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flwr-nightly
-Version: 1.9.0.dev20240509
+Version: 1.9.0.dev20240510
 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.dev20240510}/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.dev20240510"
 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.dev20240510}/src/py/flwr/server/workflow/default_workflows.py

@@ -250,8 +250,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 +269,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 +334,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