Merge pull request #27 from JasperE84/v2.0.2-dev

V2.0.2 - Change Hass MQTT discovery template to kW instead of W

Author: JasperE84

README.md

@@ -126,6 +126,7 @@ Kenter provides measurement services for **commercially rented** grid transforme
 # Changelog
 | Version | Description |
 | --- | --- |
+| 2.0.2 | Default to kW in home assistant with 3 digit precision suggestion |
 | 2.0.1 | Now sending MQTT device discovery message |
 | 2.0.1 | Bugfix in environment variable parsing for custom pydantic nested env list parser |
 | 2.0.0 | Introduced possibility to configure multiple input sources (kiosks, openapi meters/inverters and kenter meters) |

main.py

@@ -19,7 +19,7 @@
 formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 streamHandler.setFormatter(formatter)
 logger.addHandler(streamHandler)
-logger.info("PyFusionSolarDataRelay 2.0.1 started")
+logger.info("PyFusionSolarDataRelay 2.0.2 started")
 
 # Config
 conf = Conf(logger).read_and_validate_config()

modules/write_mqtt.py

@@ -76,7 +76,7 @@ def append_if_not_empty(base, addition):
             raise Exception(f"Exception while publishing to MQTT: '{e}'")
 
         # Publish MQTT device discovery
-        self.publish_homeassistant_discovery(station_dn_sanitized, device_dn_sanitized, measurement.measurement_type, measurement.data_source, topic, data_points)
+        self.publish_homeassistant_discovery(station_dn_sanitized, device_dn_sanitized, measurement.measurement_type, measurement.data_source, measurement.device_model, topic, data_points)
 
     def publish_grid_data_to_mqtt(self, measurement: FusionSolarMeterMeasurement):
         """
@@ -139,9 +139,9 @@ def append_if_not_empty(base, addition):
             raise Exception(f"Exception while publishing to MQTT: '{e}'")
 
         # Publish MQTT device discovery
-        self.publish_homeassistant_discovery(station_dn_sanitized, device_dn_sanitized, measurement.measurement_type, measurement.data_source, topic, data_points)
+        self.publish_homeassistant_discovery(station_dn_sanitized, device_dn_sanitized, measurement.measurement_type, measurement.data_source, measurement.device_model, topic, data_points)
 
-    def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_sanitized, measurement_type, data_source, state_topic, data_points):
+    def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_sanitized, measurement_type, data_source, device_model, state_topic, data_points):
         """
         Publish Home Assistant discovery config for each data field.
         Any field ending in '_w' is treated as a power (W) sensor,
@@ -181,12 +181,12 @@ def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_saniti
             if field_name.endswith("_w"):
                 # It's a power sensor
                 device_class = "power"
-                unit_of_measurement = "W"
+                unit_of_measurement = "kW"
                 state_class = "measurement"
             elif field_name.endswith("_wh"):
                 # It's an energy sensor
                 device_class = "energy"
-                unit_of_measurement = "Wh"
+                unit_of_measurement = "kWh"
                 # For cumulative energy sensors, setting "state_class=total_increasing"
                 # helps with HA’s Energy Dashboard
                 state_class = "total_increasing"
@@ -199,7 +199,7 @@ def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_saniti
             # Topic format: homeassistant/sensor/<unique_id>/config
             field_name_sanitized = re.sub(r"\W+", "_", field_name).lower()
             unique_sensor_id = f"{device_identifier}_{field_name_sanitized}"
-            discovery_topic = f"homeassistant/sensor/{unique_sensor_id}/config"
+            discovery_topic = f"homeassistant/sensor/pyfusionsolar/{unique_sensor_id}/config"
 
             # Skip if device is already discovery_published
             if unique_sensor_id in self.hass_discovery_published:
@@ -210,11 +210,14 @@ def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_saniti
                 "name": f"{field_name}",
                 "state_topic": state_topic,
                 "uniq_id": unique_sensor_id,
+                "suggested_display_precision": 3,
                 "device": {
                     "identifiers": [device_identifier],
-                    "name": f"{device_name}",
+                    "name": device_name,
+                    "model": device_model,
+                    "manufacturer": "Huawei",
                 },
-                "value_template": f"{{{{ value_json.{field_name} }}}}",
+                "value_template": f"{{{{ none if value_json.{field_name} is none else ((value_json.{field_name}|float / 1000) if (value_json.{field_name}|float > 0) else 0) }}}}",
             }
 
             # Add the sensor-specific attributes
@@ -250,4 +253,4 @@ def publish_homeassistant_discovery(self, station_dn_sanitized, device_dn_saniti
                 self.logger.exception(f"Error publishing HA discovery to MQTT: '{e}'")
 
             # Add uniqe sensor id to device discovery published history
-            self.hass_discovery_published.append(unique_sensor_id)
+            self.hass_discovery_published.append(unique_sensor_id)