Bump aiowatttime to 2024.6.0 (#181580)

homeassistant/components/watttime/config_flow.py

@@ -145,7 +145,7 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
 
         try:
             grid_region = await self._client.emissions.async_get_grid_region(
-                user_input[CONF_LATITUDE], user_input[CONF_LONGITUDE]
+                user_input[CONF_LATITUDE], user_input[CONF_LONGITUDE], "co2_moer"
             )
         except CoordinatesNotFoundError:
             return self.async_show_form(
@@ -168,8 +168,8 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
                 CONF_PASSWORD: self._data[CONF_PASSWORD],
                 CONF_LATITUDE: user_input[CONF_LATITUDE],
                 CONF_LONGITUDE: user_input[CONF_LONGITUDE],
-                CONF_BALANCING_AUTHORITY: grid_region["name"],
-                CONF_BALANCING_AUTHORITY_ABBREV: grid_region["abbrev"],
+                CONF_BALANCING_AUTHORITY: grid_region["region_full_name"],
+                CONF_BALANCING_AUTHORITY_ABBREV: grid_region["region"],
             },
         )
 

homeassistant/components/watttime/coordinator.py

@@ -4,23 +4,23 @@ from datetime import timedelta
 from typing import override
 
 from aiowatttime import Client
-from aiowatttime.emissions import RealTimeEmissionsResponseType
 from aiowatttime.errors import InvalidCredentialsError, WattTimeError
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import DOMAIN, LOGGER
+from .const import CONF_BALANCING_AUTHORITY_ABBREV, DOMAIN, LOGGER
 
 DEFAULT_UPDATE_INTERVAL = timedelta(minutes=5)
 
+type WattTimeData = dict[str, StateType]
 type WattTimeConfigEntry = ConfigEntry[WattTimeCoordinator]
 
 
-class WattTimeCoordinator(DataUpdateCoordinator[RealTimeEmissionsResponseType]):
+class WattTimeCoordinator(DataUpdateCoordinator[WattTimeData]):
     """Coordinator for WattTime data updates."""
 
     config_entry: WattTimeConfigEntry
@@ -42,12 +42,11 @@ class WattTimeCoordinator(DataUpdateCoordinator[RealTimeEmissionsResponseType]):
         self.client = client
 
     @override
-    async def _async_update_data(self) -> RealTimeEmissionsResponseType:
+    async def _async_update_data(self) -> WattTimeData:
         """Get the latest realtime emissions data."""
         try:
-            return await self.client.emissions.async_get_realtime_emissions(
-                self.config_entry.data[CONF_LATITUDE],
-                self.config_entry.data[CONF_LONGITUDE],
+            data = await self.client.emissions.async_get_realtime_emissions(
+                self.config_entry.data[CONF_BALANCING_AUTHORITY_ABBREV]
             )
         except InvalidCredentialsError as err:
             raise ConfigEntryAuthFailed("Invalid username/password") from err
@@ -55,3 +54,5 @@ class WattTimeCoordinator(DataUpdateCoordinator[RealTimeEmissionsResponseType]):
             raise UpdateFailed(
                 f"Error while requesting data from WattTime: {err}"
             ) from err
+
+        return {"percent": data["data"][0]["value"]}

homeassistant/components/watttime/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aiowatttime"],
-  "requirements": ["aiowatttime==0.1.1"]
+  "requirements": ["aiowatttime==2024.6.0"]
 }

homeassistant/components/watttime/sensor.py

@@ -1,7 +1,7 @@
 """Support for WattTime sensors."""
 
 from collections.abc import Mapping
-from typing import Any, cast, override
+from typing import Any, override
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -110,4 +110,4 @@ class RealtimeEmissionsSensor(CoordinatorEntity[WattTimeCoordinator], SensorEnti
     @override
     def native_value(self) -> StateType:
         """Return the value reported by the sensor."""
-        return cast(StateType, self.coordinator.data[self.entity_description.key])
+        return self.coordinator.data[self.entity_description.key]

requirements_all.txt

@@ -480,7 +480,7 @@ aiovodafone==3.3.2
 aiowaqi==3.1.0
 
 # homeassistant.components.watttime
-aiowatttime==0.1.1
+aiowatttime==2024.6.0
 
 # homeassistant.components.webdav
 aiowebdav2==0.6.2

tests/components/watttime/fixtures/grid_region_data.json

@@ -1,5 +1,5 @@
 {
-  "id": 263,
-  "abbrev": "PJM_NJ",
-  "name": "PJM New Jersey"
+  "region": "PJM_NJ",
+  "region_full_name": "PJM New Jersey",
+  "signal_type": "co2_moer"
 }

tests/components/watttime/fixtures/realtime_emissions_data.json

@@ -1,7 +1,11 @@
 {
-  "freq": "300",
-  "ba": "CAISO_NORTH",
-  "percent": "53",
-  "moer": "850.743982",
-  "point_time": "2019-01-29T14:55:00.00Z"
+  "data": [{ "point_time": "2024-06-18T18:40:00+00:00", "value": 96.0 }],
+  "meta": {
+    "data_point_period_seconds": 300,
+    "region": "PJM_NJ",
+    "signal_type": "co2_moer",
+    "units": "percentile",
+    "warnings": [],
+    "model": { "date": "2022-10-01" }
+  }
 }

tests/components/watttime/snapshots/test_diagnostics.ambr

@@ -2,11 +2,7 @@
 # name: test_entry_diagnostics
   dict({
     'data': dict({
-      'ba': 'CAISO_NORTH',
-      'freq': '300',
-      'moer': '850.743982',
-      'percent': '53',
-      'point_time': '2019-01-29T14:55:00.00Z',
+      'percent': 96.0,
     }),
     'entry': dict({
       'data': dict({