Add missing enum values and improve formatting in enums

Author: iMicknl

pyoverkiz/enums/base.py

@@ -3,10 +3,7 @@
 from __future__ import annotations
 
 import logging
-from enum import Enum
-from typing import TypeVar, cast
-
-_EnumT = TypeVar("_EnumT", bound=Enum)
+from typing import Any, Self, cast
 
 
 class UnknownEnumMixin:
@@ -19,13 +16,14 @@ class UnknownEnumMixin:
     __missing_message__ = "Unsupported value %s has been returned for %s"
 
     @classmethod
-    def _missing_(cls, value):  # type: ignore[override]
+    def _missing_(cls, value: object) -> Self:
         """Return `UNKNOWN` and log unrecognized values."""
         message = getattr(cls, "__missing_message__", cls.__missing_message__)
         logging.getLogger(cls.__module__).warning(message, value, cls)
-        return cls.UNKNOWN
+        # Type checker cannot infer UNKNOWN exists on Self, but all subclasses define it
+        return cast(Self, cls.UNKNOWN)  # type: ignore[attr-defined]
 
     @classmethod
-    def from_value(cls: type[_EnumT], value: object) -> _EnumT:
+    def from_value(cls: type[Self], value: object) -> Self:
         """Return enum for `value`, falling back to `UNKNOWN`."""
-        return cast(_EnumT, cls(value))
+        return cast(Self, cast(Any, cls)(value))

pyoverkiz/enums/gateway.py

@@ -65,10 +65,12 @@ class GatewayType(UnknownEnumMixin, IntEnum):
     @property
     def beautify_name(self) -> str:
         """Return a human friendly name for the gateway type."""
-        name = self.name.replace("_", " ").title()
-        name = name.replace("Tahoma", "TaHoma")
-        name = name.replace("Rts", "RTS")
-        return name
+        return (
+            self.name.replace("_", " ")
+            .title()
+            .replace("Tahoma", "TaHoma")
+            .replace("Rts", "RTS")
+        )
 
 
 @unique
@@ -97,10 +99,12 @@ class GatewaySubType(UnknownEnumMixin, IntEnum):
     @property
     def beautify_name(self) -> str:
         """Return a human friendly name for the gateway sub-type."""
-        name = self.name.replace("_", " ").title()
-        name = name.replace("Tahoma", "TaHoma")
-        name = name.replace("Rts", "RTS")
-        return name
+        return (
+            self.name.replace("_", " ")
+            .title()
+            .replace("Tahoma", "TaHoma")
+            .replace("Rts", "RTS")
+        )
 
 
 @unique

pyoverkiz/enums/general.py

@@ -247,6 +247,7 @@ class FailureType(UnknownEnumMixin, IntEnum):
     TIME_OUT_ON_COMMAND_PROGRESS = 20003
     DEVICE_NO_ANSWER = 60004
 
+
 @unique
 class EventName(UnknownEnumMixin, StrEnum):
     """Enumeration of event names emitted by Overkiz."""
@@ -433,8 +434,3 @@ class EventName(UnknownEnumMixin, StrEnum):
     ZONE_CREATED = "ZoneCreatedEvent"
     ZONE_DELETED = "ZoneDeletedEvent"
     ZONE_UPDATED = "ZoneUpdatedEvent"
-
-    @classmethod
-    def _missing_(cls, value):  # type: ignore
-        _LOGGER.warning(f"Unsupported value {value} has been returned for {cls}")
-        return cls.UNKNOWN

pyoverkiz/enums/protocol.py

@@ -44,5 +44,3 @@ class Protocol(UnknownEnumMixin, StrEnum):
     WISER = "wiser"
     ZIGBEE = "zigbee"
     ZWAVE = "zwave"
-
-    __missing_message__ = "Unsupported protocol %s has been returned for %s"

pyoverkiz/enums/ui.py

@@ -83,6 +83,7 @@ class UIClass(UnknownEnumMixin, StrEnum):
 
     UNKNOWN = "unknown"
 
+
 @unique
 class UIWidget(UnknownEnumMixin, StrEnum):
     """Enumeration of UI widgets used by Overkiz for device presentation."""
@@ -424,8 +425,3 @@ class UIWidget(UnknownEnumMixin, StrEnum):
     ZIGBEE_STACK = "ZigbeeStack"
 
     UNKNOWN = "unknown"
-
-    @classmethod
-    def _missing_(cls, value):  # type: ignore
-        _LOGGER.warning(f"Unsupported value {value} has been returned for {cls}")
-        return cls.UNKNOWN

pyoverkiz/models.py

@@ -501,7 +501,7 @@ def to_payload(self) -> dict[str, object]:
         if self.parameters is not None:
             payload["parameters"] = [
                 p if isinstance(p, (str, int, float, bool)) else str(p)
-                for p in self.parameters  # type: ignore[arg-type]
+                for p in self.parameters
             ]
 
         return payload

pyoverkiz/utils.py

@@ -37,13 +37,17 @@ def create_server_config(
     configuration_url: str | None = None,
 ) -> ServerConfig:
     """Generate server configuration with the provided endpoint and metadata."""
+    resolved_server = (
+        server if isinstance(server, Server) or server is None else Server(server)
+    )
+    resolved_type = type if isinstance(type, APIType) else APIType(type)
     return ServerConfig(
-        server=server,  # type: ignore[arg-type]
+        server=resolved_server,
         name=name,
         endpoint=endpoint,
         manufacturer=manufacturer,
         configuration_url=configuration_url,
-        type=type,  # type: ignore[arg-type]
+        type=resolved_type,
     )