hyundai-kia-connect-api 3.22.8__tar.gz → 3.22.9__tar.gz

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.22.8
+Version: 3.22.9
 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
@@ -112,16 +112,16 @@ For a list of language codes, see here: https://www.science.co.il/language/Codes
 - "pt" Portuguese
 
 
-In Europe also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
-- First call vm.update_month_trip_info(vehicle.id, yyymm) before getting vehicle.month_trip_info for that month
+In Europe and some other regions also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
+- First call vm.update_month_trip_info(vehicle.id, yyyymm) before getting vehicle.month_trip_info for that month
 - First call vm.update_day_trip_info(vehicle.id, day.yyyymmdd) before getting vehicle.day_trip_info for that day
 
 Example of getting trip info of the current month and day (vm is VehicleManager instance)::
 
     now = datetime.now()
-    yyymm = now.strftime("%Y%m")
+    yyyymm = now.strftime("%Y%m")
     yyyymmdd = now.strftime("%Y%m%d")
-    vm.update_month_trip_info(vehicle.id, yyymm)
+    vm.update_month_trip_info(vehicle.id, yyyymm)
     if vehicle.month_trip_info is not None:
         for day in vehicle.month_trip_info.day_list:  # ordered on day
             if yyyymmdd == day.yyyymmdd:  # in example only interested in current day

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/README.rst

@@ -89,16 +89,16 @@ For a list of language codes, see here: https://www.science.co.il/language/Codes
 - "pt" Portuguese
 
 
-In Europe also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
-- First call vm.update_month_trip_info(vehicle.id, yyymm) before getting vehicle.month_trip_info for that month
+In Europe and some other regions also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
+- First call vm.update_month_trip_info(vehicle.id, yyyymm) before getting vehicle.month_trip_info for that month
 - First call vm.update_day_trip_info(vehicle.id, day.yyyymmdd) before getting vehicle.day_trip_info for that day
 
 Example of getting trip info of the current month and day (vm is VehicleManager instance)::
 
     now = datetime.now()
-    yyymm = now.strftime("%Y%m")
+    yyyymm = now.strftime("%Y%m")
     yyyymmdd = now.strftime("%Y%m%d")
-    vm.update_month_trip_info(vehicle.id, yyymm)
+    vm.update_month_trip_info(vehicle.id, yyyymm)
     if vehicle.month_trip_info is not None:
         for day in vehicle.month_trip_info.day_list:  # ordered on day
             if yyyymmdd == day.yyyymmdd:  # in example only interested in current day

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/ApiImpl.py

@@ -1,6 +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
+# pylint:disable=unnecessary-pass,missing-class-docstring,invalid-name,missing-function-docstring,wildcard-import,unused-wildcard-import,unused-argument,missing-timeout,logging-fstring-interpolation
 
 import datetime as dt
 import logging
@@ -158,7 +158,7 @@ class ApiImpl:
 
     def set_charging_current(self, token: Token, vehicle: Vehicle, level: int) -> str:
         """
-        Europe feature only.
+        feature only available for some regions.
         Sets charge current level (1=100%, 2=90%, 3=60%). Returns the tracking ID
         """
         pass
@@ -179,7 +179,7 @@ class ApiImpl:
         self, token: Token, vehicle: Vehicle, yyyymm_string: str
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.month_trip_info for the specified month.
 
         Default this information is None:
@@ -192,7 +192,7 @@ class ApiImpl:
         self, token: Token, vehicle: Vehicle, yyyymmdd_string: str
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.day_trip_info information for the specified day.
 
         Default this information is None:
@@ -208,7 +208,7 @@ class ApiImpl:
         options: ScheduleChargingClimateRequestOptions,
     ) -> str:
         """
-        Europe feature only.
+        feature only available for some regions.
         Schedule charging and climate control. Returns the tracking ID
         """
         pass

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/ApiImplType1.py

@@ -1,3 +1,5 @@
+""" "ApiImplType1.py"""
+
 import datetime as dt
 from typing import Optional
 
@@ -23,6 +25,8 @@ USER_AGENT_OK_HTTP: str = "okhttp/3.12.0"
 
 
 class ApiImplType1(ApiImpl):
