python-openevse-http 1.7.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

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

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.dist-info → python_openevse_http-1.7.1.dist-info}/METADATA

@@ -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.dist-info → python_openevse_http-1.7.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 openevsehttp/__init__.py,sha256=QeXl80ozsK6J9PN-jB_83Bde31YXFGgLuUdmArpZAMM,1363
 openevsehttp/__main__.py,sha256=EHmSdT7GjAVvHQxvLBTjZXsj_V5SB6B2_kpgUAT7mPM,146
-openevsehttp/client.py,sha256=2C2SuRkJaC2r38qo57l1gPV86Fqr8Wp72LBnv2R_tuE,22456
+openevsehttp/client.py,sha256=DRiFOtXEznthZCfD5AGwI6isHMkCd7iiwFgo1W_nux8,22482
 openevsehttp/commands.py,sha256=l9mxdfgpeYzM1M6NPr0KLIaTtTsU10vzcKG1S7Z6O1M,918
 openevsehttp/commands_base.py,sha256=DnHnB-rAI7zLDIMkL66epct6KnjLsm9OhlRFlOojREI,1934
-openevsehttp/commands_core.py,sha256=c6gzsKqBy1t3mHwlZ6TcMMvQresettVeMvYsGhHQ-Ko,18506
+openevsehttp/commands_core.py,sha256=jZZJpD9XolKW0A_1eeec_nB5Kzfbcjih18N7WI_uLvI,18941
 openevsehttp/commands_diagnostics.py,sha256=j23LX0cB9lb2UBkOpmJjNSBQm87AQijlP6qxotAmiTw,9894
 openevsehttp/commands_firmware.py,sha256=Ej_EdO8z4arA8wkqfORC0Q_zO9qi7SlC2NmPme03Llg,10308
 openevsehttp/commands_schedule.py,sha256=kBZp6hPt1qNjoZUVkhRhzB9pXlA--W1UQkQYzxEFQgw,5995
@@ -17,8 +17,8 @@ openevsehttp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openevsehttp/sensors.py,sha256=XrAaL66jkZqh2IjYXpQI5SJc84GduanBmnbCpbta8lA,5797
 openevsehttp/utils.py,sha256=fPUWL64gFTRw4TtV4WITDAFMJ75VjNhPBaU6diwVlv0,2019
 openevsehttp/websocket.py,sha256=yMuLNsB2qYZLtfYRW7-D7NH7rv-qaSTp7F79OajKm_0,10790
-python_openevse_http-1.7.0.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
-python_openevse_http-1.7.0.dist-info/METADATA,sha256=K4DJbt66K11Zqi10mFJhE9krqioECU3Wn9ZY94G4rNY,7011
-python_openevse_http-1.7.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_openevse_http-1.7.0.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
-python_openevse_http-1.7.0.dist-info/RECORD,,
+python_openevse_http-1.7.1.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
+python_openevse_http-1.7.1.dist-info/METADATA,sha256=5Ymc7plftTfZ9tmIhBRTJws0s9kpIU7KDrVzdYWLQQo,7011
+python_openevse_http-1.7.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_openevse_http-1.7.1.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
+python_openevse_http-1.7.1.dist-info/RECORD,,