python-bsblan 6.1.0__tar.gz → 6.1.1__tar.gz

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bsblan
-Version: 6.1.0
+Version: 6.1.1
 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.0 → python_bsblan-6.1.1}/examples/control.py

@@ -192,6 +192,22 @@ def print_device_info(device: Device, info: Info) -> None:
     print_attributes("Device Information", attributes)
 
 
+def _first_temperature_attribute(static_state: StaticState) -> Any:
+    """Return the first available temperature attribute for unit detection."""
+    for attribute in (
+        static_state.heating_protective_setpoint,
+        static_state.temp_reduced_setpoint,
+        static_state.comfort_setpoint_max,
+        static_state.min_temp,
+        static_state.max_temp,
+        static_state.cooling_comfort_setpoint_min,
+        static_state.cooling_reduced_setpoint,
+    ):
+        if attribute is not None:
+            return attribute
+    return None
+
+
 def print_static_state(static_state: StaticState) -> None:
     """Print static state information, including heating and cooling bounds.
 
@@ -200,8 +216,10 @@ def print_static_state(static_state: StaticState) -> None:
 
     """
     attributes = {
-        "Min Temperature (heating)": get_attribute(static_state.min_temp),
-        "Max Temperature (heating)": get_attribute(static_state.max_temp),
+        "Reduced Setpoint (eco/night)": get_attribute(
+            static_state.temp_reduced_setpoint
+        ),
+        "Comfort Setpoint Max": get_attribute(static_state.comfort_setpoint_max),
         "Heating Protective Setpoint": get_attribute(
             static_state.heating_protective_setpoint
         ),
@@ -211,7 +229,9 @@ def print_static_state(static_state: StaticState) -> None:
         "Cooling Setpoint Max (reduced)": get_attribute(
             static_state.cooling_reduced_setpoint
         ),
-        "Temperature Unit": get_attribute(static_state.min_temp, "unit"),
+        "Temperature Unit": get_attribute(
+            _first_temperature_attribute(static_state), "unit"
+        ),
     }
     print_attributes("Static State", attributes)
 

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-bsblan"
-version = "6.1.0"
+version = "6.1.1"
 description = "Asynchronous Python client for BSBLAN API"
 authors = [
     {name = "Willem-Jan van Rootselaar", email = "liudgervr@gmail.com"}

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/src/bsblan/bsblan.py

@@ -631,16 +631,45 @@ class BSBLAN:
             )
             return temp_range
 
-        if static_values.min_temp is not None:
-            temp_range["min"] = static_values.min_temp.value
+        # Prefer heating_protective_setpoint (714/1014) as the true lower bound
+        # for standard circuits. Fall back to min_temp for PPS circuits (15006)
+        # which have no separate protective setpoint. Skip sources whose value is
+        # inactive (BSB-LAN may return "---" which becomes value=None).
+        min_source = next(
+            (
+                source
+                for source in (
+                    static_values.heating_protective_setpoint,
+                    static_values.min_temp,
+                )
+                if source is not None and source.value is not None
+            ),
+            None,
+        )
+        if min_source is not None:
+            temp_range["min"] = min_source.value
             logger.debug(
                 "Circuit %d min temp initialized: %s",
                 circuit,
                 temp_range["min"],
             )
 
