Calculate Rider 18 export from rate card

Author: javaDevJT

custom_components/dte_rates/__init__.py

@@ -122,13 +122,9 @@ async def _handle_show_schedule_service(call) -> None:
 
         lines_by_season: dict[str, list[str]] = defaultdict(list)
         net_metering = entry.data.get(CONF_NET_METERING, False) if entry else False
-        rider18_rates = getattr(coordinator.data, "rider18_export_rates", {})
         for period in sorted(rate.periods, key=lambda p: (p.season_name, p.period_name)):
             import_usd = float(current_import_rate_cents(period) / 100)
-            rider18_export_cents = None
-            if not net_metering:
-                rider18_export_cents = rider18_rates.get(rate.code, {}).get((period.season_name, period.period_name))
-            export_usd = float(current_export_rate_cents(period, net_metering, rider18_export_cents) / 100)
+            export_usd = float(current_export_rate_cents(period, net_metering) / 100)
             lines_by_season[period.season_name].append(
                 f"{period_display_name(period)}: Import ${import_usd:.4f}/kWh | Export ${export_usd:.4f}/kWh"
             )

custom_components/dte_rates/config_flow.py

@@ -6,7 +6,6 @@
 
 from .const import CONF_NET_METERING, CONF_SELECTED_RATE, DOMAIN
 from .coordinator import DteRateCoordinator
-from .models import ParsedRateCard
 
 
 class DteRatesConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -45,13 +44,5 @@ async def async_step_user(self, user_input: dict | None = None) -> FlowResult:
         )
 
 
-def _rider18_status(rate_card: ParsedRateCard) -> str:
-    count = len(rate_card.rider18_export_rates)
-    if count:
-        suffix = "rate plan" if count == 1 else "rate plans"
-        return f"Rider 18 export credits loaded for {count} {suffix}."
-
-    if rate_card.rider18_source_url:
-        return "Rider 18 calculator loaded, but no export credits matched the parsed rate plans."
-
-    return "Rider 18 export credits are not loaded; non-net-metering exports will fall back to PDF generation-only pricing."
+def _rider18_status(_rate_card) -> str:
+    return "Rider 18 export credits are calculated from the parsed rate card as Generation + Distribution/Transmission."

custom_components/dte_rates/const.py

@@ -6,10 +6,6 @@
     "residential/Service-Request/pricing/residential-pricing-options/"
     "ResidentialElectricRateCard.pdf"
 )
-RIDER18_CALCULATOR_URL = (
-    "https://www.dteenergy.com/content/dam/dteenergy/deg/website/"
-    "hybris/rooftop-solar/Rider18Calculator.xlsx"
-)
 
 UPDATE_INTERVAL = timedelta(days=7)
 
@@ -23,7 +19,6 @@
 ATTR_COMPONENTS = "components"
 ATTR_MONTHLY_COMPONENTS = "monthly_components"
 ATTR_SOURCE_URL = "source_url"
-ATTR_RIDER18_SOURCE_URL = "rider18_source_url"
 ATTR_RIDER18_EXPORT_AVAILABLE = "rider18_export_available"
 ATTR_EXPORT_RATE_SOURCE = "export_rate_source"
 ATTR_EXPORT_RATE_WARNING = "export_rate_warning"

custom_components/dte_rates/coordinator.py

@@ -7,10 +7,9 @@
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import RATE_CARD_URL, RIDER18_CALCULATOR_URL, UPDATE_INTERVAL
+from .const import RATE_CARD_URL, UPDATE_INTERVAL
 from .models import ParsedRateCard
 from .pdf_parser import parse_rate_card_pdf
-from .rider18_parser import parse_rider18_xlsx
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,39 +33,11 @@ async def _async_update_data(self) -> ParsedRateCard:
         except Exception as err:
             raise UpdateFailed(f"Failed downloading DTE rate card: {err}") from err
 
-        rider18_bytes: bytes | None = None
         try:
