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

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,10 +19,10 @@ 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)
+        config = Configuration(host=api_url, access_token=access_token, client_session=client_session)
 
         async with ApiClient(configuration=config) as client:
 

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,18 +28,19 @@ 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)
 
             async with ApiClient(configuration=config) as client:
                 # Set the max power once

weheat/abstractions/user.py

@@ -1,14 +1,16 @@
 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)
 
         async with ApiClient(configuration=config) as client:
             response = await UserApi(

weheat/configuration.py

@@ -15,6 +15,8 @@
 import copy
 import logging
 import sys
+
+import aiohttp
 import urllib3
 
 import http.client as httplib
@@ -51,6 +53,7 @@ class Configuration:
       values before.
     :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
       in PEM format.
+    : param client_session: A aiohttp.ClientSession to use
 
     :Example:
     """
@@ -63,7 +66,7 @@ class Configuration:
                  access_token=None,
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
-                 ssl_ca_cert=None,
+                 ssl_ca_cert=None, client_session=None
                  ) -> None:
         """Constructor
         """
@@ -179,6 +182,8 @@ class Configuration:
         """date format
         """
 
+        self._client_session = client_session
+
     def __deepcopy__(self, memo):
         cls = self.__class__
         result = cls.__new__(cls)
@@ -196,6 +201,10 @@ class Configuration:
     def __setattr__(self, name, value):
         object.__setattr__(self, name, value)
 
+    @property
+    def client_session(self) -> aiohttp.ClientSession|None:
+        return self._client_session
+
     @classmethod
     def set_default(cls, default):
         """Set default instance of configuration.

weheat/rest.py

@@ -55,32 +55,37 @@ class RESTClientObject:
         # maxsize is number of requests to host that are allowed in parallel
         maxsize = configuration.connection_pool_maxsize
 
-        ssl_context = ssl.create_default_context(
-            cafile=configuration.ssl_ca_cert
-        )
-        if configuration.cert_file:
-            ssl_context.load_cert_chain(
-                configuration.cert_file, keyfile=configuration.key_file
+        self._client_session = configuration.client_session
+        # only setup SSL when the session is not provided. Otherwise, it will do disk access and HA will get mad.
+        if not configuration.client_session:
+            ssl_context = ssl.create_default_context(
+                cafile=configuration.ssl_ca_cert
             )
+            if configuration.cert_file:
+                ssl_context.load_cert_chain(
+                    configuration.cert_file, keyfile=configuration.key_file
+                )
+
+            if not configuration.verify_ssl:
+                ssl_context.check_hostname = False
+                ssl_context.verify_mode = ssl.CERT_NONE
 
-        if not configuration.verify_ssl:
-            ssl_context.check_hostname = False
-            ssl_context.verify_mode = ssl.CERT_NONE
+            connector = aiohttp.TCPConnector(
+                limit=maxsize,
+                ssl=ssl_context
+            )
 
-        connector = aiohttp.TCPConnector(
-            limit=maxsize,
-            ssl=ssl_context
-        )
+            # https pool manager
+            self.pool_manager = aiohttp.ClientSession(
+                connector=connector,
+                trust_env=True
+            )
+        else:
+            self.pool_manager = configuration.client_session
 
         self.proxy = configuration.proxy
         self.proxy_headers = configuration.proxy_headers
 
-        # https pool manager
-        self.pool_manager = aiohttp.ClientSession(
-            connector=connector,
-            trust_env=True
-        )
-
         retries = configuration.retries
         if retries is not None:
             self.retry_client = aiohttp_retry.RetryClient(
@@ -96,6 +101,9 @@ class RESTClientObject:
             self.retry_client = None
 
     async def close(self):
+        # do not close the session if provided via client_session
+        if self._client_session:
+            return
         await self.pool_manager.close()
         if self.retry_client is not None:
             await self.retry_client.close()

{weheat-2025.1.15rc1.dist-info → weheat-2025.1.15rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: weheat
-Version: 2025.1.15rc1
+Version: 2025.1.15rc2
 Summary: Weheat Backend client
 Home-page: https://github.com/wefabricate/wh-python
 Author: Jesper Raemaekers

{weheat-2025.1.15rc1.dist-info → weheat-2025.1.15rc2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 weheat/__init__.py,sha256=C24j_uAbbyEzqh8DmQyORUrVMdFDlzEv4jGClf4TY34,1765
 weheat/api_client.py,sha256=Bh5xHchRGCcsHbT3rXrcmhKCMiumi1_2L6n0Q57KODw,24803
 weheat/api_response.py,sha256=A7O_XgliD6y7jEv82fgIaxR3T8KiwaOqHR6djpZyh_o,674
-weheat/configuration.py,sha256=bSjeNWmg5SuxyULRbUR9KCuPK9yHSYCbrZlIbY6UiAo,14278
+weheat/configuration.py,sha256=8D0zAgx7B6YmVNuyS0AarcCAl5TmKKH655jHqWrvSl0,14531
 weheat/exceptions.py,sha256=jZjLtEMBKFpLTdV1GPsbQSPriG1ilgMSodGnhEKlWh4,5913
 weheat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-weheat/rest.py,sha256=r0ot19pStSTb4Nwco98UeSsppIQAR8FxQecABO4y9aY,6598
+weheat/rest.py,sha256=hSt8T6NQfdrgz_7Dxo9U-DO5ZEgUVVG38OUErThWqlU,7086
 weheat/abstractions/__init__.py,sha256=cRdA_kyTIooo39I13_mqShSfZMqdzNGHbmrnITqgx6A,161
 weheat/abstractions/auth.py,sha256=VCAxJ4OIj7bsYttqJl5-juU0VUlSd3xPu7kUjtHZr3U,979
-weheat/abstractions/discovery.py,sha256=Z1_tLFJzZkbA8CYIs2KpxoMB7S6Xc-V8jRk-LQeX1UE,2287
-weheat/abstractions/heat_pump.py,sha256=MwOXkUSJaq820clvM-iYaeMmYn4YfR7k6ML3pPR5nbY,9787
-weheat/abstractions/user.py,sha256=gQ5hSthG7c434lqsliI91uBOIkUQ8uTdRmCV-e7Y_Gk,663
+weheat/abstractions/discovery.py,sha256=PrhyM29OKvCgKzWig5BAjaEF15CIcTp_AIBZg2lyJ6Y,2384
+weheat/abstractions/heat_pump.py,sha256=DFgKF_4Mdv4dOVugECy9xB4y6e85B-HwZatrUBSnhPE,9920
+weheat/abstractions/user.py,sha256=L48CGvBe7YrUa-wnIgmv9Hu0DOMN4IXN0fSmufrlJIc,760
 weheat/api/__init__.py,sha256=zZ_Xqek8VY6gARsJK6hRess0qqGii-Ls1uXm92k0jPE,244
 weheat/api/energy_log_api.py,sha256=plZ9YoQ9O39qufzr3B6CduuzJMY1K6iJS5f5AXN-vUo,17587
 weheat/api/heat_pump_api.py,sha256=tyFA-Xf-Ld4cAVSYblCq1s5I1CDRQmKJx9UBJivnS0Y,28211
@@ -30,8 +30,8 @@ weheat/models/read_heat_pump_dto.py,sha256=7jH2MwMVKv_dOoJUUsKE8sTR5mROqco71OzOA
 weheat/models/read_user_dto.py,sha256=OIsWQZcdByN94ViSv0DjFHORRsMnkQ93jc-gJuudRdg,4018
 weheat/models/read_user_me_dto.py,sha256=Ger6qKlbZBBvG_4MStl6aEMkrBBJIjQtV6pvK1-lw28,4441
 weheat/models/role.py,sha256=6KUInAmkhoxEdWxBo9jBHXiy_nqJHrKXVeh8RvQPEYM,1101
-weheat-2025.1.15rc1.dist-info/LICENSE,sha256=rWmFUq0uth2jpet-RQ2QPd2VhZkcPSUs6Dxfmbqkbis,1068
-weheat-2025.1.15rc1.dist-info/METADATA,sha256=6-x-xTzWRV5bFUC4lUNjN1PULmzeH7IpHtnsHu3F8cM,3877
-weheat-2025.1.15rc1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-weheat-2025.1.15rc1.dist-info/top_level.txt,sha256=hLzdyvGZ9rs4AqK7U48mdHx_-FcP5sDuTSleDUvGAZw,7
-weheat-2025.1.15rc1.dist-info/RECORD,,
+weheat-2025.1.15rc2.dist-info/LICENSE,sha256=rWmFUq0uth2jpet-RQ2QPd2VhZkcPSUs6Dxfmbqkbis,1068
+weheat-2025.1.15rc2.dist-info/METADATA,sha256=lg2CZbj2OGdxFi33MKKI7VrqKmvlBc-Uvf1IIeO3wvA,3877
+weheat-2025.1.15rc2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+weheat-2025.1.15rc2.dist-info/top_level.txt,sha256=hLzdyvGZ9rs4AqK7U48mdHx_-FcP5sDuTSleDUvGAZw,7
+weheat-2025.1.15rc2.dist-info/RECORD,,