fix(ha): do not treat a redirect loop or an unencodable body as an outage

TooManyRedirects is a configuration problem and InvalidJSONError is raised
locally when a POST body (e.g. a NaN attribute) cannot be encoded; neither
is Home Assistant being down, but the RequestException catch-all logged
them as an outage and swallowed them. Let them escape like the other
not-an-outage errors (tuple renamed HA_NOT_OUTAGE_ERRORS). Also correct
test failure messages that still named the removed unavailable_since.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/ha.py

@@ -52,13 +52,17 @@
 HA_RETRY_SECONDS = 5
 HA_RETRY_MAX_SECONDS = 30
 
-# requests errors that mean ha_url or ha_key is malformed rather than Home Assistant being down
-HA_CONFIG_ERRORS = (
+# requests errors that are not Home Assistant being down, so waiting will not fix them: a malformed ha_url or ha_key
+# (e.g. a trailing newline), a redirect loop, or a body we cannot encode (InvalidJSONError; its JSONDecodeError
+# subclass, a reply we cannot decode, is caught before these in api_call())
+HA_NOT_OUTAGE_ERRORS = (
     requests.exceptions.InvalidURL,
     requests.exceptions.MissingSchema,
     requests.exceptions.InvalidSchema,
     requests.exceptions.InvalidHeader,
     requests.exceptions.URLRequired,
+    requests.exceptions.TooManyRedirects,
+    requests.exceptions.InvalidJSONError,
 )
 
 
@@ -1307,8 +1311,8 @@ def api_call(self, endpoint, data_in=None, post=False, core=True, silent=False,
             if track:
                 self.ha_unavailable("connection error from {}".format(endpoint))
             data = None
-        except HA_CONFIG_ERRORS:
-            # A malformed ha_url or ha_key (e.g. a trailing newline) is not an outage and waiting will not fix it, so let it fail loudly as before
+        except HA_NOT_OUTAGE_ERRORS:
+            # Not an outage and waiting will not fix it, so let it fail loudly as before
             raise
         except requests.exceptions.RequestException as e:
             # Anything else requests raises while Home Assistant is going down, e.g. a connection reset part way through the body

apps/predbat/tests/test_hainterface_api.py

@@ -169,7 +169,7 @@ def test_hainterface_api_call_json_decode_error(my_predbat=None):
 
         # Verify an outage has been recorded
         if ha_interface.outage.since is None:
-            print("ERROR: unavailable_since should be set")
+            print("ERROR: outage.since should be set")
             failed += 1
         else:
             print("✓ outage recorded")
@@ -199,7 +199,7 @@ def test_hainterface_api_call_timeout(my_predbat=None):
 
         # Verify an outage has been recorded
         if ha_interface.outage.since is None:
-            print("ERROR: unavailable_since should be set")
+            print("ERROR: outage.since should be set")
             failed += 1
         else:
             print("✓ outage recorded")
@@ -229,7 +229,7 @@ def test_hainterface_api_call_read_timeout(my_predbat=None):
 
         # Verify an outage has been recorded
         if ha_interface.outage.since is None:
-            print("ERROR: unavailable_since should be set")
+            print("ERROR: outage.since should be set")
             failed += 1
         else:
             print("✓ outage recorded")
@@ -343,7 +343,7 @@ def test_hainterface_api_call_outage_cleared(my_predbat=None):
         mock_get.return_value = create_mock_requests_response(200, {"result": "success"})
         ha_interface.api_call("/api/states")
         if ha_interface.outage.since is not None:
-            print("ERROR: unavailable_since should be cleared by a successful call")
+            print("ERROR: outage.since should be cleared by a successful call")
             failed += 1
         else:
             print("✓ outage cleared on success")
@@ -691,26 +691,31 @@ def test_hainterface_api_call_auth_rejected_repeatedly_is_fatal(my_predbat=None)
 
 
 def test_hainterface_api_call_config_error_not_outage(my_predbat=None):
-    """Test api_call() lets a malformed ha_url/ha_key error escape rather than recording it as an outage"""
-    print("\n=== Testing HAInterface api_call() configuration error ===")
+    """Test api_call() lets errors that are not Home Assistant being down (bad ha_url/ha_key, redirect loop, unencodable body) escape rather than recording an outage"""
+    print("\n=== Testing HAInterface api_call() errors that are not an outage ===")
     failed = 0
 
-    mock_base = MockBase()
-    ha_interface = create_ha_interface(mock_base, ha_key="test_key", db_enable=False, db_mirror_ha=False, db_primary=False)
-
-    with patch("ha.requests.get") as mock_get:
-        mock_get.side_effect = requests.exceptions.InvalidHeader("Invalid leading whitespace, reserved character(s), or return character(s) in header value")
-        raised = False
-        try:
-            ha_interface.api_call("/api/states")
-        except requests.exceptions.InvalidHeader:
-            raised = True
-
-    if not raised or ha_interface.outage.since is not None:
-        print(f"ERROR: expected the error to escape without an outage, got raised={raised} / {ha_interface.outage.since}")
-        failed += 1
-    else:
-        print("✓ configuration error escaped and was not an outage")
+    cases = [
+        ("get", requests.exceptions.InvalidHeader("Invalid leading whitespace, reserved character(s), or return character(s) in header value")),
+        ("get", requests.exceptions.TooManyRedirects("Exceeded 30 redirects.")),
+        ("post", requests.exceptions.InvalidJSONError("Out of range float values are not JSON compliant")),
+    ]
+    for method, error in cases:
+        mock_base = MockBase()
+        ha_interface = create_ha_interface(mock_base, ha_key="test_key", db_enable=False, db_mirror_ha=False, db_primary=False)
+        with patch("ha.requests." + method) as mock_call:
+            mock_call.side_effect = error
+            raised = False
+            try:
+                ha_interface.api_call("/api/states/sensor.test", data_in={"state": 1} if method == "post" else None, post=method == "post")
+            except type(error):
+                raised = True
+
+        if not raised or ha_interface.outage.since is not None:
+            print(f"ERROR: expected {type(error).__name__} to escape without an outage, got raised={raised} / {ha_interface.outage.since}")
+            failed += 1
+        else:
+            print(f"✓ {type(error).__name__} escaped and was not an outage")
 
     return failed