python-openevse-http 0.1.73__tar.gz → 0.1.75__tar.gz

{python_openevse_http-0.1.73 → python_openevse_http-0.1.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_openevse_http
-Version: 0.1.73
+Version: 0.1.75
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9

{python_openevse_http-0.1.73 → python_openevse_http-0.1.75}/openevsehttp/__main__.py

@@ -153,12 +153,12 @@ class OpenEVSE:
                         await self.update()
                     return message
 
-            except (TimeoutError, ServerTimeoutError):
+            except (TimeoutError, ServerTimeoutError) as err:
                 _LOGGER.error("%s: %s", ERROR_TIMEOUT, url)
-                message = {"msg": ERROR_TIMEOUT}
+                raise err
             except ContentTypeError as err:
-                _LOGGER.error("%s", err)
-                message = {"msg": err}
+                _LOGGER.error("Content error: %s", err.message)
+                raise err
 
             await session.close()
             return message
@@ -263,7 +263,7 @@ class OpenEVSE:
                 )
                 _LOGGER.debug("Disconnect message: %s", error)
                 self._ws_listening = False
-                self.ws_start()
+
             # Stopped websockets without errors are expected during shutdown
             # and ignored
             elif data == STATE_STOPPED and error:
@@ -273,7 +273,6 @@ class OpenEVSE:
                     error,
                 )
                 self._ws_listening = False
-                await self.ws_disconnect()
 
         elif msgtype == "data":
             _LOGGER.debug("Websocket data: %s", data)
@@ -428,6 +427,7 @@ class OpenEVSE:
         #   3.x: use RAPI commands $FE (enable) and $FS (sleep)
         #   4.x: use HTTP API call
         lower = "4.0.0"
+        msg = ""
         if self._version_check(lower):
             url = f"{self.url}override"
 
@@ -1288,8 +1288,8 @@ class OpenEVSE:
         return None
 
     @property
-    def shaper_current_power(self) -> int | None:
-        """Return shaper live power reading."""
+    def shaper_available_current(self) -> float | None:
+        """Return shaper available current."""
         if self._status is not None and "shaper_cur" in self._status:
             if self._status["shaper_cur"] == 255:
                 return self._status["pilot"]

{python_openevse_http-0.1.73 → python_openevse_http-0.1.75}/openevsehttp/websocket.py

@@ -110,7 +110,7 @@ class OpenEVSEWebsocket:
                 self._error_reason = error
             await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
         except (aiohttp.ClientConnectionError, asyncio.TimeoutError) as error:
-            if self.failed_attempts >= MAX_FAILED_ATTEMPTS:
+            if self.failed_attempts > MAX_FAILED_ATTEMPTS:
                 self._error_reason = ERROR_TOO_MANY_RETRIES
                 await OpenEVSEWebsocket.state.fset(self, STATE_STOPPED)
             elif self.state != STATE_STOPPED:
@@ -150,8 +150,8 @@ class OpenEVSEWebsocket:
             if time_delta < 0:
                 # Negitive time should indicate no pong reply so consider the
                 # websocket disconnected.
-                await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
                 self._error_reason = ERROR_PING_TIMEOUT
+                await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
 
         data = json.dumps({"ping": 1})
         _LOGGER.debug("Sending message: %s to websocket.", data)

{python_openevse_http-0.1.73 → python_openevse_http-0.1.75}/python_openevse_http.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openevse-http
-Version: 0.1.73
+Version: 0.1.75
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9

{python_openevse_http-0.1.73 → python_openevse_http-0.1.75}/setup.py

@@ -6,7 +6,7 @@ from setuptools import find_packages, setup
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.73"
+VERSION = "0.1.75"
 
 setup(
     name="python_openevse_http",