From e045eee901294c409e05eaa0e14c3e448baaddfa Mon Sep 17 00:00:00 2001 From: David Chang Date: Wed, 6 Mar 2024 16:16:38 +0800 Subject: [PATCH] ver Mar6thv2 updated read_cell_value --- desktop_env/evaluators/metrics/utils.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/desktop_env/evaluators/metrics/utils.py b/desktop_env/evaluators/metrics/utils.py index 4515cd5..a67b6bb 100644 --- a/desktop_env/evaluators/metrics/utils.py +++ b/desktop_env/evaluators/metrics/utils.py @@ -311,14 +311,15 @@ def read_cell_value(xlsx_file: str, sheet_name: str, coordinate: str) -> Any: , namespaces=_xlsx_ns_imapping ) logger.debug("%s.%s[%s]: %s", xlsx_file, sheet_name, coordinate, repr(cell)) - if "@t" not in cell["c"]: + try: + if "@t" not in cell["c"] or cell["c"]["@t"] == "n": + return float(cell["c"]["v"]) + if cell["c"]["@t"] == "s": + return shared_strs[int(cell["c"]["v"])] + if cell["c"]["@t"] == "str": + return cell["c"]["v"] + except ValueError: return None - if cell["c"]["@t"] == "s": - return shared_strs[int(cell["c"]["v"])] - if cell["c"]["@t"] == "n": - return float(cell["c"]["v"]) - if cell["c"]["@t"] == "str": - return cell["c"]["v"] # }}} read_cell_value #