Solax Cloud fixes to add inverter type (#3144)

* Solax Cloud fixes to add inverter type

* [pre-commit.ci lite] apply automatic fixes

* Remove redudant line

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

Author: springfall2008

apps/predbat/config.py

@@ -1883,6 +1883,34 @@
         "charge_discharge_with_rate": False,
         "target_soc_used_for_discharge": True,
     },
+    "SolaxCloud": {
+        "name": "SolaxCloud",
+        "has_rest_api": False,
+        "has_mqtt_api": False,
+        "output_charge_control": "power",
+        "charge_control_immediate": False,
+        "has_charge_enable_time": True,
+        "has_discharge_enable_time": True,
+        "has_target_soc": True,
+        "has_reserve_soc": True,
+        "has_timed_pause": False,
+        "charge_time_format": "HH:MM:SS",
+        "charge_time_entity_is_option": True,
+        "soc_units": "%",
+        "num_load_entities": 1,
+        "has_ge_inverter_mode": False,
+        "has_fox_inverter_mode": False,
+        "time_button_press": False,
+        "clock_time_format": "%Y-%m-%d %H:%M:%S",
+        "write_and_poll_sleep": 2,
+        "has_time_window": False,
+        "support_charge_freeze": False,
+        "support_discharge_freeze": False,
+        "has_idle_time": False,
+        "can_span_midnight": False,
+        "charge_discharge_with_rate": False,
+        "target_soc_used_for_discharge": True,
+    },
 }
 
 # Control modes for Solax inverters

apps/predbat/predbat.py

@@ -27,7 +27,7 @@
 import requests
 import asyncio
 
-THIS_VERSION = "v8.31.1"
+THIS_VERSION = "v8.31.2"
 
 # fmt: off
 PREDBAT_FILES = ["predbat.py", "hass.py", "config.py", "prediction.py", "gecloud.py", "utils.py", "inverter.py", "ha.py", "download.py", "web.py", "web_helper.py", "predheat.py", "futurerate.py", "octopus.py", "solcast.py", "execute.py", "plan.py", "fetch.py", "output.py", "userinterface.py", "energydataservice.py", "alertfeed.py", "compare.py", "db_manager.py", "db_engine.py", "plugin_system.py", "ohme.py", "components.py", "fox.py", "carbon.py", "web_mcp.py", "component_base.py", "axle.py", "unit_test.py"]

apps/predbat/solax.py

@@ -374,16 +374,14 @@ async def automatic_config(self):
 
         # Set up entity references for each plant
         # Load/import/export from plant realtime data
-        inverter_list = [self.plant_inverters[plant][0] for plant in plants]
-
         self.set_arg("load_today", [f"sensor.{self.prefix}_solax_{plant}_total_load" for plant in plants])
         self.set_arg("import_today", [f"sensor.{self.prefix}_solax_{plant}_total_imported" for plant in plants])
         self.set_arg("export_today", [f"sensor.{self.prefix}_solax_{plant}_total_exported" for plant in plants])
         self.set_arg("pv_today", [f"sensor.{self.prefix}_solax_{plant}_total_yield" for plant in plants])
+        self.set_arg("battery_power", [f"sensor.{self.prefix}_solax_{plant}_battery_charge_discharge_power" for plant in plants])
 
         # Power and SOC from device realtime data (using first inverter)
         inverter_list = [self.plant_inverters[plant][0] for plant in plants]
-        self.set_arg("battery_power", [f"sensor.{self.prefix}_solax_{plant}_{inv}_charge_discharge_power" for plant, inv in zip(plants, inverter_list)])
         self.set_arg("grid_power", [f"sensor.{self.prefix}_solax_{plant}_{inv}_grid_power" for plant, inv in zip(plants, inverter_list)])
         self.set_arg("pv_power", [f"sensor.{self.prefix}_solax_{plant}_{inv}_pv_power" for plant, inv in zip(plants, inverter_list)])
         self.set_arg("load_power", [f"sensor.{self.prefix}_solax_{plant}_{inv}_ac_power" for plant, inv in zip(plants, inverter_list)])
@@ -557,6 +555,12 @@ def get_max_soc_battery(self, plant_id):
                 max_soc = plant_info.get("batteryCapacity", 0)
         return max_soc  # in kWh
 
+    def get_charge_discharge_power_battery(self, plant_id):
+        total_power = 0
+        for device_id in self.plant_batteries.get(plant_id, []):
+            total_power += self.realtime_device_data.get(device_id, {}).get("chargeDischargePower", 0)
+        return total_power  # in Watts
+
     def get_current_soc_battery_kwh(self, plant_id):
         current_soc = 0
         count_devices = 0
@@ -2077,6 +2081,7 @@ async def publish_plant_info(self):
             battery_soc_max = self.get_max_soc_battery(plant_id)
             battery_soc = self.get_current_soc_battery_kwh(plant_id)
             battery_temp = self.get_battery_temperature(plant_id)
+            charge_discharge_power = self.get_charge_discharge_power_battery(plant_id)
 
             # Battery SOC
             self.dashboard_item(
@@ -2091,6 +2096,18 @@ async def publish_plant_info(self):
                 },
                 app="solax",
             )
+            # Battery Charge/Discharge Power
+            self.dashboard_item(
+                f"sensor.{self.prefix}_solax_{plant_id}_battery_charge_discharge_power",
+                state=charge_discharge_power,
+                attributes={
+                    "friendly_name": f"SolaX {plant_name} Battery Charge/Discharge Power",
+                    "unit_of_measurement": "W",
+                    "device_class": "power",
+                    "state_class": "measurement",
+                },
+                app="solax",
+            )
             # Battery SOC max sensor
             self.dashboard_item(
                 f"sensor.{self.prefix}_solax_{plant_id}_battery_capacity",