77from .constants import Model , Theme
88
99FILE_NAME_REGEX = re .compile (
10- r"(?P<valid_time >[^-]+)-(?P<forecast_horizon>[^-]+)-(?P<parameter>.+)\.nc"
10+ r"(?P<reference_datetime >[^-]+)-(?P<forecast_horizon>[^-]+)-(?P<parameter>.+)\.nc"
1111)
1212
1313
@@ -18,7 +18,6 @@ class Href:
1818 theme : Theme
1919 parameter : str
2020 reference_datetime : str
21- valid_time : str
2221 forecast_horizon : str
2322
2423 @classmethod
@@ -28,7 +27,7 @@ def parse(
2827 """Parse a Met Office deterministic forecast href into an Href object.
2928
3029 Parses hrefs in the format:
31- [scheme://bucket/]collection/reference_datetime/valid_time -forecast_horizon-parameter.nc
30+ [scheme://bucket/]collection/reference_datetime/reference_datetime -forecast_horizon-parameter.nc
3231
3332 The model and theme are automatically extracted from the collection name and
3433 parameter, but can be overridden with the optional parameters.
@@ -70,7 +69,6 @@ def parse(
7069 theme = theme ,
7170 parameter = parameter ,
7271 reference_datetime = parts [- 2 ],
73- valid_time = matched_dict ["valid_time" ],
7472 forecast_horizon = matched_dict ["forecast_horizon" ],
7573 )
7674
@@ -90,7 +88,7 @@ def item_id(self) -> str:
9088 Returns:
9189 The item ID string combining valid time and forecast horizon.
9290 """
93- return f"{ self .valid_time } -{ self .forecast_horizon } "
91+ return f"{ self .reference_datetime } -{ self .forecast_horizon } "
9492
9593 @property
9694 def datetime (self ) -> datetime .datetime :
@@ -99,7 +97,7 @@ def datetime(self) -> datetime.datetime:
9997 Returns:
10098 A datetime object parsed from the valid time.
10199 """
102- return datetime .datetime .strptime (self .valid_time , "%Y%m%dT%H%MZ" )
100+ return datetime .datetime .strptime (self .reference_datetime , "%Y%m%dT%H%MZ" )
103101
104102 @property
105103 def duration (self ) -> str | None :
0 commit comments