From 95cd05f19aece801547082546cf2e9b908a7e575 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 11:15:27 +1300 Subject: [PATCH 1/6] fix: allow empty string from Argo for start and end dates TDE-1346 --- scripts/cli/cli_helper.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cli/cli_helper.py b/scripts/cli/cli_helper.py index 456b3198d..426d32422 100644 --- a/scripts/cli/cli_helper.py +++ b/scripts/cli/cli_helper.py @@ -80,7 +80,9 @@ def is_argo() -> bool: return bool(environ.get("ARGO_TEMPLATE")) -def valid_date(s: str) -> datetime: +def valid_date(s: str) -> datetime | None: + if not s: + return None try: return parse_rfc_3339_date(s) except ValueError as e: From 23f7308d5377a9a92db379bdfee4f58bb3260bba Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 11:47:14 +1300 Subject: [PATCH 2/6] wip: troubleshooting --- scripts/standardise_validate.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/standardise_validate.py b/scripts/standardise_validate.py index 7851ac8c6..5aa7bce2a 100644 --- a/scripts/standardise_validate.py +++ b/scripts/standardise_validate.py @@ -73,13 +73,13 @@ def parse_args() -> argparse.Namespace: "--start-datetime", dest="start_datetime", help="Start datetime in format YYYY-MM-DD. Only optional if includeDerived.", - type=valid_date, + # type=valid_date, ) parser.add_argument( "--end-datetime", dest="end_datetime", help="End datetime in format YYYY-MM-DD. Only optional if includeDerived.", - type=valid_date, + # type=valid_date, ) parser.add_argument("--target", dest="target", help="Target output", required=True) parser.add_argument( @@ -126,6 +126,7 @@ def report_non_visual_qa_errors(file: FileTiff) -> None: def main() -> None: arguments = parse_args() + print(arguments) standardising_config = StandardisingConfig( gdal_preset=arguments.preset, From 8e711001705a4bef06df2b14da17b64c1bef0c39 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 11:51:08 +1300 Subject: [PATCH 3/6] fix: remove unused import --- scripts/standardise_validate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/standardise_validate.py b/scripts/standardise_validate.py index 5aa7bce2a..c41227b95 100644 --- a/scripts/standardise_validate.py +++ b/scripts/standardise_validate.py @@ -6,7 +6,7 @@ from linz_logger import get_log -from scripts.cli.cli_helper import InputParameterError, is_argo, load_input_files, str_to_gsd, valid_date +from scripts.cli.cli_helper import InputParameterError, is_argo, load_input_files, str_to_gsd from scripts.datetimes import RFC_3339_DATETIME_FORMAT, format_rfc_3339_nz_midnight_datetime_string from scripts.files.file_tiff import FileTiff from scripts.files.files_helper import SUFFIX_JSON, ContentType From 836cf775a90b695b1f38db27b67e885bcba27b46 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 12:05:56 +1300 Subject: [PATCH 4/6] wip: troubleshooting --- scripts/datetimes.py | 2 +- scripts/standardise_validate.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/datetimes.py b/scripts/datetimes.py index f3f8a30b4..72b6dad6e 100644 --- a/scripts/datetimes.py +++ b/scripts/datetimes.py @@ -31,7 +31,7 @@ def format_rfc_3339_nz_midnight_datetime_string(datetime_object: datetime) -> st try: nz_datetime = parser.parse(naive_midnight_datetime_string).replace(tzinfo=nz_tz) except parser.ParserError as err: - raise Exception(f"Not a valid date: {err}") from err + raise Exception(f"Not a valid date FIXME: {err}") from err utc_tz = tz.gettz("UTC") datetime_utc = nz_datetime.astimezone(utc_tz) diff --git a/scripts/standardise_validate.py b/scripts/standardise_validate.py index c41227b95..76b67d7fd 100644 --- a/scripts/standardise_validate.py +++ b/scripts/standardise_validate.py @@ -73,13 +73,11 @@ def parse_args() -> argparse.Namespace: "--start-datetime", dest="start_datetime", help="Start datetime in format YYYY-MM-DD. Only optional if includeDerived.", - # type=valid_date, ) parser.add_argument( "--end-datetime", dest="end_datetime", help="End datetime in format YYYY-MM-DD. Only optional if includeDerived.", - # type=valid_date, ) parser.add_argument("--target", dest="target", help="Target output", required=True) parser.add_argument( @@ -126,7 +124,7 @@ def report_non_visual_qa_errors(file: FileTiff) -> None: def main() -> None: arguments = parse_args() - print(arguments) + print(arguments.start_datetime, arguments.end_datetime) standardising_config = StandardisingConfig( gdal_preset=arguments.preset, From 66f0d2b41834f3caa595bd2953b135af960b5f86 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 12:21:40 +1300 Subject: [PATCH 5/6] fix: date type --- scripts/cli/cli_helper.py | 1 + scripts/standardise_validate.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/cli/cli_helper.py b/scripts/cli/cli_helper.py index 426d32422..8dbce2117 100644 --- a/scripts/cli/cli_helper.py +++ b/scripts/cli/cli_helper.py @@ -81,6 +81,7 @@ def is_argo() -> bool: def valid_date(s: str) -> datetime | None: + print(s) if not s: return None try: diff --git a/scripts/standardise_validate.py b/scripts/standardise_validate.py index 76b67d7fd..c792ffd53 100644 --- a/scripts/standardise_validate.py +++ b/scripts/standardise_validate.py @@ -6,7 +6,7 @@ from linz_logger import get_log -from scripts.cli.cli_helper import InputParameterError, is_argo, load_input_files, str_to_gsd +from scripts.cli.cli_helper import InputParameterError, is_argo, load_input_files, str_to_gsd, valid_date from scripts.datetimes import RFC_3339_DATETIME_FORMAT, format_rfc_3339_nz_midnight_datetime_string from scripts.files.file_tiff import FileTiff from scripts.files.files_helper import SUFFIX_JSON, ContentType @@ -73,11 +73,13 @@ def parse_args() -> argparse.Namespace: "--start-datetime", dest="start_datetime", help="Start datetime in format YYYY-MM-DD. Only optional if includeDerived.", + type=valid_date, ) parser.add_argument( "--end-datetime", dest="end_datetime", help="End datetime in format YYYY-MM-DD. Only optional if includeDerived.", + type=valid_date, ) parser.add_argument("--target", dest="target", help="Target output", required=True) parser.add_argument( From 48a39eb5f51cc0c1bbd5d3093e41bedb14d08649 Mon Sep 17 00:00:00 2001 From: Alice Fage Date: Thu, 13 Feb 2025 13:32:58 +1300 Subject: [PATCH 6/6] wip: troubleshooting --- scripts/cli/cli_helper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/cli/cli_helper.py b/scripts/cli/cli_helper.py index 8dbce2117..a5b458174 100644 --- a/scripts/cli/cli_helper.py +++ b/scripts/cli/cli_helper.py @@ -81,13 +81,16 @@ def is_argo() -> bool: def valid_date(s: str) -> datetime | None: + print("before") print(s) + print("after") if not s: + print("inside if statement") return None try: return parse_rfc_3339_date(s) except ValueError as e: - msg = f"not a valid date: {s}" + msg = f"valid_date: not a valid date: {s}" raise argparse.ArgumentTypeError(msg) from e