bwt-api 0.6.0__tar.gz → 0.6.2__tar.gz

{bwt_api-0.6.0 → bwt_api-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bwt_api
-Version: 0.6.0
+Version: 0.6.2
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv

{bwt_api-0.6.0 → bwt_api-0.6.2}/src/bwt_api/api.py

@@ -41,7 +41,10 @@ class BwtApi:
             async with self._session.get(f"http://{self._host}:8080/api/{endpoint}") as response:
                 _logger.debug(f"Response status: {response.status}, content-type: {response.headers['content-type']}")
                 if (response.status == 200):
-                    json = await response.json(content_type=None)
+                    try:
+                        json = await response.json(content_type=None)
+                    except ValueError as e:
+                        raise ApiException(f"Invalid JSON response from {endpoint}") from e
                     _logger.debug(f"Raw response: {json}")
                     return json
                 else:
@@ -52,7 +55,7 @@ class BwtApi:
                     else:
                         _logger.warning(f"Unknown response with status {response.status}: {text}")
                         raise ApiException(f"Unknown response: {text}")
-        except aiohttp.ClientConnectorError as e:
+        except (aiohttp.ClientConnectorError, TimeoutError) as e:
             raise ConnectException from e
 
     def _convert_datetime(self, input: str) -> datetime:
@@ -66,6 +69,8 @@ class BwtApi:
         _logger.debug(f"Fetching current data from {self._host}")
         raw = await self.__get_data("GetCurrentData")
         errors = [BwtError(int(error)) for error in raw["ActiveErrorIDs"].split(",") if error]
+        if any(e.name.startswith("UNKNOWN") for e in errors):
+            _logger.warning(f"Unknown error in current data response {raw['ActiveErrorIDs']}")
         perla_one = raw["CapacityColumn2_ml_dH"] == -1
         
         in_hardness = Hardness(
@@ -159,19 +164,22 @@ class BwtSilkApi:
             async with self._session.get(f"http://{self._host}:80/silk/registers") as response:
                 _logger.debug(f"Response status: {response.status}, content-type: {response.headers['content-type']}")
                 if (response.status == 200):
-                    json = await response.json(content_type=None)
+                    try:
+                        json = await response.json(content_type=None)
+                    except ValueError as e:
+                        raise ApiException(f"Invalid JSON response from silk/registers") from e
                     _logger.debug(f"Raw response: {json}")
                     return json["params"]
                 else:
                     text = await response.text()
                     _logger.warning(f"Unknown response with status {response.status}: {text}")
                     raise ApiException(f"Unknown response: {text}")
-        except aiohttp.ClientConnectorError as e:
+        except (aiohttp.ClientConnectorError, TimeoutError) as e:
             raise ConnectException from e
 
 
 def treated_to_blended(treated: int, hardness_in: int, hardness_out: int) -> float:
-    if (hardness_in == 0 | hardness_in == hardness_out):
+    if hardness_in == 0 or hardness_in == hardness_out:
         return treated
 
     return treated / (1.0 - hardness_out / hardness_in)

{bwt_api-0.6.0 → bwt_api-0.6.2}/src/bwt_api/error.py

@@ -5,6 +5,7 @@ import enum
 
 
 class BwtError(enum.Enum):
+    UNKNOWN = -1 # Fallback for unknown errors
     OFFLINE_MOTOR_1 = 1
     OFFLINE_MOTOR_2 = 2
     OFFLINE_MOTOR_BLEND = 3
@@ -49,6 +50,26 @@ class BwtError(enum.Enum):
     BRINE_UNSATURATED = 75
     DOSING_FAULT = 88
 
+    def __new__(cls, value):
+        obj = object.__new__(cls)
+        obj._value_ = value
+        return obj
+
+    @classmethod
+    def _missing_(cls, value):
+        obj = object.__new__(cls)
+        obj._value_ = value
+        obj._name_ = f"UNKNOWN_{value}"
+        return obj
+
+    def __eq__(self, other):
+        if isinstance(other, BwtError):
+            return self._value_ == other._value_
+        return NotImplemented
+
+    def __hash__(self):
+        return hash(self._value_)
+
     def is_fatal(self) -> bool:
         return self not in WARNING_CODES
 

{bwt_api-0.6.0 → bwt_api-0.6.2}/src/bwt_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bwt_api
-Version: 0.6.0
+Version: 0.6.2
 Summary: Python API to access the local BWT Perla API.
 Home-page: https://github.com/dkarv/bwt_api
 Author: dkarv

{bwt_api-0.6.0 → bwt_api-0.6.2}/tests/test_api.py

@@ -17,7 +17,7 @@ __license__ = "MIT"
 
 current_json = """
 {
-   "ActiveErrorIDs" : "5,32,34",
+   "ActiveErrorIDs" : "5,32,34,29",
    "BlendedWaterSinceSetup_l" : 318383,
    "CapacityColumn1_ml_dH" : 5485275,
    "CapacityColumn2_ml_dH" : 3833994,
@@ -140,6 +140,15 @@ async def test_connect_error():
             await api.get_current_data()
 
 
+async def test_timeout_error():
+    """Timeouts should be wrapped as ConnectException, not escape as raw TimeoutError."""
+    with aioresponses() as mocked:
+        mocked.get("http://host:8080/api/GetCurrentData", exception=TimeoutError())
+        async with BwtApi("host", "code") as api:
+            with pytest.raises(ConnectException):
+                await api.get_current_data()
+
+
 async def test_unknown_response():
     with aioresponses() as mocked:
         mocked.get("http://host:8080/api/GetCurrentData", status=400, body="")
@@ -148,6 +157,15 @@ async def test_unknown_response():
                 await api.get_current_data()
 
 
+async def test_invalid_json_response():
+    """HTTP 200 with non-JSON body should raise ApiException, not JSONDecodeError."""
+    with aioresponses() as mocked:
+        mocked.get("http://host:8080/api/GetCurrentData", status=200, body="not json")
+        async with BwtApi("host", "code") as api:
+            with pytest.raises(ApiException):
+                await api.get_current_data()
+
+
 async def test_current_data():
     with aioresponses() as mocked:
         mocked.get("http://host:8080/api/GetCurrentData", status=200, body=current_json)
@@ -158,6 +176,7 @@ async def test_current_data():
                     BwtError.REGENERATIV_20,
                     BwtError.MAINTENANCE_CUSTOMER,
                     BwtError.MAINTENANCE_SERVICE,
+                    BwtError(29),
                 ],
                 blended_total=318383,
                 capacity_1=5485275,
@@ -256,9 +275,25 @@ async def test_perla_one():
                 columns=1,
             )
 
+def test_unknown_error_no_mutation():
+    """Unknown error codes must not mutate the UNKNOWN singleton."""
+    err1 = BwtError(29)
+    assert err1.value == 29
+    assert err1.name == "UNKNOWN_29"
+    err2 = BwtError(123)
+    assert err2.value == 123
+    assert err2.name == "UNKNOWN_123"
+    # UNKNOWN singleton must be untouched
+    assert BwtError.UNKNOWN.value == -1
+    # Different unknown codes produce different instances
+    assert err1 is not err2
+
+
 def test_treated_to_blended():
     assert treated_to_blended(0, 21, 4) == 0
     assert treated_to_blended(100, 21, 21) == 100
     assert treated_to_blended(10, 20, 4) == 12.5
     assert treated_to_blended(306, 21, 4) == 378
     assert treated_to_blended(191, 21, 4) == pytest.approx(235.9411)
+    # Edge case: hardness_in == 0 should return treated as-is, not divide by zero
+    assert treated_to_blended(100, 0, 0) == 100