Add support for energy v2 endpoint

Author: thomasddn

src/volvocarsapi/api.py

@@ -23,12 +23,14 @@
     VolvoCarsLocation,
     VolvoCarsValue,
     VolvoCarsValueField,
+    VolvoCarsValueStatusField,
     VolvoCarsVehicle,
 )
 from .util import redact_data, redact_url
 
 _API_CONNECTED_ENDPOINT = "/connected-vehicle/v2/vehicles"
 _API_ENERGY_ENDPOINT = "/energy/v1/vehicles"
+_API_ENERGY_V2_ENDPOINT = "/energy/v2/vehicles"
 _API_LOCATION_ENDPOINT = "/location/v1/vehicles"
 _API_URL = "https://api.volvocars.com"
 _API_STATUS_URL = "https://public-developer-portal-bff.weu-prod.ecpaz.volvocars.biz/api/v1/backend-status"
@@ -122,6 +124,23 @@ async def async_get_doors_status(self, vin: str = "") -> dict[str, VolvoCarsValu
         """
         return await self._async_get_field(_API_CONNECTED_ENDPOINT, "doors", vin)
 
+    async def async_get_energy_capabilities(self, vin: str = "") -> dict[str, Any]:
+        """Get energy state.
+
+        Required scopes: openid energy:capability:read
+        """
+        return await self._async_get_data_dict(_API_ENERGY_V2_ENDPOINT, "capabilities", vin, data_key="getEnergyState")
+
+    async def async_get_energy_state(self, vin: str = "") -> dict[str, VolvoCarsValueStatusField | None]:
+        """Get energy state.
+
+        Required scopes: openid energy:state:read
+        """
+        body = await self._async_get(_API_ENERGY_V2_ENDPOINT, "state", vin)
+        return {
+            key: VolvoCarsValueStatusField.from_dict(value) for key, value in body.items()
+        }
+
     async def async_get_engine_status(self, vin: str = "") -> dict[str, VolvoCarsValueField | None]:
         """Get engine status.
 
@@ -251,10 +270,10 @@ async def _async_get_field(
         }
 
     async def _async_get_data_dict(
-        self, endpoint: str, operation: str, vin: str = ""
+        self, endpoint: str, operation: str, vin: str = "", *, data_key: str = "data"
     ) -> dict[str, Any]:
         body = await self._async_get(endpoint, operation, vin)
-        return cast(dict[str, Any], body.get("data", {}))
+        return cast(dict[str, Any], body.get(data_key, {}))
 
     async def _async_get(self, endpoint: str, operation: str, vin: str = "") -> dict[str, Any]:
         url = self._create_vin_url(endpoint, operation, vin)

src/volvocarsapi/models.py

@@ -43,9 +43,9 @@ def from_dict(cls, data: dict[str, Any]) -> Self | None:
                 ):
                     # Recursive call for nested dataclasses
                     class_data[key] = param_type.from_dict(value)
-                elif key == "timestamp" and isinstance(value, str):
+                elif key in ("timestamp", "updatedAt") and isinstance(value, str):
                     if value:
-                        class_data[key] = datetime.fromisoformat(value)
+                        class_data["timestamp"] = datetime.fromisoformat(value)
                 else:
                     class_data[key] = value
             else:
@@ -116,6 +116,14 @@ class VolvoCarsValueField(VolvoCarsValue):
     unit: str | None = None
 
 
+@dataclass
+class VolvoCarsValueStatusField(VolvoCarsValueField):
+    """API value and status field model."""
+
+    value: Any = None
+    status: str | None = None
+
+
 @dataclass
 class VolvoCarsGeometry(VolvoCarsApiBaseModel):
     """API geometry model."""

src/volvocarsapi/scopes.py

@@ -31,6 +31,11 @@ class RestrictedScope(StrEnum):
     "conve:vehicle_relation",
     "conve:warnings",
     "conve:windows_status",
+    "energy:capability:read",
+    "energy:state:read"
+]
+
+DEPRECATED_SCOPES = [
     "energy:battery_charge_level",
     "energy:charging_connection_status",
     "energy:charging_current_limit",