weheat 2025.1.14rc1__py3-none-any.whl → 2025.1.15rc2__py3-none-any.whl

weheat/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "2024.07.08"
+__version__ = "2024.11.15"
 
 # import apis into sdk package
 from weheat.api.energy_log_api import EnergyLogApi
@@ -34,12 +34,17 @@ from weheat.exceptions import ApiAttributeError
 from weheat.exceptions import ApiException
 
 # import models into sdk package
+from weheat.models.boiler_type import BoilerType
 from weheat.models.device_state import DeviceState
+from weheat.models.dhw_type import DhwType
 from weheat.models.energy_view_dto import EnergyViewDto
 from weheat.models.heat_pump_log_view_dto import HeatPumpLogViewDto
+from weheat.models.heat_pump_model import HeatPumpModel
+from weheat.models.heat_pump_status_enum import HeatPumpStatusEnum
+from weheat.models.heat_pump_type import HeatPumpType
 from weheat.models.raw_heat_pump_log_dto import RawHeatPumpLogDto
 from weheat.models.read_all_heat_pump_dto import ReadAllHeatPumpDto
 from weheat.models.read_heat_pump_dto import ReadHeatPumpDto
 from weheat.models.read_user_dto import ReadUserDto
+from weheat.models.read_user_me_dto import ReadUserMeDto
 from weheat.models.role import Role
-

weheat/abstractions/discovery.py

@@ -1,6 +1,8 @@
 import asyncio
 from dataclasses import dataclass
 
+import aiohttp
+
 from weheat import DeviceState
 from weheat.configuration import Configuration
 from weheat.api_client import ApiClient
@@ -17,16 +19,14 @@ class HeatPumpDiscovery:
         has_dhw: bool = False
 
     @staticmethod
-    async def async_discover_active(api_url: str, access_token: str) -> list[HeatPumpInfo]:
+    async def async_discover_active(api_url: str, access_token: str, client_session:aiohttp.ClientSession|None = None) -> list[HeatPumpInfo]:
         discovered_pumps = []
 
-        config = Configuration(host=api_url, access_token=access_token)
-
-        with ApiClient(configuration=config) as client:
+        config = Configuration(host=api_url, access_token=access_token, client_session=client_session)
 
-            response = HeatPumpApi(client).api_v1_heat_pumps_get_with_http_info('', 1, 1000, DeviceState.NUMBER_3 ,async_req=True)
+        async with ApiClient(configuration=config) as client:
 
-            response = await asyncio.to_thread(response.get)
+            response = await  HeatPumpApi(client).api_v1_heat_pumps_get_with_http_info('', 1, 1000, DeviceState.NUMBER_3)
 
             if response.status_code == 200:
                 for pump in response.data:

weheat/abstractions/heat_pump.py

@@ -2,6 +2,8 @@
 import asyncio
 from enum import Enum, auto
 
+import aiohttp
+
 from weheat import HeatPumpApi
 from weheat.configuration import Configuration
 from weheat.api_client import ApiClient
@@ -26,49 +28,43 @@ class HeatPump:
         SELF_TEST = auto()
         MANUAL_CONTROL = auto()
 
-    def __init__(self, api_url: str, uuid: str) -> None:
+    def __init__(self, api_url: str, uuid: str, client_session:aiohttp.ClientSession|None = None) -> None:
         self._api_url = api_url
         self._uuid = uuid
         self._last_log = None
         self._energy_consumption = None
         self._energy_output = None
         self._nominal_max_power = None
+        self._client = client_session
 
     async def async_get_status(self, access_token: str):
         """Updates the heat pump instance with data from the API."""
         try:
-            config = Configuration(host=self._api_url, access_token=access_token)
+            config = Configuration(host=self._api_url, access_token=access_token, client_session=self._client)
 
-            with ApiClient(configuration=config) as client:
+            async with ApiClient(configuration=config) as client:
                 # Set the max power once
                 if self._nominal_max_power is None:
-                    response = HeatPumpApi(client).api_v1_heat_pumps_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid, async_req=True)
-
-                    response = await asyncio.to_thread(response.get)
+                    response = await HeatPumpApi(client).api_v1_heat_pumps_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid)
 
                     if response.status_code == 200:
                         self._set_nominal_max_power_for_model(response.data.model)
 
 
-                response = HeatPumpLogApi(
+                response = await HeatPumpLogApi(
                     client
                 ).api_v1_heat_pumps_heat_pump_id_logs_latest_get_with_http_info(
-                    heat_pump_id=self._uuid, async_req=True
-                )
-
-                response = await asyncio.to_thread(response.get)
+                    heat_pump_id=self._uuid                )
 
                 if response.status_code == 200:
                     self._last_log = response.data
 
                 # Also get all energy totals form past years and add them together
                 # As end time pick today + 1 day to avoid issues with timezones
-                response = EnergyLogApi(client).api_v1_energy_logs_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid,
+                response = await EnergyLogApi(client).api_v1_energy_logs_heat_pump_id_get_with_http_info(heat_pump_id=self._uuid,
                                                                                 start_time=START_DATE,
                                                                                 end_time=datetime.now() + timedelta(days=1),
-                                                                                interval='Month', async_req=True)
-
-                response = await asyncio.to_thread(response.get)
+                                                                                interval='Month')
 
                 if response.status_code == 200:
                     # aggregate the energy consumption

weheat/abstractions/user.py

@@ -1,21 +1,21 @@
 import asyncio
 
+import aiohttp
+
 from weheat.configuration import Configuration
 from weheat.api_client import ApiClient
 from weheat.api.user_api import UserApi
 
 
-async def async_get_user_id_from_token(api_url: str, access_token: str):
+async def async_get_user_id_from_token(api_url: str, access_token: str, client_session:aiohttp.ClientSession|None = None):
     """ Get the user id from the current logged-in user. """
     try:
-        config = Configuration(host=api_url, access_token=access_token)
+        config = Configuration(host=api_url, access_token=access_token, client_session=client_session)
 
-        with ApiClient(configuration=config) as client:
-            response = UserApi(
+        async with ApiClient(configuration=config) as client:
+            response = await UserApi(
                 client
-            ).api_v1_users_me_get_with_http_info(async_req=True)
-
-            response = await asyncio.to_thread(response.get)
+            ).api_v1_users_me_get_with_http_info()
 
             if response.status_code == 200:
                 return response.data.id

weheat/api/__init__.py

@@ -5,3 +5,4 @@ from weheat.api.energy_log_api import EnergyLogApi
 from weheat.api.heat_pump_api import HeatPumpApi
 from weheat.api.heat_pump_log_api import HeatPumpLogApi
 from weheat.api.user_api import UserApi
+