+    """ApiImplType1"""
+
     def __init__(self) -> None:
         """Initialize."""
 

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/HyundaiBlueLinkAPIUSA.py

@@ -710,6 +710,6 @@ class HyundaiBlueLinkAPIUSA(ApiImpl):
 
         response = self.sessions.post(url, json=data, headers=headers)
         _LOGGER.debug(
-            f"{DOMAIN} - Setting charge limits response status code: {response.status_code}"
+            f"{DOMAIN} - Setting charge limits response status code: {response.status_code}"  # noqa
         )
         _LOGGER.debug(f"{DOMAIN} - Setting charge limits: {response.text}")

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/KiaUvoApiAU.py

@@ -113,12 +113,12 @@ class KiaUvoApiAU(ApiImplType1):
             self.BASE_URL: str = "au-apigw.ccs.kia.com.au:8082"
             self.CCSP_SERVICE_ID: str = "8acb778a-b918-4a8d-8624-73a0beb64289"
             self.APP_ID: str = "4ad4dcde-be23-48a8-bc1c-91b94f5c06f8"  # Android app ID
-            self.BASIC_AUTHORIZATION: str = "Basic OGFjYjc3OGEtYjkxOC00YThkLTg2MjQtNzNhMGJlYjY0Mjg5OjdTY01NbTZmRVlYZGlFUEN4YVBhUW1nZVlkbFVyZndvaDRBZlhHT3pZSVMyQ3U5VA=="
+            self.BASIC_AUTHORIZATION: str = "Basic OGFjYjc3OGEtYjkxOC00YThkLTg2MjQtNzNhMGJlYjY0Mjg5OjdTY01NbTZmRVlYZGlFUEN4YVBhUW1nZVlkbFVyZndvaDRBZlhHT3pZSVMyQ3U5VA=="  # noqa
         elif BRANDS[brand] == BRAND_HYUNDAI:
             self.BASE_URL: str = "au-apigw.ccs.hyundai.com.au:8080"
             self.CCSP_SERVICE_ID: str = "855c72df-dfd7-4230-ab03-67cbf902bb1c"
             self.APP_ID: str = "f9ccfdac-a48d-4c57-bd32-9116963c24ed"  # Android app ID
-            self.BASIC_AUTHORIZATION: str = "Basic ODU1YzcyZGYtZGZkNy00MjMwLWFiMDMtNjdjYmY5MDJiYjFjOmU2ZmJ3SE0zMllOYmhRbDBwdmlhUHAzcmY0dDNTNms5MWVjZUEzTUpMZGJkVGhDTw=="
+            self.BASIC_AUTHORIZATION: str = "Basic ODU1YzcyZGYtZGZkNy00MjMwLWFiMDMtNjdjYmY5MDJiYjFjOmU2ZmJ3SE0zMllOYmhRbDBwdmlhUHAzcmY0dDNTNms5MWVjZUEzTUpMZGJkVGhDTw=="  # noqa
 
         self.USER_API_URL: str = "https://" + self.BASE_URL + "/api/v1/user/"
         self.SPA_API_URL: str = "https://" + self.BASE_URL + "/api/v1/spa/"
@@ -847,7 +847,7 @@ class KiaUvoApiAU(ApiImplType1):
         yyyymm_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.month_trip_info for the specified month.
 
         Default this information is None:
@@ -891,7 +891,7 @@ class KiaUvoApiAU(ApiImplType1):
         yyyymmdd_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.day_trip_info information for the specified day.
 
         Default this information is None:

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/KiaUvoApiCN.py

@@ -6,6 +6,7 @@ import datetime as dt
 import math
 import logging
 import uuid
+from typing import Optional
 from time import sleep
 from urllib.parse import parse_qs, urlparse
 
@@ -112,7 +113,7 @@ class KiaUvoApiCN(ApiImplType1):
             self.BASE_DOMAIN: str = "prd.cn-ccapi.kia.com"
             self.CCSP_SERVICE_ID: str = "9d5df92a-06ae-435f-b459-8304f2efcc67"
             self.APP_ID: str = "eea8762c-adfc-4ee4-8d7a-6e2452ddf342"
