python-openevse-http 0.4.0__tar.gz → 0.4.2__tar.gz

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/.github/workflows/autolabeler.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/.github/workflows/links.yml

@@ -15,7 +15,7 @@ jobs:
   linkChecker:
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/.github/workflows/publish-to-pypi.yml

@@ -21,7 +21,7 @@ jobs:
       contents: read
       id-token: write
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 
@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@1edb52594c857e2b5b13128931090f0640537287  # v5.3.0
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b  # v8.1.0
         with:
           enable-cache: true
           version: "0.10.9"
@@ -43,4 +43,4 @@ jobs:
         run: uv build
 
       - name: Publish release to PyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  # v1.12.4
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b  # v1.14.0

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/.github/workflows/release-drafter.yml

@@ -13,7 +13,7 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
   prek:
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 
@@ -41,7 +41,7 @@ jobs:
           - "3.14"
 
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d  # v2.16.1
+      - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411  # v2.19.4
         with:
           egress-policy: audit
 

{python_openevse_http-0.4.0/python_openevse_http.egg-info → python_openevse_http-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 0.4.0
+Version: 0.4.2
 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.4.0 → python_openevse_http-0.4.2}/openevsehttp/client.py

@@ -183,12 +183,12 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
             return (False, "")
         return (value["cmd"], value["ret"])
 
-    async def update(self) -> None:
+    async def update(self, force_status: bool = False) -> None:
         """Update the values."""
         # TODO: add addiontal endpoints to update
         urls = [f"{self.url}config"]
 
-        if not self._ws_listening:
+        if not self._ws_listening or force_status or self.ota_update:
             urls = [f"{self.url}status", f"{self.url}config"]
 
         for url in urls:
@@ -196,7 +196,7 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
             response = await self.process_request(url, method="get")
             if "/status" in url:
                 if isinstance(response, Mapping) and "error" not in response:
