python-openevse-http 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

openevsehttp/client.py

@@ -6,7 +6,6 @@ import asyncio
 import inspect
 import json
 import logging
-import re
 import threading
 from collections.abc import Callable, Mapping
 from typing import Any
@@ -31,6 +30,7 @@ from .exceptions import (
 from .managers import ManagersMixin
 from .properties import PropertiesMixin
 from .sensors import SensorsMixin
+from .utils import get_awesome_version
 from .websocket import (
     SIGNAL_CONNECTION_STATE,
     STATE_CONNECTED,
@@ -139,7 +139,7 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
                 try:
                     message = json.loads(message)
                 except ValueError:
-                    _LOGGER.warning("Non JSON response: %s", message)
+                    _LOGGER.debug("Non JSON response: %s", message)
 
                 if resp.status == 400:
                     if isinstance(message, dict) and "msg" in message:
@@ -438,41 +438,21 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
         """Return bool if minimum version is met."""
         if "version" not in self._config:
             # Throw warning if we can't find the version
-            _LOGGER.warning("Unable to find firmware version.")
+            _LOGGER.debug("Unable to find firmware version.")
             return False
         cutoff = AwesomeVersion(min_version)
-        current = ""
         limit = ""
         if max_version != "":
             limit = AwesomeVersion(max_version)
 
-        firmware_filtered = None
-        firmware_search = re.search(r"\d+\.\d+\.\d+", self._config["version"])
-        if firmware_search:
-            firmware_filtered = firmware_search.group(0)
-
-        if firmware_filtered is None:
-            _LOGGER.warning(
-                "Non-standard versioning string: %s", self._config["version"]
+        current = get_awesome_version(self._config["version"])
+        if current.strategy == "unknown":
+            _LOGGER.debug(
+                "Non-semver firmware version detected: %s",
+                self._config["version"],
             )
-            _LOGGER.debug("Non-semver firmware version detected.")
             return False
 
-        _LOGGER.debug("Detected firmware: %s", self._config["version"])
-        _LOGGER.debug("Filtered firmware: %s", firmware_filtered)
-
-        if "dev" in self._config["version"]:
-            value = self._config["version"]
-            _LOGGER.debug("Stripping 'dev' from version.")
-            value = value.split(".")
-            value = ".".join(value[0:3])
-        elif "master" in self._config["version"]:
-            value = "dev"
-        else:
-            value = firmware_filtered
-
-        current = AwesomeVersion(value)
-
         if limit:
             try:
                 if cutoff <= current < limit:

openevsehttp/commands.py

@@ -14,6 +14,7 @@ from awesomeversion.exceptions import AwesomeVersionCompareException
 
 from .const import MAX_AMPS, MIN_AMPS, RAPI_ERRORS, divert_mode
 from .exceptions import UnknownError, UnsupportedFeature
+from .utils import get_awesome_version
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -357,29 +358,17 @@ class CommandsMixin:
         """Return the latest firmware version."""
         if "version" not in self._config:
             # Throw warning if we can't find the version
-            _LOGGER.warning("Unable to find firmware version.")
+            _LOGGER.debug("Unable to find firmware version.")
             return None
         base_url = "https://api.github.com/repos/OpenEVSE/"
         url = None
         method = "get"
 
         cutoff = AwesomeVersion("3.0.0")
-        current = ""
-
         _LOGGER.debug("Detected firmware: %s", self._config["version"])
 
-        if "dev" in self._config["version"]:
-            value = self._config["version"]
-            _LOGGER.debug("Stripping 'dev' from version.")
-            value = value.split(".")
-            value = ".".join(value[0:3])
-        elif "master" in self._config["version"]:
-            value = "dev"
-        else:
-            value = self._config["version"]
-
-        _LOGGER.debug("Using version: %s", value)
-        current = AwesomeVersion(value)
+        current = get_awesome_version(self._config["version"])
+        _LOGGER.debug("Using version: %s", current)
 
         try:
             if current >= cutoff:
@@ -387,7 +376,7 @@ class CommandsMixin:
             else:
                 url = f"{base_url}ESP8266_WiFi_v2.x/releases/latest"
         except AwesomeVersionCompareException:
-            _LOGGER.warning("Non-semver firmware version detected.")
+            _LOGGER.debug("Non-semver firmware version detected.")
             return None
 
         try:
@@ -492,6 +481,8 @@ class CommandsMixin:
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 
+        self._status["divertmode"] = new_mode
+
     async def set_shaper(self, enable: bool = True) -> None:
         """Set shaper mode."""
         if not self._version_check("4.0.0"):
@@ -500,16 +491,18 @@ class CommandsMixin:
 
         url = f"{self.url}shaper"
         mode = 1 if enable else 0
-        data = {"mode": mode}
+        data = {"shaper": mode}
 
         _LOGGER.debug("Setting shaper to %s", mode)
-        response = await self.process_request(url=url, method="post", data=data)
+        response = await self.process_request(url=url, method="post", rapi=data)
         response = self._normalize_response(response)
         msg = response.get("msg") if isinstance(response, Mapping) else None
         if msg not in ["OK", "done", "no change", "Current Shaper state changed"]:
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 
+        self._status["shaper"] = mode
+
     async def toggle_shaper(self) -> None:
         """Toggle shaper mode."""
         shaper_active = self._status.get("shaper")

openevsehttp/properties.py

@@ -9,6 +9,7 @@ from typing import Any
 
 from .const import MAX_AMPS, MIN_AMPS, states
 from .exceptions import UnsupportedFeature
+from .utils import normalize_version
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -130,10 +131,8 @@ class PropertiesMixin:
     def wifi_firmware(self) -> str | None:
         """Return the ESP firmware version."""
         value = self._config.get("version")
-        if value is not None and "dev" in value:
-            _LOGGER.debug("Stripping 'dev' from version.")
-            value = value.split(".")
-            value = ".".join(value[0:3])
+        if value is not None:
+            value = normalize_version(value)
         return value
 
     @property

openevsehttp/utils.py

@@ -0,0 +1,29 @@
+"""Utility functions for python-openevse-http."""
+
+import logging
+import re
+
+from awesomeversion import AwesomeVersion
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def normalize_version(version: str) -> str:
+    """Normalize the version string to strip 'dev' tag."""
+    if "dev" in version:
+        _LOGGER.debug("Stripping 'dev' from version.")
+        value = version.split(".")
+        return ".".join(value[0:3])
+    return version
+
+
+def get_awesome_version(version: str) -> AwesomeVersion:
+    """Parse and normalize the version string, returning an AwesomeVersion."""
+    if "master" in version:
+        version = "dev"
+    value = normalize_version(version)
+    if "dev" not in version:
+        firmware_search = re.search(r"\d+\.\d+\.\d+", value)
+        if firmware_search:
+            value = firmware_search.group(0)
+    return AwesomeVersion(value)

{python_openevse_http-0.3.2.dist-info → python_openevse_http-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 0.3.2
+Version: 0.3.4
 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-0.3.2.dist-info → python_openevse_http-0.3.4.dist-info}/RECORD

@@ -1,15 +1,16 @@
 openevsehttp/__init__.py,sha256=I6a1mjOZHYiWb_qfCuDuFLOOncrkkB_7uwybtOIujfY,1165
 openevsehttp/__main__.py,sha256=EHmSdT7GjAVvHQxvLBTjZXsj_V5SB6B2_kpgUAT7mPM,146
-openevsehttp/client.py,sha256=rdUZn6HdJgUj5vZDin2PL8DyCBRK5_81YR5XJeGI6B0,18210
-openevsehttp/commands.py,sha256=UghodbIq7mF1HDI-o0BpcKcRQm7fgcz_pCqPBOtZPns,21021
+openevsehttp/client.py,sha256=JBAC1jJGdzOabVAqHv8x6EJDVjhaW4t7Iwqn4lDWhwE,17502
+openevsehttp/commands.py,sha256=qro0H2uAzNTIh3LCnP8DgI693J4CKnZkxDRQgWo8HlM,20786
 openevsehttp/const.py,sha256=VSc5Xt-KFenft0rT6ql9whCD7J9g_YvjLYU_PX706eE,1360
 openevsehttp/exceptions.py,sha256=bqz-tHTW1AYJMKcm0s5M6z5tA6XZgjnCiBLW1XrZ_70,672
 openevsehttp/managers.py,sha256=kEX1ZD9u-FY0UEZJsxeFEGBSGzSlkbBc0kmxCiMJtJw,5373
-openevsehttp/properties.py,sha256=Lo2p6WfPuhpaEcIZ0OeAxinHSa0G8Sv2wLZ-dPe7rjo,17181
+openevsehttp/properties.py,sha256=QVSyn_5a7vI1b4TdnnToRdw6veVCfnp7a19VYit95hg,17107
 openevsehttp/sensors.py,sha256=sJP2FPnU1Lk5S3VUyFT14JM1nKEBQPsjl-DiZI-pZrs,4673
+openevsehttp/utils.py,sha256=e3HH_jwZgb1iBWJgIoMOM0JPrQNwXyVdOx5vTWOh4T0,858
 openevsehttp/websocket.py,sha256=Mi_WFmlT3-9i6bbHIN6ua09SD8CpIle2vRXB3HyWzmM,10066
-python_openevse_http-0.3.2.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
-python_openevse_http-0.3.2.dist-info/METADATA,sha256=owAAfc5N-66JfgL2DjzWeeM94vf3lESDwmFTitwzQQ0,4363
-python_openevse_http-0.3.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-python_openevse_http-0.3.2.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
-python_openevse_http-0.3.2.dist-info/RECORD,,
+python_openevse_http-0.3.4.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
+python_openevse_http-0.3.4.dist-info/METADATA,sha256=xw9ot2rB-084_Du8lm-9Rx58S0mvOpgb7iEbFb4U6sw,4363
+python_openevse_http-0.3.4.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+python_openevse_http-0.3.4.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
+python_openevse_http-0.3.4.dist-info/RECORD,,