Drop get_charging_settings from RenaultVehicle (#1556)

Author: epenet

src/renault_api/cli/charge/schedule.py

@@ -2,6 +2,7 @@
 
 import re
 from typing import Any
+from typing import cast
 
 import aiohttp
 import click
@@ -12,6 +13,8 @@
 from renault_api.kamereon.helpers import DAYS_OF_WEEK
 from renault_api.kamereon.models import ChargeDaySchedule
 from renault_api.kamereon.models import ChargeSchedule
+from renault_api.kamereon.models import KamereonVehicleChargingSettingsData
+from renault_api.kamereon.schemas import KamereonVehicleChargingSettingsDataSchema
 from renault_api.renault_vehicle import RenaultVehicle
 
 _DAY_SCHEDULE_REGEX = re.compile(
@@ -44,13 +47,16 @@ async def show(
     vehicle = await renault_vehicle.get_vehicle(
         websession=websession, ctx_data=ctx_data
     )
-    response = await vehicle.get_charge_schedule()
+    full_endpoint = await vehicle.get_full_endpoint("charge-schedule")
+    response = await vehicle.http_get(full_endpoint)
+    if "data" in response.raw_data and "attributes" in response.raw_data["data"]:
+        _show_basic(response.raw_data["data"]["attributes"])
+    else:
+        _show_alternate(response.raw_data)
 
-    # Display mode
-    if "chargeModeRq" in response:
-        _show_alternate(response)
-        return
 
+def _show_basic(response: dict[str, Any]) -> None:
+    """Display charge schedules (basic)."""
     calendar = response["calendar"]
     schedule_table: list[list[str]] = []
     for day in DAYS_OF_WEEK:
@@ -111,7 +117,11 @@ async def _get_schedule(
     vehicle = await renault_vehicle.get_vehicle(
         websession=websession, ctx_data=ctx_data
     )
-    response = await vehicle.get_charging_settings()
+    response_data = await vehicle._get_vehicle_data("charging-settings")
+    response = cast(
+        KamereonVehicleChargingSettingsData,
+        response_data.get_attributes(KamereonVehicleChargingSettingsDataSchema),
+    )
 
     if not response.schedules:
         raise ValueError("No schedules found.")

src/renault_api/renault_vehicle.py

@@ -231,22 +231,6 @@ async def get_res_state(self) -> models.KamereonVehicleResStateData:
             response.get_attributes(schemas.KamereonVehicleResStateDataSchema),
         )
 
-    async def get_charging_settings(self) -> models.KamereonVehicleChargingSettingsData:
-        """Get vehicle charging settings."""
-        response = await self._get_vehicle_data("charging-settings")
-        return cast(
-            models.KamereonVehicleChargingSettingsData,
-            response.get_attributes(schemas.KamereonVehicleChargingSettingsDataSchema),
-        )
-
-    async def get_charge_schedule(self) -> dict[str, Any]:
-        """Get vehicle charging schedule."""
-        full_endpoint = await self.get_full_endpoint("charge-schedule")
-        response = await self.http_get(full_endpoint)
-        if "data" in response.raw_data and "attributes" in response.raw_data["data"]:
-            return response.raw_data["data"]["attributes"]  # type:ignore[no-any-return]
-        return response.raw_data
-
     async def get_notification_settings(
         self,
     ) -> models.KamereonVehicleNotificationSettingsData:

tests/__snapshots__/test_renault_vehicle.ambr

@@ -1,86 +1,4 @@
 # serializer version: 1
-# name: test_get_charge_schedule
-  dict({
-    'calendar': dict({
-      'friday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'monday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'saturday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'sunday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'thursday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'tuesday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-      'wednesday': list([
-        dict({
-          'activationState': False,
-          'duration': 480,
-          'startTime': '2300',
-        }),
-      ]),
-    }),
-  })
-# ---
-# name: test_get_charge_schedule_alternate
-  dict({
-    'chargeDuration': 9000,
-    'chargeModeRq': 'SCHEDULED',
-    'chargeTimeStart': '00:00',
-    'delegatedActivated': False,
-    'lastSettingsUpdateTimestamp': '2025-04-24T12:17:12.247Z',
-    'preconditioningHeatedLeftSeat': False,
-    'preconditioningHeatedRightSeat': False,
-    'preconditioningHeatedStrgWheel': False,
-    'preconditioningTemperature': 20.0,
-    'programs': list([
-      dict({
-        'programActivationFriday': True,
-        'programActivationMonday': True,
-        'programActivationSaturday': True,
-        'programActivationStatus': True,
-        'programActivationSunday': True,
-        'programActivationThursday': True,
-        'programActivationTuesday': True,
-        'programActivationWednesday': True,
-        'programDepartureTime': '02:00',
-        'programType': 'CHARGE_AND_PRECONDITIONING',
-      }),
-    ]),
-  })
-# ---
 # name: test_get_endpoints[tests/fixtures/kamereon/vehicles/captur_ii.1.json]
   dict({
     'hvac-status': None,

tests/test_renault_vehicle.py

@@ -188,36 +188,6 @@ async def test_get_lock_status(
     assert await vehicle.get_lock_status()
 
 
-@pytest.mark.asyncio
-async def test_get_charging_settings(
-    vehicle: RenaultVehicle, mocked_responses: aioresponses
-) -> None:
-    """Test get_charging_settings."""
-    fixtures.inject_get_vehicle_details(mocked_responses, "zoe_50.1.json")
-    fixtures.inject_get_charging_settings(mocked_responses, "multi")
-    assert await vehicle.get_charging_settings()
-
-
-@pytest.mark.asyncio
-async def test_get_charge_schedule(
-    vehicle: RenaultVehicle, mocked_responses: aioresponses, snapshot: SnapshotAssertion
-) -> None:
-    """Test get_charging_settings."""
-    fixtures.inject_get_vehicle_details(mocked_responses, "zoe_50.1.json")
-    fixtures.inject_get_charge_schedule(mocked_responses, "single")
-    assert await vehicle.get_charge_schedule() == snapshot
-
-
-@pytest.mark.asyncio
-async def test_get_charge_schedule_alternate(
-    vehicle: RenaultVehicle, mocked_responses: aioresponses, snapshot: SnapshotAssertion
-) -> None:
-    """Test get_charging_settings."""
-    fixtures.inject_get_vehicle_details(mocked_responses, "renault_5.1.json")
-    fixtures.inject_get_ev_settings(mocked_responses, "single")
-    assert await vehicle.get_charge_schedule() == snapshot
-
-
 @pytest.mark.asyncio
 async def test_get_notification_settings(
     vehicle: RenaultVehicle, mocked_responses: aioresponses