Update tools module

asusrouter/modules/connection.py

@@ -4,8 +4,7 @@
 from typing import Optional
 
 from asusrouter.modules.wlan import Wlan
-from asusrouter.tools import get_enum_key_by_value
-from asusrouter.tools.converters import safe_int
+from asusrouter.tools.converters import get_enum_key_by_value, safe_int
 
 
 class ConnectionState(IntEnum):
@@ -69,4 +68,4 @@ def get_connection_type(value: Optional[int]) -> ConnectionType:
     # Check that it's actually an int
     value = safe_int(value) or 0
 
-    return CONNECTION_TYPE.get(value, ConnectionType.WIRED)
+    return get_enum_key_by_value(ConnectionType, value, ConnectionType.WIRED)

asusrouter/tools/__init__.py

@@ -1,11 +1 @@
 """Tools module"""
-
-
-def get_enum_key_by_value(enum, value, default=None):
-    """Get the enum key by value"""
-
-    for key, enum_value in enum.__members__.items():
-        if enum_value.value == value:
-            return enum[key]
-
-    return default

asusrouter/tools/converters.py

@@ -11,7 +11,7 @@
 
 from datetime import datetime, timedelta, timezone
 from enum import Enum
-from typing import Any, Callable, Iterable, Optional, TypeVar, cast
+from typing import Any, Callable, Iterable, Optional, Type, TypeVar, cast
 
 from dateutil.parser import parse as dtparse
 
@@ -20,6 +20,7 @@
 
 
 _T = TypeVar("_T")
+_E = TypeVar("_E", bound=Enum)
 
 
 def clean_input(func: Callable[..., Any]) -> Callable[..., Any]:
@@ -82,6 +83,22 @@ def flatten_dict(
     return dict(items)
 
 
+def get_enum_key_by_value(
+    enum: Type[_E], value: Any, default: Optional[_E] = None
+) -> _E:
+    """Get the enum key by value"""
+
+    if issubclass(enum, Enum):
+        for enum_value in enum:
+            if enum_value.value == value:
+                return enum_value
+
+    if default is not None:
+        return default
+
+    raise ValueError(f"Invalid value: {value}")
+
+
 def handle_none_content(content: Optional[_T], default: Optional[_T]) -> Optional[_T]:
     """Return the default value if content is None, else return the content."""
 

tests/tools/test_converters.py

@@ -45,6 +45,29 @@ def test_flatten_dict():
     assert converters.flatten_dict(nested_dict, exclude="b") == expected_output
 
 
+class EnumForTest(Enum):
+    """Enum class."""
+
+    A = 1
+    B = 2
+
+
+def test_get_enum_key_by_value():
+    """Test get_enum_key_by_value method."""
+
+    assert (
+        converters.get_enum_key_by_value(EnumForTest, 1, EnumForTest.B) == EnumForTest.A
+    )
+    assert (
+        converters.get_enum_key_by_value(EnumForTest, 2, EnumForTest.A) == EnumForTest.B
+    )
+    assert (
+        converters.get_enum_key_by_value(EnumForTest, 3, EnumForTest.A) == EnumForTest.A
+    )
+    with pytest.raises(ValueError):
+        converters.get_enum_key_by_value(EnumForTest, 3)
+
+
 def test_is_enum():
     """Test is_enum method."""