python-openevse-http 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

openevsehttp/client.py

@@ -50,13 +50,13 @@ class OpenEVSE(CommandsMixin, ManagersMixin, SensorsMixin, PropertiesMixin):
     def __init__(
         self,
         host: str,
-        user: str = "",
-        pwd: str = "",
+        user: str | None = None,
+        pwd: str | None = None,
         session: aiohttp.ClientSession | None = None,
     ) -> None:
         """Connect to an OpenEVSE charger equipped with wifi or ethernet."""
-        self._user = user
-        self._pwd = pwd
+        self._user = user or ""
+        self._pwd = pwd or ""
         self.url = f"http://{host}/"
         self._status: dict[str, Any] = {}
         self._config: dict[str, Any] = {}

openevsehttp/properties.py

@@ -84,9 +84,12 @@ class PropertiesMixin:
         return bool(self._config.get("relayt", False))
 
     @property
-    def service_level(self) -> int | str | None:
-        """Return the service level (1, 2, or 'A')."""
-        return self._config.get("service")
+    def service_level(self) -> str | None:
+        """Return the service level ('1', '2', or 'A')."""
+        value = self._config.get("service")
+        if value is None:
+            return value
+        return str(value)
 
     @property
     def openevse_firmware(self) -> str | None:

openevsehttp/utils.py

@@ -18,8 +18,34 @@ def normalize_version(version: str) -> str:
 
 
 def get_awesome_version(version: str) -> AwesomeVersion:
-    """Parse and normalize the version string, returning an AwesomeVersion."""
-    if "master" in version:
+    """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-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:

{python_openevse_http-1.0.0.dist-info → python_openevse_http-1.0.2.dist-info}/METADATA

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

@@ -1,17 +1,17 @@
 openevsehttp/__init__.py,sha256=I6a1mjOZHYiWb_qfCuDuFLOOncrkkB_7uwybtOIujfY,1165
 openevsehttp/__main__.py,sha256=EHmSdT7GjAVvHQxvLBTjZXsj_V5SB6B2_kpgUAT7mPM,146
-openevsehttp/client.py,sha256=tw8MGwraUVn5ERbQCR6JRWEvMRc7KnUgJvf_0viOQHo,18983
+openevsehttp/client.py,sha256=dSvlotG7xxgnDxkI_o2KtIddVw58y6ZgIdJa9gu-WnU,19013
 openevsehttp/commands.py,sha256=JGxjmGvE2-eUJ1gD76y_701Qk3Kzab-6XtGeaXXDSb0,27243
 openevsehttp/const.py,sha256=9jVzW4CZz7uP7VKbGQT4v0jNeP5PPC55tR-jnG11ODA,1646
 openevsehttp/exceptions.py,sha256=bqz-tHTW1AYJMKcm0s5M6z5tA6XZgjnCiBLW1XrZ_70,672
 openevsehttp/managers.py,sha256=EtQMQziwhoZeqKe2zWY-0yS7zedhuYjYtL5j9xBBCZ0,5380
-openevsehttp/properties.py,sha256=psGGiRacHYs1YYmagiWSlpfua-SnpU2nCviEYDZX0V8,17892
+openevsehttp/properties.py,sha256=xbQfx256FZwNPPn9ryWWOMKliyCChq4ZaTH9NDQVR_8,17968
 openevsehttp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openevsehttp/sensors.py,sha256=yO4Q1sgJkvmfOi5dpoTwEoldsrpqgGz0k9fC7mFWass,4680
-openevsehttp/utils.py,sha256=e3HH_jwZgb1iBWJgIoMOM0JPrQNwXyVdOx5vTWOh4T0,858
+openevsehttp/utils.py,sha256=Q4I_rmh8UdD-DVAZxfb95VBdUl5jtSEE1DHqRxkktUE,1938
 openevsehttp/websocket.py,sha256=dOSemvm7CM5pFb9RaoJSTIM6Tf5xtWMLEBEccKlBUKI,10517
-python_openevse_http-1.0.0.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
-python_openevse_http-1.0.0.dist-info/METADATA,sha256=fYgJfqxD6zmc8b540T6jStiE1AKNUmkqSC2vmHHHRjo,4417
-python_openevse_http-1.0.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-python_openevse_http-1.0.0.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
-python_openevse_http-1.0.0.dist-info/RECORD,,
+python_openevse_http-1.0.2.dist-info/licenses/LICENSE,sha256=hSB6TOQ7rmwSGb6XzqRjDGMvmUj5_GlacqQin3tegtA,11341
+python_openevse_http-1.0.2.dist-info/METADATA,sha256=aTPqaY0mhzUFNc0Z_uBCSnxlX4azB0YFEAupqd8KbFw,4417
+python_openevse_http-1.0.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_openevse_http-1.0.2.dist-info/top_level.txt,sha256=u8RUkoEIE33Cjn6gmqiEoVpZ0VZ59WJ3FXBwwOg0CPE,13
+python_openevse_http-1.0.2.dist-info/RECORD,,