fwi key logic

bcgov · Oct 24, 2024 · 20de630 · 20de630
1 parent 4cd212d
commit 20de630
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/api/app/sfms/date_range_processor.py b/api/app/sfms/date_range_processor.py
@@ -48,20 +48,18 @@ async def process_bui(self):
                     logging.warning(f"No weather keys found for {model_run_for_hour(self.start_datetime.hour):02} model run")
                     break
 
-                dc_key = raster_addresser.get_uploaded_index_key(previous_fwi_datetime, FWIParameter.DC)
-                dmc_key = raster_addresser.get_uploaded_index_key(previous_fwi_datetime, FWIParameter.DMC)
-
-                fwi_keys_exist = await all_objects_exist(dc_key, dmc_key)
-
-                if not fwi_keys_exist:
+                if day == 0:  # if we're running the first day of the calculation, use previously uploaded actuals
+                    dc_key = raster_addresser.get_uploaded_index_key(previous_fwi_datetime, FWIParameter.DC)
+                    dmc_key = raster_addresser.get_uploaded_index_key(previous_fwi_datetime, FWIParameter.DMC)
+                else:  # otherwise use the last calculated key
                     dc_key = raster_addresser.get_calculated_index_key(previous_fwi_datetime, FWIParameter.DC)
                     dmc_key = raster_addresser.get_calculated_index_key(previous_fwi_datetime, FWIParameter.DMC)
 
-                    fwi_keys_exist = await all_objects_exist(dc_key, dmc_key)
+                fwi_keys_exist = await all_objects_exist(dc_key, dmc_key)
 
-                    if not fwi_keys_exist:
-                        logging.warning(f"No previous DMC/DC keys found for {previous_fwi_datetime.date().isoformat()}")
-                        break
+                if not fwi_keys_exist:
+                    logging.warning(f"No previous DMC/DC keys found for {previous_fwi_datetime.date().isoformat()}")
+                    break
 
                 temp_key, rh_key, precip_key = raster_addresser.gdal_prefix_keys(temp_key, rh_key, precip_key)
                 dc_key, dmc_key = raster_addresser.gdal_prefix_keys(dc_key, dmc_key)