hyundai-kia-connect-api 3.33.1__py2.py3-none-any.whl → 3.33.3__py2.py3-none-any.whl

hyundai_kia_connect_api/ApiImpl.py

@@ -1,9 +1,6 @@
 """ApiImpl.py"""
 
 # pylint:disable=unnecessary-pass,missing-class-docstring,invalid-name,missing-function-docstring,wildcard-import,unused-wildcard-import,unused-argument,missing-timeout,logging-fstring-interpolation
-from .utils import get_child_value
-
-
 import datetime as dt
 import logging
 from dataclasses import dataclass
@@ -11,6 +8,8 @@ from dataclasses import dataclass
 import requests
 from geopy.geocoders import GoogleV3
 from requests.exceptions import JSONDecodeError
+
+from .utils import get_child_value
 from .Token import Token
 from .Vehicle import Vehicle
 from .const import (
@@ -73,6 +72,8 @@ class ScheduleChargingClimateRequestOptions:
 class ApiImpl:
     data_timezone = dt.timezone.utc
     temperature_range = None
+    previous_latitude: float = None
+    previous_longitude: float = None
 
     def __init__(self) -> None:
         """Initialize."""
@@ -122,7 +123,13 @@ class ApiImpl:
         API_KEY: str = None,
     ) -> None:
         if vehicle.location_latitude and vehicle.location_longitude:
-            if GEO_LOCATION_PROVIDERS[provider] == OPENSTREETMAP:
+            if (
+                vehicle.geocode
+                and vehicle.location_latitude == self.previous_latitude
+                and vehicle.location_longitude == self.previous_longitude
+            ):  # previous coordinates are the same, so keep last valid vehicle.geocode
+                _LOGGER.debug(f"{DOMAIN} - Keeping last geocode location")
+            elif GEO_LOCATION_PROVIDERS[provider] == OPENSTREETMAP:
                 email_parameter = ""
                 if use_email is True:
                     email_parameter = "&email=" + token.username
@@ -136,27 +143,34 @@ class ApiImpl:
                     + email_parameter
                 )
                 headers = {"user-agent": "curl/7.81.0"}
-                _LOGGER.debug(f"{DOMAIN} - Running update geocode location")
                 response = requests.get(url, headers=headers)
                 try:
                     response = response.json()
                 except JSONDecodeError:
-                    _LOGGER.debug(
-                        f"{DOMAIN} - failed to decode json for geocode location"
-                    )
+                    _LOGGER.warning(f"{DOMAIN} - failed geocode openstreetmap")
                     vehicle.geocode = None
                 else:
                     vehicle.geocode = (
                         get_child_value(response, "display_name"),
                         get_child_value(response, "address"),
                     )
+                    self.previous_latitude = vehicle.location_latitude
+                    self.previous_longitude = vehicle.location_longitude
+                    _LOGGER.debug(f"{DOMAIN} - geocode openstreetmap")
             elif GEO_LOCATION_PROVIDERS[provider] == GOOGLE:
                 if API_KEY:
                     latlong = (vehicle.location_latitude, vehicle.location_longitude)
-                    geolocator = GoogleV3(api_key=API_KEY)
-                    locations = geolocator.reverse(latlong)
-                    if locations:
-                        vehicle.geocode = locations
+                    try:
+                        geolocator = GoogleV3(api_key=API_KEY)
+                        locations = geolocator.reverse(latlong)
+                        if locations:
+                            vehicle.geocode = locations
+                            self.previous_latitude = vehicle.location_latitude
+                            self.previous_longitude = vehicle.location_longitude
+                            _LOGGER.debug(f"{DOMAIN} - geocode google")
+                    except Exception as ex:  # pylint: disable=broad-except
+                        _LOGGER.warning(f"{DOMAIN} - failed geocode Google: {ex}")
+                        vehicle.geocode = None
 
     def lock_action(
         self, token: Token, vehicle: Vehicle, action: VEHICLE_LOCK_ACTION

hyundai_kia_connect_api/ApiImplType1.py

@@ -104,6 +104,16 @@ class ApiImplType1(ApiImpl):
             "User-Agent": USER_AGENT_OK_HTTP,
         }
 
