Prepare SillyHome Next 1.0.0 dashboard and API rework

app/ha/discovery.py

@@ -214,9 +214,12 @@ def _result(
 
 
 def _actuator_category(entity: HaEntitySummary) -> str:
+    text = _entity_text(entity)
     if entity.domain == "light":
         return "light"
     if entity.domain == "switch":
+        if any(token in text for token in {"steckdose", "socket", "plug", "outlet", "shelly"}):
+            return "socket"
         return "switch_socket"
     if entity.domain == "button" or entity.domain == "input_button":
         return "button"
@@ -239,13 +242,31 @@ def _actuator_category(entity: HaEntitySummary) -> str:
 
 def _measurement_category(entity: HaEntitySummary) -> str:
     device_class = entity.device_class or ""
+    text = _entity_text(entity)
+    if any(
+        token in text
+        for token in {
+            "pv",
+            "solar",
+            "photovoltaik",
+            "akku",
+            "batterie",
+            "battery",
+            "einspeisung",
+            "wechselrichter",
+            "inverter",
+        }
+    ):
+        return "pv_battery_grid"
+    if entity.domain == "weather":
+        return "weather"
     if device_class == "illuminance":
         return "brightness"
     if device_class == "temperature":
         return "temperature"
     if device_class in {"humidity", "moisture"}:
         return "humidity"
-    if device_class in {"power", "energy", "current", "voltage"}:
+    if device_class in {"power", "energy", "current", "voltage", "apparent_power"}:
         return "energy_power"
     if device_class in {"battery", "signal_strength"}:
         return "diagnostic"
@@ -260,12 +281,42 @@ def _binary_category(entity: HaEntitySummary) -> str:
         return "opening"
     if device_class in {"smoke", "safety", "problem"}:
         return "safety"
+    if device_class in {"lock"}:
+        return "lock_state"
     return "binary"
 
 
 def _context_category(entity: HaEntitySummary) -> str:
+    text = _entity_text(entity)
     if entity.domain.startswith("input_"):
         return "helper"
     if entity.domain in {"person", "device_tracker", "zone"}:
         return "presence_location"
+    if entity.domain == "weather":
+        return "weather"
+    if entity.domain in {"light"}:
+        return "light_state"
+    if entity.domain in {"switch"}:
+        if any(token in text for token in {"steckdose", "socket", "plug", "outlet", "shelly"}):
+            return "socket_state"
+        return "switch_state"
+    if entity.domain in {"climate"}:
+        return "heating_state"
+    if entity.domain in {"fan", "humidifier"}:
+        return "ventilation_state"
+    if entity.domain in {"cover"}:
+        return "cover_state"
     return entity.domain
+
+
+def _entity_text(entity: HaEntitySummary) -> str:
+    return " ".join(
+        value.lower().replace("_", " ")
+        for value in [
+            entity.entity_id,
+            entity.friendly_name,
+            entity.area_name,
+            entity.device_name,
+        ]
+        if value
+    )