solarlog-cli 0.3.2__tar.gz → 0.4.0__tar.gz

{solarlog_cli-0.3.2 → solarlog_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solarlog_cli
-Version: 0.3.2
+Version: 0.4.0
 Summary: Python library to access the Solar-Log
 Project-URL: Repository, https://github.com/dontinelli/solarlog_cli.git
 Project-URL: Issues, https://github.com/dontinelli/solarlog_cli/issues
@@ -8,7 +8,6 @@ Project-URL: Changelog, https://github.com/dontinelli/solarlog_cli/blob/master/C
 Project-URL: Solar-Log homepage, https://www.solar-log.com/
 Project-URL: API Documentation (inofficial), https://github.com/iobroker-community-adapters/ioBroker.solarlog/blob/master/docs/solarlog_dataobjects.md
 Author-email: dontinelli <73341522+dontinelli@users.noreply.github.com>
-License-File: LICENSE
 Keywords: IoT,hass,home assistant,sensor,smart home,solar
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent

{solarlog_cli-0.3.2 → solarlog_cli-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solarlog_cli"
-version = "0.3.2"
+version = "0.4.0"
 authors = [
   { name="dontinelli", email="73341522+dontinelli@users.noreply.github.com" },
 ]

{solarlog_cli-0.3.2 → solarlog_cli-0.4.0}/src/solarlog_cli/solarlog_client.py

@@ -26,15 +26,17 @@ class Client:
 
     # pylint: disable=too-many-positional-arguments
 
-    def __init__(self, host: str, password: str = "") -> None:
+    def __init__(self, host: str, session: ClientSession | None, password: str = "") -> None:
         self.host: str = host
         self.password: str = password
         self.token: str = ""
 
         self.request_timeout = 30
-        self.session = ClientSession(
-            timeout=ClientTimeout(total=self.request_timeout)
-        )
+
+        if not session:
+            self.session = ClientSession()
+        else:
+            self.session = session
 
         self._close_session: bool = True
 
@@ -42,14 +44,15 @@ class Client:
     async def test_connection(self) -> bool:
         """Test the connection to Solar-Log."""
         if self.session is None:
-            self.session = ClientSession(
-                timeout=ClientTimeout(total=self.request_timeout)
-            )
+            self.session = ClientSession()
             self._close_session = True
 
         url = f"{self.host}/getjp"
 
-        response = await self.session.post(url, json=SOLARLOG_REQUEST_PAYLOAD)
+        response = await self.session.post(
+            url, json=SOLARLOG_REQUEST_PAYLOAD,
+            timeout=ClientTimeout(total=self.request_timeout)
+        )
 
         if response.status == 200:
             return True
@@ -85,9 +88,7 @@ class Client:
     async def execute_http_request(self, body: str, path: str = "getjp") -> ClientResponse:
         """Helper function to process the HTTP Get call."""
         if self.session is None:
-            self.session = ClientSession(
-                timeout=ClientTimeout(total=self.request_timeout)
-            )
+            self.session = ClientSession()
             self._close_session = True
 
         url = f"{self.host}/{path}"
@@ -105,6 +106,7 @@ class Client:
                 url=url,
                 headers=header,
                 data=body,
+                timeout=ClientTimeout(total=self.request_timeout),
             )
         except asyncio.TimeoutError as exception:
             msg = f"Timeout occurred while connecting to Solar-Log at {self.host}"

{solarlog_cli-0.3.2 → solarlog_cli-0.4.0}/src/solarlog_cli/solarlog_connector.py

@@ -4,6 +4,8 @@ from datetime import timezone, tzinfo
 import logging
 from zoneinfo import ZoneInfo
 
+from aiohttp import ClientSession
+
 from .solarlog_client import Client
 from .solarlog_exceptions import(
     SolarLogAuthenticationError,
@@ -28,8 +30,9 @@ class SolarLogConnector:
         tz: str = "",
         device_enabled: dict[int, bool] | None = None,
         password: str = "",
+        session: ClientSession | None = None,
     ):
-        self.client = Client(host, password)
+        self.client = Client(host, session, password)
         self.extended_data: bool = extended_data
 
         self._device_list: dict[int, InverterData] = {}

{solarlog_cli-0.3.2 → solarlog_cli-0.4.0}/tests/test_solarlog_cli.py

@@ -1,6 +1,7 @@
 """Tests for solarlog_cli."""
 
 from aioresponses import aioresponses
+from aiohttp import ClientSession
 
 import pytest
 from syrupy.assertion import SnapshotAssertion
@@ -48,6 +49,26 @@ async def test_connection(
     assert solarlog_connector.client.session.closed
 
 
+async def test_existing_session(
+    responses: aioresponses,
+) -> None:
+    """Test connection."""
+    responses.post(
+        "localhost/getjp",
+        status=200,
+    )
+
+    solarlog_connector = SolarLogConnector("localhost", session=ClientSession())
+
+    assert await solarlog_connector.test_connection()
+
+    assert solarlog_connector.host == "localhost"
+
+    assert solarlog_connector.client.session is not None
+    assert not solarlog_connector.client.session.closed
+    await solarlog_connector.client.close()
+    assert solarlog_connector.client.session.closed
+
 async def test_extended_data_available(
     responses: aioresponses,
 ) -> None: