hyundai-kia-connect-api 3.33.2__py2.py3-none-any.whl → 3.33.4__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

@@ -452,3 +452,31 @@ class ApiImplType1(ApiImpl):
         _LOGGER.debug(f"{DOMAIN} - Set Charging Current Response: {response}")
         _check_response_for_errors(response)
         return response["msgId"]
+
+    def set_charge_limits(
+        self, token: Token, vehicle: Vehicle, ac: int, dc: int
+    ) -> str:
+        url = self.SPA_API_URL + "vehicles/" + vehicle.id + "/charge/target"
+
+        body = {
+            "targetSOClist": [
+                {
+                    "plugType": 0,
+                    "targetSOClevel": dc,
+                },
+                {
+                    "plugType": 1,
+                    "targetSOClevel": ac,
+                },
+            ]
+        }
+        response = requests.post(
+            url,
+            json=body,
+            headers=self._get_authenticated_headers(
+                token, vehicle.ccu_ccs2_protocol_support
+            ),
+        ).json()
+        _LOGGER.debug(f"{DOMAIN} - Set Charge Limits Response: {response}")
+        _check_response_for_errors(response)
+        return response["msgId"]

hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -917,30 +917,6 @@ class KiaUvoApiAU(ApiImplType1):
             )
             return None
 
-    def set_charge_limits(
-        self, token: Token, vehicle: Vehicle, ac: int, dc: int
-    ) -> str:
-        url = self.SPA_API_URL + "vehicles/" + vehicle.id + "/charge/target"
-
-        body = {
-            "targetSOClist": [
-                {
-                    "plugType": 0,
-                    "targetSOClevel": dc,
-                },
-                {
-                    "plugType": 1,
-                    "targetSOClevel": ac,
-                },
-            ]
-        }
-        response = requests.post(
-            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)
-        return response["msgId"]
-
     def _get_stamp(self) -> str:
         if BRANDS[self.brand] == BRAND_KIA:
             cfb = base64.b64decode(

hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -1196,34 +1196,6 @@ class KiaUvoApiEU(ApiImplType1):
             )
             return None
 
-    def set_charge_limits(
-        self, token: Token, vehicle: Vehicle, ac: int, dc: int
-    ) -> str:
-        url = self.SPA_API_URL + "vehicles/" + vehicle.id + "/charge/target"
-
-        body = {
-            "targetSOClist": [
-                {
-                    "plugType": 0,
-                    "targetSOClevel": dc,
-                },
-                {
-                    "plugType": 1,
-                    "targetSOClevel": ac,
-                },
-            ]
-        }
-        response = requests.post(
-            url,
-            json=body,
-            headers=self._get_authenticated_headers(
-                token, vehicle.ccu_ccs2_protocol_support
-            ),
-        ).json()
-        _LOGGER.debug(f"{DOMAIN} - Set Charge Limits Response: {response}")
-        _check_response_for_errors(response)
-        return response["msgId"]
-
     def schedule_charging_and_climate(
         self,
         token: Token,

{hyundai_kia_connect_api-3.33.2.dist-info → hyundai_kia_connect_api-3.33.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.33.2
+Version: 3.33.4
 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.2.dist-info → hyundai_kia_connect_api-3.33.4.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=6uSqZYWmFT08gH1OL1h7SJso3HvqH9GszSQzngQbWcc,16993
+hyundai_kia_connect_api/ApiImpl.py,sha256=PUZfRVb_I3uC6KaY2HK4TxBFfXyVqaXAgGO1GOAb1Hc,9344
+hyundai_kia_connect_api/ApiImplType1.py,sha256=gvI9N9ZWyeqTe0xH82-RkqbeC8A3_kdSzbzz68ibkC0,17846
 hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=FGYyrS3dSq8Plfu8DQMwVG1LM3nmRv8Y4vrN7wZ4oVY,36988
-hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=Ox-GXfu2h6dsAA1tgXRVDCYgMP5Hi9IHMXDBzmYzBxQ,45668
+hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=c-JL4mhC-_-iH4fGMgV0YWha9xsC7Vo5wPneXsQ2S78,44902
 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=G3sfyyHaAnUeoYWC3rOpyrw_FfOs9ZDOEGUJuRTkuBc,66669
+hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=rfFIm_2guw3x7Blp8dr1uL7MT2fYVpHjxmwCRrlEXD0,65816
 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.2.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.33.2.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.33.2.dist-info/METADATA,sha256=b0UCE6-Lvmy1zPUY-VPz0SYj8VolaQ7r7UeohiyYDdA,7142
-hyundai_kia_connect_api-3.33.2.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-hyundai_kia_connect_api-3.33.2.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.33.2.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.33.2.dist-info/RECORD,,
+hyundai_kia_connect_api-3.33.4.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.33.4.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.33.4.dist-info/METADATA,sha256=NEgtNiYgZKpYQdfQ8VWDLSy1qFoXt5CB4Np1UW2_1wY,7142
+hyundai_kia_connect_api-3.33.4.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+hyundai_kia_connect_api-3.33.4.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.33.4.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.33.4.dist-info/RECORD,,