Try adding a custom TIME_PARSER (and make it easier to change the tim…

…e format in _get_timeinfo)
ACCESS-NRI · Feb 25, 2025 · 0260ec5 · 0260ec5
1 parent daee934
commit 0260ec5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/access_nri_intake/source/builders.py b/src/access_nri_intake/source/builders.py
@@ -17,6 +17,7 @@
     EmptyFileError,
     GenericTimeParser,
     GfdlTimeParser,
+    ROMSTimeParser,
     _NCFileInfo,
     _VarInfo,
 )
@@ -655,6 +656,7 @@ class ROMSBuilder(BaseBuilder):
     PATTERNS = [
         rf"^roms_his_({PATTERNS_HELPERS['counter']}).*?$",
     ]
+    TIME_PARSER = ROMSTimeParser
 
     def __init__(self, path, **kwargs):
         """

diff --git a/src/access_nri_intake/source/utils.py b/src/access_nri_intake/source/utils.py
@@ -97,6 +97,8 @@ class GenericTimeParser:
     Generic time parser
     """
 
+    TIMEINFO_TIME_FORMAT = "%Y-%m-%d, %H:%M:%S"
+
     def __init__(self, ds: xr.Dataset, filename_frequency: str | None, time_dim: str):
         """
         Parameters
@@ -201,7 +203,6 @@ def _get_timeinfo(self) -> tuple[str, str, str]:
         def _todate(t):
             return cftime.num2date(t, time_var.units, calendar=time_var.calendar)
 
-        time_format = "%Y-%m-%d, %H:%M:%S"
         ts = None
         te = None
         frequency: str | tuple[int | None, str] = FREQUENCY_STATIC
@@ -263,12 +264,12 @@ def _todate(t):
         if ts is None:
             start_date = "none"
         else:
-            start_date = ts.strftime(time_format)
+            start_date = ts.strftime(self.TIMEINFO_TIME_FORMAT)
 
         if te is None:
             end_date = "none"
         else:
-            end_date = te.strftime(time_format)
+            end_date = te.strftime(self.TIMEINFO_TIME_FORMAT)
 
         if frequency[0]:
             frequency = f"{str(frequency[0])}{frequency[1]}"
@@ -286,6 +287,9 @@ class AccessTimeParser(GenericTimeParser):
 
 
 class GfdlTimeParser(GenericTimeParser):
+
+    TIMEINFO_TIME_FORMAT = "%Y-%m-%d, %H:%M:%S"
+
     def __init__(self, ds: xr.Dataset, filename_frequency: str | None, time_dim: str):
         self.ds = ds
         self.filename_frequency = filename_frequency
@@ -328,7 +332,6 @@ def _get_timeinfo(self) -> tuple[str, str, str]:
         def _todate(t):
             return cftime.num2date(t, time_var.units, calendar=time_var.calendar)
 
-        time_format = "%Y-%m-%d, %H:%M:%S"
         ts = None
         te = None
         frequency: str | tuple[int | None, str] = FREQUENCY_STATIC
@@ -380,12 +383,12 @@ def _todate(t):
         if ts is None:
             start_date = "none"
         else:
-            start_date = ts.strftime(time_format)
+            start_date = ts.strftime(self.TIMEINFO_TIME_FORMAT)
 
         if te is None:
             end_date = "none"
         else:
-            end_date = te.strftime(time_format)
+            end_date = te.strftime(self.TIMEINFO_TIME_FORMAT)
 
         if frequency[0]:
             frequency = f"{str(frequency[0])}{frequency[1]}"
@@ -396,3 +399,8 @@ def _todate(t):
 
     def __call__(self) -> tuple[str, str, str]:
         return self._get_timeinfo()
+
+
+class ROMSTimeParser(GenericTimeParser):
+
+    TIMEINFO_TIME_FORMAT = "%Y-%m-%d %H:%M:%S"