fix: trim dev from version string if detected

Author: firstof9

openevsehttp/__init__.py

@@ -469,10 +469,19 @@ async def toggle_override(self) -> None:
         #   4.x: use HTTP API call
 
         cutoff = AwesomeVersion("4.0.0")
-        current = AwesomeVersion(self._config["version"])
+        current = ""
 
         _LOGGER.debug("Detected firmware: %s", current)
 
+        if "dev" in self._config["version"]:
+            value = self._config["version"]
+            _LOGGER.debug("Stripping 'dev' from version.")
+            value = value.split(".")
+            value = ".".join(value[0:3])
+            current = AwesomeVersion(value)
+        else:
+            current = AwesomeVersion(self._config["version"])
+
         if current >= cutoff:
             url = f"{self.url}override"
 
@@ -500,7 +509,18 @@ async def set_current(self, amps: int = 6) -> None:
         #   4.1.2: use HTTP API call
         amps = int(amps)
         cutoff = AwesomeVersion("4.1.2")
-        current = AwesomeVersion(self._config["version"])
+        current = ""
+
+        _LOGGER.debug("Detected firmware: %s", current)
+
+        if "dev" in self._config["version"]:
+            value = self._config["version"]
+            _LOGGER.debug("Stripping 'dev' from version.")
+            value = value.split(".")
+            value = ".".join(value[0:3])
+            current = AwesomeVersion(value)
+        else:
+            current = AwesomeVersion(self._config["version"])
 
         if current >= cutoff:
             url = f"{self.url}config"
@@ -542,7 +562,18 @@ async def firmware_check(self) -> dict | None:
         method = "get"
 
         cutoff = AwesomeVersion("4.0.0")
-        current = AwesomeVersion(self._config["version"])
+        current = ""
+
+        _LOGGER.debug("Detected firmware: %s", current)
+
+        if "dev" in self._config["version"]:
+            value = self._config["version"]
+            _LOGGER.debug("Stripping 'dev' from version.")
+            value = value.split(".")
+            value = ".".join(value[0:3])
+            current = AwesomeVersion(value)
+        else:
+            current = AwesomeVersion(self._config["version"])
 
         if current >= cutoff:
             url = f"{base_url}ESP32_WiFi_V4.x/releases/latest"
@@ -642,7 +673,12 @@ def openevse_firmware(self) -> str:
     def wifi_firmware(self) -> str:
         """Return the ESP firmware version."""
         assert self._config is not None
-        return self._config["version"]
+        value = self._config["version"]
+        if "dev" in value:
+            _LOGGER.debug("Stripping 'dev' from version.")
+            value = value.split(".")
+            value = ".".join(value[0:3])
+        return value
 
     @property
     def ip_address(self) -> str:

tests/conftest.py

@@ -59,6 +59,22 @@ def test_charger(mock_aioclient):
     return openevsehttp.OpenEVSE(TEST_TLD)
 
 
+@pytest.fixture(name="test_charger_dev")
+def test_charger_dev(mock_aioclient):
+    """Load the charger data."""
+    mock_aioclient.get(
+        TEST_URL_STATUS,
+        status=200,
+        body=load_fixture("v4_json/status.json"),
+    )
+    mock_aioclient.get(
+        TEST_URL_CONFIG,
+        status=200,
+        body=load_fixture("v4_json/config-dev.json"),
+    )
+    return openevsehttp.OpenEVSE(TEST_TLD)
+
+
 @pytest.fixture(name="test_charger_v2")
 def test_charger_v2(mock_aioclient):
     """Load the charger data."""

tests/fixtures/v4_json/config-dev.json

@@ -0,0 +1,67 @@
+{
+    "firmware": "7.1.3",
+    "protocol": "-",
+    "espflash": 4194304,
+    "wifi_serial": "1234567890AB",
+    "version": "4.1.5.dev",
+    "diodet": 0,
+    "gfcit": 0,
+    "groundt": 0,
+    "relayt": 0,
+    "ventt": 0,
+    "tempt": 0,
+    "service": 2,
+    "scale": 220,
+    "offset": 0,
+    "max_current_soft": 48,
+    "min_current_hard": 6,
+    "max_current_hard": 48,
+    "mqtt_supported_protocols": [
+      "mqtt",
+      "mqtts"
+    ],
+    "http_supported_protocols": [
+      "http",
+      "https"
+    ],
+    "ssid": "Datanode-IoT",
+    "pass": "_DUMMY_PASSWORD",
+    "www_username": "",
+    "www_password": "",
+    "hostname": "openevse-7b2c",
+    "sntp_hostname": "0.us.pool.ntp.org",
+    "time_zone": "America/Phoenix|MST7",
+    "emoncms_server": "https://emoncms.collective.lan/",
+    "emoncms_node": "openevse",
+    "emoncms_apikey": "_DUMMY_PASSWORD",
+    "emoncms_fingerprint": "",
+    "mqtt_server": "192.168.1.198",
+    "mqtt_port": 1883,
+    "mqtt_topic": "openevse",
+    "mqtt_user": "devices",
+    "mqtt_pass": "_DUMMY_PASSWORD",
+    "mqtt_solar": "",
+    "mqtt_grid_ie": "home-assistant/power/watts",
+    "mqtt_vrms": "home-assistant/solar/watts",
+    "mqtt_announce_topic": "openevse/announce/7b2c",
+    "ohm": "",
+    "divert_PV_ratio": 1.1,
+    "divert_attack_smoothing_factor": 0.4,
+    "divert_decay_smoothing_factor": 0.05,
+    "divert_min_charge_time": 600,
+    "tesla_username": "",
+    "tesla_password": "",
+    "tesla_vehidx": -1,
+    "led_brightness": 128,
+    "flags": 522,
+    "emoncms_enabled": false,
+    "mqtt_enabled": true,
+    "mqtt_reject_unauthorized": true,
+    "ohm_enabled": false,
+    "sntp_enabled": true,
+    "tesla_enabled": false,
+    "divert_enabled": true,
+    "pause_uses_disabled": false,
+    "mqtt_protocol": "mqtt",
+    "charge_mode": "fast"
+  }

tests/test_init.py

@@ -221,7 +221,12 @@ async def test_get_service_level(fixture, expected, request):
 
 
 @pytest.mark.parametrize(
-    "fixture, expected", [("test_charger", "4.1.2"), ("test_charger_v2", "2.9.1")]
+    "fixture, expected",
+    [
+        ("test_charger", "4.1.2"),
+        ("test_charger_v2", "2.9.1"),
+        ("test_charger_dev", "4.1.5"),
+    ],
 )
 async def test_get_wifi_firmware(fixture, expected, request):
     """Test v4 Status reply."""