-                    self._status = dict(response)
+                    self._status.update(dict(response))
                     _LOGGER.debug("Status update: %s", self._status)
                 elif isinstance(response, Mapping):
                     _LOGGER.warning(
@@ -337,6 +337,16 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
             # TODO: update specific endpoints based on _version prefix
             if any(key in keys for key in UPDATE_TRIGGERS):
                 await self.update()
+
+            if "ota" in keys:
+                ota_val = data["ota"]
+                if ota_val == "started":
+                    self._status["ota_update"] = 1
+                elif ota_val in ("completed", "failed"):
+                    self._status["ota_update"] = 0
+                    data.pop("ota_progress", None)
+                    self._status.pop("ota_progress", None)
+
             self._status.update(data)
 
             if self.callback is not None:

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/openevsehttp/commands.py

@@ -39,13 +39,22 @@ class CommandsMixin:
     async def send_command(self, command: str) -> tuple:
         raise NotImplementedError
 
-    async def update(self) -> None:
+    async def update(self, force_status: bool = False) -> None:
         raise NotImplementedError
 
     def _normalize_response(self, response: Any) -> dict[str, Any] | list[Any]:
         """Normalize response to a dict or list."""
         raise NotImplementedError
 
+    def _flag_ota_if_started(self, response: Any) -> None:
+        """Flag OTA as active if response indicates firmware update has started."""
+        normalized = self._normalize_response(response)
+        if isinstance(normalized, dict) and (
+            normalized.get("msg") == "started"
+            or normalized.get("msg") in SUCCESS_ANSWERS
+        ):
+            self._status["ota_update"] = 1
+
     async def get_schedule(self) -> Mapping[str, Any] | list[Any]:
         """Return the current schedule."""
         url = f"{self.url}schedule"
@@ -447,6 +456,10 @@ class CommandsMixin:
         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 not self._version_check("4.1.7"):
+            _LOGGER.debug("Feature not supported for older firmware.")
+            raise UnsupportedFeature
+
         if firmware_bytes is not None and firmware_url is not None:
             raise ValueError("Cannot specify both firmware_bytes and firmware_url")
 
@@ -469,7 +482,11 @@ class CommandsMixin:
                 "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)
+            response = await self.process_request(
+                url=url, method="post", rapi=form_data
+            )
+            self._flag_ota_if_started(response)
+            return response
 
         # 2. Resolve URL from GitHub if not specified
         if firmware_url is None:
@@ -485,7 +502,9 @@ class CommandsMixin:
         _LOGGER.debug(
             "Requesting OpenEVSE to download and update from: %s", firmware_url
         )
-        return await self.process_request(url=url, method="post", data=data)
+        response = await self.process_request(url=url, method="post", data=data)
+        self._flag_ota_if_started(response)
+        return response
 
     async def set_led_brightness(self, level: int) -> None:
         """Set LED brightness level."""

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/openevsehttp/properties.py

@@ -341,7 +341,17 @@ class PropertiesMixin:
     @property
     def ota_update(self) -> bool:
         """Return if an OTA update is active."""
-        return self._status.get("ota_update", False)
+        return bool(self._status.get("ota_update", False))
+
+    @property
+    def ota_progress(self) -> int | None:
+        """Return the progress of the current OTA update."""
+        return self._status.get("ota_progress")
+
+    @property
+    def ota_state(self) -> str | None:
+        """Return the state of the current OTA update."""
+        return self._status.get("ota")
 
     @property
     def manual_override(self) -> bool:

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/pyproject.toml

@@ -32,7 +32,7 @@ ignore = [
 max-complexity = 18
 
 [build-system]
-requires = ["setuptools>=61.0.0", "setuptools-scm>=8.0"]
+requires = ["setuptools>=82.0.1", "setuptools-scm>=10.0.5"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2/python_openevse_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 0.4.0
+Version: 0.4.2
 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.4.0 → python_openevse_http-0.4.2}/requirements_test.txt

@@ -5,7 +5,7 @@ pytest-cov==7.1.0
 pytest-timeout==2.4.0
 pytest-asyncio
 requests_mock
-aiohttp
+aiohttp<3.11
 aioresponses
 tox==4.55.0
 freezegun

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/tests/test_client.py

@@ -117,6 +117,55 @@ async def test_get_status_auth_err(test_charger_auth_err):
         await test_charger_auth_err.update()
 
 
+async def test_update_force_status(mock_aioclient):
+    """Test force_status parameter when ws is listening."""
+    unique_host = "force-status.test.tld"
+    charger = OpenEVSE(unique_host)
+    url_status = f"http://{unique_host}/status"
+    url_config = f"http://{unique_host}/config"
+
+    mock_aioclient.get(
+        url_status,
+        status=200,
+        body='{"state": 2, "wifi_serial": "123"}',
+    )
+    mock_aioclient.get(
+        url_config,
+        status=200,
+        body='{"wifi_serial": "123", "version": "4.0.1"}',
+    )
+    charger._ws_listening = True
+    charger._status = {"transient_key": "preserved"}
+    await charger.update(force_status=True)
+    assert charger._status["state"] == 2
+    assert charger._status["transient_key"] == "preserved"
+
+
+async def test_update_ota_active(mock_aioclient):
+    """Test automatic status polling when ota_update is active."""
+    unique_host = "ota-active.test.tld"
+    charger = OpenEVSE(unique_host)
+    url_status = f"http://{unique_host}/status"
+    url_config = f"http://{unique_host}/config"
+
+    mock_aioclient.get(
+        url_status,
+        status=200,
+        body='{"state": 2, "ota_update": 1}',
+    )
+    mock_aioclient.get(
+        url_config,
+        status=200,
+        body='{"wifi_serial": "123", "version": "4.0.1"}',
+    )
+    charger._ws_listening = True
+    charger._status = {"ota_update": 1, "ota_progress": 50}
+    await charger.update()
+    assert charger._status["state"] == 2
+    assert charger._status["ota_progress"] == 50
+    assert charger.ota_update is True
+
+
 # ── send_command ──────────────────────────────────────────────────────
 
 
@@ -1651,3 +1700,26 @@ async def test_update_status_non_mapping_data(caplog):
     with caplog.at_level(logging.WARNING):
         await charger._update_status("data", "not a dict", None)
     assert "Received non-Mapping websocket data: not a dict" in caplog.text
+
+
+async def test_update_status_ota():
+    """Test _update_status with ota websocket events."""
+    charger = OpenEVSE(SERVER_URL)
+    charger._status = {"ota_update": 0}
+
+    # 1. Started event
+    await charger._update_status("data", {"ota": "started"}, None)
+    assert charger.ota_update is True
+    assert charger.ota_state == "started"
+
+    # 2. Progress event
+    await charger._update_status("data", {"ota_progress": 25}, None)
+    assert charger.ota_progress == 25
+
+    # 3. Completed event (verifying ota_progress is cleared even if present in the data dict)
+    await charger._update_status(
+        "data", {"ota": "completed", "ota_progress": 100}, None
+    )
+    assert charger.ota_update is False
+    assert charger.ota_progress is None
+    assert charger.ota_state == "completed"

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/tests/test_commands.py

@@ -1047,6 +1047,7 @@ async def test_normalize_response(test_charger):
 
 async def test_update_firmware_bytes(test_charger, mock_aioclient, caplog):
     """Test update_firmware with bytes upload."""
+    test_charger._config["version"] = "4.1.7"
     mock_aioclient.post(
         "http://openevse.test.tld/update",
         status=200,
@@ -1059,10 +1060,12 @@ async def test_update_firmware_bytes(test_charger, mock_aioclient, caplog):
             "Uploading firmware binary to http://openevse.test.tld/update (14 bytes)"
             in caplog.text
         )
+        assert test_charger.ota_update is True
 
 
 async def test_update_firmware_url(test_charger, mock_aioclient, caplog):
     """Test update_firmware with a direct URL."""
+    test_charger._config["version"] = "4.1.7"
     mock_aioclient.post(
         "http://openevse.test.tld/update",
         status=200,
@@ -1077,12 +1080,13 @@ async def test_update_firmware_url(test_charger, mock_aioclient, caplog):
             "Requesting OpenEVSE to download and update from: http://github.com/release.bin"
             in caplog.text
         )
+        assert test_charger.ota_update is True
 
 
 async def test_update_firmware_auto(test_charger, mock_aioclient, caplog):
     """Test update_firmware with auto-resolved URL from GitHub."""
-    # Setup config with a buildenv
-    test_charger._config = {"version": "4.0.1", "buildenv": "openevse_esp32-gateway"}
+    # Setup config with a buildenv and version >= 4.1.7
+    test_charger._config = {"version": "4.1.7", "buildenv": "openevse_esp32-gateway"}
 
     # Mock GitHub Releases API to return assets matching buildenv
     github_response = {
@@ -1120,11 +1124,12 @@ async def test_update_firmware_auto(test_charger, mock_aioclient, caplog):
             "Requesting OpenEVSE to download and update from: https://github.com/OpenEVSE/releases/download/v4.1.2/openevse_esp32-gateway.bin"
             in caplog.text
         )
+        assert test_charger.ota_update is True
 
 
 async def test_update_firmware_auto_missing_buildenv(test_charger, mock_aioclient):
     """Test update_firmware raises RuntimeError when buildenv asset is missing."""
-    test_charger._config = {"version": "4.0.1", "buildenv": "openevse_esp32-gateway"}
+    test_charger._config = {"version": "4.1.7", "buildenv": "openevse_esp32-gateway"}
 
     # Mock GitHub releases but without the matching gateway asset
     github_response = {
@@ -1154,6 +1159,7 @@ async def test_update_firmware_auto_missing_buildenv(test_charger, mock_aioclien
 
 async def test_update_firmware_both_provided(test_charger):
     """Test update_firmware raises ValueError when both bytes and URL are provided."""
+    test_charger._config["version"] = "4.1.7"
     with pytest.raises(
         ValueError, match="Cannot specify both firmware_bytes and firmware_url"
     ):
@@ -1164,6 +1170,7 @@ async def test_update_firmware_both_provided(test_charger):
 
 async def test_update_firmware_url_invalid(test_charger):
     """Test update_firmware raises ValueError when firmware_url is empty or invalid type."""
+    test_charger._config["version"] = "4.1.7"
     with pytest.raises(ValueError, match="Invalid firmware_url"):
         await test_charger.update_firmware(firmware_url="")
 
@@ -1172,3 +1179,26 @@ async def test_update_firmware_url_invalid(test_charger):
 
     with pytest.raises(ValueError, match="Invalid firmware_url"):
         await test_charger.update_firmware(firmware_url=123)  # type: ignore
+
+
+async def test_update_firmware_unsupported(test_charger):
+    """Test update_firmware raises UnsupportedFeature on older firmware."""
+    test_charger._config["version"] = "4.1.2"
+    with pytest.raises(UnsupportedFeature):
+        await test_charger.update_firmware(firmware_url="http://url")
+
+
+async def test_update_firmware_error_response(test_charger, mock_aioclient):
+    """Test update_firmware doesn't set ota_update on error responses."""
+    test_charger._config["version"] = "4.1.7"
+    test_charger._status = {}
+    mock_aioclient.post(
+        "http://openevse.test.tld/update",
+        status=200,
+        body='{"msg":"error"}',
+    )
+    response = await test_charger.update_firmware(
+        firmware_url="http://github.com/release.bin"
+    )
+    assert response == {"msg": "error"}
+    assert test_charger.ota_update is False

{python_openevse_http-0.4.0 → python_openevse_http-0.4.2}/tests/test_properties.py

@@ -1040,17 +1040,31 @@ async def test_get_has_limit(fixture, expected, request):
 
 
 @pytest.mark.parametrize(
-    "fixture, expected", [("test_charger", 0), ("test_charger_v2", 0)]
+    "fixture, expected", [("test_charger", False), ("test_charger_v2", False)]
 )
 async def test_get_ota_update(fixture, expected, request):
     """Test ota_update property."""
     charger = request.getfixturevalue(fixture)
     await charger.update()
     status = charger.ota_update
-    assert status == expected
+    assert status is expected
     await charger.ws_disconnect()
 
 
+async def test_ota_properties():
+    """Test ota_progress and ota_state properties."""
+    charger = OpenEVSE(SERVER_URL)
+    charger._status = {"ota_update": 1, "ota_progress": 45, "ota": "started"}
+    assert charger.ota_update is True
+    assert charger.ota_progress == 45
+    assert charger.ota_state == "started"
+
+    charger._status = {"ota_update": 0}
+    assert charger.ota_update is False
+    assert charger.ota_progress is None
+    assert charger.ota_state is None
+
+
 # ── MQTT ────────────────────────────────────────────────────────────