Align path naming with buildstock output conventions in utils/tests

Author: sherryzuo

tests/test_cohort_builder.py

@@ -92,7 +92,7 @@ def test_get_load_curve_dir(self):
 
     def test_find_load_curve_file_expected_path(self):
         with patch("pathlib.Path.exists", return_value=True):
-            load_curve_dir = Path("/data/resstock/load_curve_15min")
+            load_curve_dir = Path("/data/resstock/load_curve_hourly")
             result = find_load_curve_file(
                 load_curve_dir=load_curve_dir,
                 bldg_id=12345,
@@ -105,7 +105,7 @@ def test_find_load_curve_file_expected_path(self):
     def test_find_load_curve_file_returns_none_when_missing(self):
         with patch("pathlib.Path.exists", return_value=False):
             with patch("pathlib.Path.rglob", return_value=[]):
-                load_curve_dir = Path("/data/resstock/load_curve_15min")
+                load_curve_dir = Path("/data/resstock/load_curve_hourly")
                 result = find_load_curve_file(
                     load_curve_dir=load_curve_dir,
                     bldg_id=99999,

utils/buildstock_io.py

@@ -81,7 +81,7 @@ def find_load_curve_file(
     """Find the load curve parquet file for a specific building/upgrade.
 
     buildstock-fetch writes:
-      load_curve_15min/state={STATE}/upgrade={ID}/<bldg_id>-<ID>.parquet
+      load_curve_*/*state={STATE}/upgrade={ID}/<bldg_id>-<ID>.parquet
     where <ID> may appear zero-padded or not. We check common variants before
     falling back to a glob search.
     """

utils/resstock_cumulative_adoption.py

@@ -68,13 +68,13 @@ def fetch_baseline_and_upgrade_data(
 
     baseline_paths, baseline_failed = fetch_bldg_data(
         bldg_ids=baseline_ids,
-        file_type=("metadata", "load_curve_15min"),
+        file_type=("metadata", "load_curve_hourly"),
         output_dir=output_dir,
         max_workers=max_workers,
     )
     hp_paths, hp_failed = fetch_bldg_data(
         bldg_ids=hp_ids,
-        file_type=("metadata", "load_curve_15min"),
+        file_type=("metadata", "load_curve_hourly"),
         output_dir=output_dir,
         max_workers=max_workers,
     )