From 7b9eec95ba7935f0cec43edfb69b7aaa8fc4f7b9 Mon Sep 17 00:00:00 2001 From: Vincent Verelst Date: Mon, 2 Dec 2024 11:16:24 +0100 Subject: [PATCH 1/3] get cpu and duration from job metadata --- src/openeo_gfmap/manager/job_manager.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/openeo_gfmap/manager/job_manager.py b/src/openeo_gfmap/manager/job_manager.py index 0f1ef63..007d88d 100644 --- a/src/openeo_gfmap/manager/job_manager.py +++ b/src/openeo_gfmap/manager/job_manager.py @@ -342,10 +342,20 @@ def _update_statuses(self, df: pd.DataFrame): .get("max_executor_memory", {}) .get("value", None) ) + df.loc[idx, "cpu"] = ( + job_metadata["usage"] + .get("cpu", {}) + .get("value", None) + ) + df.loc[idx, "duration"] = ( + job_metadata["usage"] + .get("duration", {}) + .get("value", None) + ) else: _log.warning( - "Costs not found in job %s metadata. Costs will be set to 'None'.", + "Costs not found in job %s metadata. Costs, memory, cpu and duration will be set to 'None'.", job.job_id, ) From fabe66cf7ea80ae10128d2a54f3ec9e84c481840 Mon Sep 17 00:00:00 2001 From: Vincent Verelst Date: Mon, 2 Dec 2024 11:17:33 +0100 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45a9b23..90fb51d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added - +- Job Manager automatically tries to extract CPU and duration from the job metadata and add it to the job tracker ### Changed ### Removed From 5caa426a7cd48a4a3f2ebe5bc000dd3b7a8f3706 Mon Sep 17 00:00:00 2001 From: Vincent Verelst Date: Mon, 2 Dec 2024 11:20:19 +0100 Subject: [PATCH 3/3] fixed lint --- src/openeo_gfmap/manager/job_manager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/openeo_gfmap/manager/job_manager.py b/src/openeo_gfmap/manager/job_manager.py index 007d88d..08563ef 100644 --- a/src/openeo_gfmap/manager/job_manager.py +++ b/src/openeo_gfmap/manager/job_manager.py @@ -343,14 +343,10 @@ def _update_statuses(self, df: pd.DataFrame): .get("value", None) ) df.loc[idx, "cpu"] = ( - job_metadata["usage"] - .get("cpu", {}) - .get("value", None) + job_metadata["usage"].get("cpu", {}).get("value", None) ) df.loc[idx, "duration"] = ( - job_metadata["usage"] - .get("duration", {}) - .get("value", None) + job_metadata["usage"].get("duration", {}).get("value", None) ) else: