feat: add support for S5-GR3P(3-20)K

Author: mkuthan

README.md

@@ -22,6 +22,7 @@ All Solis hybrid inverters should be supported, although the integration has bee
 The integration also supports the following Solis string inverters:
 
 * S6-GR1P(2.5-6)K, model "0200"
+* S5-GR3P(3-20)K, model "0507"
 
 > [!NOTE]
 > If your inverter is not listed here, please open an issue on GitHub using "New Solis Inverter Support Request" template.

custom_components/solis_cloud_control/inverters/inverter.py

@@ -1,13 +1,24 @@
 from dataclasses import dataclass, field
 
+from custom_components.solis_cloud_control.utils.safe_converters import safe_convert_power_to_watts
+
 
 @dataclass
 class InverterInfo:
     serial_number: str
     model: str
     version: str
     machine: str
-    power: float | None
+    type: str
+    smart_support: str
+    generator_support: str
+    battery_num: str
+    power: str
+    power_unit: str
+
+    @property
+    def power_watts(self) -> float | None:
+        return safe_convert_power_to_watts(self.power, self.power_unit)
 
 
 @dataclass

custom_components/solis_cloud_control/inverters/inverter_factory.py

@@ -3,7 +3,6 @@
 
 from custom_components.solis_cloud_control.api.solis_api import SolisCloudControlApiClient
 from custom_components.solis_cloud_control.inverters.inverter import Inverter, InverterInfo
-from custom_components.solis_cloud_control.utils.safe_converters import safe_convert_power_to_watts
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -14,14 +13,24 @@ async def create_inverter_info(api_client: SolisCloudControlApiClient, inverter_
     model = str(inverter_details.get("model", "Unknown"))
     version = str(inverter_details.get("version", "Unknown"))
     machine = str(inverter_details.get("machine", "Unknown"))
-    power = safe_convert_power_to_watts(inverter_details.get("power"), inverter_details.get("powerStr"))
+    type = str(inverter_details.get("inverterType", "Unknown"))
+    smart_support = str(inverter_details.get("smartSupport", "Unknown"))
+    generator_support = str(inverter_details.get("generatorSupport", "Unknown"))
+    battery_num = str(inverter_details.get("batteryNum", "Unknown"))
+    power = str(inverter_details.get("power", "Unknown"))
+    power_unit = str(inverter_details.get("powerStr", "Unknown"))
 
     return InverterInfo(
         serial_number=inverter_sn,
         model=model,
         version=version,
         machine=machine,
+        type=type,
+        smart_support=smart_support,
+        generator_support=generator_support,
+        battery_num=battery_num,
         power=power,
+        power_unit=power_unit,
     )
 
 

custom_components/solis_cloud_control/inverters/model_0507.py

@@ -0,0 +1,10 @@
+from custom_components.solis_cloud_control.api.solis_api import SolisCloudControlApiClient
+from custom_components.solis_cloud_control.inverters.inverter import Inverter, InverterInfo
+
+
+# S5-GR3P(3-20)K
+async def create_inverter(
+    inverter_info: InverterInfo,
+    api_client: SolisCloudControlApiClient,  # noqa: ARG001
+) -> Inverter:
+    return Inverter.create_string_inverter(inverter_info)

custom_components/solis_cloud_control/inverters/model_3331.py

@@ -9,7 +9,7 @@ async def create_inverter(
 ) -> Inverter:
     inverter = Inverter.create_hybrid_inverter(inverter_info)
 
-    power = inverter_info.power if inverter_info.power is not None else 15_000
+    power = inverter_info.power_watts if inverter_info.power_watts is not None else 15_000
     inverter.max_export_power = InverterMaxExportPower(max_value=power, step=100, scale=0.01)
 
     return inverter

custom_components/solis_cloud_control/inverters/model_ca.py

@@ -9,7 +9,7 @@ async def create_inverter(
 ) -> Inverter:
     inverter = Inverter.create_hybrid_inverter(inverter_info)
 
-    power = inverter_info.power if inverter_info.power is not None else 10_000
+    power = inverter_info.power_watts if inverter_info.power_watts is not None else 10_000
     inverter.max_export_power = InverterMaxExportPower(max_value=power)
 
     return inverter

tests/conftest.py

@@ -77,7 +77,12 @@ def any_inverter_info():
         model="any_model",
         machine="any_machine",
         version="any_version",
-        power=None,
+        type="any_type",
+        smart_support="any_smart_support",
+        generator_support="any_generator_support",
+        battery_num="any_battery_num",
+        power="any_power",
+        power_unit="any_power_unit",
     )
 
 

tests/inverters/test_inverter.py

@@ -0,0 +1,22 @@
+import pytest
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "power, power_unit, expected_power",
+    [
+        ("5", "kW", 5000.0),
+        ("5000", "W", 5000.0),
+        ("5.5", "kW", 5500.0),
+        ("5500.5", "W", 5500.5),
+        ("invalid", "kW", None),
+        ("5", "invalid", None),
+        ("5", None, None),
+        (None, "kW", None),
+    ],
+)
+async def test_inverter_info_power_watts(mock_api_client, any_inverter_info, power, power_unit, expected_power):
+    any_inverter_info.power = power
+    any_inverter_info.power_unit = power_unit
+
+    assert any_inverter_info.power_watts == expected_power

tests/inverters/test_inverter_factory.py

@@ -15,6 +15,10 @@ async def test_create_inverter_info(mock_api_client):
         "model": "any model",
         "version": "any version",
         "machine": "any machine",
+        "inverterType": "any type",
+        "smartSupport": "any smart support",
+        "generatorSupport": "any generator support",
+        "batteryNum": "any battery num",
         "power": 10,
         "powerStr": "kW",
     }
@@ -26,30 +30,12 @@ async def test_create_inverter_info(mock_api_client):
     assert result.model == "any model"
     assert result.version == "any version"
     assert result.machine == "any machine"
-    assert result.power == 10_000
-
-
-@pytest.mark.asyncio
-@pytest.mark.parametrize(
-    "power_details, expected_power",
-    [
-        ({"power": "5", "powerStr": "kW"}, 5000.0),
-        ({"power": "5000", "powerStr": "W"}, 5000.0),
-        ({"power": "5.5", "powerStr": "kW"}, 5500.0),
-        ({"power": "5500.5", "powerStr": "W"}, 5500.5),
-        ({"power": "invalid", "powerStr": "kW"}, None),
-        ({"power": "5", "powerStr": "invalid"}, None),
-        ({"power": "5"}, None),
-        ({"powerStr": "kW"}, None),
-    ],
-)
-async def test_create_inverter_info_power(mock_api_client, power_details, expected_power):
-    mock_api_client.inverter_details.return_value = power_details
-
-    inverter_sn = "any serial number"
-    result = await create_inverter_info(mock_api_client, inverter_sn)
-
-    assert result.power == expected_power
+    assert result.type == "any type"
+    assert result.smart_support == "any smart support"
+    assert result.generator_support == "any generator support"
+    assert result.battery_num == "any battery num"
+    assert result.power == "10"
+    assert result.power_unit == "kW"
 
 
 @pytest.mark.asyncio
@@ -63,7 +49,12 @@ async def test_create_inverter_info_missing_fields(mock_api_client):
     assert result.model == "Unknown"
     assert result.version == "Unknown"
     assert result.machine == "Unknown"
-    assert result.power is None
+    assert result.type == "Unknown"
+    assert result.smart_support == "Unknown"
+    assert result.generator_support == "Unknown"
+    assert result.battery_num == "Unknown"
+    assert result.power == "Unknown"
+    assert result.power_unit == "Unknown"
 
 
 @pytest.mark.asyncio