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

openevsehttp/commands.py

@@ -12,7 +12,7 @@ from aiohttp.client_exceptions import ContentTypeError, ServerTimeoutError
 from awesomeversion import AwesomeVersion
 from awesomeversion.exceptions import AwesomeVersionCompareException
 
-from .const import MAX_AMPS, MIN_AMPS, RAPI_ERRORS, divert_mode
+from .const import MAX_AMPS, MIN_AMPS, RAPI_ERRORS, SUCCESS_ANSWERS, divert_mode
 from .exceptions import UnknownError, UnsupportedFeature
 from .utils import get_awesome_version
 
@@ -68,7 +68,7 @@ class CommandsMixin:
         response = await self.process_request(url=url, method="post", data=data)
         response = self._normalize_response(response)
         msg = response.get("msg") if isinstance(response, Mapping) else None
-        if msg not in ["OK", "done", "no change"]:
+        if msg not in SUCCESS_ANSWERS:
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 
@@ -95,11 +95,10 @@ class CommandsMixin:
         response = await self.process_request(url=url, method="post", data=data)
         _LOGGER.debug("divert_mode response: %s", response)
         normalized_response = self._normalize_response(response)
-        if isinstance(normalized_response, dict) and normalized_response.get("msg") in [
-            "OK",
-            "done",
-            "no change",
-        ]:
+        if (
+            isinstance(normalized_response, dict)
+            and normalized_response.get("msg") in SUCCESS_ANSWERS
+        ):
             self._config["divert_enabled"] = mode
         return normalized_response
 
@@ -172,11 +171,10 @@ class CommandsMixin:
             response = await self.process_request(url=url, method="patch")
             response = self._normalize_response(response)
             _LOGGER.debug("Toggle response: %s", response)
-            if not isinstance(response, Mapping) or response.get("msg") not in [
-                "OK",
-                "done",
-                "no change",
-            ]:
+            if (
+                not isinstance(response, Mapping)
+                or response.get("msg") not in SUCCESS_ANSWERS
+            ):
                 _LOGGER.error("Problem toggling override: %s", response)
                 raise RuntimeError(f"Failed to toggle override: {response}")
         else:
@@ -210,7 +208,7 @@ class CommandsMixin:
         response = self._normalize_response(response)
         msg = response.get("msg") if isinstance(response, Mapping) else None
         _LOGGER.debug("Clear override response: %s", msg)
-        if msg not in ["OK", "done", "no change"]:
+        if msg not in SUCCESS_ANSWERS:
             _LOGGER.error("Problem clearing override: %s", response)
             raise RuntimeError(f"Failed to clear override: {response}")
 
@@ -236,11 +234,10 @@ class CommandsMixin:
             _LOGGER.debug("Setting current limit to %s", amps)
             response = await self.set_override(charge_current=amps)
             _LOGGER.debug("Set current response: %s", response)
-            if not isinstance(response, Mapping) or response.get("msg") not in [
-                "OK",
-                "done",
-                "no change",
-            ]:
+            if (
+                not isinstance(response, Mapping)
+                or response.get("msg") not in SUCCESS_ANSWERS
+            ):
                 _LOGGER.error("Problem setting current limit: %s", response)
                 raise UnknownError
 
@@ -275,7 +272,7 @@ class CommandsMixin:
         response = self._normalize_response(response)
         _LOGGER.debug("service response: %s", response)
         msg = response.get("msg") if isinstance(response, Mapping) else None
-        if msg not in ["OK", "done", "no change"]:
+        if msg not in SUCCESS_ANSWERS:
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 
@@ -417,12 +414,79 @@ class CommandsMixin:
 
             if not isinstance(message, dict):
                 return None
+
+            # Match browser_download_url based on buildenv
+            download_url = None
+            buildenv = self._config.get("buildenv")
+            assets = message.get("assets", [])
+
+            if buildenv and assets:
+                target_filename = f"{buildenv}.bin"
+                for asset in assets:
+                    if asset.get("name") == target_filename:
+                        download_url = asset.get("browser_download_url")
+                        break
+
             return {
                 "latest_version": message.get("tag_name"),
                 "release_notes": message.get("body"),
                 "release_url": message.get("html_url"),
+                "browser_download_url": download_url,
             }
 
