Refactor conversion functions to remove suppress statements and improve error handling in EntityInfo

Author: liudger

src/bsblan/models.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-from contextlib import suppress
 from dataclasses import dataclass, field
 from datetime import time
 from enum import IntEnum
@@ -245,23 +244,17 @@ def _convert_bsblan_value(
             if any(unit.endswith(u) for u in TEMPERATURE_UNITS):
                 result = float(raw)
             else:
-                with suppress(ValueError):
-                    result = float(raw) if "." in raw else int(raw)
+                result = float(raw) if "." in raw else int(raw)
 
         elif data_type == DataType.ENUM:
-            with suppress(ValueError):
-                result = int(raw)
+            result = int(raw)
 
         elif data_type == DataType.TIME:
-            try:
-                hour, minute = map(int, raw.split(":"))
-                result = time(hour=hour, minute=minute)
-            except ValueError:
-                pass
+            hour, minute = map(int, raw.split(":"))
+            result = time(hour=hour, minute=minute)
 
         elif data_type == DataType.WEEKDAY:
-            with suppress(ValueError):
-                result = int(raw)
+            result = int(raw)
 
     except (ValueError, TypeError) as e:
         logging.getLogger(__name__).warning(

tests/test_entity_info.py

@@ -8,19 +8,22 @@
 from bsblan.models import DataType, EntityInfo
 
 
-def test_entity_info_invalid_time_conversion() -> None:
-    """Test EntityInfo with invalid time format."""
-    # Create EntityInfo with invalid time format
-    entity = EntityInfo(
-        name="Invalid Time",
-        value="24:61",  # Invalid time
-        unit="",
-        desc="",
-        data_type=DataType.TIME,
-    )
+def test_entity_info_invalid_time_conversion(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test EntityInfo with invalid time format logs a warning."""
+    with caplog.at_level(logging.WARNING):
+        entity = EntityInfo(
+            name="Invalid Time",
+            value="24:61",  # Invalid time
+            unit="",
+            desc="",
+            data_type=DataType.TIME,
+        )
 
-    # The value should remain as string since conversion failed
-    assert entity.value == "24:61"
+        # The value should remain as string since conversion failed
+        assert entity.value == "24:61"
+        assert "Failed to convert value" in caplog.text
 
 
 def test_entity_info_undefined_value_becomes_none() -> None:
@@ -35,19 +38,58 @@ def test_entity_info_undefined_value_becomes_none() -> None:
     assert entity.value is None
 
 
-def test_entity_info_invalid_weekday_conversion() -> None:
-    """Test EntityInfo with invalid weekday format."""
-    # Create EntityInfo with invalid weekday format
-    entity = EntityInfo(
-        name="Invalid Weekday",
-        value="not-a-number",  # Invalid weekday
-        unit="",
-        desc="",
-        data_type=DataType.WEEKDAY,
-    )
+def test_entity_info_invalid_weekday_conversion(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test EntityInfo with invalid weekday format logs a warning."""
+    with caplog.at_level(logging.WARNING):
+        entity = EntityInfo(
+            name="Invalid Weekday",
+            value="not-a-number",  # Invalid weekday
+            unit="",
+            desc="",
+            data_type=DataType.WEEKDAY,
+        )
 
-    # The value should remain as string since conversion failed
-    assert entity.value == "not-a-number"
+        # The value should remain as string since conversion failed
+        assert entity.value == "not-a-number"
+        assert "Failed to convert value" in caplog.text
+
+
+def test_entity_info_invalid_plain_number_conversion(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test non-temperature PLAIN_NUMBER conversion failure logs a warning."""
+    with caplog.at_level(logging.WARNING):
+        entity = EntityInfo(
+            name="Invalid Number",
+            value="not-numeric",
+            unit="%",
+            desc="",
+            data_type=DataType.PLAIN_NUMBER,
+        )
+
+        # The value should remain as string since conversion failed
+        assert entity.value == "not-numeric"
+        assert "Failed to convert value" in caplog.text
+
+
+def test_entity_info_invalid_enum_conversion(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test ENUM conversion failure logs a warning."""
+    with caplog.at_level(logging.WARNING):
+        entity = EntityInfo(
+            name="Invalid Enum",
+            value="not-an-int",
+            unit="",
+            desc="Some description",
+            data_type=DataType.ENUM,
+        )
+
+        # The value should remain as string since conversion failed
+        assert entity.value == "not-an-int"
+        assert "Failed to convert value" in caplog.text
 
 
 def test_entity_info_general_conversion_error(caplog: pytest.LogCaptureFixture) -> None: