hyundai-kia-connect-api 3.23.9__tar.gz → 3.24.1__tar.gz

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/CONTRIBUTING.rst

@@ -76,14 +76,14 @@ Ready to contribute? Here's how to set up `hyundai_kia_connect_api` for local de
 
    Now you can make your changes locally.
 
-5. When you're done making changes, check that your changes pass flake8 and the
-   tests, including testing other Python versions with tox::
+5. When you're done making changes, check that your changes pass flake8. Most
+   tests require environment variables to supply the username and password and
+   they will run as part of the PR pre-requisites:
 
     $ flake8 hyundai_kia_connect_api tests
     $ python setup.py test or pytest
-    $ tox
 
-   To get flake8 and tox, just pip install them into your virtualenv.
+   To get flake8, pip install them into your virtualenv.
 
 6. Commit your changes and push your branch to GitHub::
 
@@ -102,8 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.5, 3.6, 3.7 and 3.8, and for PyPy. Check
-   https://travis-ci.com/fuatakgun/hyundai_kia_connect_api/pull_requests
+3. The pull request should work for recent Python. Check GitHub Actions checks
    and make sure that the tests pass for all supported Python versions.
 
 Tips

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.23.9
+Version: 3.24.1
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun
@@ -11,8 +11,8 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: beautifulsoup4>=4.10.0

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/hyundai_kia_connect_api/HyundaiBlueLinkAPIUSA.py

@@ -12,6 +12,8 @@ import certifi
 from requests.adapters import HTTPAdapter
 from urllib3.util.ssl_ import create_urllib3_context
 
+from hyundai_kia_connect_api.exceptions import APIError
+
 from .const import (
     DOMAIN,
     VEHICLE_LOCK_ACTION,
@@ -459,6 +461,31 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         # fill vehicle.daily_stats
         tripStats = []
         tripDetails = get_child_value(state, "evTripDetails.tripdetails") or {}
+
+        # compute more digits for distance mileage using odometer and overrule distance
+        previous_odometer = None
+        for trip in reversed(tripDetails):
+            odometer = get_child_value(trip, "odometer.value")
+            if previous_odometer and odometer:
+                delta_odometer = odometer - previous_odometer
+                if delta_odometer >= 0.0:
+                    trip["distance"] = delta_odometer
+            previous_odometer = odometer
+
+        # overrule odometer with more accuracy from last trip
+        if (
+            previous_odometer
+            and vehicle.odometer
+            and previous_odometer > vehicle.odometer
+        ):
+            _LOGGER.debug(
+                f"Overruling odometer: {previous_odometer:.1f} old: {vehicle.odometer:.1f}"  # noqa
+            )
+            vehicle.odometer = (
+                previous_odometer,
+                DISTANCE_UNITS[3],
+            )
+
         for trip in tripDetails:
             processedTrip = DailyDrivingStats(
                 date=dt.datetime.strptime(trip["startdate"], "%Y-%m-%d %H:%M:%S.%f"),
@@ -485,7 +512,7 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
                 hhmmss=yyyymmdd_hhmmss,
                 drive_time=int(drive_time / 60),  # convert seconds to minutes
                 idle_time=int(idle_time / 60),  # convert seconds to minutes
-                distance=int(trip["distance"]),
+                distance=float(trip["distance"]),
                 avg_speed=get_child_value(trip["avgspeed"], "value"),
                 max_speed=int(get_child_value(trip["maxspeed"], "value")),
             )
@@ -733,6 +760,8 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
         elif action == VEHICLE_LOCK_ACTION.UNLOCK:
             url = self.API_URL + "rcs/rdo/on"
             _LOGGER.debug(f"{DOMAIN} - Calling unlock")
+        else:
+            raise APIError(f"Invalid action value: {action}")
 
         headers = self._get_vehicle_headers(token, vehicle)
         headers["APPCLOUD-VIN"] = vehicle.VIN

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -240,7 +240,10 @@ class KiaUvoApiAU(ApiImplType1):
                 },
             )
 
