weheat 2025.1.15rc1__tar.gz → 2025.1.15rc2__tar.gz

{weheat-2025.1.15rc1 → weheat-2025.1.15rc2}/PKG-INFO

@@ -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 → weheat-2025.1.15rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "weheat"
-version = "2025.1.15rc1"
+version = "2025.1.15rc2"
 description = "Weheat Backend"
 authors = ["Jesper Raemaekers <jesper.raemaekers@wefabricate.com>", "Kjell van Straaten <kjell.van.straaten@wefabricate.com>"]
 license = "MIT"

{weheat-2025.1.15rc1 → weheat-2025.1.15rc2}/setup.py

@@ -21,7 +21,7 @@ from setuptools import setup, find_packages  # noqa: H301
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "weheat"
-VERSION = "2025.1.15rc1"
+VERSION = "2025.1.15rc2"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 2.1.0",

{weheat-2025.1.15rc1 → weheat-2025.1.15rc2}/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-2025.1.15rc1 → weheat-2025.1.15rc2}/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-2025.1.15rc1 → weheat-2025.1.15rc2}/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-2025.1.15rc1 → weheat-2025.1.15rc2}/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-2025.1.15rc1 → weheat-2025.1.15rc2}/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 → weheat-2025.1.15rc2}/weheat.egg-info/PKG-INFO

@@ -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