python-openevse-http 1.7.0__tar.gz → 1.7.1__tar.gz

{python_openevse_http-1.7.0/python_openevse_http.egg-info → python_openevse_http-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 1.7.0
+Version: 1.7.1
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Download-URL: https://github.com/firstof9/python-openevse-http

{python_openevse_http-1.7.0 → python_openevse_http-1.7.1}/openevsehttp/client.py

@@ -26,6 +26,7 @@ from .const import (
 from .exceptions import (
     AlreadyListening,
     AuthenticationError,
+    CommandFailedError,
     MissingMethod,
     MissingSerial,
     ParseJSONError,
@@ -186,15 +187,16 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
 
                 if resp.status == 400:
                     if isinstance(response_content, dict) and "msg" in response_content:
-                        _LOGGER.error("Error 400: %s", response_content["msg"])
+                        msg = str(response_content["msg"])
                     elif (
                         isinstance(response_content, dict)
                         and "error" in response_content
                     ):
-                        _LOGGER.error("Error 400: %s", response_content["error"])
+                        msg = str(response_content["error"])
                     else:
-                        _LOGGER.error("Error 400: %s", response_content)
-                    raise ParseJSONError
+                        msg = str(response_content)
+                    _LOGGER.error("Error 400: %s", msg)
+                    raise CommandFailedError(msg)
                 if resp.status == 401:
                     _LOGGER.error("Authentication error: %s", response_content)
                     raise AuthenticationError

{python_openevse_http-1.7.0 → python_openevse_http-1.7.1}/openevsehttp/commands_core.py

@@ -271,17 +271,31 @@ class CoreCommandsMixin(BaseCommandMixin):
 
         # Strict success check:
         # 1. Must be a Mapping
-        # 2. Must have "result" == "OK" OR "success" is True
-        # 3. Must NOT have an "error" key
-        # 4. If "msg" is present, it must be "OK" or contain "ok" (case-insensitive)
+        # 2. Must NOT have an "error" key
+        # 3. Must have "result" in ("OK", "ok", True) OR "success" is True
+        #    OR "msg" indicating restart acknowledgment ("restart gateway", "ok")
         success = (
             isinstance(response, Mapping)
-            and (response.get("result") == "OK" or response.get("success") is True)
             and not response.get("error")
+            and (
+                response.get("result") in ("OK", "ok", True)
+                or response.get("success") is True
+                or (
+                    isinstance(response.get("msg"), str)
+                    and any(
+                        val in response["msg"].lower()
+                        for val in ("ok", "restart gateway")
+                    )
+                )
+            )
         )
         if success and isinstance(response, Mapping) and "msg" in response:
             msg_val = str(response["msg"]).lower()
-            if msg_val != "ok" and "ok" not in msg_val:
+            if (
+                msg_val != "ok"
+                and "ok" not in msg_val
+                and "restart gateway" not in msg_val
+            ):
                 success = False
 
         if not success:

{python_openevse_http-1.7.0 → python_openevse_http-1.7.1/python_openevse_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 1.7.0
+Version: 1.7.1
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Download-URL: https://github.com/firstof9/python-openevse-http

python_openevse_http-1.7.1/python_openevse_http.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.7.1",
+  "distance": 0,
+  "node": "g5bd22bb9dfe02ab480daf3c8d674dc07ee9dc59e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-29"
+}

{python_openevse_http-1.7.0 → python_openevse_http-1.7.1}/tests/test_client.py

@@ -284,25 +284,25 @@ async def test_send_command_auth(test_charger_auth, mock_aioclient):
 
 
 async def test_send_command_parse_err(test_charger_auth, mock_aioclient):
-    """Test RAPI command with JSON parse error."""
+    """Test RAPI command with 400 error response."""
     mock_aioclient.post(
         TEST_URL_RAPI, status=400, body='{"msg": "Could not parse JSON"}'
     )
-    with pytest.raises(main.ParseJSONError):
+    with pytest.raises(main.CommandFailedError):
         await test_charger_auth.send_command("test")
 
     mock_aioclient.post(
         TEST_URL_RAPI, status=400, body='{"error": "Could not parse JSON"}'
     )
-    with pytest.raises(main.ParseJSONError):
+    with pytest.raises(main.CommandFailedError):
         await test_charger_auth.send_command("test")
 
     mock_aioclient.post(TEST_URL_RAPI, status=400, body='{"other": "Something else"}')
-    with pytest.raises(main.ParseJSONError):
+    with pytest.raises(main.CommandFailedError):
         await test_charger_auth.send_command("test")
 
     mock_aioclient.post(TEST_URL_RAPI, status=400, body='"Just a string response"')
-    with pytest.raises(main.ParseJSONError):
+    with pytest.raises(main.CommandFailedError):
         await test_charger_auth.send_command("test")
 
 
@@ -1243,7 +1243,7 @@ async def test_process_request_400_error_with_msg(mock_aioclient, charger_factor
 
     charger = charger_factory(SERVER_URL)
 
-    with pytest.raises(ParseJSONError):
+    with pytest.raises(CommandFailedError, match="Bad request"):
         await charger.process_request(TEST_URL_STATUS, method="get")
 
 
@@ -1260,7 +1260,24 @@ async def test_process_request_400_error_with_error_field(
 
     charger = charger_factory(SERVER_URL)
 
-    with pytest.raises(ParseJSONError):
+    with pytest.raises(CommandFailedError, match="Invalid input"):
+        await charger.process_request(TEST_URL_STATUS, method="get")
+
+
+async def test_process_request_400_error_with_string_body(
+    mock_aioclient, charger_factory
+):
+    """Test process_request handles 400 error with plain string body."""
+
+    mock_aioclient.get(
+        TEST_URL_STATUS,
+        status=400,
+        body="Plain text error",
+    )
+
+    charger = charger_factory(SERVER_URL)
+
+    with pytest.raises(CommandFailedError, match="Plain text error"):
         await charger.process_request(TEST_URL_STATUS, method="get")
 
 
@@ -1566,7 +1583,7 @@ async def test_external_session_400_error_with_msg():
         async with aiohttp.ClientSession() as session:
             charger = OpenEVSE(SERVER_URL, session=session)
 
-            with pytest.raises(ParseJSONError):
+            with pytest.raises(CommandFailedError, match="Bad request"):
                 await charger.process_request(TEST_URL_STATUS, method="get")
 
 
@@ -1582,7 +1599,7 @@ async def test_external_session_400_error_with_error_field():
         async with aiohttp.ClientSession() as session:
             charger = OpenEVSE(SERVER_URL, session=session)
 
-            with pytest.raises(ParseJSONError):
+            with pytest.raises(CommandFailedError, match="Invalid input"):
                 await charger.process_request(TEST_URL_STATUS, method="get")
 
 

{python_openevse_http-1.7.0 → python_openevse_http-1.7.1}/tests/test_commands.py

@@ -673,6 +673,17 @@ async def test_restart_wifi(test_charger_modified_ver, mock_aioclient, caplog):
         await test_charger_modified_ver.restart_wifi()
     assert "Restart response: restart gateway" in caplog.text
 
+    # Also verify standard ESP32 gateway response `{"msg": "restart gateway"}`
+    caplog.clear()
+    mock_aioclient.post(
+        TEST_URL_RESTART,
+        status=200,
+        body='{"msg": "restart gateway"}',
+    )
+    with caplog.at_level(logging.DEBUG):
+        await test_charger_modified_ver.restart_wifi()
+    assert "WiFi Restart response: restart gateway" in caplog.text
+
 
 async def test_restart_wifi_fail(test_charger, mock_aioclient, caplog):
     """Test restart_wifi failure."""

python_openevse_http-1.7.0/python_openevse_http.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.7.0",
-  "distance": 0,
-  "node": "g386a44e84fa6e86a88a75dabe86d19c1afb693c6",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-28"
-}