-        if vehicle.engine_type == ENGINE_TYPES.EV:
+        if (
+            vehicle.engine_type == ENGINE_TYPES.EV
+            or vehicle.engine_type == ENGINE_TYPES.PHEV
+        ):
             try:
                 state = self._get_driving_info(token, vehicle)
             except Exception as e:
@@ -255,8 +258,8 @@ class KiaUvoApiAU(ApiImplType1):
                             """,
                     exc_info=e,
                 )
-        else:
-            self._update_vehicle_drive_info(vehicle, state)
+            else:
+                self._update_vehicle_drive_info(vehicle, state)
 
     def force_refresh_vehicle_state(self, token: Token, vehicle: Vehicle) -> None:
         status = self._get_forced_vehicle_state(token, vehicle)
@@ -270,15 +273,19 @@ class KiaUvoApiAU(ApiImplType1):
         )
         # Only call for driving info on cars we know have a chance of supporting it.
         # Could be expanded if other types do support it.
-        if vehicle.engine_type == ENGINE_TYPES.EV:
+        if (
+            vehicle.engine_type == ENGINE_TYPES.EV
+            or vehicle.engine_type == ENGINE_TYPES.PHEV
+        ):
             try:
                 state = self._get_driving_info(token, vehicle)
             except Exception as e:
-                # we don't know if all car types provide this information.
-                # we also don't know what the API returns if the info is unavailable.
-                # so, catch any exception and move on.
+                # we don't know if all car types (ex: ICE cars) provide this
+                # information. We also don't know what the API returns if
+                # the info is unavailable. So, catch any exception and move on.
                 _LOGGER.exception(
                     """Failed to parse driving info. Possible reasons:
+                                    - incompatible vehicle (ICE)
                                     - new API format
                                     - API outage
                             """,

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/hyundai_kia_connect_api/Vehicle.py

@@ -19,7 +19,7 @@ class TripInfo:
     hhmmss: str = None  # will not be filled by summary
     drive_time: int = None  # minutes
     idle_time: int = None  # minutes
-    distance: int = None
+    distance: float = None
     avg_speed: float = None
     max_speed: int = None
 
@@ -60,9 +60,7 @@ class DailyDrivingStats:
     onboard_electronics_consumption: int = None
     battery_care_consumption: int = None
     regenerated_energy: int = None
-    # distance is expressed in (I assume) whatever unit the vehicle is
-    # configured in. KMs (rounded) in my case
-    distance: int = None
+    distance: float = None
     distance_unit: str = DISTANCE_UNITS[1]  # set to kms by default
 
 

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/hyundai_kia_connect_api/__init__.py

@@ -2,17 +2,10 @@
 
 # flake8: noqa
 from .ApiImpl import (
-    ApiImpl,
     ClimateRequestOptions,
     WindowRequestOptions,
     ScheduleChargingClimateRequestOptions,
 )
-from .ApiImplType1 import ApiImplType1
-from .HyundaiBlueLinkAPIUSA import HyundaiBlueLinkAPIUSA
-from .KiaUvoApiCA import KiaUvoApiCA
-from .KiaUvoApiEU import KiaUvoApiEU
-from .KiaUvoAPIUSA import KiaUvoAPIUSA
-from .KiaUvoApiCN import KiaUvoApiCN
 
 from .Token import Token
 from .Vehicle import Vehicle

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.23.9
+Version: 3.24.1
 Summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
 Home-page: https://github.com/fuatakgun/hyundai_kia_connect_api
 Author: Fuat Akgun
@@ -11,8 +11,8 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.10
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: beautifulsoup4>=4.10.0

{hyundai_kia_connect_api-3.23.9 → hyundai_kia_connect_api-3.24.1}/setup.py

@@ -23,13 +23,13 @@ test_requirements = [
 setup(
     author="Fuat Akgun",
     author_email="fuatakgun@gmail.com",
-    python_requires=">=3.6",
+    python_requires=">=3.10",
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     description="Python Boilerplate contains all the boilerplate you need to create a Python package.",
     install_requires=requirements,
@@ -44,6 +44,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/fuatakgun/hyundai_kia_connect_api",
-    version="3.23.9",
+    version="3.24.1",
     zip_safe=False,
 )