From 70fe7e7cdcd14f639b08dee9cdf02b260bdd767a Mon Sep 17 00:00:00 2001 From: jafermarq Date: Mon, 1 Apr 2024 16:00:09 +0200 Subject: [PATCH 1/2] pillow 10.2.0 --- baselines/flwr_baselines/pyproject.toml | 1 + src/py/flwr/server/superlink/fleet/vce/vce_api.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/baselines/flwr_baselines/pyproject.toml b/baselines/flwr_baselines/pyproject.toml index f0b2ac84e66e..add99938d2a3 100644 --- a/baselines/flwr_baselines/pyproject.toml +++ b/baselines/flwr_baselines/pyproject.toml @@ -51,6 +51,7 @@ wget = "^3.2" virtualenv = "^20.24.6" pandas = "^1.5.3" pyhamcrest = "^2.0.4" +pillow = "==10.2.0" [tool.poetry.dev-dependencies] isort = "==5.13.2" diff --git a/src/py/flwr/server/superlink/fleet/vce/vce_api.py b/src/py/flwr/server/superlink/fleet/vce/vce_api.py index 9736ae0fb57f..10cf6533700c 100644 --- a/src/py/flwr/server/superlink/fleet/vce/vce_api.py +++ b/src/py/flwr/server/superlink/fleet/vce/vce_api.py @@ -24,6 +24,7 @@ from flwr.client.client_app import ClientApp, LoadClientAppError from flwr.client.node_state import NodeState +from flwr.common.constant import ErrorCode from flwr.common.logger import log from flwr.common.message import Error from flwr.common.object_ref import load_app @@ -94,7 +95,7 @@ async def worker( log(ERROR, ex) log(ERROR, traceback.format_exc()) reason = str(type(ex)) + ":<'" + str(ex) + "'>" - error = Error(code=0, reason=reason) + error = Error(code=ErrorCode.CLIENT_APP_RAISED_EXCEPTION, reason=reason) out_mssg = message.create_error_reply(error=error) finally: From dc70f02157020d73f93a6e6f1ea1b7222ea86d4c Mon Sep 17 00:00:00 2001 From: jafermarq Date: Mon, 1 Apr 2024 16:05:18 +0200 Subject: [PATCH 2/2] revert future changes --- src/py/flwr/server/superlink/fleet/vce/vce_api.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/py/flwr/server/superlink/fleet/vce/vce_api.py b/src/py/flwr/server/superlink/fleet/vce/vce_api.py index 10cf6533700c..9736ae0fb57f 100644 --- a/src/py/flwr/server/superlink/fleet/vce/vce_api.py +++ b/src/py/flwr/server/superlink/fleet/vce/vce_api.py @@ -24,7 +24,6 @@ from flwr.client.client_app import ClientApp, LoadClientAppError from flwr.client.node_state import NodeState -from flwr.common.constant import ErrorCode from flwr.common.logger import log from flwr.common.message import Error from flwr.common.object_ref import load_app @@ -95,7 +94,7 @@ async def worker( log(ERROR, ex) log(ERROR, traceback.format_exc()) reason = str(type(ex)) + ":<'" + str(ex) + "'>" - error = Error(code=ErrorCode.CLIENT_APP_RAISED_EXCEPTION, reason=reason) + error = Error(code=0, reason=reason) out_mssg = message.create_error_reply(error=error) finally: