feat: improve actor-specific context selection
This commit is contained in:
@@ -65,6 +65,20 @@ _CONTEXT_AUTO_ACCEPT_SCORE = 0.78
|
||||
_CONTEXT_AUTO_ACCEPT_MIN_SCORE = 0.3
|
||||
_MAX_CONTEXT_SELECTIONS = 5
|
||||
_AUDIT_LIMIT = 20
|
||||
_MANUAL_CONTEXT_DOMAINS = frozenset({
|
||||
"binary_sensor",
|
||||
"climate",
|
||||
"cover",
|
||||
"device_tracker",
|
||||
"fan",
|
||||
"humidifier",
|
||||
"light",
|
||||
"person",
|
||||
"sensor",
|
||||
"switch",
|
||||
"weather",
|
||||
})
|
||||
_CONTEXT_SUGGESTION_LIMIT = 120
|
||||
|
||||
|
||||
class ActuatorReconciliationService:
|
||||
@@ -91,6 +105,46 @@ class ActuatorReconciliationService:
|
||||
def get_actuator(self, actuator_entity_id: str) -> ActuatorRecord:
|
||||
return self._store.get(actuator_entity_id)
|
||||
|
||||
def suggest_context_options(
|
||||
self,
|
||||
actuator_entity_id: str,
|
||||
*,
|
||||
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()}
|
||||
actuator = entities.get(actuator_entity_id)
|
||||
if actuator is None:
|
||||
raise KeyError("Aktuator-Konfiguration nicht gefunden.")
|
||||
selected_ids = _selected_context_ids(self._store.get(actuator_entity_id))
|
||||
ranked: list[tuple[float, str, HaEntitySummary]] = []
|
||||
for entity in entities.values():
|
||||
if entity.entity_id == actuator_entity_id or entity.domain not in _MANUAL_CONTEXT_DOMAINS:
|
||||
continue
|
||||
role = _manual_context_role(entity, discovered.get(entity.entity_id))
|
||||
score, _ = _score_candidate(
|
||||
actuator,
|
||||
entity,
|
||||
role,
|
||||
context=role is not EntityRole.MEASUREMENT,
|
||||
)
|
||||
selected = entity.entity_id in selected_ids
|
||||
if selected:
|
||||
score = max(score, 1.0)
|
||||
if not selected and score < 0.1:
|
||||
continue
|
||||
ranked.append((score, _context_sort_group(entity), entity))
|
||||
ranked.sort(
|
||||
key=lambda item: (
|
||||
-item[0],
|
||||
item[1],
|
||||
item[2].area_name or "",
|
||||
item[2].friendly_name or item[2].entity_id,
|
||||
item[2].entity_id,
|
||||
)
|
||||
)
|
||||
return [entity for _, _, entity in ranked[:limit]]
|
||||
|
||||
def delete_actuator(self, actuator_entity_id: str) -> None:
|
||||
model_id = model_id_for_actuator(actuator_entity_id)
|
||||
self._registry.archive(model_id)
|
||||
@@ -592,6 +646,47 @@ def _filter_candidates(
|
||||
return result
|
||||
|
||||
|
||||
def _selected_context_ids(record: ActuatorRecord) -> set[str]:
|
||||
result = set(record.assignment.selected_context_entity_ids)
|
||||
if record.assignment.selected_numeric_entity_id:
|
||||
result.add(record.assignment.selected_numeric_entity_id)
|
||||
if record.manual_override is not None:
|
||||
result.update(record.manual_override.context_entity_ids)
|
||||
if record.manual_override.numeric_entity_id:
|
||||
result.add(record.manual_override.numeric_entity_id)
|
||||
return result
|
||||
|
||||
|
||||
def _manual_context_role(
|
||||
entity: HaEntitySummary,
|
||||
discovered: DiscoveredEntity | None,
|
||||
) -> EntityRole:
|
||||
if discovered is not None and discovered.role is not EntityRole.UNSUPPORTED:
|
||||
return discovered.role
|
||||
if entity.domain == "sensor":
|
||||
return EntityRole.MEASUREMENT
|
||||
if entity.domain == "binary_sensor":
|
||||
return EntityRole.BINARY_CONTEXT
|
||||
return EntityRole.CONTEXT
|
||||
|
||||
|
||||
def _context_sort_group(entity: HaEntitySummary) -> str:
|
||||
device_class = entity.device_class or ""
|
||||
if device_class in {"motion", "occupancy", "presence"}:
|
||||
return "01_presence"
|
||||
if device_class in {"illuminance"}:
|
||||
return "02_brightness"
|
||||
if device_class in {"door", "garage_door", "opening", "window"}:
|
||||
return "03_opening"
|
||||
if device_class in {"humidity", "moisture"}:
|
||||
return "04_humidity"
|
||||
if device_class in {"power", "energy", "current", "voltage"}:
|
||||
return "05_power"
|
||||
if entity.domain in {"light", "switch"}:
|
||||
return "06_states"
|
||||
return f"20_{entity.domain}_{device_class}"
|
||||
|
||||
|
||||
def _score_candidate(
|
||||
actuator: HaEntitySummary,
|
||||
entity: HaEntitySummary,
|
||||
@@ -637,6 +732,14 @@ def _score_candidate(
|
||||
if context and role is EntityRole.BINARY_CONTEXT:
|
||||
score += 0.05
|
||||
evidence.append("Binärer Kontextsensor bevorzugt für Zusatzkontext.")
|
||||
outdoor_tokens = {"aussen", "außen", "outdoor", "garten", "terrasse", "balkon"}
|
||||
if entity_tokens.intersection(outdoor_tokens) and entity.device_class in {
|
||||
"illuminance",
|
||||
"humidity",
|
||||
"temperature",
|
||||
}:
|
||||
score += 0.1
|
||||
evidence.append("Außenmesswert ist oft als übergreifender Kontext relevant.")
|
||||
return round(min(score, 1.0), 4), evidence
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user