Skip to content

Commit 0fd4574

Browse files
committed
Issue #191 #285 be less picky about deprecated job metadata fields
1 parent 8ed0d9a commit 0fd4574

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

openeo_driver/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.102.0a1"
1+
__version__ = "0.102.1a1"

openeo_driver/backend.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,16 @@ def from_api_dict(cls, d: dict) -> 'BatchJobMetadata':
321321

322322
usage = d.get("usage")
323323
if usage:
324+
# TODO #191 All these fields are deprecated in favor of general "usage" field
324325
if usage.get("cpu"):
325-
# TODO: support other units too
326-
assert usage["cpu"]["unit"] == "cpu-seconds"
327-
kwargs["cpu_time"] = timedelta(seconds=usage["cpu"]["value"])
326+
if usage["cpu"]["unit"] == "cpu-seconds":
327+
kwargs["cpu_time"] = timedelta(seconds=usage["cpu"]["value"])
328328
if usage.get("memory"):
329-
assert usage["memory"]["unit"] == "mb-seconds"
330-
kwargs["memory_time_megabyte"] = timedelta(seconds=usage["memory"]["value"])
329+
if usage["memory"]["unit"] == "mb-seconds":
330+
kwargs["memory_time_megabyte"] = timedelta(seconds=usage["memory"]["value"])
331331
if usage.get("duration"):
332-
assert usage["duration"]["unit"] == "seconds"
333-
kwargs["duration_"] = timedelta(seconds=usage["duration"]["value"])
332+
if usage["duration"]["unit"] == "seconds":
333+
kwargs["duration_"] = timedelta(seconds=usage["duration"]["value"])
334334

335335
return cls(**kwargs)
336336

0 commit comments

Comments
 (0)