+    def _get_control_headers(self, token: Token, vehicle: Vehicle) -> dict:
+        control_token, _ = self._get_control_token(token)
+        authenticated_headers = self._get_authenticated_headers(
+            token, vehicle.ccu_ccs2_protocol_support
+        )
+        return authenticated_headers | {
+            "Authorization": control_token,
+            "AuthorizationCCSP": control_token,
+        }
+
     def _update_vehicle_properties_ccs2(self, vehicle: Vehicle, state: dict) -> None:
         if get_child_value(state, "Date"):
             vehicle.last_updated_at = parse_datetime(

hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -82,14 +82,6 @@ class KiaUvoApiAU(ApiImplType1):
         self.SPA_API_URL_V2: str = "https://" + self.BASE_URL + "/api/v2/spa/"
         self.CLIENT_ID: str = self.CCSP_SERVICE_ID
 
-    def _get_control_headers(self, token: Token) -> dict:
-        control_token, _ = self._get_control_token(token)
-        authenticated_headers = self._get_authenticated_headers(token)
-        return authenticated_headers | {
-            "Authorization": control_token,
-            "AuthorizationCCSP": control_token,
-        }
-
     def login(self, username: str, password: str) -> Token:
         stamp = self._get_stamp()
         device_id = self._get_device_id(stamp)
@@ -647,7 +639,7 @@ class KiaUvoApiAU(ApiImplType1):
         payload = {"action": action.value, "deviceId": token.device_id}
         _LOGGER.debug(f"{DOMAIN} - Lock Action Request: {payload}")
         response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token)
+            url, json=payload, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Lock Action Response: {response}")
         _check_response_for_errors(response)
@@ -666,7 +658,7 @@ class KiaUvoApiAU(ApiImplType1):
         }
         _LOGGER.debug(f"{DOMAIN} - Window State Action Request: {payload}")
         response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token)
+            url, json=payload, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Window State Action Response: {response}")
         _check_response_for_errors(response)
@@ -681,7 +673,7 @@ class KiaUvoApiAU(ApiImplType1):
         payload = {"action": action.value, "deviceId": token.device_id}
         _LOGGER.debug(f"{DOMAIN} - Charge Port Action Request: {payload}")
         response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token)
+            url, json=payload, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Charge Port Action Response: {response}")
         _check_response_for_errors(response)
@@ -721,7 +713,7 @@ class KiaUvoApiAU(ApiImplType1):
         }
         _LOGGER.debug(f"{DOMAIN} - Start Climate Action Request: {payload}")
         response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token)
+            url, json=payload, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Start Climate Action Response: {response}")
         _check_response_for_errors(response)
@@ -734,7 +726,7 @@ class KiaUvoApiAU(ApiImplType1):
         }
         _LOGGER.debug(f"{DOMAIN} - Stop Climate Action Request: {payload}")
         response = requests.post(
-            url, json=payload, headers=self._get_control_headers(token)
+            url, json=payload, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Stop Climate Action Response: {response}")
         _check_response_for_errors(response)
@@ -943,7 +935,7 @@ class KiaUvoApiAU(ApiImplType1):
             ]
         }
         response = requests.post(
-            url, json=body, headers=self._get_control_headers(token)
+            url, json=body, headers=self._get_control_headers(token, vehicle)
         ).json()
         _LOGGER.debug(f"{DOMAIN} - Set Charge Limits Response: {response}")
         _check_response_for_errors(response)

hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -183,16 +183,6 @@ class KiaUvoApiEU(ApiImplType1):
                 + "&state=$service_id:$user_id"
             )
 
-    def _get_control_headers(self, token: Token, vehicle: Vehicle) -> dict:
-        control_token, _ = self._get_control_token(token)
-        authenticated_headers = self._get_authenticated_headers(
-            token, vehicle.ccu_ccs2_protocol_support
-        )
-        return authenticated_headers | {
-            "Authorization": control_token,
-            "AuthorizationCCSP": control_token,
-        }
-
     def login(self, username: str, password: str) -> Token:
         stamp = self._get_stamp()
         device_id = self._get_device_id(stamp)