-            async with session.get(RIDER18_CALCULATOR_URL, timeout=60) as resp:
-                resp.raise_for_status()
-                rider18_bytes = await resp.read()
-        except Exception as err:
-            _LOGGER.warning(
-                "Failed downloading DTE Rider 18 calculator; export rates will fall back to generation-only values: %s",
-                err,
-            )
-
-        try:
-            parsed = await self.hass.async_add_executor_job(
+            return await self.hass.async_add_executor_job(
                 parse_rate_card_pdf,
                 pdf_bytes,
                 RATE_CARD_URL,
             )
         except Exception as err:
             raise UpdateFailed(f"Failed parsing DTE rate card: {err}") from err
-
-        if rider18_bytes is None:
-            return parsed
-
-        try:
-            parsed.rider18_export_rates = await self.hass.async_add_executor_job(
-                parse_rider18_xlsx,
-                rider18_bytes,
-            )
-            parsed.rider18_source_url = RIDER18_CALCULATOR_URL
-        except Exception as err:
-            _LOGGER.warning(
-                "Failed parsing DTE Rider 18 calculator; export rates will fall back to generation-only values: %s",
-                err,
-            )
-
-        return parsed

custom_components/dte_rates/models.py

@@ -50,5 +50,3 @@ class ParsedRateCard:
     effective_date: str | None
     rates: dict[str, RatePlan]
     raw_text_hash: str
-    rider18_source_url: str | None = None
-    rider18_export_rates: dict[str, dict[tuple[str, str], Decimal]] = field(default_factory=dict)

custom_components/dte_rates/rate_calculator.py

@@ -7,6 +7,7 @@
 
 
 GENERATION_COMPONENT_MARKERS = ("capacity_energy", "non_capacity_energy")
+DISTRIBUTION_TRANSMISSION_COMPONENT_MARKERS = ("distribution", "transmission")
 
 
 def _is_hour_in_range(start_hour: int, end_hour: int, hour: int) -> bool:
@@ -65,22 +66,37 @@ def current_import_rate_cents(period: SeasonalPeriodRate) -> Decimal:
     return period.components.per_kwh_total
 
 
-def current_export_rate_cents(
-    period: SeasonalPeriodRate,
-    net_metering: bool,
-    rider18_export_cents: Decimal | None = None,
-) -> Decimal:
+def _component_total(period: SeasonalPeriodRate, markers: tuple[str, ...]) -> Decimal:
+    total = Decimal("0")
+    for key, value in period.components.per_kwh.items():
+        if any(marker in key for marker in markers):
+            total += value
+    return total
+
+
+def _has_component(period: SeasonalPeriodRate, markers: tuple[str, ...]) -> bool:
+    return any(any(marker in key for marker in markers) for key in period.components.per_kwh)
+
+
+def rider18_export_rate_cents(period: SeasonalPeriodRate) -> Decimal:
+    return _component_total(period, GENERATION_COMPONENT_MARKERS) + _component_total(
+        period,
+        DISTRIBUTION_TRANSMISSION_COMPONENT_MARKERS,
+    )
+
+
+def rider18_export_formula_available(period: SeasonalPeriodRate) -> bool:
+    return _has_component(period, GENERATION_COMPONENT_MARKERS) and _has_component(
+        period,
+        DISTRIBUTION_TRANSMISSION_COMPONENT_MARKERS,
+    )
+
+
+def current_export_rate_cents(period: SeasonalPeriodRate, net_metering: bool) -> Decimal:
     if net_metering:
         return period.components.per_kwh_total
 
-    if rider18_export_cents is not None:
-        return rider18_export_cents
-
-    generation_only = Decimal("0")
-    for key, value in period.components.per_kwh.items():
-        if any(marker in key for marker in GENERATION_COMPONENT_MARKERS):
-            generation_only += value
-    return generation_only
+    return rider18_export_rate_cents(period)
 
 
 def period_display_name(period: SeasonalPeriodRate) -> str: