Remove R/rpy2 dependency; replace with cffdrs_py

backend/packages/wps-api/Dockerfile

@@ -12,12 +12,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update
 RUN apt-get -y install unixodbc-dev libgdal-dev libudunits2-dev
 
-# Install R
-RUN apt-get update --fix-missing && apt-get -y install r-base
-
-# Install cffdrs
-RUN R -e "install.packages('cffdrs')"
-
 # Install other dependencies
 RUN apt-get -y install git build-essential python3 python3-dev python3-pip curl vim
 

backend/packages/wps-api/pyproject.toml

@@ -27,7 +27,6 @@ dependencies = [
     "jinja2>=3,<4",
     "numpy==2.3.*",
     "aiobotocore==2.15.1",
-    "rpy2>=3.4.5,<4",
     "redis>=7.0.0,<8",
     "pyjnius>=1.3.0,<2",
     "hiredis>=3.0.0,<4",

backend/packages/wps-api/src/app/auto_spatial_advisory/critical_hours.py

@@ -233,7 +233,7 @@ def calculate_critical_hours_for_station_by_fuel_type(
         pdf=percentage_dead_balsam_fir,
         cbh=crown_base_height,
     )
-    cfb = calculate_cfb(fuel_type, fmc, sfc, ros, crown_base_height)
+    cfb = calculate_cfb(fuel_type, fmc, sfc, ros, crown_base_height, isi=isi, bui=bui)
 
     critical_hours = get_critical_hours(
         4000,

backend/packages/wps-api/src/app/fire_behaviour/advisory.py

@@ -147,13 +147,13 @@ def calculate_fire_behaviour_advisory(
         pdf=station.percentage_dead_balsam_fir,
         cbh=station.crown_base_height,
     )
-    cfb = calculate_cfb(station.fuel_type, fmc, sfc, ros, station.crown_base_height)
+    cfb = calculate_cfb(station.fuel_type, fmc, sfc, ros, station.crown_base_height, isi=station.isi, bui=station.bui)
 
     # Calculate rate of spread assuming 60 minutes since ignition.
     ros_t = cffdrs.rate_of_spread_t(
         fuel_type=station.fuel_type, ros_eq=ros, minutes_since_ignition=60, cfb=cfb
     )
-    cfb_t = calculate_cfb(station.fuel_type, fmc, sfc, ros_t, station.crown_base_height)
+    cfb_t = calculate_cfb(station.fuel_type, fmc, sfc, ros_t, station.crown_base_height, isi=station.isi, bui=station.bui)
 
     # Get the default crown fuel load, if none specified.
     if station.crown_fuel_load is None: