update the benchmark fim_lookup query within fimserv

Author: supathdhitalGEO

src/fimserve/fimevaluation/fims_setup.py

@@ -19,9 +19,16 @@ class FIMService:
       Creates folders {CWD}/FIM_evaluation/FIM_inputs/HUC{huc}_flood{YYYYMMDD[HHMMSS]}
       Downloads ONLY the matched record(s) (and their gpkg) into that folder.
     """
-    _, _, out_root = setup_directories()
-    default_root = out_root
-    owp_root = Path(os.getenv("OWP_OUT_ROOT", default_root))
+    # Run setup_directories() only when actually needed.
+    def _ensure_roots(self):
+        if hasattr(self, "_roots_initialized"):
+            return
+
+        _, _, out_root = setup_directories()
+        self.default_root = out_root
+        self.owp_root = Path(os.getenv("OWP_OUT_ROOT", out_root))
+
+        self._roots_initialized = True
 
     def availability(self, HUCID: str) -> str:
         from .utilis import availability as _avail
@@ -110,6 +117,8 @@ def process(
             relaxed_for_print=False,
         )
 
+        self._ensure_roots()
+
         # If strict match missing but filename given → fallback to filename-based lookup
         if not strict_matches:
             if file_name:
@@ -386,6 +395,8 @@ def _generate_owp(self, huc8: str, user_dt: str) -> Optional[Path]:
         - Skip running if the target file (or any-hour for day-only) already exists.
         - After running, return the produced path (exact hour if known; else first match for the day).
         """
+        self._ensure_roots()
+        
         ymd, timestr = self._ymd_timestr_from_user(user_dt)
 
         # Skip if already there

src/fimserve/fimevaluation/utilis.py

@@ -70,7 +70,7 @@ def _record_day(rec: Dict[str, Any]) -> Optional[dt.date]:
             return dt.date.fromisoformat(ymd)
         except Exception:
             pass
-    raw = rec.get("date_raw")
+    raw = rec.get("date_of_flood")
     if isinstance(raw, str) and len(raw) >= 8:
         try:
             return dt.datetime.strptime(raw[:8], "%Y%m%d").date()
@@ -79,7 +79,7 @@ def _record_day(rec: Dict[str, Any]) -> Optional[dt.date]:
     return None
 
 def _record_hour_or_none(rec: Dict[str, Any]) -> Optional[int]:
-    raw = rec.get("date_raw")
+    raw = rec.get("date_of_flood")
     if isinstance(raw, str) and "T" in raw and len(raw) >= 11:
         try:
             return int(raw.split("T", 1)[1][:2])
@@ -89,7 +89,7 @@ def _record_hour_or_none(rec: Dict[str, Any]) -> Optional[int]:
 
 # Printing helpers
 def _pretty_date_for_print(rec: Dict[str, Any]) -> str:
-    raw = rec.get("date_raw")
+    raw = rec.get("date_of_flood")
     if isinstance(raw, str) and "T" in raw and len(raw) >= 11:
         return f"{raw[:4]}-{raw[4:6]}-{raw[6:8]}T{raw.split('T',1)[1][:2]}"
     ymd = rec.get("date_ymd")
@@ -238,7 +238,7 @@ def find_fims(
             if d1 and r_day > d1:
                 continue
             out.append(r)
-        out.sort(key=lambda x: (str(x.get("date_raw", "")), str(x.get("file_name", ""))))
+        out.sort(key=lambda x: (str(x.get("date_of_flood", "")), str(x.get("file_name", ""))))
         return out
 
     if date_input and _to_hour_or_none(date_input) is None:
@@ -248,7 +248,7 @@ def find_fims(
             r_day = _record_day(r)
             if r_day == target_day:
                 out.append(r)
-        out.sort(key=lambda x: (str(x.get("date_raw", "")), str(x.get("file_name", ""))))
+        out.sort(key=lambda x: (str(x.get("date_of_flood", "")), str(x.get("file_name", ""))))
         return out
 
     return find_fims(
@@ -269,7 +269,7 @@ def summarize_huc_availability(records: List[Dict[str, Any]], huc8: str) -> str:
 
     with_raw = []
     for r in recs:
-        raw = r.get("date_raw")
+        raw = r.get("date_of_flood")
         if isinstance(raw, str) and (len(raw) == 8 or ("T" in raw and len(raw) >= 11)):
             with_raw.append(r)
 

tests/test_evalutionhandfim.py

@@ -5,8 +5,8 @@
 def test_bm_fimlookup():
     out = fm.fim_lookup(
         HUCID="10170203",
-        # date_input="2019-09-19 16:00:00", #If user is more specific then they can pass date (with hour if known) along with HUC8
-        run_handfim=True,  #It will look for the owp hand fim for the mentioned HUC8 and date, if not found it will download and generate the owp hand fim
+        date_input="2019-09-19 16:00:00", #If user is more specific then they can pass date (with hour if known) along with HUC8
+        # run_handfim=True,  #It will look for the owp hand fim for the mentioned HUC8 and date, if not found it will download and generate the owp hand fim
         # file_name="PSS_1_0m_20190919T165541_963659W424518N_BM.tif", #If user pass the specific filename, it will download that and assume that this is the right benchmark, else based on exact match of date it will look for the benchmark
         # start_date="2024-06-20", #If user is not sure of the exact date then they can pass a range of dates
         # end_date="2024-06-25",