violet-poolController-api 0.0.25__tar.gz → 0.0.26__tar.gz

{violet_poolcontroller_api-0.0.25/violet_poolController_api.egg-info → violet_poolcontroller_api-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: violet-poolController-api
-Version: 0.0.25
+Version: 0.0.26
 Summary: Asynchronous Python client for the Violet Pool Controller.
 Home-page: https://github.com/Xerolux/violet-poolController-api
 Author: Basti (Xerolux)
@@ -22,9 +22,9 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.11.0
+Requires-Dist: aiohttp<3.14,>=3.11.0
 Provides-Extra: test
-Requires-Dist: aioresponses>=0.7.7; extra == "test"
+Requires-Dist: aioresponses>=0.7.8; extra == "test"
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-asyncio>=0.24; extra == "test"
 Dynamic: author

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "violet-poolController-api"
-version = "0.0.25"
+version = "0.0.26"
 authors = [
   { name="Basti (Xerolux)", email="git@xerolux.de" },
 ]
@@ -24,12 +24,12 @@ classifiers = [
     "Topic :: Home Automation",
 ]
 dependencies = [
-    "aiohttp>=3.11.0",
+    "aiohttp>=3.11.0,<3.14",
 ]
 
 [project.optional-dependencies]
 test = [
-    "aioresponses>=0.7.7",
+    "aioresponses>=0.7.8",
     "pytest>=8.3",
     "pytest-asyncio>=0.24",
 ]
@@ -45,13 +45,13 @@ asyncio_mode = "auto"
 
 [tool.ruff]
 line-length = 100
-target-version = "0.0.25"
+target-version = "0.0.26"
 
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "UP"]
 ignore = ["E501"]
 
 [tool.mypy]
-python_version = "0.0.25"
+python_version = "0.0.26"
 warn_return_any = true
 warn_unused_configs = true

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="violet-poolController-api",
-    version="0.0.25",
+    version="0.0.26",
     author="Basti (Xerolux)",
     author_email="git@xerolux.de",
     description="Asynchronous Python client for the Violet Pool Controller.",

violet_poolcontroller_api-0.0.26/tests/conftest.py

@@ -0,0 +1,40 @@
+# violet-poolController-api - API für Violet Pool Controller
+# Copyright (C) 2024-2026  Xerolux
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+"""Pytest configuration and fixtures."""
+
+from __future__ import annotations
+
+from inspect import signature
+
+import aiohttp.client_reqrep
+
+_original_client_response_init = aiohttp.client_reqrep.ClientResponse.__init__
+
+
+def _patched_client_response_init(
+    self: aiohttp.client_reqrep.ClientResponse,
+    *args: object,
+    **kwargs: object,
+) -> None:
+    """Patched ClientResponse.__init__ that adds stream_writer if missing."""
+    sig = signature(_original_client_response_init)
+    if "stream_writer" in sig.parameters and "stream_writer" not in kwargs:
+        kwargs["stream_writer"] = None
+    _original_client_response_init(self, *args, **kwargs)
+
+
+aiohttp.client_reqrep.ClientResponse.__init__ = _patched_client_response_init

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26/violet_poolController_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: violet-poolController-api
-Version: 0.0.25
+Version: 0.0.26
 Summary: Asynchronous Python client for the Violet Pool Controller.
 Home-page: https://github.com/Xerolux/violet-poolController-api
 Author: Basti (Xerolux)
@@ -22,9 +22,9 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.11.0
+Requires-Dist: aiohttp<3.14,>=3.11.0
 Provides-Extra: test
-Requires-Dist: aioresponses>=0.7.7; extra == "test"
+Requires-Dist: aioresponses>=0.7.8; extra == "test"
 Requires-Dist: pytest>=8.3; extra == "test"
 Requires-Dist: pytest-asyncio>=0.24; extra == "test"
 Dynamic: author

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26}/violet_poolController_api.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 setup.py
 tests/__init__.py
+tests/conftest.py
 tests/mock_server.py
 tests/test_api.py
 tests/test_api_smoke.py

violet_poolcontroller_api-0.0.26/violet_poolController_api.egg-info/requires.txt

@@ -0,0 +1,6 @@
+aiohttp<3.14,>=3.11.0
+
+[test]
+aioresponses>=0.7.8
+pytest>=8.3
+pytest-asyncio>=0.24

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26}/violet_poolcontroller_api/api.py

