python-bsblan 6.1.2__tar.gz → 6.1.3__tar.gz

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/.github/workflows/release.yaml

@@ -59,7 +59,7 @@ jobs:
           verbose: true
           print-hash: true
       - name: ✍️ Sign published artifacts
-        uses: sigstore/gh-action-sigstore-python@04cffa1d795717b140764e8b640de88853c92acc # v3.3.0
+        uses: sigstore/gh-action-sigstore-python@5b79a39c381910c090341a2c9b0bf022c8b387e1 # v3.4.0
         with:
           inputs: ./dist/*.tar.gz ./dist/*.whl
           release-signing-artifacts: false

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/.github/workflows/tests.yaml

@@ -101,7 +101,7 @@ jobs:
       - name: SonarQube Cloud Scan
         if: env.HAS_SONAR_TOKEN == 'true' && (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork)
         # yamllint disable-line rule:line-length
-        uses: SonarSource/sonarqube-scan-action@7006c4492b2e0ee0f816d36501671557c97f5995 # v8.1
+        uses: SonarSource/sonarqube-scan-action@713881670b6b3676cda39549040e2d88c70d582e # v8.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bsblan
-Version: 6.1.2
+Version: 6.1.3
 Summary: Asynchronous Python client for BSBLAN API
 Project-URL: Homepage, https://github.com/liudger/python-bsblan
 Project-URL: Repository, https://github.com/liudger/python-bsblan

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/package-lock.json

@@ -12,13 +12,13 @@
         "url-parse": "1.5.10"
       },
       "devDependencies": {
-        "prettier": "3.8.3"
+        "prettier": "3.8.4"
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
-      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
+      "version": "3.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz",
+      "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==",
       "dev": true,
       "license": "MIT",
       "bin": {

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/package.json

@@ -9,7 +9,7 @@
   "author": "WJL van Rootselaar <liudgervr@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "prettier": "3.8.3"
+    "prettier": "3.8.4"
   },
   "dependencies": {
     "url-parse": "1.5.10"

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-bsblan"
-version = "6.1.2"
+version = "6.1.3"
 description = "Asynchronous Python client for BSBLAN API"
 authors = [
     {name = "Willem-Jan van Rootselaar", email = "liudgervr@gmail.com"}
@@ -189,7 +189,7 @@ dev = [
     "blacken-docs==1.20.0",
     "codespell==2.4.2",
     "covdefaults==2.3.0",
-    "coverage==7.14.0",
+    "coverage==7.14.1",
     "darglint==1.8.1",
     "flake8==7.3.0",
     "flake8-simplify==0.30.0",
@@ -206,7 +206,7 @@ dev = [
     "pytest-xdist>=3.8.0",
     "pyupgrade==3.21.2",
     "ruff==0.15.16",
-    "safety==3.7.0",
+    "safety==3.8.1",
     "vulture==2.16",
     "yamllint==1.38.0",
     "zeroconf>=0.148.0",

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/src/bsblan/bsblan.py

@@ -19,6 +19,7 @@ from ._version import VersionResolver
 from .constants import (
     API_BASIC,
     API_FULL,
+    MIN_SUPPORTED_JSON_API,
     APIConfig,
     CircuitConfig,
     ErrorMsg,
@@ -187,6 +188,13 @@ class BSBLAN:
                 # circuits == [1, 2] for a dual-circuit controller
 
         """
+        if self._json_api_version == MIN_SUPPORTED_JSON_API:
+            logger.debug(
+                "BSBLAN JSON-API version 1.0 detected; skipping circuit discovery and "
+                "assuming only circuit 1 is available"
+            )
+            self._available_circuits = {1}
+            return [1]
         if self._uses_pps_bus:
             return await self._get_available_pps_circuits()
 
@@ -204,8 +212,9 @@ class BSBLAN:
                 continue
 
             # A circuit exists if the response contains the operating mode key
-            # with actual data (not an empty dict).
-            if not response.get(param_id):
+            # with a valid value (not an empty dict, and not None/"---").
+            param_data = response.get(param_id)
+            if not param_data or param_data.get("value") in (None, "---"):
                 logger.debug(
                     "Circuit %d has no operating mode data (not supported)",
                     circuit,
@@ -230,6 +239,11 @@ class BSBLAN:
             logger.debug("PPS climate circuit has no operating mode data")
             self._available_circuits = set()
             return []
+        param_data = response[param_id]
+        if param_data.get("value") in (None, "---"):
+            logger.debug("PPS climate circuit has invalid operating mode value")
+            self._available_circuits = set()
+            return []
         self._available_circuits = {1}
         return [1]
 

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/tests/test_circuit.py

@@ -13,7 +13,12 @@ import pytest
 from aresponses import Response, ResponsesMockServer
 
 from bsblan import BSBLAN, BSBLANConfig, State, StaticState
-from bsblan.constants import CircuitConfig, ErrorMsg, build_api_config
+from bsblan.constants import (
+    MIN_SUPPORTED_JSON_API,
+    CircuitConfig,
+    ErrorMsg,
+    build_api_config,
+)
 from bsblan.exceptions import BSBLANError, BSBLANInvalidParameterError
 from bsblan.utility import APIValidator
 
@@ -769,6 +774,77 @@ async def test_get_available_circuits_all_probes_missing(
     ] == expected_params
 
 
+@pytest.mark.asyncio
+async def test_get_available_circuits_inactive_marker_excludes_circuit(
+    mock_bsblan_circuit: BSBLAN,
+) -> None:
+    """Test a circuit whose probe value is "---" is excluded."""
+    bsblan = mock_bsblan_circuit
+
+    async def mock_request(
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        params = kwargs.get("params", {})
+        param_id = params.get("Parameter", "")
+        if param_id == "700":
+            return {"700": {"value": "1", "unit": "", "desc": "Automatic"}}
+        # HC2 reports the inactive marker value
+        if param_id == "1000":
+            return {"1000": {"value": "---", "unit": "", "desc": ""}}
+        msg = f"Unexpected parameter probe: {param_id}"
+        raise AssertionError(msg)
+
+    bsblan._request = AsyncMock(side_effect=mock_request)  # type: ignore[method-assign]
+
+    circuits = await bsblan.get_available_circuits()
+    assert circuits == [1]
+    assert bsblan._available_circuits == {1}
+
+
+@pytest.mark.asyncio
+async def test_get_available_circuits_none_value_excludes_circuit(
+    mock_bsblan_circuit: BSBLAN,
+) -> None:
+    """Test a circuit whose probe value is None is excluded."""
+    bsblan = mock_bsblan_circuit
+
+    async def mock_request(
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        params = kwargs.get("params", {})
+        param_id = params.get("Parameter", "")
+        if param_id == "700":
+            return {"700": {"value": "1", "unit": "", "desc": "Automatic"}}
+        if param_id == "1000":
+            return {"1000": {"value": None, "unit": "", "desc": ""}}
+        msg = f"Unexpected parameter probe: {param_id}"
+        raise AssertionError(msg)
+
+    bsblan._request = AsyncMock(side_effect=mock_request)  # type: ignore[method-assign]
+
+    circuits = await bsblan.get_available_circuits()
+    assert circuits == [1]
+    assert bsblan._available_circuits == {1}
+
+
+@pytest.mark.asyncio
+async def test_get_available_circuits_json_api_v1_skips_discovery(
+    mock_bsblan_circuit: BSBLAN,
+) -> None:
+    """Test that JSON-API version 1.0 skips circuit discovery and returns [1]."""
+    bsblan = mock_bsblan_circuit
+    bsblan._json_api_version = MIN_SUPPORTED_JSON_API
+
+    request_mock = AsyncMock()
+    bsblan._request = request_mock  # type: ignore[method-assign]
+
+    circuits = await bsblan.get_available_circuits()
+
+    assert circuits == [1]
+    assert bsblan._available_circuits == {1}
+    request_mock.assert_not_awaited()
+
+
 @pytest.mark.asyncio
 async def test_temperature_range_skips_unavailable_discovered_circuit(
     mock_bsblan_circuit: BSBLAN,

{python_bsblan-6.1.2 → python_bsblan-6.1.3}/tests/test_pps.py

@@ -357,12 +357,20 @@ async def test_pps_circuit_discovery_returns_single_climate(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize("response", [{}, {"15000": {}}])
+@pytest.mark.parametrize(
+    "response",
+    [
+        {},
+        {"15000": {}},
+        {"15000": {"value": "---", "unit": "", "desc": ""}},
+        {"15000": {"value": None, "unit": "", "desc": ""}},
+    ],
+)
 async def test_pps_circuit_discovery_returns_empty_without_mode(
     pps_bsblan: BSBLAN,
     response: dict[str, Any],
 ) -> None:
-    """Test PPS circuit discovery handles missing operating mode data."""
+    """Test PPS circuit discovery handles missing or inactive mode data."""
     pps_bsblan._request = AsyncMock(return_value=response)  # type: ignore[method-assign]
 
     circuits = await pps_bsblan.get_available_circuits()