Prepare SillyHome Next 1.0.0 dashboard and API rework

app/actuators/lifecycle.py

@@ -20,7 +20,7 @@ from app.actuators.models import (
 )
 from app.actuators.store import ActuatorStore
 from app.config import Settings
-from app.ha.discovery import DiscoveredEntity, EntityRole
+from app.ha.discovery import DiscoveredEntity, EntityRole, discover_entities
 from app.ha.history import EntityHistorySeries, NumericHistoryPoint
 from app.ha.models import HaEntitySummary
 from app.ha.reader import HaReader
@@ -170,7 +170,7 @@ class ActuatorReconciliationService:
         limit: int = _CONTEXT_SUGGESTION_LIMIT,
     ) -> list[HaEntitySummary]:
         entities = {entity.entity_id: entity for entity in self._ha_reader.read_entities()}
-        discovered = {entity.entity_id: entity for entity in self._ha_reader.discover()}
+        discovered = {entity.entity_id: entity for entity in discover_entities(list(entities.values()))}
         actuator = entities.get(actuator_entity_id)
         if actuator is None:
             raise KeyError("Aktuator-Konfiguration nicht gefunden.")
@@ -736,6 +736,11 @@ def _manual_context_role(
 
 def _context_sort_group(entity: HaEntitySummary) -> str:
     device_class = entity.device_class or ""
+    text = " ".join(
+        value.lower().replace("_", " ")
+        for value in [entity.entity_id, entity.friendly_name, entity.area_name, entity.device_name]
+        if value
+    )
     if device_class in {"motion", "occupancy", "presence"}:
         return "01_presence"
     if device_class in {"illuminance"}:
@@ -744,10 +749,26 @@ def _context_sort_group(entity: HaEntitySummary) -> str:
         return "03_opening"
     if device_class in {"humidity", "moisture"}:
         return "04_humidity"
+    if device_class in {"temperature"}:
+        return "05_temperature"
+    if any(token in text for token in {"pv", "solar", "akku", "batterie", "battery", "einspeisung"}):
+        return "06_pv_battery"
     if device_class in {"power", "energy", "current", "voltage"}:
-        return "05_power"
+        return "07_power"
+    if entity.domain in {"weather"}:
+        return "08_weather"
+    if entity.domain in {"fan", "humidifier"}:
+        return "09_ventilation"
+    if entity.domain in {"climate"}:
+        return "10_heating"
+    if entity.domain in {"cover"}:
+        return "11_cover"
     if entity.domain in {"light", "switch"}:
-        return "06_states"
+        return "12_states"
+    if entity.domain.startswith("input_"):
+        return "13_helper"
+    if entity.domain in {"person", "device_tracker"}:
+        return "14_people"
     return f"20_{entity.domain}_{device_class}"
 
 
@@ -900,11 +921,12 @@ def _merge_manual_candidates(
 def _preferred_device_classes(domain: str, *, context: bool) -> frozenset[str]:
     if context:
         mapping = {
-            "climate": {"occupancy", "presence", "window"},
-            "cover": {"illuminance", "wind_speed"},
+            "climate": {"humidity", "illuminance", "occupancy", "presence", "temperature", "window"},
+            "cover": {"illuminance", "motion", "occupancy", "presence", "wind_speed"},
             "fan": {"humidity", "moisture", "occupancy", "presence", "temperature"},
             "humidifier": {"humidity", "moisture", "temperature"},
-            "light": {"door", "garage_door", "motion", "occupancy", "opening", "presence", "window"},
+            "light": {"door", "garage_door", "illuminance", "motion", "occupancy", "opening", "presence", "window"},
+            "media_player": {"occupancy", "presence"},
             "switch": {"door", "garage_door", "motion", "occupancy", "opening", "presence", "window"},
         }
         return frozenset(