python-openevse-http 1.0.1__tar.gz → 1.1.0__tar.gz

{python_openevse_http-1.0.1 → python_openevse_http-1.1.0}/.github/workflows/test.yml

@@ -82,6 +82,6 @@ jobs:
         with:
           name: coverage-data
       - name: Upload coverage report
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354  # v6
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f  # v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

{python_openevse_http-1.0.1/python_openevse_http.egg-info → python_openevse_http-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 1.0.1
+Version: 1.1.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-1.1.0/openevsehttp/utils.py

@@ -0,0 +1,57 @@
+"""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.
+
+    Development and custom firmware versions (e.g. branch builds ending in a commit hash,
+    or standalone 'main'/'master' builds) are normalized to 'dev' to bypass feature flags
+    and version-checks.
+
+    Non-dev version strings are normalized by extracting the first stable 'X.Y.Z' match,
+    meaning pre-release, build, or other trailing tags (such as '_rc1' or '_alpha') are
+    removed and not preserved in the returned version.
+    """
+    # Match non-numeric git branch names (e.g. 'main', 'master', 'develop', or 'feature-x_abc123456')
+    # We use custom word boundary checks to avoid false positives like 'domain' matching 'main'
+    # or 'webmaster' matching 'master'.
+    is_dev = False
+    if re.search(r"[^/]+/[^_]+_[a-fA-F0-9]{6,40}_modified$", version, re.IGNORECASE):
+        is_dev = True
+    elif re.search(
+        r"(?:^|[^a-zA-Z0-9])(master|main)(?:[^a-zA-Z0-9]|$)", version, re.IGNORECASE
+    ):
+        is_dev = True
+    elif re.search(r"_[a-fA-F0-9]{7,40}$", version):
+        is_dev = True
+    elif re.search(
+        r"(?:^|[^a-zA-Z0-9])(dev|feature|fix|main|master)(?:[^a-zA-Z0-9].*?)?_[a-fA-F0-9]{6}$",
+        version,
+        re.IGNORECASE,
+    ):
+        is_dev = True
+
+    if is_dev:
+        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-1.0.1 → python_openevse_http-1.1.0/python_openevse_http.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 1.0.1
+Version: 1.1.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-1.0.1 → python_openevse_http-1.1.0}/requirements_lint.txt

@@ -1,4 +1,4 @@
 -r requirements.txt
-prek==0.4.3
-ruff==0.15.15
+prek==0.4.4
+ruff==0.15.16
 mypy==2.1.0

{python_openevse_http-1.0.1 → python_openevse_http-1.1.0}/requirements_test.txt

@@ -1,5 +1,5 @@
 -r requirements.txt
-prek==0.4.3
+prek==0.4.4
 pytest==9.0.3
 pytest-cov==7.1.0
 pytest-timeout==2.4.0

{python_openevse_http-1.0.1 → python_openevse_http-1.1.0}/tests/fixtures/v4_json/config-unknown-semver.json

@@ -3,7 +3,7 @@
     "protocol": "-",
     "espflash": 4194304,
     "wifi_serial": "1234567890AB",
-    "version": "random_a4f11e",
+    "version": "random_g4f11e",
     "diodet": 0,
     "gfcit": 0,
     "groundt": 0,

{python_openevse_http-1.0.1 → python_openevse_http-1.1.0}/tests/test_client.py

@@ -424,7 +424,8 @@ async def test_firmware_check(
     assert firmware["latest_version"] == "4.1.4"
 
     await test_charger_unknown_semver.update()
-    assert test_charger_unknown_semver.wifi_firmware == "random_a4f11e"
+    # Changed from 'random_a4f11e' to 'random_g4f11e' to avoid false positive matches on the 6-character hex hash regex
+    assert test_charger_unknown_semver.wifi_firmware == "random_g4f11e"
     mock_aioclient.get(
         TEST_URL_GITHUB_v4,
         status=200,
@@ -432,7 +433,7 @@ async def test_firmware_check(
     )
     with caplog.at_level(logging.DEBUG):
         firmware = await test_charger_unknown_semver.firmware_check()
-        assert "Using version: random_a4f11e" in caplog.text
+        assert "Using version: random_g4f11e" in caplog.text
         assert "Non-semver firmware version detected" in caplog.text
         assert firmware is None
 
@@ -634,6 +635,72 @@ async def test_version_check_limit():
     assert charger.version_check("2.0.0") is True
 
 
+async def test_version_check_dev_branches():
+    """Test _version_check with dev branches.
+
+    Test that dev branch version strings bypass version checks and are correctly
+    treated as development builds. Also tests false-positive avoidance and
+    pre-release handling.
+    """
+    charger = OpenEVSE(SERVER_URL, session=MagicMock())
+
+    # Standalone dev branches - treated as dev, returns True
+    charger._config = {"version": "main"}
+    assert charger._version_check("2.0.0") is True
+
+    charger._config = {"version": "master"}
+    assert charger._version_check("2.0.0") is True
+
+    # 'main' branch with hash - treated as dev, returns True
+    charger._config = {"version": "main_abc1234"}
+    assert charger._version_check("2.0.0") is True
+
+    # 'master' branch with hash - treated as dev, returns True
+    charger._config = {"version": "master_abc1234"}
+    assert charger._version_check("2.0.0") is True
+
+    # Custom branch with 7-char hash - treated as dev, returns True
+    charger._config = {"version": "feature-ui_2b4ad2c"}
+    assert charger._version_check("2.0.0") is True
+
+    # Custom branch with 6-char hash - treated as dev, returns True
+    charger._config = {"version": "feature-ui_2b4ad2"}
+    assert charger._version_check("2.0.0") is True
+
+    # Case-insensitive hex hash matching (uppercase) - treated as dev, returns True
+    charger._config = {"version": "feature_1A2B3C"}
+    assert charger._version_check("2.0.0") is True
+
+    # Local dev build templates (category/branch_hash_modified) - treated as dev, returns True
+    charger._config = {
+        "version": "local_feature/gui-nightshift-default_2bcdf1d0_modified"
+    }
+    assert charger._version_check("2.0.0") is True
+
+    charger._config = {"version": "custom_branch/my-feature_abc123_modified"}
+    assert charger._version_check("2.0.0") is True
+
+    # False positives containing 'main' or 'master' but not at word boundaries,
+    # ending in 6-char hashes without dev keywords, or other non-matching modified strings
+    # — should fail version check
+    charger._config = {"version": "domain_abc123"}
+    assert charger._version_check("2.0.0") is False
+
+    charger._config = {"version": "webmaster_def456"}
+    assert charger._version_check("2.0.0") is False
+
+    charger._config = {"version": "unmodified"}
+    assert charger._version_check("2.0.0") is False
+
+    # Pre-release (rc) version — should fail when checking against a newer target
+    charger._config = {"version": "4.1.2_rc1"}
+    assert charger._version_check("5.0.0") is False
+
+    # Pre-release (alpha) version — should also fail when checking against a newer target
+    charger._config = {"version": "4.1.0_alpha"}
+    assert charger._version_check("5.0.0") is False
+
+
 # ── websocket lifecycle ──────────────────────────────────────────────
 
 

python_openevse_http-1.0.1/openevsehttp/utils.py

@@ -1,29 +0,0 @@
-"""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)