hyundai-kia-connect-api 3.32.15__py2.py3-none-any.whl → 3.33.0__py2.py3-none-any.whl

hyundai_kia_connect_api/ApiImpl.py

@@ -1,12 +1,15 @@
 """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
 
 import requests
+from geopy.geocoders import GoogleV3
 from requests.exceptions import JSONDecodeError
 from .Token import Token
 from .Vehicle import Vehicle
@@ -17,8 +20,10 @@ from .const import (
     DOMAIN,
     VALET_MODE_ACTION,
     VEHICLE_LOCK_ACTION,
+    GEO_LOCATION_PROVIDERS,
+    OPENSTREETMAP,
+    GOOGLE,
 )
-from .utils import get_child_value
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -109,38 +114,49 @@ class ApiImpl:
         pass
 
     def update_geocoded_location(
-        self, token: Token, vehicle: Vehicle, use_email: bool
+        self,
+        token: Token,
+        vehicle: Vehicle,
+        use_email: bool,
+        provider: int = 1,
+        API_KEY: str = None,
     ) -> None:
         if vehicle.location_latitude and vehicle.location_longitude:
-            email_parameter = ""
-            if use_email is True:
-                email_parameter = "&email=" + token.username
-
-            url = (
-                "https://nominatim.openstreetmap.org/reverse?lat="
-                + str(vehicle.location_latitude)
-                + "&lon="
-                + str(vehicle.location_longitude)
-                + "&format=json&addressdetails=1&zoom=18"
-                + email_parameter
-            )
-            headers = {"user-agent": "curl/7.81.0"}
-            _LOGGER.debug(
-                f"{DOMAIN} - Running update geocode location with value: {url}"
-            )
-            response = requests.get(url, headers=headers)
-            _LOGGER.debug(f"{DOMAIN} - geocode location raw response: {response}")
-            try:
-                response = response.json()
-            except JSONDecodeError:
-                _LOGGER.debug(f"{DOMAIN} - failed to decode json for geocode location")
-                vehicle.geocode = None
-            else:
-                _LOGGER.debug(f"{DOMAIN} - geocode location json response: {response}")
-                vehicle.geocode = (
-                    get_child_value(response, "display_name"),
-                    get_child_value(response, "address"),
+            if GEO_LOCATION_PROVIDERS[provider] == OPENSTREETMAP:
+                email_parameter = ""
+                if use_email is True:
+                    email_parameter = "&email=" + token.username
+
+                url = (
+                    "https://nominatim.openstreetmap.org/reverse?lat="
+                    + str(vehicle.location_latitude)
+                    + "&lon="
+                    + str(vehicle.location_longitude)
+                    + "&format=json&addressdetails=1&zoom=18"
+                    + 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"
+                    )
+                    vehicle.geocode = None
+                else:
+                    vehicle.geocode = (
+                        get_child_value(response, "display_name"),
+                        get_child_value(response, "address"),
+                    )
+            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
 
     def lock_action(
         self, token: Token, vehicle: Vehicle, action: VEHICLE_LOCK_ACTION

hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py

@@ -749,6 +749,7 @@ class HyundaiBlueLinkApiUSA(ApiImpl):
                 model=entry["modelCode"],
                 registration_date=entry["enrollmentDate"],
                 timezone=self.data_timezone,
+                enabled=entry.get("enrollmentStatus") != "CANCELLED",
                 generation=entry.get("vehicleGeneration", 2),
             )
             result.append(vehicle)

hyundai_kia_connect_api/VehicleManager.py

@@ -53,6 +53,8 @@ class VehicleManager:
         pin: str,
         geocode_api_enable: bool = False,
         geocode_api_use_email: bool = False,
+        geocode_provider: int = 1,
+        geocode_api_key: str = None,
         language: str = "en",
     ):
         self.region: int = region
@@ -61,8 +63,10 @@ class VehicleManager:
         self.password: str = password
         self.geocode_api_enable: bool = geocode_api_enable
         self.geocode_api_use_email: bool = geocode_api_use_email
+        self.geocode_provider: int = geocode_provider
         self.pin: str = pin
         self.language: str = language
+        self.geocode_api_key: str = geocode_api_key
 
         self.api: ApiImpl = self.get_implementation_by_region_brand(
             self.region, self.brand, self.language
@@ -91,7 +95,11 @@ class VehicleManager:
             self.api.update_vehicle_with_cached_state(self.token, vehicle)
             if self.geocode_api_enable is True:
                 self.api.update_geocoded_location(
-                    self.token, vehicle, self.geocode_api_use_email
+                    token=self.token,
+                    vehicle=vehicle,
+                    use_email=self.geocode_api_use_email,
+                    provider=self.geocode_provider,
+                    API_KEY=self.geocode_api_key,
                 )
         else:
             _LOGGER.debug(f"{DOMAIN} - Vehicle Disabled, skipping.")

hyundai_kia_connect_api/const.py

@@ -12,6 +12,10 @@ BRAND_HYUNDAI = "Hyundai"
 BRAND_GENESIS = "Genesis"
 BRANDS = {1: BRAND_KIA, 2: BRAND_HYUNDAI, 3: BRAND_GENESIS}
 
+GOOGLE = "google"
+OPENSTREETMAP = "openstreetmap"
+GEO_LOCATION_PROVIDERS = {1: OPENSTREETMAP, 2: GOOGLE}
+
 REGION_EUROPE = "Europe"
 REGION_CANADA = "Canada"
 REGION_USA = "USA"

{hyundai_kia_connect_api-3.32.15.dist-info → hyundai_kia_connect_api-3.33.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyundai_kia_connect_api
-Version: 3.32.15
+Version: 3.33.0
 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
@@ -20,6 +20,7 @@ Requires-Dist: curlify>=2.2.1
 Requires-Dist: python-dateutil
 Requires-Dist: pytz>=2021.3
 Requires-Dist: certifi>=2024.6.2
+Requires-Dist: geopy>=2.2.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -60,10 +61,19 @@ Python 3.10 or newer is required to use this package. Vehicle manager is the key
     password: str
     pin: str (required for CA, and potentially USA, otherwise pass a blank string)
 
+    Optional parameters are::
+    geocode_api_enable: bool
+    geocode_api_use_email: bool
+    geocode_provider: int
+    geocode_api_key: str
+    language: str
+
 Key values for the int exist in the `const.py <https://github.com/Hyundai-Kia-Connect/hyundai_kia_connect_api/blob/master/hyundai_kia_connect_api/const.py>`_ file as::
 
     REGIONS = {1: REGION_EUROPE, 2: REGION_CANADA, 3: REGION_USA, 4: REGION_CHINA, 5: REGION_AUSTRALIA}
     BRANDS = {1: BRAND_KIA, 2: BRAND_HYUNDAI, 3: BRAND_GENESIS}
+    GEO_LOCATION_PROVIDERS = {1: OPENSTREETMAP, 2: GOOGLE}
+
 
 Once this is done you can now make the following calls against the vehicle manager::
 

{hyundai_kia_connect_api-3.32.15.dist-info → hyundai_kia_connect_api-3.33.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-hyundai_kia_connect_api/ApiImpl.py,sha256=sgUXOcQnBMTVylxOLeqnYOGnz9KqLqRClRpE12u6ZS4,7806
+hyundai_kia_connect_api/ApiImpl.py,sha256=PuK3dID01qTGB6aGtQY4uf1hF-t4d03wUzG_gUFn_1g,8353
 hyundai_kia_connect_api/ApiImplType1.py,sha256=PnKwpbCoYGOXBWzBLIlDSrC6daIYeW9qlfW7TM4HCU0,12184
-hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=l4IAY1DqUh01WzPgM8TDlYKR80FEvqLkYqrfNtyT9Yw,36918
+hyundai_kia_connect_api/HyundaiBlueLinkApiUSA.py,sha256=FGYyrS3dSq8Plfu8DQMwVG1LM3nmRv8Y4vrN7wZ4oVY,36988
 hyundai_kia_connect_api/KiaUvoApiAU.py,sha256=tslh0gzvPBwYJmcWlf9B0l7PyYZdy2e7GqpRkl8_Svk,48471
 hyundai_kia_connect_api/KiaUvoApiCA.py,sha256=XBya0yHZ2MC3TBVQLSc6N-SzmGt_s3l4nGVyNgmjl9Q,32514
 hyundai_kia_connect_api/KiaUvoApiCN.py,sha256=cwIPZ0dU6HolKdooUQeQKlLAic6YU8dQmNs0VQDBgpQ,47035
@@ -8,16 +8,16 @@ hyundai_kia_connect_api/KiaUvoApiEU.py,sha256=TxgO2dfLjKSKfSkRMoTL_fbmzRFRPb8oJ9
 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
-hyundai_kia_connect_api/VehicleManager.py,sha256=SfGuCT0foCJqUNNLXs_9lRR5XGQ7xd-fodTIs3JEl0o,11167
+hyundai_kia_connect_api/VehicleManager.py,sha256=k2MZR6nuPPrH1G9cLrukjYyDAar-M39qdNcQtl1ntPI,11512
 hyundai_kia_connect_api/__init__.py,sha256=IkyVeIMbcFJZgLaiiNnUVA1Ferxvrm1bXHKVg01cxvc,319
 hyundai_kia_connect_api/bluelink.py,sha256=JiNIHl-Qi8zwqyN6ywKg5CdXOLT74WkvpjVcn-rYEjI,19730
-hyundai_kia_connect_api/const.py,sha256=scBlhrMims0W6_pESVVdQz2uUxczg2cf2qDQ7avbhVo,2174
+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.32.15.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
-hyundai_kia_connect_api-3.32.15.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
-hyundai_kia_connect_api-3.32.15.dist-info/METADATA,sha256=E5HTqYKSAUTNn9z96HFGuVNVhoHtq9JM8IhO7J-OzmE,6894
-hyundai_kia_connect_api-3.32.15.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-hyundai_kia_connect_api-3.32.15.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
-hyundai_kia_connect_api-3.32.15.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
-hyundai_kia_connect_api-3.32.15.dist-info/RECORD,,
+hyundai_kia_connect_api-3.33.0.dist-info/licenses/AUTHORS.rst,sha256=T77OE1hrQF6YyDE6NbdMKyL66inHt7dnjHAzblwuk2A,155
+hyundai_kia_connect_api-3.33.0.dist-info/licenses/LICENSE,sha256=49hmc755oyMwKdZ-2epiorjStRB0PfcZR1w5_NXZPgs,1068
+hyundai_kia_connect_api-3.33.0.dist-info/METADATA,sha256=XVjyHKnqYRRtOs_DdZDcMRdcNAIqAMmQRp8QmIongwU,7142
+hyundai_kia_connect_api-3.33.0.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
+hyundai_kia_connect_api-3.33.0.dist-info/entry_points.txt,sha256=XfrroRdyC_9q9VXjEZe5SdRPhkQyCCE4S7ZK6XSKelA,67
+hyundai_kia_connect_api-3.33.0.dist-info/top_level.txt,sha256=otZ7J_fN-s3EW4jD-kAearIo2OIzhQLR8DNEHIaFfds,24
+hyundai_kia_connect_api-3.33.0.dist-info/RECORD,,