python-bsblan 5.2.0__py3-none-any.whl → 5.2.1__py3-none-any.whl

bsblan/bsblan.py

@@ -152,13 +152,10 @@ class BSBLAN:
     async def get_available_circuits(self) -> list[int]:
         """Detect which heating circuits are available on the device.
 
-        Uses a two-step probe for each circuit (1, 2):
-        1. Query the operating mode parameter — the response must be
-           non-empty and contain actual data.
-        2. Query the status parameter (8000/8001) — an inactive
-           circuit returns ``value="0"`` with ``desc="---"``.
-
-        A circuit is only considered available when both checks pass.
+        Uses the configured operating mode probe parameters from
+        CircuitConfig.PROBE_PARAMS as the only discovery signal. Status
+        parameters are not queried during discovery to keep setup lightweight
+        and avoid excluding valid circuits when status data is unavailable.
 
         This is useful for integration setup flows (e.g., Home Assistant
         config flow) to discover how many circuits the user's controller
@@ -179,46 +176,23 @@ class BSBLAN:
                 response = await self._request(
                     params={"Parameter": param_id},
                 )
-                # A circuit exists if the response contains the param_id key
-                # with actual data (not an empty dict)
-                if not response.get(param_id):
-                    continue
-
-                # Secondary check: query the status parameter.
-                # Inactive circuits either:
-                # - return value="0" and desc="---"
-                # - return an empty dict {} (param not supported)
-                status_id = CircuitConfig.STATUS_PARAMS[circuit]
-                status_resp = await self._request(
-                    params={"Parameter": status_id},
+            except BSBLANError:
+                logger.debug(
+                    "Circuit %d not available (operating mode request failed)",
+                    circuit,
                 )
-                status_data = status_resp.get(status_id, {})
-
-                # Empty response means the parameter doesn't exist
-                if not status_data or not isinstance(status_data, dict):
-                    logger.debug(
-                        "Circuit %d has no status data (not supported)",
-                        circuit,
-                    )
-                    continue
-
-                # value="0" + desc="---" means inactive
-                if (
-                    status_data.get("desc") == CircuitConfig.INACTIVE_MARKER
-                    and str(status_data.get("value", "")) == "0"
-                ):
-                    logger.debug(
-                        "Circuit %d has status '---' (inactive)",
-                        circuit,
-                    )
-                    continue
+                continue
 
-                available.append(circuit)
-            except BSBLANError:
+            # A circuit exists if the response contains the operating mode key
+            # with actual data (not an empty dict).
+            if not response.get(param_id):
                 logger.debug(
-                    "Circuit %d not available (request failed)",
+                    "Circuit %d has no operating mode data (not supported)",
                     circuit,
                 )
+                continue
+
+            available.append(circuit)
         return sorted(available)
 
     async def _setup_api_validator(self) -> None:

bsblan/models.py

@@ -326,13 +326,13 @@ class EntityInfo(BaseModel, Generic[T]):
     unit: str
     desc: str
     value: T | None = None
-    data_type: int = Field(alias="dataType", default=0)
+    data_type: int = Field(validation_alias="dataType", default=0)
     error: int = 0
     readonly: int = 0
     readwrite: int = 0
     precision: float | None = None
-    data_type_name: str = Field(default="", alias="dataType_name")
-    data_type_family: str = Field(default="", alias="dataType_family")
+    data_type_name: str = Field(default="", validation_alias="dataType_name")
+    data_type_family: str = Field(default="", validation_alias="dataType_family")
 
     @model_validator(mode="before")
     @classmethod

{python_bsblan-5.2.0.dist-info → python_bsblan-5.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-bsblan
-Version: 5.2.0
+Version: 5.2.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-5.2.0.dist-info → python_bsblan-5.2.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 bsblan/__init__.py,sha256=YD_edvxHL5ocUE2iLWhdinqpsRYWJkVrcds0b6aKp9U,1288
-bsblan/bsblan.py,sha256=PCNForRgeJFHwZRE_mEcvySQxiYLA2JCIzMJu429Fq4,63034
+bsblan/bsblan.py,sha256=3aBmx9mSc0uWthM4m28z3wppH6FsbBA03CaStGEG9Co,61907
 bsblan/constants.py,sha256=LoMSrEdZj2zohDFxOQ2JT7J4jIH9clXh7sfkNnnjl5A,22864
 bsblan/exceptions.py,sha256=jL7qohIMmuVTsdWBB_trKPg5Yzim6JxaOT13h6EJPlk,1770
-bsblan/models.py,sha256=qEycc2eVkCK2CXWDXBSqtTyM-to6pH7jX6aKvXeH3R8,20705
+bsblan/models.py,sha256=DZlkRPh8vhe7dPDJyEofaAS1Fhgr_T7fum0lY3GzmHw,20738
 bsblan/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bsblan/utility.py,sha256=sS0wWJoqvLAHzwaSLIqQEQ-boHsYFLKAHw8KNTSmdX8,5772
-python_bsblan-5.2.0.dist-info/METADATA,sha256=MjhQBz4cjiRwunT2OH4X-gRFsprNSIpLBMNu7kam24Y,8529
-python_bsblan-5.2.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_bsblan-5.2.0.dist-info/licenses/LICENSE.md,sha256=Shv8HPcD1WbZjBPvfb5r3h_cwaPeVaUZMUqU_XQGwGw,1092
-python_bsblan-5.2.0.dist-info/RECORD,,
+python_bsblan-5.2.1.dist-info/METADATA,sha256=XbvdXo99frOZIvcEwbIPvvUdeQ8XCExcQmvOyIDsoe8,8529
+python_bsblan-5.2.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_bsblan-5.2.1.dist-info/licenses/LICENSE.md,sha256=Shv8HPcD1WbZjBPvfb5r3h_cwaPeVaUZMUqU_XQGwGw,1092
+python_bsblan-5.2.1.dist-info/RECORD,,