hyundai-kia-connect-api 3.42.4__tar.gz → 3.42.11__tar.gz

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.42.4
+Version: 3.42.11
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api
 Author: Fuat Akgun
@@ -37,7 +37,7 @@ Dynamic: summary
 Code Maintainers Wanted
 =======================
 
-I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project!   Even just pull requests are appreciated!
+I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project! Even just pull requests are appreciated!
 
 Introduction
 ============
@@ -158,7 +158,6 @@ Example of getting trip info of the current month and day (vm is VehicleManager
                     for trip in reversed(vehicle.day_trip_info.trip_list):  # show oldest first
                         print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")
 
-
 CLI Usage
 =========
 

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/README.rst

@@ -1,7 +1,7 @@
 Code Maintainers Wanted
 =======================
 
-I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project!   Even just pull requests are appreciated!
+I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project! Even just pull requests are appreciated!
 
 Introduction
 ============
@@ -122,7 +122,6 @@ Example of getting trip info of the current month and day (vm is VehicleManager
                     for trip in reversed(vehicle.day_trip_info.trip_list):  # show oldest first
                         print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")
 
-
 CLI Usage
 =========
 

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/hyundai_kia_connect_api/ApiImplType1.py

@@ -34,6 +34,7 @@ from .const import (
 
 from .exceptions import (
     APIError,
+    AuthenticationError,
     DuplicateRequestError,
     RequestTimeoutError,
     ServiceTemporaryUnavailable,
@@ -79,16 +80,28 @@ def _check_response_for_errors(response: dict) -> None:
         "9999": RequestTimeoutError,
     }
 
-    if not any(x in response for x in ["retCode", "resCode", "resMsg"]):
+    error_message_to_exception_mapping = {
+        "Key not authorized: Token is expired": AuthenticationError
+    }
+
+    if not any(x in response for x in ["retCode", "resCode", "resMsg", "error"]):
         _LOGGER.error(f"Unknown API response format: {response}")
         raise InvalidAPIResponseError()
 
-    if response["retCode"] == "F":
+    if "retCode" in response and response["retCode"] == "F":
         if response["resCode"] in error_code_mapping:
             raise error_code_mapping[response["resCode"]](response["resMsg"])
         raise APIError(
             f"Server returned:  '{response['resCode']}' '{response['resMsg']}'"
         )
+    elif "error" in response:
+        error_reason = response["error"]
+        if error_reason in error_message_to_exception_mapping:
+            _LOGGER.error(f"API error: {error_reason}")
+            raise error_message_to_exception_mapping[error_reason](error_reason)
+        else:
+            _LOGGER.error(f"Unknown error in API response: {error_reason}")
+            raise APIError(f"Unknown error in API response: {error_reason}")
 
 
 class ApiImplType1(ApiImpl):

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/hyundai_kia_connect_api/KiaUvoApiCA.py

@@ -80,9 +80,7 @@ class KiaUvoApiCA(ApiImpl):
     @property
     def sessions(self):
         if not self._sessions:
-            self._sessions = cloudscraper.create_scraper(
-                browser={"custom": "okhttp/4.12.0"}
-            )
+            self._sessions = cloudscraper.create_scraper()
         return self._sessions
 
     def _check_response_for_errors(self, response: dict) -> None:

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -36,7 +36,6 @@ from .const import (
     DISTANCE_UNITS,
     DOMAIN,
     ENGINE_TYPES,
-    LOGIN_TOKEN_LIFETIME,
     SEAT_STATUS,
     TEMPERATURE_UNITS,
     VALET_MODE_ACTION,
@@ -193,11 +192,12 @@ class KiaUvoApiEU(ApiImplType1):
         if authorization_code is None:
             raise AuthenticationError("Login Failed")
 
-        _, access_token, authorization_code = self._get_access_token(
+        _, access_token, authorization_code, expires_in = self._get_access_token(
             stamp, authorization_code
         )
+        valid_until = dt.datetime.now(pytz.utc) + dt.timedelta(seconds=expires_in)
+
         _, refresh_token = self._get_refresh_token(stamp, authorization_code)
-        valid_until = dt.datetime.now(pytz.utc) + LOGIN_TOKEN_LIFETIME
 
         return Token(
             username=username,
@@ -1226,7 +1226,8 @@ class KiaUvoApiEU(ApiImplType1):
         token_type = response["token_type"]
         access_token = token_type + " " + response["access_token"]
         authorization_code = response["refresh_token"]
-        return token_type, access_token, authorization_code
+        expires_in = response["expires_in"]
+        return token_type, access_token, authorization_code, expires_in
 
     def _get_refresh_token(self, stamp, authorization_code):
         # Get Refresh Token #

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.42.4
+Version: 3.42.11
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api
 Author: Fuat Akgun
@@ -37,7 +37,7 @@ Dynamic: summary
 Code Maintainers Wanted
 =======================
 
-I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project!   Even just pull requests are appreciated!
+I no longer have a Kia or Hyundai so don't maintain this like I used to.  Others who are interested in jumping in are welcome to join the project! Even just pull requests are appreciated!
 
 Introduction
 ============
@@ -158,7 +158,6 @@ Example of getting trip info of the current month and day (vm is VehicleManager
                     for trip in reversed(vehicle.day_trip_info.trip_list):  # show oldest first
                         print(f"{day.yyyymmdd},{trip.hhmmss},{trip.drive_time},{trip.idle_time},{trip.distance},{trip.avg_speed},{trip.max_speed}")
 
-
 CLI Usage
 =========
 

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/requirements.txt

@@ -4,4 +4,4 @@ python-dateutil
 pytz>=2021.3
 certifi>=2024.6.2
 geopy >= 2.2.0
-cloudscraper>=1.2.60
+cloudscraper >= 1.2.60

{hyundai_kia_connect_api-3.42.4 → hyundai_kia_connect_api-3.42.11}/setup.py

@@ -47,6 +47,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api",
-    version="3.42.4",
+    version="3.42.11",
     zip_safe=False,
 )