+    async def update_firmware(
+        self,
+        firmware_url: str | None = None,
+        firmware_bytes: bytes | None = None,
+        filename: str = "firmware.bin",
+    ) -> Mapping[str, Any] | list[Any] | str:
+        """Instruct the device to update its firmware.
+
+        You can either:
+        1. Pass firmware_bytes to perform a multipart upload of a local file.
+        2. Pass firmware_url to tell the device to download the file directly.
+        3. Pass neither to automatically resolve the latest matching binary URL from GitHub.
+        """
+        if firmware_bytes is not None and firmware_url is not None:
+            raise ValueError("Cannot specify both firmware_bytes and firmware_url")
+
+        if firmware_url is not None:
+            if not isinstance(firmware_url, str) or not firmware_url.strip():
+                raise ValueError("Invalid firmware_url")
+
+        url = f"{self.url}update"
+
+        # 1. Handle multipart binary upload
+        if firmware_bytes is not None:
+            form_data = aiohttp.FormData()
+            form_data.add_field(
+                name="file",
+                value=firmware_bytes,
+                filename=filename,
+                content_type="application/octet-stream",
+            )
+            _LOGGER.debug(
+                "Uploading firmware binary to %s (%d bytes)", url, len(firmware_bytes)
+            )
+            # Rapi is mapped to http request's data kwarg in process_request
+            return await self.process_request(url=url, method="post", rapi=form_data)
+
+        # 2. Resolve URL from GitHub if not specified
+        if firmware_url is None:
+            check_result = await self.firmware_check()
+            if not check_result or not check_result.get("browser_download_url"):
+                raise RuntimeError(
+                    "Could not resolve latest firmware download URL from GitHub."
+                )
+            firmware_url = check_result["browser_download_url"]
+
+        # 3. Post JSON URL payload
+        data = {"url": firmware_url}
+        _LOGGER.debug(
+            "Requesting OpenEVSE to download and update from: %s", firmware_url
+        )
+        return await self.process_request(url=url, method="post", data=data)
+
     async def set_led_brightness(self, level: int) -> None:
         """Set LED brightness level."""
         if isinstance(level, bool) or not isinstance(level, int):
@@ -448,7 +512,7 @@ class CommandsMixin:
         response = await self.process_request(url=url, method="post", data=data)
         response = self._normalize_response(response)
         msg = response.get("msg") if isinstance(response, Mapping) else None
-        if msg not in ["OK", "done", "no change"]:
+        if msg not in SUCCESS_ANSWERS:
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 
@@ -470,11 +534,7 @@ class CommandsMixin:
             res_lower = response.lower()
             if "divert" in res_lower and "changed" in res_lower:
                 success = True
-        elif isinstance(response, dict) and response.get("msg") in [
-            "OK",
-            "done",
-            "no change",
-        ]:
+        elif isinstance(response, dict) and response.get("msg") in SUCCESS_ANSWERS:
             success = True
 
         if not success:
@@ -497,7 +557,7 @@ class CommandsMixin:
         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"]:
+        if msg not in SUCCESS_ANSWERS and msg != "Current Shaper state changed":
             _LOGGER.error("Problem issuing command: %s", response)
             raise UnknownError
 

openevsehttp/const.py

@@ -60,3 +60,5 @@ RAPI_ERRORS = [
     "RAPI_RESPONSE_BLOCKED",
     "RAPI_RESPONSE_INVALID_COMMAND",
 ]
+
+SUCCESS_ANSWERS = ["OK", "done", "no change", "Created", "Updated", "Deleted"]

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

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

@@ -1,16 +1,16 @@
 openevsehttp/__init__.py,sha256=I6a1mjOZHYiWb_qfCuDuFLOOncrkkB_7uwybtOIujfY,1165
 openevsehttp/__main__.py,sha256=EHmSdT7GjAVvHQxvLBTjZXsj_V5SB6B2_kpgUAT7mPM,146
 openevsehttp/client.py,sha256=JBAC1jJGdzOabVAqHv8x6EJDVjhaW4t7Iwqn4lDWhwE,17502
-openevsehttp/commands.py,sha256=qro0H2uAzNTIh3LCnP8DgI693J4CKnZkxDRQgWo8HlM,20786
-openevsehttp/const.py,sha256=VSc5Xt-KFenft0rT6ql9whCD7J9g_YvjLYU_PX706eE,1360
+openevsehttp/commands.py,sha256=Pv3H0VXWndQica4J4zZlGbxvCz8NjGyJdkppcTnrZcs,23384
+openevsehttp/const.py,sha256=y-2hGv_PCal_-VCSGC7IIyzQYtfeVdq3MjOhBWIdZvc,1440
 openevsehttp/exceptions.py,sha256=bqz-tHTW1AYJMKcm0s5M6z5tA6XZgjnCiBLW1XrZ_70,672
 openevsehttp/managers.py,sha256=kEX1ZD9u-FY0UEZJsxeFEGBSGzSlkbBc0kmxCiMJtJw,5373
 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.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,,
+python_openevse_http-0.4.0.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
+python_openevse_http-0.4.0.dist-info/METADATA,sha256=oSaVonGB3ZuiNKcUHN-X-tqW6p3K5Is8wDY8FLjpg7M,4363
+python_openevse_http-0.4.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_openevse_http-0.4.0.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
+python_openevse_http-0.4.0.dist-info/RECORD,,

{python_openevse_http-0.3.4.dist-info → python_openevse_http-0.4.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any