-        if static_values.max_temp is not None:
-            temp_range["max"] = static_values.max_temp.value
+        # Prefer comfort_setpoint_max (716/1016) as the upper bound for standard
+        # circuits. Fall back to max_temp for PPS circuits (15007) which expose
+        # only a generic max. Skip sources whose value is inactive.
+        max_source = next(
+            (
+                source
+                for source in (
+                    static_values.comfort_setpoint_max,
+                    static_values.max_temp,
+                )
+                if source is not None and source.value is not None
+            ),
+            None,
+        )
+        if max_source is not None:
+            temp_range["max"] = max_source.value
             logger.debug(
                 "Circuit %d max temp initialized: %s",
                 circuit,

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/src/bsblan/constants.py

@@ -40,9 +40,9 @@ BASE_HEATING_PARAMS: Final[dict[str, str]] = {
 }
 
 BASE_STATIC_VALUES_PARAMS: Final[dict[str, str]] = {
-    "712": "min_temp",
+    "712": "temp_reduced_setpoint",
     "714": "heating_protective_setpoint",
-    "716": "max_temp",
+    "716": "comfort_setpoint_max",
     "905": "cooling_comfort_setpoint_min",
     "903": "cooling_reduced_setpoint",
 }
@@ -107,9 +107,9 @@ BASE_HEATING_CIRCUIT2_PARAMS: Final[dict[str, str]] = {
 }
 
 BASE_STATIC_VALUES_CIRCUIT2_PARAMS: Final[dict[str, str]] = {
-    "1012": "min_temp",
+    "1012": "temp_reduced_setpoint",
     "1014": "heating_protective_setpoint",
-    "1016": "max_temp",
+    "1016": "comfort_setpoint_max",
     "1205": "cooling_comfort_setpoint_min",
     "1203": "cooling_reduced_setpoint",
 }

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/src/bsblan/models.py

@@ -479,8 +479,15 @@ class State(BaseModel):
 class StaticState(BaseModel):
     """Class for entities that are not changing."""
 
+    # 712/1012: room temperature reduced (eco/night) setpoint
+    temp_reduced_setpoint: EntityInfo[float] | None = None
+    # PPS-only lower bound (15006)
     min_temp: EntityInfo[float] | None = None
+    # 716/1016: comfort setpoint max upper bound
+    comfort_setpoint_max: EntityInfo[float] | None = None
+    # PPS-only upper bound (15007)
     max_temp: EntityInfo[float] | None = None
+    # 714/1014: frost-protection lower bound
     heating_protective_setpoint: EntityInfo[float] | None = None
     cooling_comfort_setpoint_min: EntityInfo[float] | None = None
     cooling_reduced_setpoint: EntityInfo[float] | None = None

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/fixtures/dict_version.json

@@ -7,9 +7,9 @@
     "8740": "current_temperature"
   },
   "staticValues": {
-    "712": "min_temp",
+    "712": "temp_reduced_setpoint",
     "714": "heating_protective_setpoint",
-    "716": "max_temp"
+    "716": "comfort_setpoint_max"
   },
   "device": {
     "6224": "device_identification",

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_circuit.py

@@ -225,10 +225,10 @@ async def test_static_values_circuit2(monkeypatch: Any) -> None:
         static: StaticState = await bsblan.static_values(circuit=2)
 
         assert isinstance(static, StaticState)
-        assert static.min_temp is not None
-        assert static.min_temp.value == 16.0
-        assert static.max_temp is not None
-        assert static.max_temp.value == 28.0
+        assert static.temp_reduced_setpoint is not None
+        assert static.temp_reduced_setpoint.value == 16.0
+        assert static.comfort_setpoint_max is not None
+        assert static.comfort_setpoint_max.value == 28.0
         assert static.heating_protective_setpoint is not None
         assert static.heating_protective_setpoint.value == 8.0
         assert static.cooling_comfort_setpoint_min is not None
@@ -490,7 +490,7 @@ async def test_circuit2_temp_range_initialization(
         await bsblan._initialize_temperature_range(circuit=2)
 
         assert 2 in bsblan._circuit_temp_initialized
-        assert bsblan._circuit_temp_ranges[2]["min"] == 16.0
+        assert bsblan._circuit_temp_ranges[2]["min"] == 8.0
         assert bsblan._circuit_temp_ranges[2]["max"] == 28.0
         assert bsblan._circuit_temp_ranges[2]["cooling_min"] == 18.0
         assert bsblan._circuit_temp_ranges[2]["cooling_max"] == 26.0
@@ -526,11 +526,11 @@ async def test_circuit1_temp_range_uses_reduced_lower_bound(
         await bsblan._initialize_temperature_range(circuit=1)
 
         assert 1 in bsblan._circuit_temp_initialized
-        assert bsblan._circuit_temp_ranges[1]["min"] == 17.0
+        assert bsblan._circuit_temp_ranges[1]["min"] == 8.0
         assert bsblan._circuit_temp_ranges[1]["max"] == 23.0
 
         with pytest.raises(BSBLANInvalidParameterError):
-            await bsblan._validate_target_temperature("16.5", circuit=1)
+            await bsblan._validate_target_temperature("7.5", circuit=1)
 
 
 @pytest.mark.asyncio
@@ -584,7 +584,7 @@ async def test_thermostat_circuit2_lazy_temp_init(
 
         # Verify it was initialized
         assert 2 in bsblan._circuit_temp_initialized
-        assert bsblan._circuit_temp_ranges[2]["min"] == 16.0
+        assert bsblan._circuit_temp_ranges[2]["min"] == 8.0
         assert bsblan._circuit_temp_ranges[2]["max"] == 28.0
 
 

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_constants.py

@@ -128,14 +128,14 @@ def test_cooling_target_uses_single_base_parameter() -> None:
 
     assert config["heating"]["902"] == "target_temperature_high"
     assert config["heating_circuit2"]["1202"] == "target_temperature_high"
-    assert config["staticValues"]["712"] == "min_temp"
+    assert config["staticValues"]["712"] == "temp_reduced_setpoint"
     assert config["staticValues"]["714"] == "heating_protective_setpoint"
-    assert config["staticValues"]["716"] == "max_temp"
+    assert config["staticValues"]["716"] == "comfort_setpoint_max"
     assert config["staticValues"]["905"] == "cooling_comfort_setpoint_min"
     assert config["staticValues"]["903"] == "cooling_reduced_setpoint"
-    assert config["staticValues_circuit2"]["1012"] == "min_temp"
+    assert config["staticValues_circuit2"]["1012"] == "temp_reduced_setpoint"
     assert config["staticValues_circuit2"]["1014"] == ("heating_protective_setpoint")
-    assert config["staticValues_circuit2"]["1016"] == "max_temp"
+    assert config["staticValues_circuit2"]["1016"] == "comfort_setpoint_max"
     assert config["staticValues_circuit2"]["1205"] == ("cooling_comfort_setpoint_min")
     assert config["staticValues_circuit2"]["1203"] == "cooling_reduced_setpoint"
     assert "908" not in config["staticValues"]

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_include_parameter.py

@@ -407,9 +407,12 @@ async def test_static_values_with_include(monkeypatch: Any) -> None:
         request_mock: AsyncMock = AsyncMock(return_value=partial_response)
         monkeypatch.setattr(bsblan, "_request", request_mock)
 
-        static: StaticState = await bsblan.static_values(include=["min_temp"])
+        static: StaticState = await bsblan.static_values(
+            include=["temp_reduced_setpoint"]
+        )
 
-        assert static.min_temp is not None
+        assert static.temp_reduced_setpoint is not None
+        assert static.min_temp is None
         assert static.max_temp is None
 
 

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_static_state.py

@@ -40,10 +40,11 @@ async def test_sensor(monkeypatch: Any) -> None:
 
         static: StaticState = await bsblan.static_values()
         assert isinstance(static, StaticState)
-        assert static.min_temp is not None
-        assert static.min_temp.value == 17.0
-        assert static.max_temp is not None
-        assert static.max_temp.value == 23.0
+        assert static.temp_reduced_setpoint is not None
+        assert static.temp_reduced_setpoint.value == 17.0
+        assert static.min_temp is None
+        assert static.comfort_setpoint_max is not None
+        assert static.comfort_setpoint_max.value == 23.0
         assert static.heating_protective_setpoint is not None
         assert static.heating_protective_setpoint.value == 8.0
         assert static.cooling_comfort_setpoint_min is not None

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_temperature_validation.py

@@ -153,8 +153,11 @@ async def test_temperature_range_min_temp_not_available(monkeypatch: Any) -> Non
         client._api_validator = APIValidator(client._api_data)
 
         # Mock static_values to return data without min_temp
+        # Mock static_values without protective or pps min temp
         static_values_mock = AsyncMock()
+        static_values_mock.return_value.heating_protective_setpoint = None
         static_values_mock.return_value.min_temp = None
+        static_values_mock.return_value.comfort_setpoint_max = None
         static_values_mock.return_value.max_temp = AsyncMock()
         static_values_mock.return_value.max_temp.value = "30"
         monkeypatch.setattr(client, "static_values", static_values_mock)
@@ -162,7 +165,7 @@ async def test_temperature_range_min_temp_not_available(monkeypatch: Any) -> Non
         # This should log a warning
         await client._initialize_temperature_range()
 
-        # min_temp should remain None
+        # min should remain None when neither protective nor pps min is available
         temp_range = client._circuit_temp_ranges.get(1, {})
         assert temp_range.get("min") is None
 
@@ -188,8 +191,10 @@ async def test_temperature_range_max_temp_not_available(monkeypatch: Any) -> Non
 
         # Mock static_values to return data without max_temp
         static_values_mock = AsyncMock()
+        static_values_mock.return_value.heating_protective_setpoint = None
         static_values_mock.return_value.min_temp = AsyncMock()
         static_values_mock.return_value.min_temp.value = "10"
+        static_values_mock.return_value.comfort_setpoint_max = None
         static_values_mock.return_value.max_temp = None
         monkeypatch.setattr(client, "static_values", static_values_mock)
 

{python_bsblan-6.1.0 → python_bsblan-6.1.1}/tests/test_utility_additional.py

@@ -41,9 +41,9 @@ def fresh_api_validator() -> APIValidator:
             "710": "target_temperature",
         },
         "staticValues": {
-            "712": "min_temp",
+            "712": "temp_reduced_setpoint",
             "714": "heating_protective_setpoint",
-            "716": "max_temp",
+            "716": "comfort_setpoint_max",
         },
         "hot_water": {
             "8830": "dhw_actual_value_top_temperature",