-            self.BASIC_AUTHORIZATION: str = "Basic OWQ1ZGY5MmEtMDZhZS00MzVmLWI0NTktODMwNGYyZWZjYzY3OnRzWGRrVWcwOEF2MlpaelhPZ1d6Snl4VVQ2eWVTbk5OUWtYWFBSZEtXRUFOd2wxcA=="
+            self.BASIC_AUTHORIZATION: str = "Basic OWQ1ZGY5MmEtMDZhZS00MzVmLWI0NTktODMwNGYyZWZjYzY3OnRzWGRrVWcwOEF2MlpaelhPZ1d6Snl4VVQ2eWVTbk5OUWtYWFBSZEtXRUFOd2wxcA=="  # noqa
         elif BRANDS[brand] == BRAND_HYUNDAI:
             self.BASE_DOMAIN: str = "prd.cn-ccapi.hyundai.com"
             self.CCSP_SERVICE_ID: str = "72b3d019-5bc7-443d-a437-08f307cf06e2"
@@ -128,7 +129,9 @@ class KiaUvoApiCN(ApiImplType1):
         self.CLIENT_ID: str = self.CCSP_SERVICE_ID
         self.GCM_SENDER_ID = 199360397125
 
-    def _get_authenticated_headers(self, token: Token) -> dict:
+    def _get_authenticated_headers(
+        self, token: Token, ccs2_support: Optional[int] = None
+    ) -> dict:
         return {
             "Authorization": token.access_token,
             "ccsp-service-id": self.CCSP_SERVICE_ID,
@@ -826,7 +829,7 @@ class KiaUvoApiCN(ApiImplType1):
         yyyymm_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.month_trip_info for the specified month.
 
         Default this information is None:
@@ -870,7 +873,7 @@ class KiaUvoApiCN(ApiImplType1):
         yyyymmdd_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.day_trip_info information for the specified day.
 
         Default this information is None:

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/KiaUvoApiEU.py

@@ -706,13 +706,13 @@ class KiaUvoApiEU(ApiImplType1):
 
         if get_child_value(
             state,
-            "vehicleStatus.evStatus.reservChargeInfos.reservChargeInfo.reservChargeInfoDetail.reservFatcSet.airTemp.value",
-        ):  # noqa
+            "vehicleStatus.evStatus.reservChargeInfos.reservChargeInfo.reservChargeInfoDetail.reservFatcSet.airTemp.value",  # noqa
+        ):
             temp_index = get_hex_temp_into_index(
                 get_child_value(
                     state,
-                    "vehicleStatus.evStatus.reservChargeInfos.reservChargeInfo.reservChargeInfoDetail.reservFatcSet.airTemp.value",
-                )  # noqa
+                    "vehicleStatus.evStatus.reservChargeInfos.reservChargeInfo.reservChargeInfoDetail.reservFatcSet.airTemp.value",  # noqa
+                )
             )
 
             vehicle.ev_first_departure_climate_temperature = (
@@ -727,13 +727,13 @@ class KiaUvoApiEU(ApiImplType1):
 
         if get_child_value(
             state,
-            "vehicleStatus.evStatus.reservChargeInfos.reserveChargeInfo2.reservChargeInfoDetail.reservFatcSet.airTemp.value",
-        ):  # noqa
+            "vehicleStatus.evStatus.reservChargeInfos.reserveChargeInfo2.reservChargeInfoDetail.reservFatcSet.airTemp.value",  # noqa
+        ):
             temp_index = get_hex_temp_into_index(
                 get_child_value(
                     state,
-                    "vehicleStatus.evStatus.reservChargeInfos.reserveChargeInfo2.reservChargeInfoDetail.reservFatcSet.airTemp.value",
-                )  # noqa
+                    "vehicleStatus.evStatus.reservChargeInfos.reserveChargeInfo2.reservChargeInfoDetail.reservFatcSet.airTemp.value",  # noqa
+                )
             )
 
             vehicle.ev_second_departure_climate_temperature = (
@@ -1088,7 +1088,7 @@ class KiaUvoApiEU(ApiImplType1):
         yyyymm_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.month_trip_info for the specified month.
 
         Default this information is None:
@@ -1123,9 +1123,6 @@ class KiaUvoApiEU(ApiImplType1):
                 )
                 result.day_list.append(processed_day)
 
