Merge branch 'main' into fds-improve-seed-docstring

adap · Apr 10, 2024 · 86d7e14 · 86d7e14
2 parents f51bd53 + 6e0dbdb
commit 86d7e14
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/py/flwr/cli/example.py b/src/py/flwr/cli/example.py
@@ -39,7 +39,9 @@ def example() -> None:
     with urllib.request.urlopen(examples_directory_url) as res:
         data = json.load(res)
         example_names = [
-            item["path"] for item in data["tree"] if item["path"] not in [".gitignore"]
+            item["path"]
+            for item in data["tree"]
+            if item["path"] not in [".gitignore", "doc"]
         ]
 
     example_name = prompt_options(

diff --git a/src/py/flwr/client/app.py b/src/py/flwr/client/app.py
@@ -456,12 +456,13 @@ def _load_client_app() -> ClientApp:
                     continue
 
                 log(INFO, "")
-                log(
-                    INFO,
-                    "[RUN %s, ROUND %s]",
-                    message.metadata.run_id,
-                    message.metadata.group_id,
-                )
+                if len(message.metadata.group_id) > 0:
+                    log(
+                        INFO,
+                        "[RUN %s, ROUND %s]",
+                        message.metadata.run_id,
+                        message.metadata.group_id,
+                    )
                 log(
                     INFO,
                     "Received: %s message %s",

diff --git a/src/py/flwr/common/retry_invoker.py b/src/py/flwr/common/retry_invoker.py
@@ -261,6 +261,7 @@ def try_call_event_handler(
             try:
                 ret = target(*args, **kwargs)
             except self.recoverable_exceptions as err:
+                state.exception = err
                 # Check if giveup event should be triggered
                 max_tries_exceeded = try_cnt == self.max_tries
                 max_time_exceeded = (