renault-api 0.6.0__tar.gz → 0.6.2__tar.gz

{renault_api-0.6.0 → renault_api-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: renault-api
-Version: 0.6.0
+Version: 0.6.2
 Summary: Renault API
 Author: epenet
 License-Expression: MIT

{renault_api-0.6.0 → renault_api-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "renault-api"
-version = "0.6.0"
+version = "0.6.2"
 description = "Renault API"
 license = "MIT"
 license-files = ["LICENSE.rst"]
@@ -40,25 +40,25 @@ Changelog = "https://github.com/hacf-fr/renault-api/releases"
 
 [dependency-groups]
 dev = [
-    "aiointercept==0.1.12",
+    "aiointercept==1.0.0",
     "codespell==2.4.3",
     "covdefaults==2.3.0",
-    "coverage[toml]==7.16.2",
+    "coverage[toml]==7.17.0",
     "pre-commit-hooks==6.0.0",
-    "prek==0.5.5",
+    "prek==0.5.7",
     "pytest==9.1.1",
-    "pytest-asyncio==1.4.0",
+    "pytest-asyncio==1.4.1",
     "pytest-cov==7.1.0",
-    "ruff==0.17.0",
+    "ruff==0.17.2",
     "syrupy==6.1.1",
-    "ty==0.0.85",
+    "ty==0.0.92",
     "yamllint==1.38.0",
-    "zizmor==1.30.1",
+    "zizmor==1.31.1",
 ]
 docs = [
     "furo==2025.12.19; python_version >= '3.14'",
     "myst-parser==5.1.0; python_version >= '3.14'",
-    "sphinx==9.1.0; python_version >= '3.14'",
+    "sphinx==9.2.0; python_version >= '3.14'",
     "sphinx-autobuild==2025.8.25; python_version >= '3.14'",
     "sphinx-click==6.2.0; python_version >= '3.14'",
 ]

{renault_api-0.6.0 → renault_api-0.6.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "renault-api"
-version = "0.6.0"
+version = "0.6.2"
 description = "Renault API"
 authors = [{ name = "epenet" }]
 license = "MIT"
@@ -40,26 +40,26 @@ Changelog = "https://github.com/hacf-fr/renault-api/releases"
 
 [dependency-groups]
 dev = [
-    "aiointercept==0.1.12",
+    "aiointercept==1.0.0",
     "codespell==2.4.3",
     "covdefaults==2.3.0",
-    "coverage[toml]==7.16.2",
+    "coverage[toml]==7.17.0",
     "pre-commit-hooks==6.0.0",
-    "prek==0.5.5",
+    "prek==0.5.7",
     "pytest==9.1.1",
-    "pytest-asyncio==1.4.0",
+    "pytest-asyncio==1.4.1",
     "pytest-cov==7.1.0",
-    "ruff==0.17.0",
+    "ruff==0.17.2",
     "syrupy==6.1.1",
-    "ty==0.0.85",
+    "ty==0.0.92",
     "yamllint==1.38.0",
-    "zizmor==1.30.1",
+    "zizmor==1.31.1",
 ]
 # docs (Python >= 3.14)
 docs = [
     "furo==2025.12.19; python_version >= '3.14'",
     "myst-parser==5.1.0; python_version >= '3.14'",
-    "sphinx==9.1.0; python_version >= '3.14'",
+    "sphinx==9.2.0; python_version >= '3.14'",
     "sphinx-autobuild==2025.8.25; python_version >= '3.14'",
     "sphinx-click==6.2.0; python_version >= '3.14'",
 ]

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/cli/renault_client.py

@@ -17,6 +17,7 @@ from renault_api.credential import Credential
 from renault_api.credential_store import CredentialStore
 from renault_api.exceptions import RenaultException
 from renault_api.gigya import GIGYA_LOGIN_TOKEN
+from renault_api.gigya.exceptions import InvalidVerificationCodeException
 from renault_api.gigya.exceptions import PendingTwoFactorAuthenticationException
 from renault_api.helpers import get_api_keys
 from renault_api.renault_client import RenaultClient
@@ -133,8 +134,14 @@ async def _prompt_two_factor_auth(session: RenaultSession) -> None:
         )
         email_id = emails[choice - 1].id
     await session.request_two_factor_auth_code(email_id)
-    code = click.prompt("Verification code")
-    await session.complete_two_factor_auth(code)
+    while True:
+        code = click.prompt("Verification code")
+        try:
+            await session.complete_two_factor_auth(code)
+        except InvalidVerificationCodeException:
+            click.echo("Wrong verification code, please try again.", err=True)
+        else:
+            return
 
 
 async def login(

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/gigya/enums.py

@@ -6,4 +6,5 @@ from enum import IntEnum
 class GigyaErrorCode(IntEnum):
     """Enum for Gigya error codes."""
 
+    INVALID_PARAMETER_VALUE = 400006
     PENDING_TWO_FACTOR_AUTHENTICATION = 403101

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/gigya/exceptions.py

@@ -14,6 +14,7 @@ class GigyaResponseException(GigyaException):
 
     def __init__(self, error_code: int, error_details: str | None):
         """Initialise GigyaResponseException."""
+        super().__init__(error_code, error_details)
         self.error_code = error_code
         self.error_details = error_details
 
@@ -24,6 +25,16 @@ class InvalidCredentialsException(GigyaResponseException):
     pass
 
 
+class InvalidVerificationCodeException(GigyaResponseException):
+    """Wrong two-factor authentication code (Gigya errorCode 400006).
+
+    Only raised when completing the email verification: the same challenge
+    can be retried with the right code.
+    """
+
+    pass
+
+
 class PendingTwoFactorAuthenticationException(GigyaResponseException):
     """Account requires two-factor authentication (Gigya errorCode 403101).
 
@@ -33,6 +44,10 @@ class PendingTwoFactorAuthenticationException(GigyaResponseException):
     """
 
     def __init__(self, error_code: int, error_details: str | None, reg_token: str):
-        """Initialise PendingTwoFactorAuthenticationException."""
+        """Initialise PendingTwoFactorAuthenticationException.
+
+        `reg_token` is kept out of `args`, so that it doesn't appear in
+        `str()`/`repr()` of the exception, or in logged tracebacks.
+        """
         super().__init__(error_code, error_details)
         self.reg_token = reg_token

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/gigya/models.py

@@ -2,6 +2,7 @@
 
 from dataclasses import dataclass
 from typing import Any
+from typing import ClassVar
 
 from . import exceptions
 from .enums import GigyaErrorCode
@@ -19,6 +20,9 @@ COMMON_ERRRORS: list[dict[str, Any]] = [
 class GigyaResponse(BaseModel):
     """Gigya response."""
 
+    # Errors specific to an endpoint, checked before COMMON_ERRRORS
+    _SPECIFIC_ERRORS: ClassVar[list[dict[str, Any]]] = []
+
     errorCode: int
     errorDetails: str | None
     regToken: str | None
@@ -33,9 +37,9 @@ class GigyaResponse(BaseModel):
                 raise exceptions.PendingTwoFactorAuthenticationException(
                     self.errorCode, self.errorDetails, self.regToken
                 )
-            for common_error in COMMON_ERRRORS:
-                if self.errorCode == common_error["errorCode"]:
-                    error_type = common_error["error_type"]
+            for known_error in (*self._SPECIFIC_ERRORS, *COMMON_ERRRORS):
+                if self.errorCode == known_error["errorCode"]:
+                    error_type = known_error["error_type"]
                     raise error_type(self.errorCode, self.errorDetails)
             raise exceptions.GigyaResponseException(self.errorCode, self.errorDetails)
 
@@ -160,6 +164,13 @@ class GigyaTfaSendEmailCodeResponse(GigyaResponse):
 class GigyaTfaEmailCompleteVerificationResponse(GigyaResponse):
     """Gigya response to GET on /accounts.tfa.email.completeVerification."""
 
+    _SPECIFIC_ERRORS: ClassVar[list[dict[str, Any]]] = [
+        {
+            "errorCode": GigyaErrorCode.INVALID_PARAMETER_VALUE,
+            "error_type": exceptions.InvalidVerificationCodeException,
+        }
+    ]
+
     providerAssertion: str | None
 
     def get_provider_assertion(self) -> str:

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/kamereon/exceptions.py

@@ -82,3 +82,9 @@ class ForbiddenException(KamereonResponseException):
     """The access is forbidden."""
 
     pass
+
+
+class InsufficientBatteryLevelException(KamereonResponseException):
+    """The battery level is too low to perform this action."""
+
+    pass

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/kamereon/models.py

@@ -63,6 +63,10 @@ COMMON_ERRRORS: list[dict[str, Any]] = [
         "errorCode": "409001",
         "error_type": exceptions.ChargeModeInProgressException,
     },
+    {
+        "errorCode": "err.func.wired.low.battery.level",
+        "error_type": exceptions.InsufficientBatteryLevelException,
+    },
 ]
 
 VEHICLE_SPECIFICATIONS: dict[str, dict[str, Any]] = {
@@ -390,6 +394,34 @@ _VEHICLE_ENDPOINTS: dict[str, dict[str, EndpointDefinition | None]] = {
         "res-state": None,  # Reason: "err.func.wired.notFound"
         "soc-levels": None,  # Reason: "err.func.wired.forbidden"
     },
+    "XBG2VE": {  # DACIA SPRING MY25
+        "actions/charge-start": _KCM_ENDPOINTS["actions/charge-start-via-settings"],
+        "actions/charge-stop": None,  # Reason: "err.func.wired.forbidden" (kcm pause-resume) / "err.func.wired.invalid-body-format" (default)  # noqa: E501
+        "actions/horn-start": _DEFAULT_ENDPOINTS["actions/horn-start"],
+        "actions/hvac-start": _DEFAULT_ENDPOINTS["actions/hvac-start"],
+        # hvac-stop: "cancel" is accepted (200) but has no effect, "stop" works
+        "actions/hvac-stop": _KCA_ALTERNATIVE_ENDPOINTS["actions/hvac-stop"],
+        "actions/lights-start": _DEFAULT_ENDPOINTS["actions/lights-start"],
+        "actions/refresh-location": _DEFAULT_ENDPOINTS["actions/refresh-location"],
+        "alerts": None,  # Reason: "err.func.wired.not-found"
+        "battery-status": _DEFAULT_ENDPOINTS["battery-status"],
+        "charge-history": None,  # Reason: "err.func.wired.not-found"
+        "charge-mode": None,  # Reason: "err.func.wired.forbidden"
+        "charge-schedule": _KCM_ENDPOINTS["charge-schedule-via-settings"],
+        "charges": _DEFAULT_ENDPOINTS["charges"],
+        "charging-settings": None,  # Reason: "err.func.wired.forbidden"
+        "cockpit": _DEFAULT_ENDPOINTS["cockpit"],
+        "hvac-history": None,  # Reason: "err.func.wired.not-found"
+        "hvac-sessions": None,  # Reason: "err.func.wired.not-found"
+        "hvac-settings": _DEFAULT_ENDPOINTS["hvac-settings"],
+        "hvac-status": _DEFAULT_ENDPOINTS["hvac-status"],
+        "location": _DEFAULT_ENDPOINTS["location"],
+        "lock-status": None,  # Reason: "There is no data for this vin and uid" (404)
+        "notification-settings": None,  # Reason: "The vehicle does not have a GDC gateway" (400001)  # noqa: E501
+        "pressure": None,  # Reason: "There is no data for this vin and uid" (404)
+        "res-state": None,  # Reason: "There is no data for this vin and uid" (404)
+        "soc-levels": _DEFAULT_ENDPOINTS["soc-levels"],
+    },
     "XCB1SE": {  # SCENIC E-TECH
         "actions/charge-start": _KCM_ENDPOINTS["actions/charge-start-via-settings"],
         "actions/charge-stop": None,  # Reason: "err.func.wired.forbidden" (kcm pause-resume) / "err.func.wired.invalid-body-format" (default)  # noqa: E501
@@ -552,11 +584,11 @@ _VEHICLE_ENDPOINTS: dict[str, dict[str, EndpointDefinition | None]] = {
         "charge-mode": None,  # Reason: "err.func.wired.forbidden"
         "charging-settings": None,  # Reason: "err.func.wired.forbidden"
         "cockpit": _DEFAULT_ENDPOINTS["cockpit"],  # confirmed
-        "hvac-status": None,
+        "hvac-status": None,  # Reason: "err.func.wired.notFound"
         "location": _DEFAULT_ENDPOINTS["location"],
-        "lock-status": None,
+        "lock-status": _DEFAULT_ENDPOINTS["lock-status"],  # confirmed
         "pressure": None,  # Reason: 404
-        "res-state": None,
+        "res-state": None,  # Reason: "err.func.wired.notFound"
         "soc-levels": None,  # Reason: "err.func.wired.forbidden"
     },
     "XJA1VP": {  # CLIO V
@@ -1160,6 +1192,16 @@ class KamereonVehicleCockpitData(KamereonVehicleDataAttributes):
     totalMileage: float | None
 
 
+# Some vehicles (eg. XJB2SU, XHN1SU) report the door statuses as statusDoor*
+_LOCK_STATUS_ALIASES = {
+    "doorStatusRearLeft": "statusDoorRearLeft",
+    "doorStatusRearRight": "statusDoorRearRight",
+    "doorStatusDriver": "statusDoorDriver",
+    "doorStatusPassenger": "statusDoorPassenger",
+    "hatchStatus": "statusDoorTailGate",
+}
+
+
 @dataclass
 class KamereonVehicleLockStatusData(KamereonVehicleDataAttributes):
     """Kamereon vehicle data lock-status attributes."""
@@ -1172,6 +1214,12 @@ class KamereonVehicleLockStatusData(KamereonVehicleDataAttributes):
     hatchStatus: str | None
     lastUpdateTime: str | None
 
+    def __post_init__(self) -> None:
+        """Fall back to the statusDoor* attributes used by newer vehicles."""
+        for field, alias in _LOCK_STATUS_ALIASES.items():
+            if getattr(self, field) is None:
+                setattr(self, field, self.raw_data.get(alias))
+
 
 @dataclass
 class KamereonVehicleResStateData(KamereonVehicleDataAttributes):

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/models.py

@@ -16,7 +16,7 @@ class BaseModel:
 class BaseSchema(marshmallow.Schema):
     """Base schema for Gigya and Kamereon models to exclude unknown fields."""
 
-    class Meta:
+    class Meta:  # ty: ignore[invalid-attribute-override]  # astral-sh/ty#4711
         """Force unknown fields to 'exclude'."""
 
         unknown = marshmallow.EXCLUDE

{renault_api-0.6.0 → renault_api-0.6.2}/src/renault_api/renault_session.py

@@ -157,10 +157,15 @@ class RenaultSession:
     ) -> None:
         """Submit the emailed one-time code and finish logging in.
 
+        Raises `InvalidVerificationCodeException` if the code is wrong. The
+        challenge stays pending, so this can be called again with the right
+        code, without requesting a new one.
+
         When `remember_device` is True (the default), Gigya should not ask
         for another code for this device for about 30 days. The device is
-        identified by cookies, so the aiohttp session must keep its cookie
-        jar between `login` and this call.
+        identified by `device_ids`, which are sent explicitly with each
+        request (so the aiohttp session may be shared): persist them with
+        `device_ids`, and restore them with `set_device_ids`.
         """
         pending_tfa = self._get_pending_tfa()
         if not pending_tfa.gigya_assertion or not pending_tfa.phv_token: