Compare commits
13 Commits
v0.5.1
...
feature/co
| Author | SHA1 | Date | |
|---|---|---|---|
| b3cf68eade | |||
| 77f328c4a8 | |||
| 7ad97320a2 | |||
| 58d3126a35 | |||
| 1c5eab14b6 | |||
| 87ae051238 | |||
| fb76d89204 | |||
| 1370d02c15 | |||
| 100f5af578 | |||
| ede6b87dbd | |||
| 47e8c7e549 | |||
| ef7e0c5600 | |||
| 8d070fc9ca |
33
.gitea/ISSUE_TEMPLATE/bug.md
Normal file
33
.gitea/ISSUE_TEMPLATE/bug.md
Normal file
@@ -0,0 +1,33 @@
|
||||
---
|
||||
name: Fehler
|
||||
about: Reproduzierbaren SillyHome-Fehler melden
|
||||
title: "BUG: "
|
||||
---
|
||||
|
||||
## Beobachtet
|
||||
|
||||
Was ist tatsächlich passiert?
|
||||
|
||||
## Erwartet
|
||||
|
||||
Was sollte passieren?
|
||||
|
||||
## Aktor und Kontext
|
||||
|
||||
- Aktor:
|
||||
- Trigger/Kontext:
|
||||
- SillyHome-Modus:
|
||||
- Passende HA-Automation und Zustand:
|
||||
|
||||
## Nachweise
|
||||
|
||||
- Version:
|
||||
- Relevante Logs:
|
||||
- `activation_reason`:
|
||||
- `prediction.execution_reason`:
|
||||
|
||||
## Reproduktion
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
25
.gitea/PULL_REQUEST_TEMPLATE.md
Normal file
25
.gitea/PULL_REQUEST_TEMPLATE.md
Normal file
@@ -0,0 +1,25 @@
|
||||
## Ziel
|
||||
|
||||
Welches konkrete Verhalten ändert sich?
|
||||
|
||||
## Umsetzung
|
||||
|
||||
-
|
||||
|
||||
## Sicherheit
|
||||
|
||||
- Backup/Rollback:
|
||||
- Auswirkung auf bestehende HA-Automationen:
|
||||
- Shadow/Active-Verhalten:
|
||||
|
||||
## Verifikation
|
||||
|
||||
```bash
|
||||
.venv/bin/pytest -q
|
||||
.venv/bin/ruff check .
|
||||
.venv/bin/mypy app backend tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
- Live-Health:
|
||||
- Live-Aktor:
|
||||
50
AGENTS.md
Normal file
50
AGENTS.md
Normal file
@@ -0,0 +1,50 @@
|
||||
# AGENTS.md
|
||||
|
||||
Diese Datei ist die kurze Arbeitsanweisung für Menschen und kleine Coding-Modelle.
|
||||
|
||||
## Reihenfolge
|
||||
|
||||
1. `README.md` lesen.
|
||||
2. Für Verhaltenslogik `docs/BEHAVIOR_ENGINE.md` lesen.
|
||||
3. Für Fehler `docs/DEBUGGING.md` abarbeiten.
|
||||
4. Für HA-Automationen `docs/CONTROL_HANDOFF.md` lesen.
|
||||
5. Vor Release oder Live-Update `docs/OPERATIONS.md` vollständig abarbeiten.
|
||||
|
||||
## Verbindliche Regeln
|
||||
|
||||
- Erst Zustand und Logs prüfen, dann Ursache formulieren, dann ändern.
|
||||
- Keine Annahme als Fakt darstellen.
|
||||
- Vor Live-Änderungen Backup oder klaren Rollback-Punkt erstellen.
|
||||
- Bestehende Nutzeränderungen nicht zurücksetzen.
|
||||
- Kleine, fokussierte Änderungen mit passenden Tests.
|
||||
- Eigene SillyHome-Schaltungen niemals als neues Nutzerverhalten lernen.
|
||||
- Ein Aktor darf nicht unbeabsichtigt ohne Steuerung bleiben:
|
||||
- SillyHome aktiv: passende HA-Automation darf pausiert sein.
|
||||
- SillyHome Shadow: HA-Automation muss auf Wunsch fortgesetzt werden können.
|
||||
- Keine Secrets in Code, Dokumentation, Commits oder Logs.
|
||||
|
||||
## Pflichtprüfung
|
||||
|
||||
```bash
|
||||
.venv/bin/pytest -q
|
||||
.venv/bin/ruff check .
|
||||
.venv/bin/mypy app backend tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
## Versionsstellen
|
||||
|
||||
Bei jedem Release dieselbe Version setzen:
|
||||
|
||||
- `pyproject.toml`
|
||||
- `addon/config.yaml`
|
||||
- `app/main.py`
|
||||
- `CHANGELOG.md`
|
||||
|
||||
Danach prüfen:
|
||||
|
||||
```bash
|
||||
grep -R 'version.*0\\.7\\.0' -n pyproject.toml addon/config.yaml app/main.py
|
||||
```
|
||||
|
||||
Die konkrete Zielversion im Befehl anpassen.
|
||||
@@ -11,10 +11,13 @@ Autonomes Schalten wird separat pro Aktor freigegeben.
|
||||
- Lokal-first und datensparsam; keine Cloudpflicht.
|
||||
- Trennung von Datenintegration, Kontextzuordnung, Verhaltenslernen,
|
||||
Vorhersage und Aktorausführung.
|
||||
- Logbook-basierte Herkunftserkennung; bekannte Automationen und eigene
|
||||
Schaltungen werden nicht als Nutzerhandlungen trainiert.
|
||||
- Logbook-basierte Herkunftserkennung; eindeutig erkannte HA-Automationen
|
||||
zählen wie manuelle Bedienungen. Eigene SillyHome-Schaltungen werden nicht
|
||||
zurückgelernt.
|
||||
- Ausführung nur für freigegebene, reversible Domains und Zustände sowie mit
|
||||
Konfidenzschwelle und Cooldown.
|
||||
Konfidenzschwelle und zustandsbezogenem Cooldown.
|
||||
- Eindeutig passende HA-Automationen können bei einer SillyHome-Übernahme
|
||||
pausiert und beim Rückfall in den Shadow-Modus wieder fortgesetzt werden.
|
||||
- Standardintegration über die lokale Home-Assistant-REST-API.
|
||||
- Persistenz als atomische lokale Modell- und Aktorartefakte.
|
||||
- Deployment als Home-Assistant-Add-on oder über Docker Compose.
|
||||
|
||||
57
CHANGELOG.md
57
CHANGELOG.md
@@ -1,5 +1,62 @@
|
||||
# Changelog
|
||||
|
||||
## 0.7.0 - 2026-06-14
|
||||
- Freie Eingabe von Home-Assistant-Entitätsnamen mit Vorschlagsliste
|
||||
- Freigabestatus und Blockadegrund sind in Übersicht und Details immer sichtbar
|
||||
- Vorhersagen erklären konkret, warum sie ausgeführt oder nicht ausgeführt wurden
|
||||
- Cooldown blockiert nur Wiederholungen desselben Zielzustands; Gegenaktionen
|
||||
wie `Licht an` gefolgt von `Licht aus` bleiben sofort möglich
|
||||
- Passende HA-Automationen werden aus ihren echten Konfigurationen erkannt und
|
||||
können pausiert oder fortgesetzt werden
|
||||
- Sichere Steuerungsübergabe: SillyHome kann übernehmen und passende
|
||||
HA-Automationen pausieren; beim Stoppen können sie gezielt fortgesetzt werden
|
||||
- Dashboard wird ohne Browser-Cache ausgeliefert
|
||||
- Reproduzierbare Runbooks für Debugging, Berechnung, Entwicklung, Tests,
|
||||
Release, Add-on-Update, Live-Verifikation und Rollback
|
||||
|
||||
## 0.6.2 - 2026-06-14
|
||||
- Eindeutig im Home-Assistant-Logbuch erkannte Automationen und Scripts zählen für
|
||||
Lernen und Freigabe gleichwertig wie manuelle Bedienungen
|
||||
- Automationsmuster erhalten dieselbe Modellgewichtung wie manuelle Handlungen
|
||||
- Oberfläche zeigt die gemeinsame Zahl als `eindeutig geregelt`; eine
|
||||
ausdrückliche Aktivierung pro Aktor bleibt weiterhin erforderlich
|
||||
|
||||
## 0.6.1 - 2026-06-14
|
||||
- Manuelle Prüfung als `Aktuelle Situation auswerten` eindeutig von Simulation
|
||||
oder Aktorschaltung abgegrenzt
|
||||
- Sichtbare Rückmeldung mit Prüfzeitpunkt, vorhergesagtem Zustand und Sicherheit
|
||||
oder klarem Hinweis auf einen fehlenden frischen Sensorwechsel
|
||||
|
||||
## 0.6.0 - 2026-06-14
|
||||
- Kausales Shadow-Lernen erkennt frische Kontextwechsel unmittelbar vor einer
|
||||
Aktorhandlung, etwa `Tür geschlossen → offen` vor `Licht aus → an`
|
||||
- Historische Home-Assistant-Automationen dürfen Vorhersagen begründen, zählen
|
||||
aber weiterhin niemals als eindeutige Benutzerhandlung oder Ausführungsfreigabe
|
||||
- Aktuelle `last_changed`-Zeitpunkte verhindern Vorhersagen aus längst
|
||||
unveränderten Sensorzuständen
|
||||
- Oberfläche trennt gelernte Benutzerhandlungen und erkannte HA-Automationen
|
||||
|
||||
## 0.5.4 - 2026-06-14
|
||||
- Tür-, Bewegungs- und andere belastbare Kontextsensoren werden auch ohne
|
||||
numerischen Sensor als vollständige automatische Kontextzuordnung angezeigt
|
||||
- Status und Zuordnungssicherheit bilden das aktive Verhaltenslernen ab statt
|
||||
eines optionalen numerischen Modells
|
||||
- Ausführungsfreigabe erscheint erst, wenn genügend eindeutig manuelle
|
||||
Bedienungen vorliegen; bis dahin nennt die Oberfläche die noch fehlende Anzahl
|
||||
|
||||
## 0.5.3 - 2026-06-14
|
||||
- Verhindert fachlich falsche Sensorzuordnungen nur aufgrund generischer Namen wie
|
||||
`Licht` oder `Lichtschalter`
|
||||
- Übernimmt numerische Sensoren nur noch bei einem belastbaren absoluten Score und
|
||||
einer eindeutigen Abgrenzung zum zweitbesten Kandidaten
|
||||
- Begrenzt Zusatzkontext auf relevante Sensoren und bevorzugt bei Lichtaktoren
|
||||
echte Beleuchtungsstärke gegenüber fremden Leistungs- oder Energiezählern
|
||||
|
||||
## 0.5.2 - 2026-06-14
|
||||
- Add-on-Build invalidiert den Docker-Cache bei jeder Versionsänderung, damit
|
||||
Versionsmetadaten und tatsächlich ausgelieferter Anwendungscode übereinstimmen
|
||||
- Korrigierte Ingress-Oberfläche aus 0.5.1 dadurch erstmals zuverlässig ausgeliefert
|
||||
|
||||
## 0.5.1 - 2026-06-14
|
||||
- Technische Modell-, Intervall- und Sicherheitsparameter aus der normalen
|
||||
Home-Assistant-Add-on-Konfiguration entfernt; sichere Standardwerte bleiben aktiv
|
||||
|
||||
23
README.md
23
README.md
@@ -1,6 +1,17 @@
|
||||
# SillyHome Next
|
||||
|
||||
Lokaler, datenschutzfreundlicher API-Prototyp für Home Assistant.
|
||||
SillyHome lernt aus Home Assistant, sagt Aktorhandlungen voraus und darf sie
|
||||
nach einer ausdrücklichen Freigabe ausführen.
|
||||
|
||||
## Schnell orientieren
|
||||
|
||||
- Fehler finden: [`docs/DEBUGGING.md`](docs/DEBUGGING.md)
|
||||
- Berechnung verstehen: [`docs/BEHAVIOR_ENGINE.md`](docs/BEHAVIOR_ENGINE.md)
|
||||
- Steuerung übernehmen/zurückgeben:
|
||||
[`docs/CONTROL_HANDOFF.md`](docs/CONTROL_HANDOFF.md)
|
||||
- Entwickeln, testen, veröffentlichen und installieren:
|
||||
[`docs/OPERATIONS.md`](docs/OPERATIONS.md)
|
||||
- Arbeitsregeln für Coding-Agenten: [`AGENTS.md`](AGENTS.md)
|
||||
|
||||
## Reifegrad
|
||||
|
||||
@@ -109,8 +120,12 @@ Lernentscheidungen erfolgen automatisch.
|
||||
System das lokale Modell automatisch.
|
||||
5. Vorhersagen laufen zunächst ausschließlich im Shadow-Modus.
|
||||
6. Erst nach ausdrücklicher Freigabe pro Aktor werden hochkonfidente,
|
||||
erlaubte Zustände geschaltet. Eigene Schaltungen und erkannte
|
||||
HA-Automationen werden nicht als Nutzerhandlungen zurückgelernt.
|
||||
erlaubte Zustände geschaltet. Eindeutig im HA-Logbuch erkannte Automationen
|
||||
und Scripts zählen dabei gleichwertig wie manuelle Bedienungen. Eigene
|
||||
Schaltungen von SillyHome werden nicht zurückgelernt.
|
||||
7. Bei der Freigabe kann SillyHome passende HA-Automationen pausieren und die
|
||||
Steuerung übernehmen. Beim Stoppen können diese Automationen gezielt wieder
|
||||
fortgesetzt werden.
|
||||
|
||||
Vor einem Update sollte in Home Assistant unter **Einstellungen → System → Backups**
|
||||
eine Teil-Sicherung des Add-ons erstellt werden. Zur Wiederherstellung das gewünschte
|
||||
@@ -121,5 +136,5 @@ Teststand `v0.3.0` wurde als HA-Backup `7df0fca0` gesichert.
|
||||
```bash
|
||||
pytest
|
||||
ruff check .
|
||||
mypy
|
||||
mypy app backend tests
|
||||
```
|
||||
|
||||
@@ -4,13 +4,17 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||
PYTHONUNBUFFERED=1 \
|
||||
PIP_NO_CACHE_DIR=1
|
||||
|
||||
# The add-on version changes for every release. Copying its config before the
|
||||
# clone makes Docker invalidate the application layer instead of reusing old code.
|
||||
COPY config.yaml /tmp/addon-config.yaml
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends git \
|
||||
&& git clone --depth 1 --branch main \
|
||||
http://192.168.6.31:3000/pino/sillyhome-next.git /app \
|
||||
&& python -m pip install --upgrade pip \
|
||||
&& python -m pip install /app \
|
||||
&& rm -rf /var/lib/apt/lists/* /app/.git
|
||||
&& rm -rf /var/lib/apt/lists/* /app/.git /tmp/addon-config.yaml
|
||||
|
||||
COPY run.sh /run.sh
|
||||
RUN chmod 0755 /run.sh
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: SillyHome Next
|
||||
version: "0.5.1"
|
||||
version: "0.7.0"
|
||||
slug: sillyhome_next
|
||||
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
||||
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||
|
||||
@@ -45,6 +45,8 @@ _STOPWORDS = frozenset(
|
||||
"humidity",
|
||||
"illuminance",
|
||||
"light",
|
||||
"licht",
|
||||
"lichtschalter",
|
||||
"power",
|
||||
"sensor",
|
||||
"state",
|
||||
@@ -54,8 +56,10 @@ _STOPWORDS = frozenset(
|
||||
}
|
||||
)
|
||||
_NUMERIC_AUTO_ACCEPT_SCORE = 0.82
|
||||
_NUMERIC_AUTO_ACCEPT_MIN_SCORE = 0.5
|
||||
_NUMERIC_MIN_MARGIN = 0.18
|
||||
_CONTEXT_AUTO_ACCEPT_SCORE = 0.78
|
||||
_CONTEXT_AUTO_ACCEPT_MIN_SCORE = 0.3
|
||||
_MAX_CONTEXT_SELECTIONS = 5
|
||||
_AUDIT_LIMIT = 20
|
||||
|
||||
@@ -231,12 +235,29 @@ class ActuatorReconciliationService:
|
||||
numeric_candidates: list[AssignmentCandidate],
|
||||
context_candidates: list[AssignmentCandidate],
|
||||
) -> AssignmentSelection:
|
||||
top_numeric = numeric_candidates[0] if numeric_candidates else None
|
||||
top_contexts = [
|
||||
candidate.entity_id
|
||||
top_numeric = next(
|
||||
(candidate for candidate in numeric_candidates if candidate.auto_accepted),
|
||||
None,
|
||||
)
|
||||
accepted_contexts = [
|
||||
candidate
|
||||
for candidate in context_candidates
|
||||
if candidate.auto_accepted
|
||||
][: _MAX_CONTEXT_SELECTIONS]
|
||||
top_contexts = [candidate.entity_id for candidate in accepted_contexts]
|
||||
if top_numeric is None:
|
||||
if accepted_contexts:
|
||||
return AssignmentSelection(
|
||||
selected_numeric_entity_id=None,
|
||||
selected_context_entity_ids=top_contexts,
|
||||
source=AssignmentSource.AUTOMATIC,
|
||||
confidence=max(candidate.confidence for candidate in accepted_contexts),
|
||||
review_required=False,
|
||||
reason=(
|
||||
"Passender Schaltkontext automatisch erkannt. Für diese "
|
||||
"Verhaltensvorhersage ist kein numerischer Sensor erforderlich."
|
||||
),
|
||||
)
|
||||
return AssignmentSelection(
|
||||
selected_numeric_entity_id=None,
|
||||
selected_context_entity_ids=top_contexts,
|
||||
@@ -433,8 +454,15 @@ class ActuatorReconciliationService:
|
||||
confidence = candidate.score / highest if highest else 0.0
|
||||
margin = candidate.score - second_score if index == 0 else 0.0
|
||||
auto_score = _CONTEXT_AUTO_ACCEPT_SCORE if context else _NUMERIC_AUTO_ACCEPT_SCORE
|
||||
auto_accepted = confidence >= auto_score and (
|
||||
context or margin >= _NUMERIC_MIN_MARGIN
|
||||
minimum_score = (
|
||||
_CONTEXT_AUTO_ACCEPT_MIN_SCORE
|
||||
if context
|
||||
else _NUMERIC_AUTO_ACCEPT_MIN_SCORE
|
||||
)
|
||||
auto_accepted = (
|
||||
candidate.score >= minimum_score
|
||||
and confidence >= auto_score
|
||||
and (context or margin >= _NUMERIC_MIN_MARGIN)
|
||||
)
|
||||
sorted_candidates[index] = candidate.model_copy(
|
||||
update={
|
||||
@@ -510,6 +538,9 @@ def _score_candidate(
|
||||
if entity.device_class in preferred_device_classes:
|
||||
score += 0.2
|
||||
evidence.append(f"Passende device_class: {entity.device_class}")
|
||||
if not context and actuator.domain == "light" and entity.device_class == "illuminance":
|
||||
score += 0.2
|
||||
evidence.append("Beleuchtungsstärke wird für Lichtaktoren bevorzugt.")
|
||||
if not context and entity.unit_of_measurement is not None:
|
||||
score += 0.05
|
||||
evidence.append(f"Numerische Einheit vorhanden: {entity.unit_of_measurement}")
|
||||
|
||||
@@ -92,6 +92,9 @@ class BehaviorPattern(BaseModel):
|
||||
minute_of_day: int = Field(ge=0, le=1439)
|
||||
weekday: int = Field(ge=0, le=6)
|
||||
context_states: dict[str, str] = Field(default_factory=dict)
|
||||
trigger_entity_id: str | None = None
|
||||
trigger_from_state: str | None = None
|
||||
trigger_to_state: str | None = None
|
||||
source: str = Field(default="observed", max_length=40)
|
||||
weight: float = Field(default=1.0, ge=0.1, le=1.0)
|
||||
observed_at: datetime
|
||||
@@ -104,6 +107,7 @@ class BehaviorPrediction(BaseModel):
|
||||
reason: str
|
||||
matching_patterns: int = Field(default=0, ge=0)
|
||||
executed: bool = False
|
||||
execution_reason: str = "Vorhersage wurde noch nicht ausgeführt."
|
||||
|
||||
|
||||
class ExecutionEvent(BaseModel):
|
||||
@@ -111,6 +115,13 @@ class ExecutionEvent(BaseModel):
|
||||
executed_at: datetime
|
||||
|
||||
|
||||
class RelatedAutomation(BaseModel):
|
||||
entity_id: str = Field(pattern=r"^automation\.[a-z0-9_]+$")
|
||||
config_id: str = Field(min_length=1, max_length=120)
|
||||
friendly_name: str = Field(min_length=1, max_length=200)
|
||||
enabled: bool
|
||||
|
||||
|
||||
class BehaviorState(BaseModel):
|
||||
mode: BehaviorMode = BehaviorMode.SHADOW
|
||||
status: BehaviorStatus = BehaviorStatus.COLLECTING
|
||||
@@ -123,6 +134,10 @@ class BehaviorState(BaseModel):
|
||||
last_evaluated_at: datetime | None = None
|
||||
last_executed_at: datetime | None = None
|
||||
execution_events: list[ExecutionEvent] = Field(default_factory=list)
|
||||
activation_ready: bool = False
|
||||
activation_reason: str = "Noch nicht genügend Verhalten für eine Freigabe gelernt."
|
||||
related_automations: list[RelatedAutomation] = Field(default_factory=list)
|
||||
paused_automation_entity_ids: list[str] = Field(default_factory=list)
|
||||
reason: str = "Historische Aktorhandlungen werden analysiert."
|
||||
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ from app.actuators.store import ActuatorStore
|
||||
from app.behavior.engine import BehaviorEngine
|
||||
from app.dependencies import get_ha_reader
|
||||
from app.ha.discovery import EntityRole
|
||||
from app.ha.exceptions import HaClientError
|
||||
from app.ha.models import HaEntitySummary
|
||||
from app.ha.reader import HaReader
|
||||
|
||||
@@ -22,6 +23,13 @@ class ConfigureActuatorRequest(BaseModel):
|
||||
|
||||
class ActivationRequest(BaseModel):
|
||||
active: bool
|
||||
pause_matching_automations: bool = False
|
||||
restore_paused_automations: bool = False
|
||||
|
||||
|
||||
class AutomationControlRequest(BaseModel):
|
||||
automation_entity_id: str = Field(pattern=r"^automation\.[a-z0-9_]+$")
|
||||
enabled: bool
|
||||
|
||||
|
||||
@router.get("/discovery", response_model=list[HaEntitySummary])
|
||||
@@ -96,13 +104,55 @@ def set_activation(
|
||||
request: Request,
|
||||
) -> ActuatorRecord:
|
||||
try:
|
||||
return _behavior(request).set_active(actuator_entity_id, active=payload.active)
|
||||
return _behavior(request).set_active(
|
||||
actuator_entity_id,
|
||||
active=payload.active,
|
||||
pause_matching_automations=payload.pause_matching_automations,
|
||||
restore_paused_automations=payload.restore_paused_automations,
|
||||
)
|
||||
except KeyError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=409, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.post(
|
||||
"/{actuator_entity_id}/related-automations/refresh",
|
||||
response_model=ActuatorRecord,
|
||||
)
|
||||
def refresh_related_automations(
|
||||
actuator_entity_id: str,
|
||||
request: Request,
|
||||
) -> ActuatorRecord:
|
||||
try:
|
||||
return _behavior(request).refresh_related_automations(actuator_entity_id)
|
||||
except KeyError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
except (ValueError, HaClientError) as exc:
|
||||
raise HTTPException(status_code=409, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.post(
|
||||
"/{actuator_entity_id}/related-automations/control",
|
||||
response_model=ActuatorRecord,
|
||||
)
|
||||
def control_related_automation(
|
||||
actuator_entity_id: str,
|
||||
payload: AutomationControlRequest,
|
||||
request: Request,
|
||||
) -> ActuatorRecord:
|
||||
try:
|
||||
return _behavior(request).set_automation_enabled(
|
||||
actuator_entity_id,
|
||||
payload.automation_entity_id,
|
||||
enabled=payload.enabled,
|
||||
)
|
||||
except KeyError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
except (ValueError, HaClientError) as exc:
|
||||
raise HTTPException(status_code=409, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.get("/reconciliation/state", response_model=ReconciliationState)
|
||||
def get_reconciliation_state(request: Request) -> ReconciliationState:
|
||||
store = getattr(request.app.state, "actuator_store", None)
|
||||
|
||||
@@ -12,6 +12,7 @@ from app.actuators.models import (
|
||||
BehaviorState,
|
||||
BehaviorStatus,
|
||||
ExecutionEvent,
|
||||
RelatedAutomation,
|
||||
)
|
||||
from app.actuators.store import ActuatorStore
|
||||
from app.config import Settings
|
||||
@@ -22,6 +23,7 @@ from app.ha.reader import HaReader
|
||||
_MAX_PATTERNS = 500
|
||||
_MAX_EXECUTION_EVENTS = 100
|
||||
_ACTION_LOGBOOK_TOLERANCE = timedelta(seconds=10)
|
||||
_CONTEXT_TRIGGER_TOLERANCE = timedelta(seconds=3)
|
||||
_OWN_ACTION_TOLERANCE = timedelta(seconds=20)
|
||||
_SAFE_ACTIVE_DOMAINS = frozenset({"cover", "fan", "humidifier", "light", "switch"})
|
||||
_AUTOMATION_CONTEXT_DOMAINS = frozenset({"automation", "script"})
|
||||
@@ -70,6 +72,10 @@ class BehaviorEngine:
|
||||
record.behavior.model_copy(
|
||||
update={
|
||||
"status": BehaviorStatus.COLLECTING,
|
||||
"activation_ready": False,
|
||||
"activation_reason": (
|
||||
"Freigabe gesperrt: Noch kein geeigneter Kontext erkannt."
|
||||
),
|
||||
"last_trained_at": now,
|
||||
"reason": "Noch kein geeigneter Kontext für Verhaltenslernen vorhanden.",
|
||||
}
|
||||
@@ -104,6 +110,11 @@ class BehaviorEngine:
|
||||
"status": BehaviorStatus.COLLECTING,
|
||||
"sample_count": 0,
|
||||
"high_confidence_sample_count": 0,
|
||||
"activation_ready": False,
|
||||
"activation_reason": (
|
||||
"Freigabe gesperrt: Noch keine historischen "
|
||||
"Aktorhandlungen gefunden."
|
||||
),
|
||||
"patterns": [],
|
||||
"last_trained_at": now,
|
||||
"reason": "Noch keine historischen Aktorhandlungen gefunden.",
|
||||
@@ -123,7 +134,9 @@ class BehaviorEngine:
|
||||
logbook=logbook,
|
||||
own_executions=record.behavior.execution_events,
|
||||
)
|
||||
high_confidence = sum(1 for pattern in patterns if pattern.source == "user")
|
||||
trusted_actions = sum(
|
||||
1 for pattern in patterns if pattern.source in {"user", "automation"}
|
||||
)
|
||||
status = (
|
||||
BehaviorStatus.TRAINED
|
||||
if len(patterns) >= self._settings.min_behavior_actions
|
||||
@@ -137,11 +150,26 @@ class BehaviorEngine:
|
||||
"benötigten Handlungen gelernt."
|
||||
)
|
||||
)
|
||||
activation_ready = (
|
||||
status is BehaviorStatus.TRAINED
|
||||
and trusted_actions >= self._settings.min_behavior_actions
|
||||
)
|
||||
activation_reason = (
|
||||
"Freigabe bereit: Genügend eindeutig zugeordnete Handlungen gelernt."
|
||||
if activation_ready
|
||||
else (
|
||||
"Freigabe gesperrt: "
|
||||
f"{max(0, self._settings.min_behavior_actions - trusted_actions)} "
|
||||
"eindeutig zugeordnete Handlungen fehlen."
|
||||
)
|
||||
)
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"status": status,
|
||||
"sample_count": len(patterns),
|
||||
"high_confidence_sample_count": high_confidence,
|
||||
"high_confidence_sample_count": trusted_actions,
|
||||
"activation_ready": activation_ready,
|
||||
"activation_reason": activation_reason,
|
||||
"patterns": patterns[-_MAX_PATTERNS:],
|
||||
"last_trained_at": now,
|
||||
"reason": reason,
|
||||
@@ -198,14 +226,31 @@ class BehaviorEngine:
|
||||
)
|
||||
if entity_id and entity_id in entities and entities[entity_id].state is not None
|
||||
}
|
||||
current_context_changed_at = {
|
||||
entity_id: entities[entity_id].last_changed
|
||||
for entity_id in current_context
|
||||
}
|
||||
prediction = predict_behavior(
|
||||
record.behavior.patterns,
|
||||
current_context=current_context,
|
||||
current_context_changed_at=current_context_changed_at,
|
||||
now=now,
|
||||
min_support=self._settings.min_behavior_actions,
|
||||
window_minutes=self._settings.prediction_window_minutes,
|
||||
causal_window_seconds=self._settings.prediction_interval_seconds * 2,
|
||||
timezone_name=self._settings.timezone,
|
||||
)
|
||||
if prediction is not None:
|
||||
prediction = prediction.model_copy(
|
||||
update={
|
||||
"execution_reason": self._prediction_execution_reason(
|
||||
record,
|
||||
actuator.state,
|
||||
prediction,
|
||||
now,
|
||||
)
|
||||
}
|
||||
)
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"last_evaluated_at": now,
|
||||
@@ -222,7 +267,11 @@ class BehaviorEngine:
|
||||
and behavior.mode is BehaviorMode.ACTIVE
|
||||
and prediction.confidence >= self._settings.prediction_confidence
|
||||
and actuator.state != prediction.target_state
|
||||
and self._cooldown_elapsed(behavior, now)
|
||||
and self._cooldown_elapsed(
|
||||
behavior,
|
||||
now,
|
||||
prediction.target_state,
|
||||
)
|
||||
):
|
||||
domain = actuator_entity_id.split(".", 1)[0]
|
||||
service = service_for_state(domain, prediction.target_state)
|
||||
@@ -251,7 +300,14 @@ class BehaviorEngine:
|
||||
)
|
||||
behavior = behavior.model_copy(
|
||||
update={
|
||||
"prediction": prediction.model_copy(update={"executed": True}),
|
||||
"prediction": prediction.model_copy(
|
||||
update={
|
||||
"executed": True,
|
||||
"execution_reason": (
|
||||
f"Ausgeführt mit {prediction.confidence:.0%} Sicherheit."
|
||||
),
|
||||
}
|
||||
),
|
||||
"last_executed_at": now,
|
||||
"execution_events": [
|
||||
*behavior.execution_events,
|
||||
@@ -273,8 +329,71 @@ class BehaviorEngine:
|
||||
)
|
||||
return self._save_behavior(record, behavior)
|
||||
|
||||
def set_active(self, actuator_entity_id: str, *, active: bool) -> ActuatorRecord:
|
||||
def refresh_related_automations(self, actuator_entity_id: str) -> ActuatorRecord:
|
||||
record = self._store.get(actuator_entity_id)
|
||||
related = [
|
||||
RelatedAutomation(
|
||||
entity_id=item.entity_id,
|
||||
config_id=item.config_id,
|
||||
friendly_name=item.friendly_name,
|
||||
enabled=item.enabled,
|
||||
)
|
||||
for item in self._ha_reader.find_automations_for_entity(
|
||||
actuator_entity_id
|
||||
)
|
||||
]
|
||||
behavior = record.behavior.model_copy(
|
||||
update={"related_automations": related}
|
||||
)
|
||||
return self._save_behavior(record, behavior)
|
||||
|
||||
def set_automation_enabled(
|
||||
self,
|
||||
actuator_entity_id: str,
|
||||
automation_entity_id: str,
|
||||
*,
|
||||
enabled: bool,
|
||||
) -> ActuatorRecord:
|
||||
record = self.refresh_related_automations(actuator_entity_id)
|
||||
if automation_entity_id not in {
|
||||
item.entity_id for item in record.behavior.related_automations
|
||||
}:
|
||||
raise ValueError(
|
||||
"Die Automation ist diesem Aktor nicht eindeutig zugeordnet."
|
||||
)
|
||||
self._ha_reader.call_service(
|
||||
"automation",
|
||||
"turn_on" if enabled else "turn_off",
|
||||
{"entity_id": automation_entity_id},
|
||||
)
|
||||
related = [
|
||||
item.model_copy(update={"enabled": enabled})
|
||||
if item.entity_id == automation_entity_id
|
||||
else item
|
||||
for item in record.behavior.related_automations
|
||||
]
|
||||
paused = [
|
||||
entity_id
|
||||
for entity_id in record.behavior.paused_automation_entity_ids
|
||||
if entity_id != automation_entity_id
|
||||
]
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"related_automations": related,
|
||||
"paused_automation_entity_ids": paused,
|
||||
}
|
||||
)
|
||||
return self._save_behavior(record, behavior)
|
||||
|
||||
def set_active(
|
||||
self,
|
||||
actuator_entity_id: str,
|
||||
*,
|
||||
active: bool,
|
||||
pause_matching_automations: bool = False,
|
||||
restore_paused_automations: bool = False,
|
||||
) -> ActuatorRecord:
|
||||
record = self.refresh_related_automations(actuator_entity_id)
|
||||
now = datetime.now(timezone.utc)
|
||||
if active:
|
||||
domain = actuator_entity_id.split(".", 1)[0]
|
||||
@@ -284,30 +403,138 @@ class BehaviorEngine:
|
||||
)
|
||||
if record.behavior.status is not BehaviorStatus.TRAINED:
|
||||
raise ValueError("Das Verhaltensmodell hat noch nicht genügend Handlungen gelernt.")
|
||||
if (
|
||||
record.behavior.high_confidence_sample_count
|
||||
< self._settings.min_behavior_actions
|
||||
):
|
||||
raise ValueError(
|
||||
"Für die Freigabe fehlen noch eindeutig dir zugeordnete Handlungen. "
|
||||
"Bediene den Aktor einige Male über Home Assistant."
|
||||
)
|
||||
if not record.behavior.activation_ready:
|
||||
raise ValueError(record.behavior.activation_reason)
|
||||
mode = BehaviorMode.ACTIVE
|
||||
approved_at = now
|
||||
reason = "Autonomes Lernen und Schalten wurde ausdrücklich freigegeben."
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"mode": mode,
|
||||
"approved_at": approved_at,
|
||||
"reason": (
|
||||
"Autonomes Lernen und Schalten wurde ausdrücklich freigegeben."
|
||||
),
|
||||
}
|
||||
)
|
||||
record = self._save_behavior(record, behavior)
|
||||
if pause_matching_automations:
|
||||
paused: list[str] = []
|
||||
try:
|
||||
for automation in record.behavior.related_automations:
|
||||
if not automation.enabled:
|
||||
continue
|
||||
self._ha_reader.call_service(
|
||||
"automation",
|
||||
"turn_off",
|
||||
{"entity_id": automation.entity_id},
|
||||
)
|
||||
paused.append(automation.entity_id)
|
||||
except (HaClientError, ValueError):
|
||||
for entity_id in paused:
|
||||
try:
|
||||
self._ha_reader.call_service(
|
||||
"automation",
|
||||
"turn_on",
|
||||
{"entity_id": entity_id},
|
||||
)
|
||||
except (HaClientError, ValueError):
|
||||
logger.exception(
|
||||
"Failed to restore automation %s after handoff error",
|
||||
entity_id,
|
||||
)
|
||||
rollback = record.behavior.model_copy(
|
||||
update={
|
||||
"mode": BehaviorMode.SHADOW,
|
||||
"approved_at": None,
|
||||
"reason": (
|
||||
"Übernahme fehlgeschlagen; SillyHome bleibt im "
|
||||
"Shadow-Modus."
|
||||
),
|
||||
}
|
||||
)
|
||||
self._save_behavior(record, rollback)
|
||||
raise
|
||||
related = [
|
||||
automation.model_copy(update={"enabled": False})
|
||||
if automation.entity_id in paused
|
||||
else automation
|
||||
for automation in record.behavior.related_automations
|
||||
]
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"related_automations": related,
|
||||
"paused_automation_entity_ids": paused,
|
||||
"reason": (
|
||||
"SillyHome steuert aktiv; passende HA-Automationen "
|
||||
"wurden pausiert."
|
||||
),
|
||||
}
|
||||
)
|
||||
return self._save_behavior(record, behavior)
|
||||
return record
|
||||
else:
|
||||
if restore_paused_automations:
|
||||
for entity_id in record.behavior.paused_automation_entity_ids:
|
||||
self._ha_reader.call_service(
|
||||
"automation",
|
||||
"turn_on",
|
||||
{"entity_id": entity_id},
|
||||
)
|
||||
mode = BehaviorMode.SHADOW
|
||||
approved_at = None
|
||||
reason = "Shadow-Modus aktiv; Vorhersagen werden nicht ausgeführt."
|
||||
reason = (
|
||||
"Shadow-Modus aktiv; pausierte HA-Automationen wurden fortgesetzt."
|
||||
if restore_paused_automations
|
||||
else "Shadow-Modus aktiv; Vorhersagen werden nicht ausgeführt."
|
||||
)
|
||||
behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"mode": mode,
|
||||
"approved_at": approved_at,
|
||||
"related_automations": [
|
||||
automation.model_copy(update={"enabled": True})
|
||||
if (
|
||||
restore_paused_automations
|
||||
and automation.entity_id
|
||||
in record.behavior.paused_automation_entity_ids
|
||||
)
|
||||
else automation
|
||||
for automation in record.behavior.related_automations
|
||||
],
|
||||
"paused_automation_entity_ids": (
|
||||
[]
|
||||
if restore_paused_automations
|
||||
else record.behavior.paused_automation_entity_ids
|
||||
),
|
||||
"reason": reason,
|
||||
}
|
||||
)
|
||||
return self._save_behavior(record, behavior)
|
||||
|
||||
def _prediction_execution_reason(
|
||||
self,
|
||||
record: ActuatorRecord,
|
||||
current_state: str | None,
|
||||
prediction: BehaviorPrediction,
|
||||
now: datetime,
|
||||
) -> str:
|
||||
if record.behavior.mode is not BehaviorMode.ACTIVE:
|
||||
return "Nicht ausgeführt: SillyHome ist im Shadow-Modus."
|
||||
if prediction.confidence < self._settings.prediction_confidence:
|
||||
return (
|
||||
"Nicht ausgeführt: Sicherheit liegt unter der "
|
||||
f"Schaltschwelle von {self._settings.prediction_confidence:.0%}."
|
||||
)
|
||||
if current_state == prediction.target_state:
|
||||
return "Nicht ausgeführt: Zielzustand ist bereits erreicht."
|
||||
if not self._cooldown_elapsed(
|
||||
record.behavior,
|
||||
now,
|
||||
prediction.target_state,
|
||||
):
|
||||
return "Nicht ausgeführt: Sicherheits-Cooldown ist noch aktiv."
|
||||
return "Ausführung ist freigegeben."
|
||||
|
||||
def _build_patterns(
|
||||
self,
|
||||
*,
|
||||
@@ -326,8 +553,11 @@ class BehaviorEngine:
|
||||
if _matches_own_execution(point, own_executions):
|
||||
continue
|
||||
source, weight = _action_source(point, logbook)
|
||||
if source == "automation":
|
||||
continue
|
||||
trigger = _recent_context_transition(
|
||||
context_history,
|
||||
context_ids,
|
||||
point.timestamp,
|
||||
)
|
||||
contexts = {
|
||||
entity_id: state
|
||||
for entity_id in context_ids
|
||||
@@ -340,6 +570,9 @@ class BehaviorEngine:
|
||||
minute_of_day=local.hour * 60 + local.minute,
|
||||
weekday=local.weekday(),
|
||||
context_states=contexts,
|
||||
trigger_entity_id=trigger[0] if trigger else None,
|
||||
trigger_from_state=trigger[1] if trigger else None,
|
||||
trigger_to_state=trigger[2] if trigger else None,
|
||||
source=source,
|
||||
weight=weight,
|
||||
observed_at=point.timestamp,
|
||||
@@ -347,10 +580,20 @@ class BehaviorEngine:
|
||||
)
|
||||
return patterns
|
||||
|
||||
def _cooldown_elapsed(self, behavior: BehaviorState, now: datetime) -> bool:
|
||||
return behavior.last_executed_at is None or (
|
||||
now - behavior.last_executed_at
|
||||
) >= timedelta(seconds=self._settings.execution_cooldown_seconds)
|
||||
def _cooldown_elapsed(
|
||||
self,
|
||||
behavior: BehaviorState,
|
||||
now: datetime,
|
||||
target_state: str,
|
||||
) -> bool:
|
||||
if behavior.last_executed_at is None:
|
||||
return True
|
||||
last_event = behavior.execution_events[-1] if behavior.execution_events else None
|
||||
if last_event is not None and last_event.target_state != target_state:
|
||||
return True
|
||||
return (now - behavior.last_executed_at) >= timedelta(
|
||||
seconds=self._settings.execution_cooldown_seconds
|
||||
)
|
||||
|
||||
def _save_behavior(
|
||||
self,
|
||||
@@ -373,14 +616,52 @@ def predict_behavior(
|
||||
now: datetime,
|
||||
min_support: int,
|
||||
window_minutes: int,
|
||||
current_context_changed_at: dict[str, datetime | None] | None = None,
|
||||
causal_window_seconds: int = 120,
|
||||
timezone_name: str = "Europe/Berlin",
|
||||
) -> BehaviorPrediction | None:
|
||||
if not patterns:
|
||||
return None
|
||||
local = now.astimezone(ZoneInfo(timezone_name))
|
||||
minute_of_day = local.hour * 60 + local.minute
|
||||
changed_at = current_context_changed_at or {}
|
||||
by_state: dict[str, list[float]] = {}
|
||||
causal_support_by_state: dict[str, int] = {}
|
||||
for pattern in patterns:
|
||||
if pattern.trigger_entity_id and pattern.trigger_to_state:
|
||||
trigger_changed_at = changed_at.get(pattern.trigger_entity_id)
|
||||
trigger_age = (
|
||||
(now - trigger_changed_at).total_seconds()
|
||||
if trigger_changed_at is not None
|
||||
else None
|
||||
)
|
||||
if not (
|
||||
current_context.get(pattern.trigger_entity_id)
|
||||
== pattern.trigger_to_state
|
||||
and trigger_age is not None
|
||||
and 0 <= trigger_age <= causal_window_seconds
|
||||
):
|
||||
continue
|
||||
comparable = [
|
||||
(entity_id, expected)
|
||||
for entity_id, expected in pattern.context_states.items()
|
||||
if entity_id in current_context
|
||||
]
|
||||
context_score = (
|
||||
sum(
|
||||
current_context[entity_id] == expected
|
||||
for entity_id, expected in comparable
|
||||
)
|
||||
/ len(comparable)
|
||||
if comparable
|
||||
else 0.5
|
||||
)
|
||||
score = pattern.weight * (0.85 + 0.15 * context_score)
|
||||
by_state.setdefault(pattern.target_state, []).append(score)
|
||||
causal_support_by_state[pattern.target_state] = (
|
||||
causal_support_by_state.get(pattern.target_state, 0) + 1
|
||||
)
|
||||
continue
|
||||
distance = _circular_minute_distance(minute_of_day, pattern.minute_of_day)
|
||||
if distance > window_minutes:
|
||||
continue
|
||||
@@ -414,6 +695,7 @@ def predict_behavior(
|
||||
key=lambda item: (sum(item[1]), len(item[1]), item[0]),
|
||||
)
|
||||
support = len(scores)
|
||||
causal_support = causal_support_by_state.get(target_state, 0)
|
||||
confidence = min(1.0, (sum(scores) / support) * min(1.0, support / min_support))
|
||||
if confidence <= 0:
|
||||
return None
|
||||
@@ -423,7 +705,12 @@ def predict_behavior(
|
||||
generated_at=now,
|
||||
matching_patterns=support,
|
||||
reason=(
|
||||
f"{support} ähnliche Handlungsmuster passen zu Zeit und aktuellem Kontext."
|
||||
(
|
||||
f"{causal_support} historische Handlungen folgten demselben "
|
||||
"frischen Sensorwechsel."
|
||||
)
|
||||
if causal_support
|
||||
else f"{support} ähnliche Handlungsmuster passen zu Zeit und aktuellem Kontext."
|
||||
),
|
||||
)
|
||||
|
||||
@@ -461,7 +748,7 @@ def _action_source(
|
||||
if nearest.context_user_id:
|
||||
return "user", 1.0
|
||||
if nearest.context_domain in _AUTOMATION_CONTEXT_DOMAINS:
|
||||
return "automation", 0.1
|
||||
return "automation", 1.0
|
||||
return "physical_or_unknown", 0.7
|
||||
|
||||
|
||||
@@ -476,6 +763,32 @@ def _matches_own_execution(
|
||||
)
|
||||
|
||||
|
||||
def _recent_context_transition(
|
||||
history: dict[str, StateHistorySeries],
|
||||
context_ids: list[str],
|
||||
timestamp: datetime,
|
||||
) -> tuple[str, str, str] | None:
|
||||
nearest: tuple[timedelta, str, str, str] | None = None
|
||||
for entity_id in context_ids:
|
||||
series = history.get(entity_id)
|
||||
if series is None:
|
||||
continue
|
||||
previous_state: str | None = None
|
||||
for point in series.points:
|
||||
if point.timestamp > timestamp:
|
||||
break
|
||||
if previous_state is not None and point.state != previous_state:
|
||||
age = timestamp - point.timestamp
|
||||
if age <= _CONTEXT_TRIGGER_TOLERANCE and (
|
||||
nearest is None or age < nearest[0]
|
||||
):
|
||||
nearest = (age, entity_id, previous_state, point.state)
|
||||
previous_state = point.state
|
||||
if nearest is None:
|
||||
return None
|
||||
return nearest[1], nearest[2], nearest[3]
|
||||
|
||||
|
||||
def _circular_minute_distance(left: int, right: int) -> int:
|
||||
direct = abs(left - right)
|
||||
return min(direct, 1440 - direct)
|
||||
|
||||
@@ -107,6 +107,18 @@ class HaClient:
|
||||
)
|
||||
return payload
|
||||
|
||||
def get_automation_config(self, automation_id: str) -> dict[str, object]:
|
||||
if not automation_id or len(automation_id) > 120:
|
||||
raise ValueError("Ungültige Automation-ID.")
|
||||
payload = self._get_json(
|
||||
f"/api/config/automation/config/{quote(automation_id, safe='')}"
|
||||
)
|
||||
if not isinstance(payload, dict):
|
||||
raise HaUnexpectedPayloadError(
|
||||
"Automation-Konfiguration hat ein unerwartetes Format."
|
||||
)
|
||||
return payload
|
||||
|
||||
def call_service(
|
||||
self,
|
||||
domain: str,
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
@@ -15,6 +17,7 @@ class HaEntitySummary(BaseModel):
|
||||
entity_id: str
|
||||
domain: str
|
||||
state: str | None = None
|
||||
last_changed: datetime | None = None
|
||||
state_class: str | None = None
|
||||
device_class: str | None = None
|
||||
unit_of_measurement: str | None = None
|
||||
@@ -23,3 +26,10 @@ class HaEntitySummary(BaseModel):
|
||||
area_name: str | None = None
|
||||
device_id: str | None = None
|
||||
device_name: str | None = None
|
||||
|
||||
|
||||
class HaAutomationSummary(BaseModel):
|
||||
entity_id: str
|
||||
config_id: str
|
||||
friendly_name: str
|
||||
enabled: bool
|
||||
|
||||
104
app/ha/reader.py
104
app/ha/reader.py
@@ -1,7 +1,8 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Sequence
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from threading import RLock
|
||||
from typing import Any
|
||||
import logging
|
||||
|
||||
@@ -17,7 +18,7 @@ from app.ha.history import (
|
||||
normalize_logbook_payload,
|
||||
normalize_state_history_payload,
|
||||
)
|
||||
from app.ha.models import HaEntitySummary
|
||||
from app.ha.models import HaAutomationSummary, HaEntitySummary
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -25,6 +26,11 @@ logger = logging.getLogger(__name__)
|
||||
class HaReader:
|
||||
def __init__(self, client: HaClient) -> None:
|
||||
self._client = client
|
||||
self._automation_cache: list[
|
||||
tuple[HaAutomationSummary, dict[str, object]]
|
||||
] = []
|
||||
self._automation_cache_at: datetime | None = None
|
||||
self._automation_cache_lock = RLock()
|
||||
|
||||
def read_entities(self) -> Sequence[HaEntitySummary]:
|
||||
entities = self._client.list_entities()
|
||||
@@ -53,6 +59,7 @@ class HaReader:
|
||||
entity_id=entity_id,
|
||||
domain=domain,
|
||||
state=_optional_str(item.get("state")),
|
||||
last_changed=_optional_datetime(item.get("last_changed")),
|
||||
state_class=_optional_str(attributes.get("state_class")),
|
||||
device_class=_optional_str(attributes.get("device_class")),
|
||||
unit_of_measurement=_optional_str(attributes.get("unit_of_measurement")),
|
||||
@@ -111,8 +118,101 @@ class HaReader:
|
||||
) -> Sequence[object]:
|
||||
return self._client.call_service(domain, service, service_data)
|
||||
|
||||
def find_automations_for_entity(
|
||||
self,
|
||||
entity_id: str,
|
||||
) -> list[HaAutomationSummary]:
|
||||
current_states = {
|
||||
raw_entity_id: item.get("state") == "on"
|
||||
for item in self._client.list_entities()
|
||||
if isinstance((raw_entity_id := item.get("entity_id")), str)
|
||||
and raw_entity_id.startswith("automation.")
|
||||
}
|
||||
matches = [
|
||||
summary.model_copy(
|
||||
update={
|
||||
"enabled": current_states.get(
|
||||
summary.entity_id,
|
||||
summary.enabled,
|
||||
)
|
||||
}
|
||||
)
|
||||
for summary, config in self._read_automation_configs()
|
||||
if _contains_exact_value(config, entity_id)
|
||||
]
|
||||
return sorted(matches, key=lambda item: item.entity_id)
|
||||
|
||||
def _read_automation_configs(
|
||||
self,
|
||||
) -> list[tuple[HaAutomationSummary, dict[str, object]]]:
|
||||
now = datetime.now(timezone.utc)
|
||||
with self._automation_cache_lock:
|
||||
if (
|
||||
self._automation_cache_at is not None
|
||||
and now - self._automation_cache_at < timedelta(minutes=10)
|
||||
):
|
||||
return list(self._automation_cache)
|
||||
configs: list[tuple[HaAutomationSummary, dict[str, object]]] = []
|
||||
for item in self._client.list_entities():
|
||||
raw_entity_id = item.get("entity_id")
|
||||
if not isinstance(raw_entity_id, str) or not raw_entity_id.startswith(
|
||||
"automation."
|
||||
):
|
||||
continue
|
||||
attributes = item.get("attributes")
|
||||
if not isinstance(attributes, dict):
|
||||
continue
|
||||
config_id = attributes.get("id")
|
||||
if not isinstance(config_id, str) or not config_id:
|
||||
continue
|
||||
try:
|
||||
config = self._client.get_automation_config(config_id)
|
||||
except (HaClientError, ValueError) as exc:
|
||||
logger.warning(
|
||||
"Automation config unavailable for %s: %s",
|
||||
raw_entity_id,
|
||||
exc,
|
||||
)
|
||||
continue
|
||||
configs.append(
|
||||
(
|
||||
HaAutomationSummary(
|
||||
entity_id=raw_entity_id,
|
||||
config_id=config_id,
|
||||
friendly_name=str(
|
||||
attributes.get("friendly_name") or raw_entity_id
|
||||
),
|
||||
enabled=item.get("state") == "on",
|
||||
),
|
||||
config,
|
||||
)
|
||||
)
|
||||
self._automation_cache = configs
|
||||
self._automation_cache_at = now
|
||||
return list(configs)
|
||||
|
||||
|
||||
def _optional_str(value: object) -> str | None:
|
||||
if value is None or value == "":
|
||||
return None
|
||||
return str(value)
|
||||
|
||||
|
||||
def _optional_datetime(value: object) -> datetime | None:
|
||||
if not isinstance(value, str) or not value:
|
||||
return None
|
||||
try:
|
||||
parsed = datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||
except ValueError:
|
||||
return None
|
||||
return parsed if parsed.tzinfo is not None else None
|
||||
|
||||
|
||||
def _contains_exact_value(value: object, expected: str) -> bool:
|
||||
if value == expected:
|
||||
return True
|
||||
if isinstance(value, dict):
|
||||
return any(_contains_exact_value(item, expected) for item in value.values())
|
||||
if isinstance(value, list):
|
||||
return any(_contains_exact_value(item, expected) for item in value)
|
||||
return False
|
||||
|
||||
@@ -77,7 +77,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
||||
app = FastAPI(
|
||||
title="SillyHome Next API",
|
||||
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
||||
version="0.5.1",
|
||||
version="0.7.0",
|
||||
lifespan=lifespan,
|
||||
)
|
||||
app.state.settings = load_settings()
|
||||
@@ -97,7 +97,10 @@ def health() -> dict[str, str]:
|
||||
|
||||
@app.get("/")
|
||||
def root() -> FileResponse:
|
||||
return FileResponse(STATIC_DIR / "index.html")
|
||||
return FileResponse(
|
||||
STATIC_DIR / "index.html",
|
||||
headers={"Cache-Control": "no-store, max-age=0"},
|
||||
)
|
||||
|
||||
|
||||
async def _periodic_reconciliation(app: FastAPI) -> None:
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
.warn { color: #f3c969; }
|
||||
.bad { color: #ff8f8f; }
|
||||
label { display: block; margin: 9px 0 4px; color: #b9c9d6; }
|
||||
select,button { box-sizing: border-box; width: 100%; border-radius: 7px; border: 1px solid #3b4b5b; padding: 10px; background: #101820; color: #fff; }
|
||||
select,input,button { box-sizing: border-box; width: 100%; border-radius: 7px; border: 1px solid #3b4b5b; padding: 10px; background: #101820; color: #fff; }
|
||||
button { margin-top: 10px; background: #23715b; border: 0; font-weight: 700; cursor: pointer; }
|
||||
button.secondary { background: #37495c; }
|
||||
button.danger { background: #7b3434; }
|
||||
@@ -77,8 +77,9 @@
|
||||
<section>
|
||||
<h2>1. Gerät zum Lernen auswählen</h2>
|
||||
<p class="muted">Wähle eine Lampe, einen Rollladen oder einen anderen unterstützten Aktor. Du wählst keine Sensoren und erstellst keine Regeln.</p>
|
||||
<label for="actuator-select">Gerät aus Home Assistant</label>
|
||||
<select id="actuator-select"></select>
|
||||
<label for="actuator-input">Entitätsname oder Gerät aus Home Assistant</label>
|
||||
<input id="actuator-input" list="actuator-options" placeholder="z. B. light.licht_abstellraum" autocomplete="off">
|
||||
<datalist id="actuator-options"></datalist>
|
||||
<button onclick="configureActuator()">Gerät hinzufügen und Beobachtung starten</button>
|
||||
<p id="actuator-config-result" class="muted">Noch kein Aktor ausgewählt.</p>
|
||||
</section>
|
||||
@@ -112,6 +113,7 @@ async function api(path, options = {}) {
|
||||
}
|
||||
|
||||
function lifecycleLabel(record) {
|
||||
if (record.behavior.status === "trained") return "Kontext erkannt";
|
||||
const labels = {
|
||||
trained: "lernt",
|
||||
pending_history: "sammelt Historie",
|
||||
@@ -124,6 +126,7 @@ function lifecycleLabel(record) {
|
||||
}
|
||||
|
||||
function statusClass(record) {
|
||||
if (record.behavior.status === "trained") return "ok";
|
||||
if (record.lifecycle.status === "trained") return "ok";
|
||||
if (["pending_history", "pending_assignment", "archived"].includes(record.lifecycle.status)) return "warn";
|
||||
return "bad";
|
||||
@@ -161,7 +164,7 @@ async function loadOverview() {
|
||||
}
|
||||
|
||||
async function loadActuatorDiscovery() {
|
||||
const select = document.getElementById("actuator-select");
|
||||
const options = document.getElementById("actuator-options");
|
||||
try {
|
||||
const [available, configured] = await Promise.all([
|
||||
api("v1/actuators/discovery"),
|
||||
@@ -169,16 +172,16 @@ async function loadActuatorDiscovery() {
|
||||
]);
|
||||
const configuredIds = new Set(configured.map(record => record.actuator_entity_id));
|
||||
const choices = available.filter(entity => !configuredIds.has(entity.entity_id));
|
||||
select.innerHTML = choices.length
|
||||
? choices.map(entity => `<option value="${escapeHtml(entity.entity_id)}">${escapeHtml(entity.friendly_name || entity.entity_id)}${entity.area_name ? ` (${escapeHtml(entity.area_name)})` : ""}</option>`).join("")
|
||||
: "<option value=''>Alle erkannten Aktoren sind ausgewählt</option>";
|
||||
options.innerHTML = choices.map(entity =>
|
||||
`<option value="${escapeHtml(entity.entity_id)}">${escapeHtml(entity.friendly_name || entity.entity_id)}${entity.area_name ? ` (${escapeHtml(entity.area_name)})` : ""}</option>`
|
||||
).join("");
|
||||
} catch (error) {
|
||||
select.innerHTML = `<option value="">${escapeHtml(error.message)}</option>`;
|
||||
options.innerHTML = "";
|
||||
}
|
||||
}
|
||||
|
||||
async function configureActuator() {
|
||||
const actuatorId = document.getElementById("actuator-select").value;
|
||||
const actuatorId = document.getElementById("actuator-input").value.trim();
|
||||
const result = document.getElementById("actuator-config-result");
|
||||
if (!actuatorId) return;
|
||||
result.textContent = "Kontext wird automatisch analysiert ...";
|
||||
@@ -202,17 +205,23 @@ async function loadConfiguredActuators() {
|
||||
const rows = await api("v1/actuators");
|
||||
box.innerHTML = rows.length ? `
|
||||
<table>
|
||||
<tr><th>Gerät</th><th>Lernstatus</th><th>Gelernte Handlungen</th><th>Letzte Vorhersage</th><th>Aktionen</th></tr>
|
||||
<tr><th>Gerät</th><th>Lernstatus</th><th>Freigabe</th><th>Gelernte Handlungen</th><th>Letzte Vorhersage</th><th>Aktionen</th></tr>
|
||||
${rows.map(record => `
|
||||
<tr>
|
||||
<td>${escapeHtml(record.actuator_entity_id)}</td>
|
||||
<td class="${record.behavior.status === "trained" ? "ok" : "warn"}">${escapeHtml(behaviorLabel(record))}</td>
|
||||
<td class="${record.behavior.activation_ready ? "ok" : "warn"}">${escapeHtml(record.behavior.activation_ready ? "bereit" : record.behavior.activation_reason)}</td>
|
||||
<td>${record.behavior.sample_count}</td>
|
||||
<td>${record.behavior.prediction
|
||||
? `${escapeHtml(record.behavior.prediction.target_state)} (${Math.round(record.behavior.prediction.confidence * 100)} %)`
|
||||
: "-"}</td>
|
||||
<td>
|
||||
<button onclick="showActuator('${escapeHtml(record.actuator_entity_id)}')">Details</button>
|
||||
${record.behavior.mode === "active"
|
||||
? `<button class="danger" onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', false, false, true)">Stoppen + HA-Automationen fortsetzen</button>`
|
||||
: record.behavior.activation_ready
|
||||
? `<button onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', true, true, false)">SillyHome übernehmen lassen</button>`
|
||||
: ""}
|
||||
<button class="danger" onclick="removeActuator('${escapeHtml(record.actuator_entity_id)}')">Entfernen</button>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -223,11 +232,16 @@ async function loadConfiguredActuators() {
|
||||
}
|
||||
}
|
||||
|
||||
async function showActuator(actuatorId) {
|
||||
async function showActuator(actuatorId, evaluationMessage = "") {
|
||||
currentActuatorId = actuatorId;
|
||||
const box = document.getElementById("actuator-detail");
|
||||
try {
|
||||
const record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}`);
|
||||
let record;
|
||||
try {
|
||||
record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}/related-automations/refresh`, {method: "POST"});
|
||||
} catch (_) {
|
||||
record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}`);
|
||||
}
|
||||
const contexts = [
|
||||
record.assignment.selected_numeric_entity_id,
|
||||
...record.assignment.selected_context_entity_ids,
|
||||
@@ -237,11 +251,26 @@ async function showActuator(actuatorId) {
|
||||
.map(candidate => `<li><strong>${escapeHtml(candidate.friendly_name || candidate.entity_id)}</strong>: ${candidate.evidence.map(escapeHtml).join(", ") || "statistisch relevanter Kandidat"}</li>`)
|
||||
.join("");
|
||||
const prediction = record.behavior.prediction;
|
||||
const learnedAutomationActions = record.behavior.patterns.filter(
|
||||
pattern => pattern.source === "automation",
|
||||
).length;
|
||||
const relatedAutomations = record.behavior.related_automations || [];
|
||||
const activationButton = record.behavior.mode === "active"
|
||||
? `<button class="danger" onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', false)">Autonomes Schalten stoppen</button>`
|
||||
: record.behavior.status === "trained"
|
||||
? `<button onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', true)">Lernen und Schalten freigeben</button>`
|
||||
: "<p class='muted'>Freigabe wird möglich, sobald genügend Handlungen gelernt wurden.</p>";
|
||||
? `<button class="danger" onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', false, false, true)">SillyHome stoppen und pausierte HA-Automationen fortsetzen</button>
|
||||
<button class="secondary" onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', false, false, false)">SillyHome stoppen; HA-Automationen pausiert lassen</button>`
|
||||
: record.behavior.activation_ready
|
||||
? `<button onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', true, true, false)">SillyHome übernehmen lassen und passende HA-Automationen pausieren</button>
|
||||
<button class="secondary" onclick="setActivation('${escapeHtml(record.actuator_entity_id)}', true, false, false)">SillyHome parallel aktivieren</button>`
|
||||
: `<p class='warn'>${escapeHtml(record.behavior.activation_reason)}</p>`;
|
||||
const automationControls = relatedAutomations.length
|
||||
? `<ul>${relatedAutomations.map(automation => `
|
||||
<li>
|
||||
<strong>${escapeHtml(automation.friendly_name)}</strong>
|
||||
<code>${escapeHtml(automation.entity_id)}</code>:
|
||||
<span class="${automation.enabled ? "ok" : "warn"}">${automation.enabled ? "aktiv" : "pausiert"}</span>
|
||||
<button class="secondary" onclick="setRelatedAutomation('${escapeHtml(record.actuator_entity_id)}', '${escapeHtml(automation.entity_id)}', ${automation.enabled ? "false" : "true"})">${automation.enabled ? "Pausieren" : "Fortsetzen"}</button>
|
||||
</li>`).join("")}</ul>`
|
||||
: "<p class='muted'>Keine eindeutig passende HA-Automation gefunden.</p>";
|
||||
box.innerHTML = `
|
||||
<div class="grid-two">
|
||||
<div>
|
||||
@@ -256,17 +285,24 @@ async function showActuator(actuatorId) {
|
||||
<h3>Lernfortschritt</h3>
|
||||
<p><strong>Betriebsart:</strong> ${escapeHtml(behaviorLabel(record))}</p>
|
||||
<p><strong>Gelernte Handlungen:</strong> ${record.behavior.sample_count}</p>
|
||||
<p><strong>Davon eindeutig Benutzer:</strong> ${record.behavior.high_confidence_sample_count}</p>
|
||||
<p><strong>Davon eindeutig geregelt:</strong> ${record.behavior.high_confidence_sample_count}</p>
|
||||
<p><strong>Davon erkannte HA-Automationen:</strong> ${learnedAutomationActions}</p>
|
||||
<p><strong>Letztes Training:</strong> ${escapeHtml(record.behavior.last_trained_at || "noch nicht")}</p>
|
||||
<p><strong>Was noch passiert:</strong> ${escapeHtml(record.behavior.reason)}</p>
|
||||
<p><strong>Freigabestatus:</strong> <span class="${record.behavior.activation_ready ? "ok" : "warn"}">${escapeHtml(record.behavior.activation_reason)}</span></p>
|
||||
${activationButton}
|
||||
<button class="secondary" onclick="evaluateActuator('${escapeHtml(record.actuator_entity_id)}')">Vorhersage jetzt prüfen</button>
|
||||
<button class="secondary" onclick="evaluateActuator('${escapeHtml(record.actuator_entity_id)}')">Aktuelle Situation auswerten</button>
|
||||
<p class="muted">Die Prüfung simuliert keinen Sensorwechsel und schaltet keinen Aktor.</p>
|
||||
${evaluationMessage ? `<p class="ok">${escapeHtml(evaluationMessage)}</p>` : ""}
|
||||
</div>
|
||||
</div>
|
||||
<h3>Was SillyHome aktuell vorhersagt</h3>
|
||||
${prediction
|
||||
? `<p><strong>${escapeHtml(prediction.target_state)}</strong> mit ${Math.round(prediction.confidence * 100)} % Sicherheit. ${escapeHtml(prediction.reason)} ${prediction.executed ? "<span class='ok'>Ausgeführt.</span>" : "<span class='muted'>Nicht ausgeführt.</span>"}</p>`
|
||||
? `<p><strong>${escapeHtml(prediction.target_state)}</strong> mit ${Math.round(prediction.confidence * 100)} % Sicherheit. ${escapeHtml(prediction.reason)} <span class="${prediction.executed ? "ok" : "muted"}">${escapeHtml(prediction.execution_reason)}</span></p>`
|
||||
: "<p class='muted'>Aktuell ist kein gelerntes Handlungsmuster fällig.</p>"}
|
||||
<h3>Passende Home-Assistant-Automationen</h3>
|
||||
<p class="muted">Bei einer Übernahme pausiert SillyHome diese Automationen. Beim Stoppen können sie gezielt fortgesetzt werden.</p>
|
||||
${automationControls}
|
||||
<h3>Welche Zusammenhänge automatisch verwendet werden</h3>
|
||||
${evidence ? `<ul>${evidence}</ul>` : "<p class='warn'>Noch kein geeigneter Kontext erkannt. SillyHome prüft bei neuen HA-Daten erneut.</p>"}
|
||||
`;
|
||||
@@ -277,7 +313,41 @@ async function showActuator(actuatorId) {
|
||||
|
||||
async function evaluateActuator(actuatorId) {
|
||||
try {
|
||||
await api(`v1/actuators/${encodeURIComponent(actuatorId)}/evaluate`, {method: "POST"});
|
||||
const record = await api(
|
||||
`v1/actuators/${encodeURIComponent(actuatorId)}/evaluate`,
|
||||
{method: "POST"},
|
||||
);
|
||||
const checkedAt = new Date(
|
||||
record.behavior.last_evaluated_at || Date.now(),
|
||||
).toLocaleString("de-DE");
|
||||
const message = record.behavior.prediction
|
||||
? `Prüfung ${checkedAt}: ${record.behavior.prediction.target_state} mit ${Math.round(record.behavior.prediction.confidence * 100)} % vorhergesagt.`
|
||||
: `Prüfung ${checkedAt}: Kein frischer passender Sensorwechsel erkannt; aktuell ist keine Aktion fällig.`;
|
||||
await loadConfiguredActuators();
|
||||
await showActuator(actuatorId, message);
|
||||
} catch (error) {
|
||||
alert(error.message);
|
||||
}
|
||||
}
|
||||
|
||||
async function setActivation(actuatorId, active, pauseMatchingAutomations, restorePausedAutomations) {
|
||||
const question = active
|
||||
? pauseMatchingAutomations
|
||||
? `${actuatorId}: SillyHome aktivieren und passende HA-Automationen pausieren?`
|
||||
: `${actuatorId}: SillyHome parallel zu den HA-Automationen aktivieren?`
|
||||
: restorePausedAutomations
|
||||
? `${actuatorId}: SillyHome stoppen und pausierte HA-Automationen fortsetzen?`
|
||||
: `${actuatorId}: SillyHome stoppen und HA-Automationen pausiert lassen?`;
|
||||
if (!confirm(question)) return;
|
||||
try {
|
||||
await api(`v1/actuators/${encodeURIComponent(actuatorId)}/activation`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
active,
|
||||
pause_matching_automations: pauseMatchingAutomations,
|
||||
restore_paused_automations: restorePausedAutomations,
|
||||
}),
|
||||
});
|
||||
await loadConfiguredActuators();
|
||||
await showActuator(actuatorId);
|
||||
} catch (error) {
|
||||
@@ -285,15 +355,16 @@ async function evaluateActuator(actuatorId) {
|
||||
}
|
||||
}
|
||||
|
||||
async function setActivation(actuatorId, active) {
|
||||
const question = active
|
||||
? `${actuatorId} wirklich für autonomes Lernen und Schalten freigeben?`
|
||||
: `${actuatorId} wieder in den Shadow-Modus setzen?`;
|
||||
if (!confirm(question)) return;
|
||||
async function setRelatedAutomation(actuatorId, automationEntityId, enabled) {
|
||||
const action = enabled ? "fortsetzen" : "pausieren";
|
||||
if (!confirm(`${automationEntityId} wirklich ${action}?`)) return;
|
||||
try {
|
||||
await api(`v1/actuators/${encodeURIComponent(actuatorId)}/activation`, {
|
||||
await api(`v1/actuators/${encodeURIComponent(actuatorId)}/related-automations/control`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({active}),
|
||||
body: JSON.stringify({
|
||||
automation_entity_id: automationEntityId,
|
||||
enabled,
|
||||
}),
|
||||
});
|
||||
await loadConfiguredActuators();
|
||||
await showActuator(actuatorId);
|
||||
|
||||
73
docs/BEHAVIOR_ENGINE.md
Normal file
73
docs/BEHAVIOR_ENGINE.md
Normal file
@@ -0,0 +1,73 @@
|
||||
# Verhaltensmodell und Berechnung
|
||||
|
||||
## Datenfluss
|
||||
|
||||
1. Nutzer wählt einen Aktor.
|
||||
2. `ActuatorReconciliationService` ordnet Kontext-Entities zu.
|
||||
3. `BehaviorEngine.train()` liest Aktor- und Kontexthistorie.
|
||||
4. Aktor-Zustandswechsel werden als `BehaviorPattern` gespeichert.
|
||||
5. `BehaviorEngine.evaluate()` vergleicht aktuelle Zustände mit den Mustern.
|
||||
6. Shadow zeigt nur die Vorhersage. Active darf sie ausführen.
|
||||
|
||||
## Herkunft und Gewicht
|
||||
|
||||
- HA-Benutzer: `source=user`, Gewicht `1.0`
|
||||
- eindeutig erkannte HA-Automation oder Script: `source=automation`, Gewicht `1.0`
|
||||
- physisch oder unbekannt: `source=physical_or_unknown`, Gewicht `0.7`
|
||||
- eigene SillyHome-Ausführung: wird verworfen
|
||||
|
||||
Manuelle und eindeutig automatisierte Handlungen zählen für die Freigabe.
|
||||
|
||||
## Kausale Muster
|
||||
|
||||
Wechselt ein Kontextsensor höchstens drei Sekunden vor der Aktorhandlung, wird
|
||||
der Wechsel gespeichert:
|
||||
|
||||
```text
|
||||
binary_sensor.tuer: off -> on
|
||||
light.raum: off -> on
|
||||
```
|
||||
|
||||
Eine kausale Vorhersage gilt nur, wenn derselbe Kontextzustand frisch ist. Das
|
||||
Standardfenster ist zweimal `SILLYHOME_PREDICTION_INTERVAL_SECONDS`.
|
||||
|
||||
## Nicht-kausale Bewertung
|
||||
|
||||
Für Muster ohne frischen Trigger:
|
||||
|
||||
```text
|
||||
score = weight * (
|
||||
0.45 * time_score
|
||||
+ 0.45 * context_score
|
||||
+ 0.10 * weekday_score
|
||||
)
|
||||
```
|
||||
|
||||
Die Confidence ist der mittlere Score, begrenzt durch die Mindestunterstützung:
|
||||
|
||||
```text
|
||||
confidence = mean(scores) * min(1, support / min_behavior_actions)
|
||||
```
|
||||
|
||||
## Ausführungsbedingungen
|
||||
|
||||
Eine Vorhersage wird nur ausgeführt, wenn alle Bedingungen erfüllt sind:
|
||||
|
||||
- Betriebsart `active`
|
||||
- Confidence mindestens `SILLYHOME_PREDICTION_CONFIDENCE`
|
||||
- Zielzustand ist noch nicht erreicht
|
||||
- Domain und Zustand sind erlaubt
|
||||
- Cooldown erlaubt die Aktion
|
||||
|
||||
Der Cooldown sperrt nur eine schnelle Wiederholung desselben Zielzustands.
|
||||
Eine Gegenaktion, beispielsweise `on` gefolgt von `off`, bleibt sofort erlaubt.
|
||||
|
||||
## Freigabe
|
||||
|
||||
`activation_ready=true`, wenn:
|
||||
|
||||
- Verhaltensstatus `trained`
|
||||
- mindestens `SILLYHOME_MIN_BEHAVIOR_ACTIONS` eindeutig zugeordnete manuelle
|
||||
oder automatisierte Handlungen vorhanden sind
|
||||
|
||||
Die UI zeigt `activation_reason` immer an.
|
||||
47
docs/CONTROL_HANDOFF.md
Normal file
47
docs/CONTROL_HANDOFF.md
Normal file
@@ -0,0 +1,47 @@
|
||||
# Übergabe zwischen SillyHome und HA-Automationen
|
||||
|
||||
## Erkennung
|
||||
|
||||
SillyHome liest aktive `automation.*`-Entities, lädt deren Konfiguration über
|
||||
die Home-Assistant-API und sucht darin nach der exakten Aktor-Entity-ID.
|
||||
Namensähnlichkeit allein reicht nicht.
|
||||
|
||||
## Betriebsarten
|
||||
|
||||
### Shadow
|
||||
|
||||
- SillyHome lernt und prognostiziert.
|
||||
- SillyHome schaltet nicht.
|
||||
- HA-Automationen können normal weiterlaufen.
|
||||
|
||||
### Active parallel
|
||||
|
||||
- SillyHome darf schalten.
|
||||
- Passende HA-Automationen bleiben aktiv.
|
||||
- Diese Betriebsart kann doppelte Auslöser verursachen und ist nur für Tests.
|
||||
|
||||
### Active mit Übernahme
|
||||
|
||||
- SillyHome wird zuerst aktiviert.
|
||||
- Danach werden aktuell aktive, passend erkannte HA-Automationen pausiert.
|
||||
- Nur erfolgreich pausierte Automationen werden für eine spätere
|
||||
Wiederherstellung gespeichert.
|
||||
- Scheitert die Pause, fällt SillyHome auf Shadow zurück und stellt bereits
|
||||
pausierte Automationen wieder her.
|
||||
|
||||
## Stoppen
|
||||
|
||||
Zwei bewusste Optionen:
|
||||
|
||||
- SillyHome stoppen und pausierte HA-Automationen fortsetzen.
|
||||
- SillyHome stoppen und HA-Automationen pausiert lassen.
|
||||
|
||||
Einzelne passende Automationen können im Dashboard jederzeit pausiert oder
|
||||
fortgesetzt werden.
|
||||
|
||||
In Home Assistant bedeutet:
|
||||
|
||||
```text
|
||||
automation.turn_off = pausieren/deaktivieren
|
||||
automation.turn_on = fortsetzen/aktivieren
|
||||
```
|
||||
63
docs/DEBUGGING.md
Normal file
63
docs/DEBUGGING.md
Normal file
@@ -0,0 +1,63 @@
|
||||
# Debugging
|
||||
|
||||
## Vorhersage korrekt, aber keine Ausführung
|
||||
|
||||
1. Aktor-Details öffnen.
|
||||
2. `Betriebsart` prüfen.
|
||||
3. `Freigabestatus` prüfen.
|
||||
4. Text hinter der Vorhersage lesen. `execution_reason` nennt exakt:
|
||||
- Shadow-Modus
|
||||
- Confidence unter Schaltschwelle
|
||||
- Zielzustand bereits erreicht
|
||||
- Cooldown aktiv
|
||||
- ausgeführt
|
||||
5. Live-Zustand des Aktors und Triggers in HA prüfen.
|
||||
6. Add-on-Logs prüfen.
|
||||
|
||||
## Weder SillyHome noch HA-Automation schaltet
|
||||
|
||||
1. SillyHome-Modus prüfen.
|
||||
2. Unter `Passende Home-Assistant-Automationen` den Zustand prüfen.
|
||||
3. Bei Shadow mindestens eine gewünschte HA-Automation fortsetzen.
|
||||
4. Bei Active mit Übernahme müssen die passenden HA-Automationen pausiert sein.
|
||||
|
||||
## Freigabe fehlt
|
||||
|
||||
Die UI zeigt den Grund immer als `activation_reason`.
|
||||
|
||||
Prüfen:
|
||||
|
||||
```text
|
||||
behavior.status
|
||||
behavior.sample_count
|
||||
behavior.high_confidence_sample_count
|
||||
behavior.activation_ready
|
||||
behavior.activation_reason
|
||||
```
|
||||
|
||||
## Entität fehlt in der Liste
|
||||
|
||||
Den vollständigen Entitätsnamen direkt eingeben. Der Server akzeptiert nur
|
||||
existierende, unterstützte Aktoren. Ein unbekannter Name liefert `404`.
|
||||
|
||||
## Standarddiagnose lokal
|
||||
|
||||
```bash
|
||||
.venv/bin/pytest tests/behavior/test_engine.py -q
|
||||
.venv/bin/pytest tests/api/test_actuators.py -q
|
||||
.venv/bin/ruff check app tests
|
||||
.venv/bin/mypy app backend tests
|
||||
```
|
||||
|
||||
## Standarddiagnose im HA-Add-on
|
||||
|
||||
```bash
|
||||
ha apps info 58adbe1e_sillyhome_next
|
||||
ha apps logs 58adbe1e_sillyhome_next
|
||||
```
|
||||
|
||||
Health aus einem Add-on mit Zugriff auf das interne Netz:
|
||||
|
||||
```bash
|
||||
wget -qO- http://58adbe1e-sillyhome-next:8000/health
|
||||
```
|
||||
87
docs/OPERATIONS.md
Normal file
87
docs/OPERATIONS.md
Normal file
@@ -0,0 +1,87 @@
|
||||
# Entwicklung, Release und Betrieb
|
||||
|
||||
## Lokales Setup
|
||||
|
||||
```bash
|
||||
python3 -m venv .venv
|
||||
.venv/bin/pip install -e '.[dev]'
|
||||
cp .env.example .env
|
||||
.venv/bin/uvicorn app.main:app --reload
|
||||
```
|
||||
|
||||
`SILLYHOME_HA_URL` und `SILLYHOME_HA_TOKEN` nur lokal in `.env` setzen.
|
||||
|
||||
## Qualitätsprüfung
|
||||
|
||||
```bash
|
||||
.venv/bin/pytest -q
|
||||
.venv/bin/ruff check .
|
||||
.venv/bin/mypy app backend tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
## Release
|
||||
|
||||
1. Version in allen vier Stellen ändern:
|
||||
`pyproject.toml`, `addon/config.yaml`, `app/main.py`, `CHANGELOG.md`.
|
||||
2. Qualitätsprüfung ausführen.
|
||||
3. Feature-Branch committen und pushen.
|
||||
4. Pull Request nach `main` erstellen und mergen.
|
||||
5. Annotiertes Tag auf dem Merge-Commit erstellen.
|
||||
6. Gitea-Release aus demselben Tag erstellen.
|
||||
|
||||
Beispiel:
|
||||
|
||||
```bash
|
||||
git tag -a v0.7.0 -m 'SillyHome Next 0.7.0'
|
||||
git push origin v0.7.0
|
||||
```
|
||||
|
||||
## Home-Assistant-Update
|
||||
|
||||
Vorher Teil-Backup des Add-ons erstellen. Danach:
|
||||
|
||||
```bash
|
||||
ha store reload
|
||||
ha apps info 58adbe1e_sillyhome_next
|
||||
ha apps update 58adbe1e_sillyhome_next
|
||||
ha apps info 58adbe1e_sillyhome_next
|
||||
ha apps logs 58adbe1e_sillyhome_next
|
||||
```
|
||||
|
||||
Kein Home-Assistant-Neustart ist erforderlich.
|
||||
|
||||
## Live-Verifikation
|
||||
|
||||
Pflicht:
|
||||
|
||||
```bash
|
||||
wget -qO- http://58adbe1e-sillyhome-next:8000/health
|
||||
wget -qO- http://58adbe1e-sillyhome-next:8000/v1/actuators
|
||||
```
|
||||
|
||||
Für einen Aktor prüfen:
|
||||
|
||||
- `behavior.mode`
|
||||
- `behavior.activation_ready`
|
||||
- `behavior.activation_reason`
|
||||
- `behavior.related_automations`
|
||||
- `behavior.paused_automation_entity_ids`
|
||||
- `behavior.prediction.execution_reason`
|
||||
|
||||
Bei einer Übernahme testen:
|
||||
|
||||
1. Passende HA-Automation ist vorher `on`.
|
||||
2. SillyHome übernimmt.
|
||||
3. SillyHome ist `active`.
|
||||
4. Passende HA-Automation ist `off`.
|
||||
5. Trigger erzeugt erwartete Aktoraktion.
|
||||
6. Gegenaktion wird trotz Cooldown ausgeführt.
|
||||
7. SillyHome stoppen und Automationen fortsetzen.
|
||||
8. SillyHome ist `shadow`, HA-Automation wieder `on`.
|
||||
|
||||
## Rollback
|
||||
|
||||
Bevorzugt das vor dem Update erstellte HA-Teil-Backup wiederherstellen.
|
||||
Alternativ vorherige Git-Version in `addon/config.yaml` veröffentlichen und das
|
||||
Add-on erneut aktualisieren.
|
||||
@@ -205,12 +205,44 @@ Shadow-Modus wird niemals geschaltet.
|
||||
### `POST /v1/actuators/{actuator_entity_id}/activation`
|
||||
|
||||
```json
|
||||
{"active": true}
|
||||
{
|
||||
"active": true,
|
||||
"pause_matching_automations": true,
|
||||
"restore_paused_automations": false
|
||||
}
|
||||
```
|
||||
|
||||
Aktiviert autonomes Schalten erst nach ausreichendem Training und nur für
|
||||
erlaubte Aktor-Domains. Mit `false` wird der Aktor sofort wieder in den
|
||||
Shadow-Modus versetzt.
|
||||
erlaubte Aktor-Domains. `pause_matching_automations` pausiert eindeutig
|
||||
zugeordnete HA-Automationen bei der Übernahme.
|
||||
|
||||
Beim Stoppen:
|
||||
|
||||
```json
|
||||
{
|
||||
"active": false,
|
||||
"pause_matching_automations": false,
|
||||
"restore_paused_automations": true
|
||||
}
|
||||
```
|
||||
|
||||
Damit wird der Aktor in den Shadow-Modus versetzt und zuvor von SillyHome
|
||||
pausierte Automationen werden fortgesetzt.
|
||||
|
||||
### `POST /v1/actuators/{actuator_entity_id}/related-automations/refresh`
|
||||
|
||||
Liest passende HA-Automationen anhand ihrer echten Konfiguration neu ein.
|
||||
|
||||
### `POST /v1/actuators/{actuator_entity_id}/related-automations/control`
|
||||
|
||||
```json
|
||||
{
|
||||
"automation_entity_id": "automation.licht_abstellkammer",
|
||||
"enabled": false
|
||||
}
|
||||
```
|
||||
|
||||
Pausiert oder aktiviert eine eindeutig diesem Aktor zugeordnete Automation.
|
||||
|
||||
## Betrieb
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@ Für jeden Aktor lädt SillyHome Next:
|
||||
- automatisch zugeordnete Mess- und Kontext-Entities
|
||||
- deren Zustand zum Zeitpunkt der Handlung
|
||||
|
||||
Eindeutig einem Home-Assistant-Benutzer zugeordnete Handlungen erhalten das
|
||||
höchste Gewicht. Erkannte Automations- und Script-Aktionen werden verworfen.
|
||||
Physische oder nicht eindeutig zuordenbare Bedienungen dürfen das
|
||||
Shadow-Modell ergänzen, reichen allein aber nicht zur Aktivierung.
|
||||
Eindeutig einem Home-Assistant-Benutzer zugeordnete Handlungen und im Logbuch
|
||||
erkannte Automations- oder Script-Aktionen erhalten das höchste Gewicht.
|
||||
Physische oder nicht eindeutig zuordenbare Bedienungen dürfen das Shadow-Modell
|
||||
ergänzen, reichen allein aber nicht zur Aktivierung.
|
||||
|
||||
## Modell
|
||||
|
||||
@@ -36,8 +36,8 @@ Kontext. Mehrere passende historische Handlungen erhöhen die Confidence.
|
||||
2. `shadow`: Modell ist trainiert; Vorhersagen werden angezeigt, aber nicht ausgeführt.
|
||||
3. `active`: Nutzer hat den Aktor ausdrücklich freigegeben.
|
||||
|
||||
Die Aktivierung verlangt genügend eindeutig einem Benutzer zugeordnete
|
||||
Handlungen. Ausgeführt werden nur erlaubte Zustände reversibler Domains:
|
||||
Die Aktivierung verlangt genügend eindeutig zugeordnete manuelle oder
|
||||
automatisierte Handlungen. Ausgeführt werden nur erlaubte Zustände reversibler Domains:
|
||||
`light`, `switch`, `fan`, `humidifier` und `cover`.
|
||||
|
||||
## Schutzmechanismen
|
||||
@@ -48,4 +48,4 @@ Handlungen. Ausgeführt werden nur erlaubte Zustände reversibler Domains:
|
||||
- keine Ausführung bei bereits erreichtem Zielzustand
|
||||
- keine Ausführung unbekannter Zustände oder riskanter Domains
|
||||
- eigene Schaltungen werden beim nächsten Training herausgefiltert
|
||||
- bekannte Automation-/Script-Aktionen werden nicht als Nutzerverhalten gelernt
|
||||
- Automation-/Script-Aktionen zählen nur bei eindeutiger Herkunft im HA-Logbuch
|
||||
|
||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "sillyhome-next"
|
||||
version = "0.5.1"
|
||||
version = "0.7.0"
|
||||
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
||||
requires-python = ">=3.11"
|
||||
dependencies = [
|
||||
|
||||
@@ -5,6 +5,7 @@ from pathlib import Path
|
||||
|
||||
from app.actuators.lifecycle import ActuatorReconciliationService
|
||||
from app.actuators.models import (
|
||||
AssignmentSource,
|
||||
LifecycleStatus,
|
||||
ManualOverride,
|
||||
model_id_for_actuator,
|
||||
@@ -141,7 +142,7 @@ def test_reconciliation_auto_assigns_and_trains_numeric_model(tmp_path: Path) ->
|
||||
assert "binary_sensor.abstellkammer_motion" not in artifact.supported_sensors
|
||||
|
||||
|
||||
def test_reconciliation_uses_best_automatic_mapping_when_ambiguous(tmp_path: Path) -> None:
|
||||
def test_reconciliation_rejects_ambiguous_numeric_mapping(tmp_path: Path) -> None:
|
||||
start = datetime(2026, 6, 1, tzinfo=timezone.utc)
|
||||
entities = [
|
||||
HaEntitySummary(
|
||||
@@ -181,8 +182,62 @@ def test_reconciliation_uses_best_automatic_mapping_when_ambiguous(tmp_path: Pat
|
||||
record = service.configure_actuator("switch.garage_pump")
|
||||
|
||||
assert record.assignment.review_required is True
|
||||
assert record.assignment.selected_numeric_entity_id == "sensor.garage_energy"
|
||||
assert record.lifecycle.status is LifecycleStatus.TRAINED
|
||||
assert record.assignment.selected_numeric_entity_id is None
|
||||
assert record.lifecycle.status is LifecycleStatus.ARCHIVED
|
||||
|
||||
|
||||
def test_reconciliation_does_not_cross_assign_other_room_light_energy(
|
||||
tmp_path: Path,
|
||||
) -> None:
|
||||
start = datetime(2026, 6, 1, tzinfo=timezone.utc)
|
||||
entities = [
|
||||
HaEntitySummary(
|
||||
entity_id=(
|
||||
"light.lichtschalter_abstellraum_"
|
||||
"lichtschalter_abstellraum_s1"
|
||||
),
|
||||
domain="light",
|
||||
friendly_name="Licht Abstellraum",
|
||||
),
|
||||
HaEntitySummary(
|
||||
entity_id="sensor.licht_badezimmer_energy",
|
||||
domain="sensor",
|
||||
device_class="energy",
|
||||
state_class="total_increasing",
|
||||
unit_of_measurement="kWh",
|
||||
friendly_name="Lichtschalter_Badezimmer Licht Badezimmer energy",
|
||||
),
|
||||
HaEntitySummary(
|
||||
entity_id="binary_sensor.abstellraum_ture",
|
||||
domain="binary_sensor",
|
||||
device_class="door",
|
||||
friendly_name="Abstellraum Türe",
|
||||
),
|
||||
HaEntitySummary(
|
||||
entity_id="binary_sensor.briefkasten_open",
|
||||
domain="binary_sensor",
|
||||
device_class="opening",
|
||||
friendly_name="Briefkasten open",
|
||||
),
|
||||
]
|
||||
service = _service(
|
||||
tmp_path,
|
||||
entities,
|
||||
{"sensor.licht_badezimmer_energy": _points(8, start, 1.0)},
|
||||
)
|
||||
|
||||
record = service.configure_actuator(
|
||||
"light.lichtschalter_abstellraum_lichtschalter_abstellraum_s1"
|
||||
)
|
||||
|
||||
assert record.assignment.selected_numeric_entity_id is None
|
||||
assert record.assignment.selected_context_entity_ids == [
|
||||
"binary_sensor.abstellraum_ture"
|
||||
]
|
||||
assert record.assignment.source is AssignmentSource.AUTOMATIC
|
||||
assert record.assignment.confidence == 1.0
|
||||
assert record.assignment.review_required is False
|
||||
assert record.lifecycle.status is LifecycleStatus.ARCHIVED
|
||||
|
||||
|
||||
def test_legacy_manual_override_is_cleared_and_automatic_mapping_wins(tmp_path: Path) -> None:
|
||||
|
||||
@@ -17,7 +17,7 @@ from app.ha.history import (
|
||||
NumericHistoryPoint,
|
||||
StateHistorySeries,
|
||||
)
|
||||
from app.ha.models import HaEntitySummary
|
||||
from app.ha.models import HaAutomationSummary, HaEntitySummary
|
||||
from app.ha.reader import HaReader
|
||||
from app.main import app
|
||||
from app.ml.registry.model_registry import ModelRegistry
|
||||
@@ -84,6 +84,12 @@ class FakeHaReader(HaReader):
|
||||
) -> list[object]:
|
||||
return []
|
||||
|
||||
def find_automations_for_entity(
|
||||
self,
|
||||
entity_id: str,
|
||||
) -> list[HaAutomationSummary]:
|
||||
return []
|
||||
|
||||
|
||||
def _install_service(tmp_path: Path) -> None:
|
||||
entities = [
|
||||
|
||||
@@ -76,6 +76,7 @@ def test_entities_returns_reader_data() -> None:
|
||||
"entity_id": "sensor.temperature",
|
||||
"domain": "sensor",
|
||||
"state": None,
|
||||
"last_changed": None,
|
||||
"state_class": None,
|
||||
"device_class": None,
|
||||
"unit_of_measurement": None,
|
||||
|
||||
@@ -5,7 +5,13 @@ from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from app.actuators.models import BehaviorMode, BehaviorStatus
|
||||
from app.actuators.models import (
|
||||
BehaviorMode,
|
||||
BehaviorPattern,
|
||||
BehaviorState,
|
||||
BehaviorStatus,
|
||||
ExecutionEvent,
|
||||
)
|
||||
from app.actuators.store import ActuatorStore
|
||||
from app.behavior.engine import BehaviorEngine, predict_behavior, service_for_state
|
||||
from app.config import Settings
|
||||
@@ -14,7 +20,7 @@ from app.ha.history import (
|
||||
StateHistoryPoint,
|
||||
StateHistorySeries,
|
||||
)
|
||||
from app.ha.models import HaEntitySummary
|
||||
from app.ha.models import HaAutomationSummary, HaEntitySummary
|
||||
from app.ha.reader import HaReader
|
||||
|
||||
|
||||
@@ -30,6 +36,7 @@ class FakeBehaviorReader(HaReader):
|
||||
self.history = history
|
||||
self.logbook = logbook
|
||||
self.service_calls: list[tuple[str, str, dict[str, object]]] = []
|
||||
self.automations: list[HaAutomationSummary] = []
|
||||
|
||||
def read_entities(self) -> list[HaEntitySummary]:
|
||||
return list(self.entities)
|
||||
@@ -59,6 +66,12 @@ class FakeBehaviorReader(HaReader):
|
||||
self.service_calls.append((domain, service, service_data))
|
||||
return []
|
||||
|
||||
def find_automations_for_entity(
|
||||
self,
|
||||
entity_id: str,
|
||||
) -> list[HaAutomationSummary]:
|
||||
return list(self.automations)
|
||||
|
||||
|
||||
def _settings(tmp_path: Path) -> Settings:
|
||||
return Settings(
|
||||
@@ -161,8 +174,8 @@ def test_engine_trains_predicts_in_shadow_and_executes_only_after_approval(
|
||||
shadow = engine.evaluate("light.office")
|
||||
|
||||
assert trained.behavior.status is BehaviorStatus.TRAINED
|
||||
assert trained.behavior.sample_count == 3
|
||||
assert trained.behavior.high_confidence_sample_count == 3
|
||||
assert trained.behavior.sample_count == 6
|
||||
assert trained.behavior.high_confidence_sample_count == 6
|
||||
assert shadow.behavior.mode is BehaviorMode.SHADOW
|
||||
assert shadow.behavior.prediction is not None
|
||||
assert shadow.behavior.prediction.target_state == "on"
|
||||
@@ -179,14 +192,121 @@ def test_engine_trains_predicts_in_shadow_and_executes_only_after_approval(
|
||||
]
|
||||
|
||||
|
||||
def test_engine_excludes_known_automation_actions(tmp_path: Path) -> None:
|
||||
def test_engine_counts_known_automation_actions_like_manual_actions(
|
||||
tmp_path: Path,
|
||||
) -> None:
|
||||
now = datetime.now(timezone.utc).replace(second=0, microsecond=0)
|
||||
engine, _ = _engine(tmp_path, now)
|
||||
|
||||
trained = engine.train("light.office")
|
||||
|
||||
assert {pattern.target_state for pattern in trained.behavior.patterns} == {"on"}
|
||||
assert {pattern.source for pattern in trained.behavior.patterns} == {"user"}
|
||||
assert {pattern.target_state for pattern in trained.behavior.patterns} == {
|
||||
"on",
|
||||
"off",
|
||||
}
|
||||
assert {pattern.source for pattern in trained.behavior.patterns} == {
|
||||
"user",
|
||||
"automation",
|
||||
}
|
||||
assert trained.behavior.high_confidence_sample_count == 6
|
||||
assert {pattern.weight for pattern in trained.behavior.patterns} == {1.0}
|
||||
|
||||
|
||||
def test_engine_learns_causal_automation_with_activation_credit(
|
||||
tmp_path: Path,
|
||||
) -> None:
|
||||
now = datetime.now(timezone.utc).replace(second=0, microsecond=0)
|
||||
actuator_points: list[StateHistoryPoint] = []
|
||||
door_points: list[StateHistoryPoint] = []
|
||||
logbook: list[LogbookEntry] = []
|
||||
for days_ago in (3, 2, 1):
|
||||
action_at = now - timedelta(days=days_ago)
|
||||
actuator_points.extend(
|
||||
[
|
||||
StateHistoryPoint(
|
||||
timestamp=action_at - timedelta(minutes=1),
|
||||
state="off",
|
||||
),
|
||||
StateHistoryPoint(timestamp=action_at, state="on"),
|
||||
]
|
||||
)
|
||||
door_points.extend(
|
||||
[
|
||||
StateHistoryPoint(
|
||||
timestamp=action_at - timedelta(minutes=1),
|
||||
state="off",
|
||||
),
|
||||
StateHistoryPoint(
|
||||
timestamp=action_at - timedelta(seconds=1),
|
||||
state="on",
|
||||
),
|
||||
]
|
||||
)
|
||||
logbook.append(
|
||||
LogbookEntry(
|
||||
entity_id="light.storage",
|
||||
timestamp=action_at,
|
||||
message="turned on",
|
||||
context_domain="automation",
|
||||
context_service="trigger",
|
||||
)
|
||||
)
|
||||
actuator_points.sort(key=lambda point: point.timestamp)
|
||||
door_points.sort(key=lambda point: point.timestamp)
|
||||
settings = _settings(tmp_path)
|
||||
store = ActuatorStore(settings.actuator_store)
|
||||
record = store.configure("light.storage")
|
||||
store.upsert(
|
||||
record.model_copy(
|
||||
update={
|
||||
"assignment": record.assignment.model_copy(
|
||||
update={
|
||||
"selected_context_entity_ids": [
|
||||
"binary_sensor.storage_door"
|
||||
],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
)
|
||||
reader = FakeBehaviorReader(
|
||||
entities=[],
|
||||
history=[
|
||||
StateHistorySeries(
|
||||
entity_id="light.storage",
|
||||
points=actuator_points,
|
||||
),
|
||||
StateHistorySeries(
|
||||
entity_id="binary_sensor.storage_door",
|
||||
points=door_points,
|
||||
),
|
||||
],
|
||||
logbook=logbook,
|
||||
)
|
||||
engine = BehaviorEngine(ha_reader=reader, store=store, settings=settings)
|
||||
|
||||
trained = engine.train("light.storage")
|
||||
automation_patterns = [
|
||||
pattern
|
||||
for pattern in trained.behavior.patterns
|
||||
if pattern.source == "automation"
|
||||
]
|
||||
|
||||
assert len(automation_patterns) == 3
|
||||
assert trained.behavior.high_confidence_sample_count == 3
|
||||
assert {pattern.weight for pattern in automation_patterns} == {1.0}
|
||||
assert {
|
||||
(
|
||||
pattern.trigger_entity_id,
|
||||
pattern.trigger_from_state,
|
||||
pattern.trigger_to_state,
|
||||
)
|
||||
for pattern in automation_patterns
|
||||
} == {("binary_sensor.storage_door", "off", "on")}
|
||||
|
||||
active = engine.set_active("light.storage", active=True)
|
||||
|
||||
assert active.behavior.mode is BehaviorMode.ACTIVE
|
||||
|
||||
|
||||
def test_active_mode_rejects_unsafe_domains(tmp_path: Path) -> None:
|
||||
@@ -209,7 +329,7 @@ def test_active_mode_rejects_unsafe_domains(tmp_path: Path) -> None:
|
||||
engine.set_active("lock.front_door", active=True)
|
||||
|
||||
|
||||
def test_active_mode_requires_user_attributed_actions(tmp_path: Path) -> None:
|
||||
def test_active_mode_requires_trusted_manual_or_automation_actions(tmp_path: Path) -> None:
|
||||
settings = _settings(tmp_path)
|
||||
store = ActuatorStore(settings.actuator_store)
|
||||
record = store.configure("light.office")
|
||||
@@ -229,10 +349,91 @@ def test_active_mode_requires_user_attributed_actions(tmp_path: Path) -> None:
|
||||
reader = FakeBehaviorReader(entities=[], history=[], logbook=[])
|
||||
engine = BehaviorEngine(ha_reader=reader, store=store, settings=settings)
|
||||
|
||||
with pytest.raises(ValueError, match="eindeutig dir zugeordnete"):
|
||||
with pytest.raises(ValueError, match="Freigabe"):
|
||||
engine.set_active("light.office", active=True)
|
||||
|
||||
|
||||
def test_control_handoff_pauses_and_restores_matching_automation(
|
||||
tmp_path: Path,
|
||||
) -> None:
|
||||
settings = _settings(tmp_path)
|
||||
store = ActuatorStore(settings.actuator_store)
|
||||
record = store.configure("light.storage")
|
||||
store.upsert(
|
||||
record.model_copy(
|
||||
update={
|
||||
"behavior": record.behavior.model_copy(
|
||||
update={
|
||||
"status": BehaviorStatus.TRAINED,
|
||||
"sample_count": 3,
|
||||
"high_confidence_sample_count": 3,
|
||||
"activation_ready": True,
|
||||
"activation_reason": "Freigabe bereit.",
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
)
|
||||
reader = FakeBehaviorReader(entities=[], history=[], logbook=[])
|
||||
reader.automations = [
|
||||
HaAutomationSummary(
|
||||
entity_id="automation.storage_light",
|
||||
config_id="123",
|
||||
friendly_name="Storage light",
|
||||
enabled=True,
|
||||
)
|
||||
]
|
||||
engine = BehaviorEngine(ha_reader=reader, store=store, settings=settings)
|
||||
|
||||
active = engine.set_active(
|
||||
"light.storage",
|
||||
active=True,
|
||||
pause_matching_automations=True,
|
||||
)
|
||||
shadow = engine.set_active(
|
||||
"light.storage",
|
||||
active=False,
|
||||
restore_paused_automations=True,
|
||||
)
|
||||
|
||||
assert active.behavior.mode is BehaviorMode.ACTIVE
|
||||
assert active.behavior.paused_automation_entity_ids == [
|
||||
"automation.storage_light"
|
||||
]
|
||||
assert shadow.behavior.mode is BehaviorMode.SHADOW
|
||||
assert shadow.behavior.paused_automation_entity_ids == []
|
||||
assert reader.service_calls == [
|
||||
(
|
||||
"automation",
|
||||
"turn_off",
|
||||
{"entity_id": "automation.storage_light"},
|
||||
),
|
||||
(
|
||||
"automation",
|
||||
"turn_on",
|
||||
{"entity_id": "automation.storage_light"},
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
def test_cooldown_allows_opposite_follow_up_action(tmp_path: Path) -> None:
|
||||
settings = _settings(tmp_path)
|
||||
store = ActuatorStore(settings.actuator_store)
|
||||
reader = FakeBehaviorReader(entities=[], history=[], logbook=[])
|
||||
engine = BehaviorEngine(ha_reader=reader, store=store, settings=settings)
|
||||
now = datetime.now(timezone.utc)
|
||||
behavior = BehaviorState(
|
||||
mode=BehaviorMode.ACTIVE,
|
||||
last_executed_at=now - timedelta(seconds=5),
|
||||
execution_events=[
|
||||
ExecutionEvent(target_state="on", executed_at=now - timedelta(seconds=5))
|
||||
],
|
||||
)
|
||||
|
||||
assert engine._cooldown_elapsed(behavior, now, "off") is True
|
||||
assert engine._cooldown_elapsed(behavior, now, "on") is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("domain", "state", "service"),
|
||||
[
|
||||
@@ -259,3 +460,66 @@ def test_prediction_requires_temporal_support() -> None:
|
||||
min_support=3,
|
||||
window_minutes=30,
|
||||
) is None
|
||||
|
||||
|
||||
def test_prediction_uses_fresh_causal_context_transition_outside_time_window() -> None:
|
||||
now = datetime.now(timezone.utc).replace(second=0, microsecond=0)
|
||||
patterns = [
|
||||
BehaviorPattern(
|
||||
target_state="on",
|
||||
minute_of_day=60,
|
||||
weekday=0,
|
||||
context_states={"binary_sensor.storage_door": "on"},
|
||||
trigger_entity_id="binary_sensor.storage_door",
|
||||
trigger_from_state="off",
|
||||
trigger_to_state="on",
|
||||
source="automation",
|
||||
weight=0.7,
|
||||
observed_at=now - timedelta(days=days_ago),
|
||||
)
|
||||
for days_ago in (3, 2, 1)
|
||||
]
|
||||
|
||||
prediction = predict_behavior(
|
||||
patterns,
|
||||
current_context={"binary_sensor.storage_door": "on"},
|
||||
current_context_changed_at={
|
||||
"binary_sensor.storage_door": now - timedelta(seconds=10)
|
||||
},
|
||||
now=now,
|
||||
min_support=3,
|
||||
window_minutes=30,
|
||||
)
|
||||
|
||||
assert prediction is not None
|
||||
assert prediction.target_state == "on"
|
||||
assert prediction.matching_patterns == 3
|
||||
assert prediction.confidence == 0.7
|
||||
assert "frischen Sensorwechsel" in prediction.reason
|
||||
|
||||
|
||||
def test_prediction_ignores_stale_causal_context_state() -> None:
|
||||
now = datetime.now(timezone.utc).replace(second=0, microsecond=0)
|
||||
pattern = BehaviorPattern(
|
||||
target_state="on",
|
||||
minute_of_day=60,
|
||||
weekday=0,
|
||||
context_states={"binary_sensor.storage_door": "on"},
|
||||
trigger_entity_id="binary_sensor.storage_door",
|
||||
trigger_from_state="off",
|
||||
trigger_to_state="on",
|
||||
source="automation",
|
||||
weight=0.7,
|
||||
observed_at=now - timedelta(days=1),
|
||||
)
|
||||
|
||||
assert predict_behavior(
|
||||
[pattern],
|
||||
current_context={"binary_sensor.storage_door": "on"},
|
||||
current_context_changed_at={
|
||||
"binary_sensor.storage_door": now - timedelta(minutes=5)
|
||||
},
|
||||
now=now,
|
||||
min_support=1,
|
||||
window_minutes=30,
|
||||
) is None
|
||||
|
||||
@@ -15,6 +15,7 @@ class FakeHaClient(HaClient):
|
||||
{
|
||||
"entity_id": "sensor.temperature",
|
||||
"state": "21.5",
|
||||
"last_changed": "2026-06-14T12:00:00+00:00",
|
||||
"attributes": {
|
||||
"state_class": "measurement",
|
||||
"device_class": "temperature",
|
||||
@@ -87,6 +88,7 @@ def test_ha_reader_returns_summaries() -> None:
|
||||
sensor = next(item for item in summaries if item.entity_id == "sensor.temperature")
|
||||
assert sensor.unit_of_measurement == "°C"
|
||||
assert sensor.state == "21.5"
|
||||
assert sensor.last_changed == datetime(2026, 6, 14, 12, 0, tzinfo=timezone.utc)
|
||||
assert sensor.area_name == "Kueche"
|
||||
assert sensor.device_name == "Thermometer"
|
||||
|
||||
@@ -123,3 +125,28 @@ def test_ha_reader_normalizes_state_history_and_logbook() -> None:
|
||||
|
||||
assert history[0].points[0].state == "21.5"
|
||||
assert logbook[0].context_user_id == "user-1"
|
||||
|
||||
|
||||
def test_ha_reader_finds_automation_that_targets_entity() -> None:
|
||||
client = FakeHaClient()
|
||||
client.list_entities = lambda: [ # type: ignore[method-assign]
|
||||
{
|
||||
"entity_id": "automation.storage_light",
|
||||
"state": "on",
|
||||
"attributes": {
|
||||
"id": "123",
|
||||
"friendly_name": "Storage light",
|
||||
},
|
||||
}
|
||||
]
|
||||
client.get_automation_config = lambda automation_id: { # type: ignore[method-assign]
|
||||
"id": automation_id,
|
||||
"target": {"entity_id": "light.storage"},
|
||||
}
|
||||
reader = HaReader(client)
|
||||
|
||||
matches = reader.find_automations_for_entity("light.storage")
|
||||
|
||||
assert len(matches) == 1
|
||||
assert matches[0].entity_id == "automation.storage_light"
|
||||
assert matches[0].enabled is True
|
||||
|
||||
@@ -8,3 +8,11 @@ def test_addon_does_not_expose_internal_learning_parameters() -> None:
|
||||
assert "\nschema:" not in config
|
||||
assert "prediction_confidence" not in config
|
||||
assert "execution_cooldown_seconds" not in config
|
||||
|
||||
|
||||
def test_addon_version_invalidates_application_build_layer() -> None:
|
||||
dockerfile = Path("addon/Dockerfile").read_text(encoding="utf-8")
|
||||
|
||||
config_copy = dockerfile.index("COPY config.yaml /tmp/addon-config.yaml")
|
||||
repository_clone = dockerfile.index("git clone --depth 1 --branch main")
|
||||
assert config_copy < repository_clone
|
||||
|
||||
@@ -11,8 +11,19 @@ def test_dashboard_is_served_at_root() -> None:
|
||||
assert "SillyHome Next" in response.text
|
||||
assert "So gehst du vor" in response.text
|
||||
assert "Gerät zum Lernen auswählen" in response.text
|
||||
assert "Entitätsname oder Gerät aus Home Assistant" in response.text
|
||||
assert "Wie gewohnt bedienen" in response.text
|
||||
assert "Ohne deine spätere Freigabe wird nichts geschaltet" in response.text
|
||||
assert "Du wählst keine Sensoren und erstellst keine Regeln" in response.text
|
||||
assert "Freigabestatus" in response.text
|
||||
assert "SillyHome übernehmen lassen" in response.text
|
||||
assert "Passende Home-Assistant-Automationen" in response.text
|
||||
assert "Pausieren" in response.text
|
||||
assert "Davon erkannte HA-Automationen" in response.text
|
||||
assert "Aktuelle Situation auswerten" in response.text
|
||||
assert "Die Prüfung simuliert keinen Sensorwechsel" in response.text
|
||||
assert "Kein frischer passender Sensorwechsel erkannt" in response.text
|
||||
assert "Vorhersage jetzt prüfen" not in response.text
|
||||
assert "record.behavior.activation_ready" in response.text
|
||||
assert "Automation-Entwurf" not in response.text
|
||||
assert "Manuelle Overrides" not in response.text
|
||||
|
||||
Reference in New Issue
Block a user