Fix broken inverter detection

solax/inverter.py

@@ -91,7 +91,7 @@ def sensor_map(cls) -> Dict[str, Tuple[int, Measurement]]:
         for name, mapping in cls.response_decoder().items():
             unit = Measurement(Units.NONE)
 
-            (idx, unit_or_measurement, *_) = mapping
+            idx, unit_or_measurement, *_ = mapping
 
             if isinstance(unit_or_measurement, Units):
                 unit = Measurement(unit_or_measurement)

solax/inverters/x1_lite_lv.py

@@ -11,7 +11,7 @@ class X1LiteLV(Inverter):
     # pylint: disable=duplicate-code
     _schema = vol.Schema(
         {
-            vol.Required("type"): int,
+            vol.Required("type"): vol.All(int, 103),
             vol.Required("sn"): str,
             vol.Required("ver"): str,
             vol.Required("data"): vol.Schema(

solax/response_parser.py

@@ -46,7 +46,7 @@ def serial_number(self):
 _KEY_TYPE = "type"
 
 
-GenericResponseSchema = vol.All(
+GENERIC_RESPONSE_SCHEMA = vol.All(
     vol.Schema({vol.Required(_KEY_SERIAL): str}, extra=vol.ALLOW_EXTRA),
     vol.Any(
         vol.Schema({vol.Required(_KEY_VERSION): str}, extra=vol.ALLOW_EXTRA),
@@ -77,7 +77,7 @@ def __init__(
         dongle_serial_number_getter: Callable[[Dict[str, Any]], Optional[str]],
         inverter_serial_number_getter: Callable[[Dict[str, Any]], Optional[str]],
     ) -> None:
-        self.schema = vol.And(GenericResponseSchema, schema)
+        self.schema = vol.And(GENERIC_RESPONSE_SCHEMA, schema)
         self.response_decoder = decoder
         self.dongle_serial_number_getter = dongle_serial_number_getter
         self.inverter_serial_number_getter = inverter_serial_number_getter
@@ -95,7 +95,7 @@ def _postprocess_gen(
         Return map of functions to be applied to each sensor value
         """
         for name, mapping in self.response_decoder.items():
-            (_, _, *processors) = mapping
+            _, _, *processors = mapping
             for processor in processors:
                 yield name, processor
 

tests/test_discovery.py

@@ -6,7 +6,7 @@
 from solax import InverterResponse
 from solax.discovery import REGISTRY, DiscoveryError
 from solax.inverter import InverterError
-from solax.inverters import X1Boost
+from solax.inverters import X1Boost, X1HybridGen4, X1LiteLV
 
 
 class DelayedX1Boost(X1Boost):
@@ -34,6 +34,47 @@ async def test_discovery(inverters_fixture):
             assert data.serial_number == data.dongle_serial_number
 
 
+@pytest.mark.asyncio
+async def test_discovery_returns_only_expected_model_for_overlapping_schemas(
+    inverters_fixture,
+):
+    conn, inverter_class, _ = inverters_fixture
+
+    overlapping_inverters = {X1HybridGen4, X1LiteLV}
+
+    if inverter_class not in overlapping_inverters:
+        pytest.skip()
+
+    inverters = await solax.discover(
+        *conn,
+        inverters=list(overlapping_inverters),
+        return_when=asyncio.ALL_COMPLETED,
+    )
+    discovered_types = {type(inverter) for inverter in inverters}
+
+    assert discovered_types == {inverter_class}
+
+
+@pytest.mark.asyncio
+async def test_discovery_first_completed_returns_expected_model_for_overlapping_schemas(
+    inverters_fixture,
+):
+    conn, inverter_class, _ = inverters_fixture
+
+    overlapping_inverters = [X1LiteLV, X1HybridGen4]
+
+    if inverter_class not in set(overlapping_inverters):
+        pytest.skip()
+
+    inverter = await solax.discover(
+        *conn,
+        inverters=overlapping_inverters,
+        return_when=asyncio.FIRST_COMPLETED,
+    )
+
+    assert isinstance(inverter, inverter_class)
+
+
 @pytest.mark.asyncio
 async def test_real_time_api(inverters_fixture):
     conn, inverter_class, _ = inverters_fixture
@@ -111,7 +152,7 @@ async def test_discovery_not_first_completed_after_staggering(
     inverters = await solax.discover(
         *conn,
         inverters=[DelayedX1Boost, DelayedFailedX1Boost],
-        return_when=asyncio.FIRST_EXCEPTION
+        return_when=asyncio.FIRST_EXCEPTION,
     )
     assert DelayedX1Boost in {type(inverter) for inverter in inverters}