{hyundai_kia_connect_api-3.33.1.dist-info → hyundai_kia_connect_api-3.33.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.33.1
+Version: 3.33.3
 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

{hyundai_kia_connect_api-3.33.1.dist-info → hyundai_kia_connect_api-3.33.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-hyundai_kia_connect_api/ApiImpl.py,sha256=PuK3dID01qTGB6aGtQY4uf1hF-t4d03wUzG_gUFn_1g,8353
-hyundai_kia_connect_api/ApiImplType1.py,sha256=V2rieKKPhR-92E4_0N6wKFEupab5OgAaKxHxB5OKVi4,16587
+hyundai_kia_connect_api/ApiImpl.py,sha256=PUZfRVb_I3uC6KaY2HK4TxBFfXyVqaXAgGO1GOAb1Hc,9344
+hyundai_kia_connect_api/ApiImplType1.py,sha256=6uSqZYWmFT08gH1OL1h7SJso3HvqH9GszSQzngQbWcc,16993
 hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=FGYyrS3dSq8Plfu8DQMwVG1LM3nmRv8Y4vrN7wZ4oVY,36988
-hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=0QmWLeLa6RL3tKrCLOfemhVDmC8pdsxykdNd_C1DHLg,45945
+hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=Ox-GXfu2h6dsAA1tgXRVDCYgMP5Hi9IHMXDBzmYzBxQ,45668
 hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=XBya0yHZ2MC3TBVQLSc6N-SzmGt_s3l4nGVyNgmjl9Q,32514
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=cwIPZ0dU6HolKdooUQeQKlLAic6YU8dQmNs0VQDBgpQ,47035
-hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=RuPWWsyEYP4xYPH5YTNnC2Vzgkm0tB9PE9Ar2wK2v_M,67075
+hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=G3sfyyHaAnUeoYWC3rOpyrw_FfOs9ZDOEGUJuRTkuBc,66669
 hyundai_kia_connect_api/KiaUvoApiUSA.py,sha256=8DP7iOORHtU98LipcAYEPdtJvubBlUP2-jlDxAhTDhQ,30548
 hyundai_kia_connect_api/Token.py,sha256=ZsPvXh1ID7FUTGHAqhZUZyrKT7xVbOtIn6FRJn4Ygf0,370
 hyundai_kia_connect_api/Vehicle.py,sha256=hZT0wU7-mMi85bgqNHMu6CyhQQ5h-Jfmoc1ce2uPhYM,18867
@@ -14,10 +14,10 @@ hyundai_kia_connect_api/bluelink.py,sha256=JiNIHl-Qi8zwqyN6ywKg5CdXOLT74WkvpjVcn
 hyundai_kia_connect_api/const.py,sha256=dXEh-lpthH8000nUXFoRZpQXkTxVHDAgDe_KqnSZhZw,2280
 hyundai_kia_connect_api/exceptions.py,sha256=m7gyDnvA5OVAK4EXSP_ZwE0s0uV8HsGUV0tiYwqofK0,1343
 hyundai_kia_connect_api/utils.py,sha256=J0aXUX-nKIoS3XbelatNh-DZlHRU2_DYz_Mg_ZUKQJU,1957
-hyundai_kia_connect_api-3.33.1.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.33.1.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.33.1.dist-info/METADATA,sha256=q9Xdkya0cPSkYGagr8hL8l0P07KgHgi3ZLM5R--dpaU,7142
-hyundai_kia_connect_api-3.33.1.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-hyundai_kia_connect_api-3.33.1.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.33.1.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.33.1.dist-info/RECORD,,
+hyundai_kia_connect_api-3.33.3.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.33.3.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.33.3.dist-info/METADATA,sha256=FGOXRnhGoB3Giy_-CSajQQTB39-CEiKBKSIZrfZOAZQ,7142
+hyundai_kia_connect_api-3.33.3.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+hyundai_kia_connect_api-3.33.3.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.33.3.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.33.3.dist-info/RECORD,,