python-openevse-http 0.1.76__tar.gz → 0.1.78__tar.gz

{python_openevse_http-0.1.76 → python_openevse_http-0.1.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python_openevse_http
-Version: 0.1.76
+Version: 0.1.78
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 

{python_openevse_http-0.1.76 → python_openevse_http-0.1.78}/openevsehttp/__main__.py

@@ -242,8 +242,8 @@ class OpenEVSE:
 
         if not self._ws_listening:
             _LOGGER.debug("Setting up websocket ping...")
-            self._loop.create_task(self.repeat(300, self.websocket.keepalive))
             self._loop.create_task(self.websocket.listen())
+            self._loop.create_task(self.repeat(300, self.websocket.keepalive))
             pending = asyncio.all_tasks()
             self._ws_listening = True
             try:
@@ -268,7 +268,7 @@ class OpenEVSE:
             # Stopped websockets without errors are expected during shutdown
             # and ignored
             elif data == STATE_STOPPED and error:
-                _LOGGER.error(
+                _LOGGER.debug(
                     "Websocket to %s failed, aborting [Error: %s]",
                     self.websocket.uri,
                     error,
@@ -296,11 +296,6 @@ class OpenEVSE:
         self._ws_listening = False
         assert self.websocket
         await self.websocket.close()
-        if self._loop:
-            try:
-                self._loop.cancel()
-            except AttributeError:
-                pass
 
     def is_coroutine_function(self, callback):
         """Check if a callback is a coroutine function."""
@@ -320,7 +315,7 @@ class OpenEVSE:
 
         *args and **kwargs are passed as the arguments to func.
         """
-        while True:
+        while self.ws_state != "stopped":
             await asyncio.sleep(interval)
             await func(*args, **kwargs)
 
@@ -964,7 +959,9 @@ class OpenEVSE:
         except UnsupportedFeature:
             pass
         if claims is not None and "charge_current" in claims["properties"].keys():
-            return claims["properties"]["charge_current"]
+            return min(
+                claims["properties"]["charge_current"], self._config["max_current_hard"]
+            )
         if self._config is not None and "max_current_soft" in self._config:
             return self._config["max_current_soft"]
         return self._status["pilot"]

{python_openevse_http-0.1.76 → python_openevse_http-0.1.78}/openevsehttp/websocket.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import datetime
-import json
 import logging
 
 import aiohttp  # type: ignore
@@ -154,14 +153,19 @@ class OpenEVSEWebsocket:
                 self._error_reason = ERROR_PING_TIMEOUT
                 await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
 
-        data = json.dumps({"ping": 1})
+        data = {"ping": 1}
         _LOGGER.debug("Sending message: %s to websocket.", data)
         try:
-            await self._client.send_str(data)
+            await self._client.send_json(data)
             self._ping = datetime.datetime.now()
             _LOGGER.debug("Ping message sent.")
         except TypeError as err:
             _LOGGER.error("Attempt to send ping data failed: %s", err)
+        except ValueError as err:
+            _LOGGER.error("Error parsing data: %s", err)
+        except RuntimeError as err:
+            _LOGGER.debug("Websocket connection issue: %s", err)
+            await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)
         except Exception as err:  # pylint: disable=broad-exception-caught
-            _LOGGER.error("Problem sending ping request: %s", err)
+            _LOGGER.debug("Problem sending ping request: %s", err)
             await OpenEVSEWebsocket.state.fset(self, STATE_DISCONNECTED)

{python_openevse_http-0.1.76 → python_openevse_http-0.1.78}/python_openevse_http.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openevse-http
-Version: 0.1.76
+Version: 0.1.78
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Author: firstof9
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 

{python_openevse_http-0.1.76 → python_openevse_http-0.1.78}/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.76"
+VERSION = "0.1.78"
 
 setup(
     name="python_openevse_http",
@@ -32,5 +32,6 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
 )