-            if len(result.day_list) > 0:  # sort on increasing yyyymmdd
-                result.day_list.sort(key=lambda k: k.yyyymmdd)
-
             vehicle.month_trip_info = result
 
     def update_day_trip_info(
@@ -1135,7 +1132,7 @@ class KiaUvoApiEU(ApiImplType1):
         yyyymmdd_string,
     ) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.day_trip_info information for the specified day.
 
         Default this information is None:
@@ -1174,9 +1171,6 @@ class KiaUvoApiEU(ApiImplType1):
                 )
                 result.trip_list.append(processed_trip)
 
-            if len(result.trip_list) > 0:  # sort on descending hhmmss
-                result.trip_list.sort(reverse=True, key=lambda k: k.hhmmss)
-
             vehicle.day_trip_info = result
 
     def _get_driving_info(self, token: Token, vehicle: Vehicle) -> dict:
@@ -1244,12 +1238,6 @@ class KiaUvoApiEU(ApiImplType1):
                     )
                     break
 
-            daily_stats = drivingInfo["dailyStats"]
-            _LOGGER.debug(f"KiaUvoApiEU: before daily_stats: {daily_stats}")  # noqa
-            if len(daily_stats) > 0:  # sort on decreasing date
-                daily_stats.sort(reverse=True, key=lambda k: k.date)
-                drivingInfo["dailyStats"] = daily_stats
-                _LOGGER.debug(f"KiaUvoApiEU: after  daily_stats: {daily_stats}")  # noqa
             return drivingInfo
         else:
             _LOGGER.debug(
@@ -1375,7 +1363,7 @@ class KiaUvoApiEU(ApiImplType1):
                 "reservFatcSet": {
                     "airCtrl": 1 if options.climate_enabled else 0,
                     "airTemp": {
-                        "value": "{:.1f}".format(temperature),
+                        "value": f"{temperature:.1f}",
                         "hvacTempType": 1,
                         "unit": options.temperature_unit,
                     },
@@ -1390,15 +1378,15 @@ class KiaUvoApiEU(ApiImplType1):
             "offPeakPowerInfo": {
                 "offPeakPowerTime1": {
                     "endtime": {
-                        "timeSection": 1
-                        if options.off_peak_end_time >= dt.time(12, 0)
-                        else 0,
+                        "timeSection": (
+                            1 if options.off_peak_end_time >= dt.time(12, 0) else 0
+                        ),
                         "time": options.off_peak_end_time.strftime("%I%M"),
                     },
                     "starttime": {
-                        "timeSection": 1
-                        if options.off_peak_start_time >= dt.time(12, 0)
-                        else 0,
+                        "timeSection": (
+                            1 if options.off_peak_start_time >= dt.time(12, 0) else 0
+                        ),
                         "time": options.off_peak_start_time.strftime("%I%M"),
                     },
                 },

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/Vehicle.py

@@ -1,4 +1,4 @@
-# pylint:disable=missing-class-docstring,missing-function-docstring,wildcard-import,unused-wildcard-import,invalid-name
+# pylint:disable=missing-class-docstring,missing-function-docstring,wildcard-import,unused-wildcard-import,invalid-name,logging-fstring-interpolation
 """Vehicle class"""
 
 import logging
@@ -173,11 +173,61 @@ class Vehicle:
     # expressed in watt-hours (Wh)
     power_consumption_30d: float = None  # Europe feature only
 
-    # Europe feature only
-    daily_stats: list[DailyDrivingStats] = field(default_factory=list)
+    # feature only available for some regions (getter/setter for sorting)
+    _daily_stats: list[DailyDrivingStats] = field(default_factory=list)
 
-    month_trip_info: MonthTripInfo = None  # Europe feature only
-    day_trip_info: DayTripInfo = None  # Europe feature only
+    @property
+    def daily_stats(self):
+        return self._daily_stats
+
+    @daily_stats.setter
+    def daily_stats(self, value):
+        result = value
+        if result is not None and len(result) > 0:  # sort on decreasing date
+            _LOGGER.debug(f"before daily_stats: {result}")
+            result.sort(reverse=True, key=lambda k: k.date)
+            _LOGGER.debug(f"after  daily_stats: {result}")
+        self._daily_stats = result
+
+    # feature only available for some regions (getter/setter for sorting)
+    _month_trip_info: MonthTripInfo = None
+
+    @property
+    def month_trip_info(self):
+        return self._month_trip_info
+
+    @month_trip_info.setter
+    def month_trip_info(self, value):
+        result = value
+        if (
+            result is not None
+            and hasattr(result, "day_list")
+            and len(result.day_list) > 0
+        ):  # sort on increasing yyyymmdd
+            _LOGGER.debug(f"before month_trip_info: {result}")
+            result.day_list.sort(key=lambda k: k.yyyymmdd)
+            _LOGGER.debug(f"after  month_trip_info: {result}")
+        self._month_trip_info = result
+
+    # feature only available for some regions (getter/setter for sorting)
+    _day_trip_info: DayTripInfo = None
+
+    @property
+    def day_trip_info(self):
+        return self._day_trip_info
+
+    @day_trip_info.setter
+    def day_trip_info(self, value):
+        result = value
+        if (
+            result is not None
+            and hasattr(result, "trip_list")
+            and len(result.trip_list) > 0
+        ):  # sort on descending hhmmss
+            _LOGGER.debug(f"before day_trip_info: {result}")
+            result.trip_list.sort(reverse=True, key=lambda k: k.hhmmss)
+            _LOGGER.debug(f"after day_trip_info: {result}")
+        self._day_trip_info = result
 
     ev_battery_percentage: int = None
     ev_battery_soh_percentage: int = None

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/VehicleManager.py

@@ -219,7 +219,7 @@ class VehicleManager:
 
     def update_month_trip_info(self, vehicle_id: str, yyyymm_string: str) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.month_trip_info for the specified month.
 
         Default this information is None:
@@ -231,7 +231,7 @@ class VehicleManager:
 
     def update_day_trip_info(self, vehicle_id: str, yyyymmdd_string: str) -> None:
         """
-        Europe feature only.
+        feature only available for some regions.
         Updates the vehicle.day_trip_info information for the specified day.
 
         Default this information is None:

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api/utils.py

@@ -1,4 +1,4 @@
-# pylint:disable=bare-except,missing-function-docstring,invalid-name
+# pylint:disable=bare-except,missing-function-docstring,invalid-name,broad-exception-caught
 """utils.py"""
 
 import datetime

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/hyundai_kia_connect_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyundai_kia_connect_api
-Version: 3.22.8
+Version: 3.22.9
 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
@@ -112,16 +112,16 @@ For a list of language codes, see here: https://www.science.co.il/language/Codes
 - "pt" Portuguese
 
 
-In Europe also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
-- First call vm.update_month_trip_info(vehicle.id, yyymm) before getting vehicle.month_trip_info for that month
+In Europe and some other regions also trip info can be retrieved. For a month you can ask the days with trips. And you can ask for a specific day for all the trips of that specific day.::
+- First call vm.update_month_trip_info(vehicle.id, yyyymm) before getting vehicle.month_trip_info for that month
 - First call vm.update_day_trip_info(vehicle.id, day.yyyymmdd) before getting vehicle.day_trip_info for that day
 
 Example of getting trip info of the current month and day (vm is VehicleManager instance)::
 
     now = datetime.now()
-    yyymm = now.strftime("%Y%m")
+    yyyymm = now.strftime("%Y%m")
     yyyymmdd = now.strftime("%Y%m%d")
-    vm.update_month_trip_info(vehicle.id, yyymm)
+    vm.update_month_trip_info(vehicle.id, yyyymm)
     if vehicle.month_trip_info is not None:
         for day in vehicle.month_trip_info.day_list:  # ordered on day
             if yyyymmdd == day.yyyymmdd:  # in example only interested in current day

{hyundai_kia_connect_api-3.22.8 → hyundai_kia_connect_api-3.22.9}/setup.py

@@ -44,6 +44,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/fuatakgun/hyundai_kia_connect_api",
-    version="3.22.8",
+    version="3.22.9",
     zip_safe=False,
 )