@@ -139,6 +139,7 @@ class VioletPoolAPI:
 
         # SSL/TLS security configuration
         self._verify_ssl = verify_ssl
+        self._use_ssl = use_ssl
         self._ssl_context = None
         if use_ssl and not verify_ssl:
             _LOGGER.warning(
@@ -190,6 +191,15 @@ class VioletPoolAPI:
         """Return whether dosing-standalone mode is enabled."""
         return self._dosing_standalone
 
+    @property
+    def _ssl_param(self) -> bool | None:
+        """Return the SSL parameter for aiohttp requests."""
+        if not self._use_ssl:
+            return None
+        if self._ssl_context is not None:
+            return self._ssl_context
+        return True
+
     # ---------------------------------------------------------------------
     # Generic helpers
     # ---------------------------------------------------------------------
@@ -292,7 +302,7 @@ class VioletPoolAPI:
                         data=data,
                         auth=self._auth,
                         timeout=self._timeout,
-                        ssl=self._ssl_context,  # type: ignore[arg-type]
+                        ssl=self._ssl_param,
                     ) as response:
                         if (
                             response.status >= _HTTP_SERVER_ERROR
@@ -570,14 +580,11 @@ class VioletPoolAPI:
         ext1_alive = "SYSTEM_ext1module_alive_count" in readings
         ext2_alive = "SYSTEM_ext2module_alive_count" in readings
 
-        if ext1_alive and ext2_alive:
-            return readings
-
-        return {
-            k: v
-            for k, v in readings.items()
-            if (ext1_alive or not k.startswith("EXT1")) and (ext2_alive or not k.startswith("EXT2"))
-        }
+        if not ext1_alive:
+            readings = {k: v for k, v in readings.items() if not k.startswith("EXT1")}
+        if not ext2_alive:
+            readings = {k: v for k, v in readings.items() if not k.startswith("EXT2")}
+        return readings
 
     async def get_readings(self) -> dict[str, Any]:
         """Return the complete dataset from the controller.
@@ -1388,13 +1395,13 @@ class VioletPoolAPI:
 
         """
         if page < 0 and log_type == "actions":
-            url = f"{API_GET_LOG}?downloadActionsLog"
+            query = "downloadActionsLog"
         else:
-            url = f"{API_GET_LOG}?{log_type}&{page}"
+            query = f"{log_type}&{page}"
 
-        resp = await self._api_request(
-            "GET",
-            url,
+        resp = await self._request(
+            API_GET_LOG,
+            query=query,
             priority=API_PRIORITY_NORMAL,
         )
         text = resp.strip() if resp else ""
@@ -1414,8 +1421,9 @@ class VioletPoolAPI:
             SENSOR_ID, TYPE, TEXT, MAIL_STATE, etc.
 
         """
-        return await self._api_request(
-            "GET",
-            f"{API_GET_NOTIFICATIONS}?ALL",
+        return await self._request(
+            API_GET_NOTIFICATIONS,
+            query="ALL",
+            expect_json=True,
             priority=API_PRIORITY_NORMAL,
         )

{violet_poolcontroller_api-0.0.25 → violet_poolcontroller_api-0.0.26}/violet_poolcontroller_api/utils_rate_limiter.py

@@ -190,18 +190,13 @@ class RateLimiter:
     def get_stats(self) -> dict:
         """Hole Rate-Limiter-Statistiken."""
         current_time = time.monotonic()
-
-        # Berechne Requests in letzter Minute
-        recent_requests = [
-            r for r in self.request_history if current_time - r["time"] <= _STATS_WINDOW_SECONDS
-        ]
-        recent_blocked = sum(1 for r in recent_requests if r["blocked"])
+        self._update_recent_stats(current_time)
 
         return {
             "total_requests": self.total_requests,
             "blocked_requests": self.blocked_requests,
-            "recent_requests_1min": len(recent_requests),
-            "recent_blocked_1min": recent_blocked,
+            "recent_requests_1min": self._recent_stats["requests_last_minute"],
+            "recent_blocked_1min": self._recent_stats["blocked_last_minute"],
             "current_tokens": self.tokens,
             "max_tokens": self.max_tokens,
             "block_rate": (

violet_poolcontroller_api-0.0.25/violet_poolController_api.egg-info/requires.txt

@@ -1,6 +0,0 @@
-aiohttp>=3.11.0
-
-[test]
-aioresponses>=0.7.7
-pytest>=8.3
-pytest-asyncio>=0.24