2 Commits

Author SHA1 Message Date
3c6fe24b03 Add production safety controls 2026-06-18 13:24:17 +02:00
01e5464ec1 Add dashboard control and learning editor 2026-06-18 13:08:58 +02:00
11 changed files with 646 additions and 22 deletions

View File

@@ -2,7 +2,7 @@ FROM python:3.13-slim
WORKDIR /app WORKDIR /app
ARG SILLYHOME_FUTURE_REF=v2.0.0-alpha.7 ARG SILLYHOME_FUTURE_REF=v2.0.0-alpha.9
RUN python -m pip install --no-cache-dir \ RUN python -m pip install --no-cache-dir \
"http://192.168.6.31:3000/Otto/sillyhome-future/archive/${SILLYHOME_FUTURE_REF}.tar.gz" "http://192.168.6.31:3000/Otto/sillyhome-future/archive/${SILLYHOME_FUTURE_REF}.tar.gz"

View File

@@ -1,5 +1,5 @@
name: SillyHome Future name: SillyHome Future
version: "2.0.0-alpha.7" version: "2.0.0-alpha.9"
slug: sillyhome_future slug: sillyhome_future
description: Event-first SillyHome v2 test controller description: Event-first SillyHome v2 test controller
url: http://192.168.6.31:3000/Otto/sillyhome-future url: http://192.168.6.31:3000/Otto/sillyhome-future

View File

@@ -27,6 +27,8 @@ class DecisionEngineV2:
blockers.append(f"Domain {domain} ist nicht fuer Active-Control freigegeben.") blockers.append(f"Domain {domain} ist nicht fuer Active-Control freigegeben.")
if control.manual_block: if control.manual_block:
blockers.append("Manuelle Sicherheitssperre ist aktiv.") blockers.append("Manuelle Sicherheitssperre ist aktiv.")
if control.stage is SafetyStage.ACTIVE and not control.active_ready:
blockers.append("Active ist noch nicht freigegeben. Erst Dry-run-Reife erreichen.")
best = None best = None
for pattern in learning.patterns: for pattern in learning.patterns:
if pattern.trigger_entity_id != trigger_entity_id: if pattern.trigger_entity_id != trigger_entity_id:
@@ -63,4 +65,3 @@ class DecisionEngineV2:
blockers=blockers, blockers=blockers,
trigger_entity_id=trigger_entity_id, trigger_entity_id=trigger_entity_id,
) )

View File

@@ -76,6 +76,17 @@ class EventCore:
learning=learning_profile, learning=learning_profile,
control=control_profile, control=control_profile,
) )
if not control.global_enabled and decision.allowed:
decision = decision.model_copy(
update={
"allowed": False,
"reason": "Globaler Not-Aus ist aktiv.",
"blockers": [*decision.blockers, "Globaler Not-Aus ist aktiv."],
}
)
if decision.dry_run:
control_profile = _record_dry_run(control_profile, decision)
control.profiles[actuator_id] = control_profile
if callable(execute) and decision.allowed and not decision.dry_run: if callable(execute) and decision.allowed and not decision.dry_run:
decision = _execute_decision(decision, execute) decision = _execute_decision(decision, execute)
audit.append( audit.append(
@@ -110,3 +121,25 @@ def _execute_decision(decision: Decision, execute: Callable[[Decision], bool]) -
} }
) )
return decision.model_copy(update={"executed": bool(result)}) return decision.model_copy(update={"executed": bool(result)})
def _record_dry_run(profile: ControlProfile, decision: Decision) -> ControlProfile:
events = profile.dry_run_events + 1
successes = profile.dry_run_successes + int(decision.allowed and not decision.blockers)
failures = profile.dry_run_failures + int(bool(decision.blockers))
success_rate = successes / events if events else 0.0
ready = events >= 5 and success_rate >= 0.8 and failures <= 1
reason = (
f"Dry-run {successes}/{events} erfolgreich."
if ready
else f"Dry-run braucht mindestens 5 Events und 80% Treffer; aktuell {successes}/{events}."
)
return profile.model_copy(
update={
"dry_run_events": events,
"dry_run_successes": successes,
"dry_run_failures": failures,
"active_ready": ready,
"active_readiness_reason": reason,
}
)

View File

@@ -67,6 +67,11 @@ class ControlProfile(BaseModel):
handoff_mode: HandoffMode = HandoffMode.SHADOW handoff_mode: HandoffMode = HandoffMode.SHADOW
related_automation_ids: list[str] = Field(default_factory=list) related_automation_ids: list[str] = Field(default_factory=list)
paused_automation_ids: list[str] = Field(default_factory=list) paused_automation_ids: list[str] = Field(default_factory=list)
dry_run_events: int = Field(default=0, ge=0)
dry_run_successes: int = Field(default=0, ge=0)
dry_run_failures: int = Field(default=0, ge=0)
active_ready: bool = False
active_readiness_reason: str = "Noch nicht bewertet."
class RoomProfile(BaseModel): class RoomProfile(BaseModel):
@@ -120,6 +125,7 @@ class LearningState(BaseModel):
class ControlState(BaseModel): class ControlState(BaseModel):
profiles: dict[str, ControlProfile] = Field(default_factory=dict) profiles: dict[str, ControlProfile] = Field(default_factory=dict)
global_enabled: bool = True
class BackupBundle(BaseModel): class BackupBundle(BaseModel):
@@ -127,4 +133,3 @@ class BackupBundle(BaseModel):
runtime: RuntimeState runtime: RuntimeState
learning: LearningState learning: LearningState
control: ControlState control: ControlState

View File

@@ -4,7 +4,7 @@ import json
import os import os
from pathlib import Path from pathlib import Path
from threading import RLock from threading import RLock
from typing import TypeVar from typing import cast, TypeVar
from pydantic import BaseModel from pydantic import BaseModel
@@ -18,13 +18,20 @@ class JsonDocumentStore:
self.root = Path(root).resolve() self.root = Path(root).resolve()
self.root.mkdir(parents=True, exist_ok=True) self.root.mkdir(parents=True, exist_ok=True)
self._lock = RLock() self._lock = RLock()
self._cache: dict[str, BaseModel] = {}
def load(self, name: str, model: type[T], default: T) -> T: def load(self, name: str, model: type[T], default: T) -> T:
path = self.root / name path = self.root / name
with self._lock: with self._lock:
cached = self._cache.get(name)
if cached is not None:
return cast(T, cached)
if not path.exists(): if not path.exists():
self._cache[name] = default
return default return default
return model.model_validate_json(path.read_text(encoding="utf-8")) value = model.model_validate_json(path.read_text(encoding="utf-8"))
self._cache[name] = value
return value
def save(self, name: str, value: T) -> T: def save(self, name: str, value: T) -> T:
path = self.root / name path = self.root / name
@@ -35,6 +42,7 @@ class JsonDocumentStore:
encoding="utf-8", encoding="utf-8",
) )
os.replace(temporary, path) os.replace(temporary, path)
self._cache[name] = value
return value return value
@@ -71,4 +79,3 @@ class FutureStores:
self.save_runtime(bundle.runtime) self.save_runtime(bundle.runtime)
self.save_learning(bundle.learning) self.save_learning(bundle.learning)
self.save_control(bundle.control) self.save_control(bundle.control)

View File

@@ -7,19 +7,24 @@ from contextlib import asynccontextmanager, suppress
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.responses import HTMLResponse from fastapi.responses import HTMLResponse
from pydantic import BaseModel, Field
from app.core.decision import DecisionEngineV2
from app.core.event_core import EventCore from app.core.event_core import EventCore
from app.core.ha_client import FutureHaClient, HaClientConfig, service_for_state from app.core.ha_client import FutureHaClient, HaClientConfig, service_for_state
from app.core.handoff import HandoffMatrix from app.core.handoff import HandoffMatrix
from app.core.models import ( from app.core.models import (
AuditEvent, AuditEvent,
BackupBundle, BackupBundle,
BehaviorPatternV2,
ControlProfile, ControlProfile,
ControlState, ControlState,
EntityState, EntityState,
HandoffMode, HandoffMode,
LearningProfile,
LearningState, LearningState,
RuntimeState, RuntimeState,
SafetyStage,
StateEvent, StateEvent,
) )
from app.core.stores import FutureStores from app.core.stores import FutureStores
@@ -30,6 +35,41 @@ handoff = HandoffMatrix()
ha_client: FutureHaClient | None = None ha_client: FutureHaClient | None = None
class ControlStageUpdate(BaseModel):
stage: SafetyStage
min_confidence: float = Field(default=0.82, ge=0.0, le=1.0)
manual_block: bool = False
cooldown_seconds: int = Field(default=900, ge=0)
class PatternCreateRequest(BaseModel):
trigger_entity_id: str
trigger_state: str | None = None
target_state: str
confidence: float = Field(default=0.9, ge=0.0, le=1.0)
support: int = Field(default=3, ge=1)
source: str = Field(default="dashboard", max_length=40)
class GlobalControlUpdate(BaseModel):
enabled: bool
class SimulationRequest(BaseModel):
actuator_entity_id: str
trigger_entity_id: str
trigger_state: str | None = None
class ActiveReadiness(BaseModel):
actuator_entity_id: str
ready: bool
reason: str
dry_run_events: int
dry_run_successes: int
dry_run_failures: int
@asynccontextmanager @asynccontextmanager
async def lifespan(app: FastAPI) -> AsyncIterator[None]: async def lifespan(app: FastAPI) -> AsyncIterator[None]:
global ha_client global ha_client
@@ -50,7 +90,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
app = FastAPI( app = FastAPI(
title="SillyHome Future API", title="SillyHome Future API",
description="SillyHome v2 event-core side project.", description="SillyHome v2 event-core side project.",
version="2.0.0-alpha.7", version="2.0.0-alpha.9",
lifespan=lifespan, lifespan=lifespan,
) )
@@ -65,6 +105,21 @@ def health() -> dict[str, str]:
} }
@app.get("/v2/health")
def detailed_health() -> dict[str, object]:
runtime = stores.runtime()
control = stores.control()
return {
"api": "ok",
"version": app.version,
"websocket": runtime.websocket_status,
"store": "ok",
"global_enabled": control.global_enabled,
"entities": len(runtime.entities),
"audit_events": len(runtime.audit),
}
@app.get("/", response_class=HTMLResponse) @app.get("/", response_class=HTMLResponse)
def dashboard() -> str: def dashboard() -> str:
return _dashboard_html() return _dashboard_html()
@@ -76,9 +131,16 @@ def dashboard_data() -> dict[str, object]:
learning = stores.learning() learning = stores.learning()
control = stores.control() control = stores.control()
latest_audit = runtime.audit[-20:] latest_audit = runtime.audit[-20:]
actuator_entities = [
entity
for entity in runtime.entities.values()
if entity.domain in {"light", "switch", "fan", "cover", "humidifier"}
]
return { return {
"websocket_status": runtime.websocket_status, "websocket_status": runtime.websocket_status,
"entity_count": len(runtime.entities), "entity_count": len(runtime.entities),
"actuator_count": len(actuator_entities),
"global_enabled": control.global_enabled,
"learning_profiles": len(learning.profiles), "learning_profiles": len(learning.profiles),
"control_profiles": len(control.profiles), "control_profiles": len(control.profiles),
"rooms": list(learning.rooms.values()), "rooms": list(learning.rooms.values()),
@@ -97,6 +159,35 @@ def get_runtime() -> RuntimeState:
return stores.runtime() return stores.runtime()
@app.get("/v2/entities", response_model=list[EntityState])
def list_entities(domain: str | None = None, q: str | None = None) -> list[EntityState]:
entities = list(stores.runtime().entities.values())
if domain:
wanted = {item.strip() for item in domain.split(",") if item.strip()}
entities = [entity for entity in entities if entity.domain in wanted]
if q:
needle = q.casefold()
entities = [
entity
for entity in entities
if needle in entity.entity_id.casefold()
or (entity.friendly_name is not None and needle in entity.friendly_name.casefold())
]
return sorted(entities, key=lambda entity: entity.entity_id)[:500]
@app.get("/v2/entities/groups")
def entity_groups() -> dict[str, list[EntityState]]:
grouped: dict[str, list[EntityState]] = {}
for entity in stores.runtime().entities.values():
key = entity.area_name or entity.domain
grouped.setdefault(key, []).append(entity)
return {
key: sorted(values, key=lambda entity: entity.entity_id)[:250]
for key, values in sorted(grouped.items())
}
@app.get("/v2/learning", response_model=LearningState) @app.get("/v2/learning", response_model=LearningState)
def get_learning() -> LearningState: def get_learning() -> LearningState:
return stores.learning() return stores.learning()
@@ -112,6 +203,18 @@ def get_control() -> ControlState:
return stores.control() return stores.control()
@app.post("/v2/control/global", response_model=ControlState)
def set_global_control(update: GlobalControlUpdate) -> ControlState:
state = stores.control().model_copy(update={"global_enabled": update.enabled})
stores.save_control(state)
_append_audit(
"safety",
None,
"Globaler Not-Aus deaktiviert." if update.enabled else "Globaler Not-Aus aktiviert.",
)
return state
@app.put("/v2/control/{actuator_entity_id}", response_model=ControlProfile) @app.put("/v2/control/{actuator_entity_id}", response_model=ControlProfile)
def put_control(actuator_entity_id: str, profile: ControlProfile) -> ControlProfile: def put_control(actuator_entity_id: str, profile: ControlProfile) -> ControlProfile:
state = stores.control() state = stores.control()
@@ -120,6 +223,135 @@ def put_control(actuator_entity_id: str, profile: ControlProfile) -> ControlProf
return profile return profile
@app.post("/v2/control/{actuator_entity_id}/stage", response_model=ControlProfile)
def update_control_stage(
actuator_entity_id: str,
update: ControlStageUpdate,
) -> ControlProfile:
state = stores.control()
profile = state.profiles.get(
actuator_entity_id,
ControlProfile(actuator_entity_id=actuator_entity_id),
)
requested_stage = update.stage
if requested_stage is SafetyStage.ACTIVE and not profile.active_ready:
requested_stage = SafetyStage.DRY_RUN
updated = profile.model_copy(
update={
"stage": requested_stage,
"min_confidence": update.min_confidence,
"manual_block": update.manual_block,
"cooldown_seconds": update.cooldown_seconds,
"handoff_mode": handoff.classify(profile),
}
)
state.profiles[actuator_entity_id] = updated
stores.save_control(state)
_append_audit(
"safety",
actuator_entity_id,
f"Stage gesetzt auf {updated.stage}."
if updated.stage == update.stage
else f"Active blockiert: {updated.active_readiness_reason}",
)
return updated
@app.get("/v2/control/{actuator_entity_id}/readiness", response_model=ActiveReadiness)
def active_readiness(actuator_entity_id: str) -> ActiveReadiness:
profile = stores.control().profiles.get(
actuator_entity_id,
ControlProfile(actuator_entity_id=actuator_entity_id),
)
return ActiveReadiness(
actuator_entity_id=actuator_entity_id,
ready=profile.active_ready,
reason=profile.active_readiness_reason,
dry_run_events=profile.dry_run_events,
dry_run_successes=profile.dry_run_successes,
dry_run_failures=profile.dry_run_failures,
)
@app.post("/v2/learning/{actuator_entity_id}/patterns", response_model=LearningProfile)
def create_learning_pattern(
actuator_entity_id: str,
pattern: PatternCreateRequest,
) -> LearningProfile:
state = stores.learning()
profile = state.profiles.get(
actuator_entity_id,
LearningProfile(actuator_entity_id=actuator_entity_id),
)
updated = profile.model_copy(
update={
"patterns": [
*profile.patterns,
BehaviorPatternV2(
actuator_entity_id=actuator_entity_id,
target_state=pattern.target_state,
trigger_entity_id=pattern.trigger_entity_id,
trigger_state=pattern.trigger_state,
support=pattern.support,
confidence=pattern.confidence,
source=pattern.source,
),
],
"model_version": "dashboard-v1",
}
)
state.profiles[actuator_entity_id] = updated
stores.save_learning(state)
return updated
@app.post("/v2/simulate")
def simulate_decision(request: SimulationRequest) -> dict[str, object]:
runtime = stores.runtime()
learning = stores.learning()
control = stores.control()
runtime.entities[request.trigger_entity_id] = EntityState(
entity_id=request.trigger_entity_id,
domain=request.trigger_entity_id.split(".", 1)[0],
state=request.trigger_state,
)
profile = learning.profiles.get(
request.actuator_entity_id,
LearningProfile(actuator_entity_id=request.actuator_entity_id),
)
control_profile = control.profiles.get(
request.actuator_entity_id,
ControlProfile(actuator_entity_id=request.actuator_entity_id),
)
decision = DecisionEngineV2().decide(
actuator_entity_id=request.actuator_entity_id,
trigger_entity_id=request.trigger_entity_id,
runtime=runtime,
learning=profile,
control=control_profile,
)
service = service_for_state(
request.actuator_entity_id.split(".", 1)[0],
decision.target_state,
)
return {
"decision": decision,
"would_call_service": service is not None and decision.allowed and not decision.dry_run,
"service": service,
}
@app.get("/v2/audit/{actuator_entity_id}", response_model=list[AuditEvent])
def actuator_audit(actuator_entity_id: str) -> list[AuditEvent]:
return [
item
for item in stores.runtime().audit
if item.entity_id == actuator_entity_id or (
item.decision is not None and item.decision.actuator_entity_id == actuator_entity_id
)
][-50:]
@app.post("/v2/handoff/{actuator_entity_id}/assume", response_model=ControlProfile) @app.post("/v2/handoff/{actuator_entity_id}/assume", response_model=ControlProfile)
def assume_control(actuator_entity_id: str) -> ControlProfile: def assume_control(actuator_entity_id: str) -> ControlProfile:
state = stores.control() state = stores.control()
@@ -259,6 +491,18 @@ def _merge_unrouted_events(events: list[StateEvent]) -> None:
stores.save_runtime(runtime) stores.save_runtime(runtime)
def _append_audit(kind: str, entity_id: str | None, message: str) -> None:
runtime = stores.runtime()
event = AuditEvent(
event_id=f"{kind}-{len(runtime.audit) + 1}",
kind=kind,
entity_id=entity_id,
message=message,
)
runtime.audit = [*runtime.audit, event][-200:]
stores.save_runtime(runtime)
def _execute_ha_decision(decision: object) -> bool: def _execute_ha_decision(decision: object) -> bool:
if ha_client is None or not hasattr(decision, "actuator_entity_id"): if ha_client is None or not hasattr(decision, "actuator_entity_id"):
return False return False
@@ -280,30 +524,159 @@ def _dashboard_html() -> str:
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>SillyHome Future</title> <title>SillyHome Future</title>
<style> <style>
body { font-family: system-ui, sans-serif; margin: 0; background: #101418; color: #eef3f6; } :root { color-scheme: dark; --bg: #101418; --panel: #171d23; --line: #2c3640; --text: #eef3f6; --muted: #9fb0bd; --accent: #42d392; --warn: #f3c969; }
main { max-width: 1080px; margin: 0 auto; padding: 24px; } * { box-sizing: border-box; }
body { font-family: system-ui, sans-serif; margin: 0; background: var(--bg); color: var(--text); }
main { max-width: 1180px; margin: 0 auto; padding: 20px; }
h1 { font-size: 28px; margin: 0 0 18px; } h1 { font-size: 28px; margin: 0 0 18px; }
.grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); gap: 12px; } h2 { font-size: 18px; margin: 24px 0 10px; }
.card { border: 1px solid #2c3640; border-radius: 8px; padding: 14px; background: #171d23; } .grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(170px, 1fr)); gap: 12px; }
.split { display: grid; grid-template-columns: minmax(260px, 1fr) minmax(320px, 1.2fr); gap: 14px; align-items: start; }
.card { border: 1px solid var(--line); border-radius: 8px; padding: 14px; background: var(--panel); }
.label { color: #9fb0bd; font-size: 13px; } .label { color: #9fb0bd; font-size: 13px; }
.value { font-size: 24px; margin-top: 4px; } .value { font-size: 24px; margin-top: 4px; }
pre { white-space: pre-wrap; word-break: break-word; background: #0c1014; padding: 14px; border-radius: 8px; } label { display: block; color: var(--muted); font-size: 13px; margin: 10px 0 5px; }
input, select, button { width: 100%; border: 1px solid var(--line); border-radius: 7px; background: #0c1014; color: var(--text); font: inherit; padding: 10px; }
button { cursor: pointer; background: #20303a; }
button:hover { border-color: var(--accent); }
.row { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; }
.stages { display: grid; grid-template-columns: repeat(4, 1fr); gap: 8px; margin-top: 8px; }
.stages button.active { border-color: var(--accent); color: var(--accent); }
.primary { background: #17402c; border-color: #256f4a; }
.status { min-height: 24px; color: var(--warn); margin-top: 10px; }
pre { max-height: 360px; overflow: auto; white-space: pre-wrap; word-break: break-word; background: #0c1014; padding: 14px; border-radius: 8px; }
@media (max-width: 800px) { .split, .row, .stages { grid-template-columns: 1fr; } }
</style> </style>
</head> </head>
<body> <body>
<main> <main>
<h1>SillyHome Future</h1> <h1>SillyHome Future</h1>
<section class="grid" id="metrics"></section> <section class="grid" id="metrics"></section>
<section class="split">
<div class="card">
<h2>Control</h2>
<label for="entitySearch">Suche</label>
<input id="entitySearch" placeholder="light., switch., sensor..." autocomplete="off">
<label for="actuator">Aktor</label>
<select id="actuator"></select>
<div class="row">
<div>
<label for="minConfidence">Min. Confidence</label>
<input id="minConfidence" type="number" min="0" max="1" step="0.01" value="0.82">
</div>
<div>
<label for="cooldown">Cooldown Sekunden</label>
<input id="cooldown" type="number" min="0" step="30" value="900">
</div>
</div>
<label><input id="manualBlock" type="checkbox" style="width:auto;margin-right:6px"> Manuell blockieren</label>
<div class="stages" id="stages"></div>
<button class="primary" id="saveControl">Control speichern</button>
<button id="globalToggle">Globaler Not-Aus</button>
<div class="status" id="readiness">Ready-Status wird geladen...</div>
<div class="status" id="controlStatus"></div>
</div>
<div class="card">
<h2>Learning Pattern</h2>
<div class="row">
<div>
<label for="trigger">Trigger</label>
<select id="trigger"></select>
</div>
<div>
<label for="triggerState">Trigger State</label>
<input id="triggerState" placeholder="on, off, open...">
</div>
</div>
<div class="row">
<div>
<label for="targetState">Zielzustand</label>
<input id="targetState" value="on">
</div>
<div>
<label for="patternConfidence">Confidence</label>
<input id="patternConfidence" type="number" min="0" max="1" step="0.01" value="0.9">
</div>
</div>
<button class="primary" id="addPattern">Pattern anlegen</button>
<button id="simulatePattern">Pattern simulieren</button>
<div class="status" id="patternStatus"></div>
<h2>Aktuelles Profil</h2>
<pre id="profile">Lade...</pre>
</div>
</section>
<h2>Audit</h2> <h2>Audit</h2>
<pre id="audit">Lade...</pre> <pre id="audit">Lade...</pre>
</main> </main>
<script> <script>
const stages = ['observe', 'dry_run', 'active', 'blocked'];
const state = { entities: [], control: {}, learning: {}, selectedStage: 'observe' };
function optionText(entity) {
const name = entity.friendly_name ? ` - ${entity.friendly_name}` : '';
const current = entity.state == null ? '' : ` (${entity.state})`;
return `${entity.entity_id}${current}${name}`;
}
function setStatus(id, text) {
document.getElementById(id).textContent = text;
if (text) setTimeout(() => document.getElementById(id).textContent = '', 4000);
}
function renderStages() {
document.getElementById('stages').innerHTML = stages.map(stage =>
`<button type="button" data-stage="${stage}" class="${stage === state.selectedStage ? 'active' : ''}">${stage}</button>`
).join('');
document.querySelectorAll('[data-stage]').forEach(button => {
button.onclick = () => { state.selectedStage = button.dataset.stage; renderStages(); };
});
}
function renderEntities() {
const actuator = document.getElementById('actuator');
const trigger = document.getElementById('trigger');
const query = document.getElementById('entitySearch').value.toLowerCase();
const shown = state.entities.filter(entity =>
!query || optionText(entity).toLowerCase().includes(query)
);
const actuators = shown.filter(entity => ['light', 'switch', 'fan', 'cover', 'humidifier'].includes(entity.domain));
actuator.innerHTML = actuators.map(entity => `<option value="${entity.entity_id}">${optionText(entity)}</option>`).join('');
trigger.innerHTML = shown.map(entity => `<option value="${entity.entity_id}">${optionText(entity)}</option>`).join('');
renderProfile();
}
function renderProfile() {
const id = document.getElementById('actuator').value;
const profile = {
control: state.control.profiles?.[id] || null,
learning: state.learning.profiles?.[id] || null,
};
if (profile.control) {
state.selectedStage = profile.control.stage;
document.getElementById('minConfidence').value = profile.control.min_confidence;
document.getElementById('cooldown').value = profile.control.cooldown_seconds;
document.getElementById('manualBlock').checked = profile.control.manual_block;
renderStages();
}
document.getElementById('profile').textContent = JSON.stringify(profile, null, 2);
}
async function loadDashboard() { async function loadDashboard() {
const response = await fetch('/v2/dashboard'); const [dashResponse, entitiesResponse, controlResponse, learningResponse] = await Promise.all([
const data = await response.json(); fetch('/v2/dashboard'),
fetch('/v2/entities?domain=light,switch,fan,cover,humidifier,binary_sensor,sensor'),
fetch('/v2/control'),
fetch('/v2/learning'),
]);
const data = await dashResponse.json();
state.entities = await entitiesResponse.json();
state.control = await controlResponse.json();
state.learning = await learningResponse.json();
const metrics = [ const metrics = [
['WebSocket', data.websocket_status], ['WebSocket', data.websocket_status],
['Entities', data.entity_count], ['Entities', data.entity_count],
['Actuators', data.actuator_count],
['Global', data.global_enabled ? 'on' : 'off'],
['Learning', data.learning_profiles], ['Learning', data.learning_profiles],
['Control', data.control_profiles], ['Control', data.control_profiles],
['Rooms', data.rooms.length], ['Rooms', data.rooms.length],
@@ -312,8 +685,78 @@ def _dashboard_html() -> str:
document.getElementById('metrics').innerHTML = metrics.map(([label, value]) => document.getElementById('metrics').innerHTML = metrics.map(([label, value]) =>
`<div class="card"><div class="label">${label}</div><div class="value">${value}</div></div>` `<div class="card"><div class="label">${label}</div><div class="value">${value}</div></div>`
).join(''); ).join('');
renderEntities();
await loadReadiness();
document.getElementById('audit').textContent = JSON.stringify(data.audit, null, 2); document.getElementById('audit').textContent = JSON.stringify(data.audit, null, 2);
} }
async function loadReadiness() {
const id = document.getElementById('actuator').value;
if (!id) return;
const response = await fetch(`/v2/control/${encodeURIComponent(id)}/readiness`);
const data = await response.json();
document.getElementById('readiness').textContent =
`${data.ready ? 'ready for active' : 'nicht active-ready'} - ${data.reason}`;
}
document.getElementById('entitySearch').oninput = renderEntities;
document.getElementById('actuator').onchange = () => { renderProfile(); loadReadiness(); };
document.getElementById('saveControl').onclick = async () => {
const id = document.getElementById('actuator').value;
const response = await fetch(`/v2/control/${encodeURIComponent(id)}/stage`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
stage: state.selectedStage,
min_confidence: Number(document.getElementById('minConfidence').value),
manual_block: document.getElementById('manualBlock').checked,
cooldown_seconds: Number(document.getElementById('cooldown').value),
}),
});
if (!response.ok) throw new Error(await response.text());
setStatus('controlStatus', 'Gespeichert');
await loadDashboard();
await loadReadiness();
};
document.getElementById('addPattern').onclick = async () => {
const id = document.getElementById('actuator').value;
const response = await fetch(`/v2/learning/${encodeURIComponent(id)}/patterns`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
trigger_entity_id: document.getElementById('trigger').value,
trigger_state: document.getElementById('triggerState').value || null,
target_state: document.getElementById('targetState').value,
confidence: Number(document.getElementById('patternConfidence').value),
}),
});
if (!response.ok) throw new Error(await response.text());
setStatus('patternStatus', 'Pattern angelegt');
await loadDashboard();
};
document.getElementById('simulatePattern').onclick = async () => {
const id = document.getElementById('actuator').value;
const response = await fetch('/v2/simulate', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
actuator_entity_id: id,
trigger_entity_id: document.getElementById('trigger').value,
trigger_state: document.getElementById('triggerState').value || null,
}),
});
document.getElementById('profile').textContent = JSON.stringify(await response.json(), null, 2);
};
document.getElementById('globalToggle').onclick = async () => {
const dash = await (await fetch('/v2/dashboard')).json();
await fetch('/v2/control/global', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: !dash.global_enabled }),
});
await loadDashboard();
};
renderStages();
loadDashboard(); loadDashboard();
setInterval(loadDashboard, 5000); setInterval(loadDashboard, 5000);
</script> </script>

View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "sillyhome-future" name = "sillyhome-future"
version = "2.0.0-alpha.7" version = "2.0.0-alpha.9"
description = "SillyHome v2 event-core prototype" description = "SillyHome v2 event-core prototype"
requires-python = ">=3.11" requires-python = ">=3.11"
dependencies = [ dependencies = [

View File

@@ -9,7 +9,7 @@ def test_addon_config_declares_future_addon() -> None:
config = yaml.safe_load(Path("addon/config.yaml").read_text(encoding="utf-8")) config = yaml.safe_load(Path("addon/config.yaml").read_text(encoding="utf-8"))
assert config["slug"] == "sillyhome_future" assert config["slug"] == "sillyhome_future"
assert config["version"] == "2.0.0-alpha.7" assert config["version"] == "2.0.0-alpha.9"
assert config["ingress"] is True assert config["ingress"] is True
assert config["ingress_port"] == 8099 assert config["ingress_port"] == 8099
assert config["homeassistant_api"] is True assert config["homeassistant_api"] is True

View File

@@ -2,20 +2,99 @@ from __future__ import annotations
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from app.main import app, stores import app.main as main
from app.core.event_core import EventCore
from app.core.models import EntityState, RuntimeState
from app.core.stores import FutureStores
def test_health_and_backup_roundtrip(tmp_path, monkeypatch) -> None: # type: ignore[no-untyped-def] def test_health_and_backup_roundtrip(tmp_path, monkeypatch) -> None: # type: ignore[no-untyped-def]
monkeypatch.setenv("SILLYHOME_FUTURE_STORE", str(tmp_path)) test_stores = FutureStores(tmp_path)
client = TestClient(app) monkeypatch.setattr(main, "stores", test_stores)
monkeypatch.setattr(main, "event_core", EventCore(test_stores))
client = TestClient(main.app)
health = client.get("/health") health = client.get("/health")
backup = client.get("/v2/backup/export") backup = client.get("/v2/backup/export")
restore = client.post("/v2/backup/restore", json=backup.json()) restore = client.post("/v2/backup/restore", json=backup.json())
assert stores is not None
assert health.status_code == 200 assert health.status_code == 200
assert health.json()["version"] == "2.0.0-alpha.7" assert health.json()["version"] == "2.0.0-alpha.9"
assert backup.status_code == 200 assert backup.status_code == 200
assert restore.status_code == 200 assert restore.status_code == 200
assert restore.json() == {"status": "restored"} assert restore.json() == {"status": "restored"}
def test_dashboard_control_and_learning_endpoints(tmp_path, monkeypatch) -> None: # type: ignore[no-untyped-def]
test_stores = FutureStores(tmp_path)
test_stores.save_runtime(
RuntimeState(
entities={
"light.storage": EntityState(
entity_id="light.storage",
domain="light",
state="off",
),
"binary_sensor.storage_door": EntityState(
entity_id="binary_sensor.storage_door",
domain="binary_sensor",
state="off",
),
}
)
)
monkeypatch.setattr(main, "stores", test_stores)
monkeypatch.setattr(main, "event_core", EventCore(test_stores))
client = TestClient(main.app)
entities = client.get("/v2/entities?domain=light,binary_sensor")
control = client.post(
"/v2/control/light.storage/stage",
json={
"stage": "dry_run",
"min_confidence": 0.75,
"manual_block": False,
"cooldown_seconds": 120,
},
)
learning = client.post(
"/v2/learning/light.storage/patterns",
json={
"trigger_entity_id": "binary_sensor.storage_door",
"trigger_state": "on",
"target_state": "on",
"confidence": 0.91,
},
)
simulation = client.post(
"/v2/simulate",
json={
"actuator_entity_id": "light.storage",
"trigger_entity_id": "binary_sensor.storage_door",
"trigger_state": "on",
},
)
readiness = client.get("/v2/control/light.storage/readiness")
global_control = client.post("/v2/control/global", json={"enabled": False})
detailed_health = client.get("/v2/health")
dashboard = client.get("/v2/dashboard")
assert entities.status_code == 200
assert [item["entity_id"] for item in entities.json()] == [
"binary_sensor.storage_door",
"light.storage",
]
assert control.status_code == 200
assert control.json()["stage"] == "dry_run"
assert learning.status_code == 200
assert learning.json()["patterns"][0]["trigger_entity_id"] == "binary_sensor.storage_door"
assert simulation.status_code == 200
assert simulation.json()["decision"]["target_state"] == "on"
assert readiness.status_code == 200
assert readiness.json()["ready"] is False
assert global_control.status_code == 200
assert global_control.json()["global_enabled"] is False
assert detailed_health.status_code == 200
assert detailed_health.json()["global_enabled"] is False
assert dashboard.status_code == 200
assert dashboard.json()["actuator_count"] == 1

View File

@@ -134,6 +134,7 @@ def test_event_core_executes_allowed_active_decision(tmp_path: Path) -> None:
actuator_entity_id="light.storage", actuator_entity_id="light.storage",
stage=SafetyStage.ACTIVE, stage=SafetyStage.ACTIVE,
min_confidence=0.8, min_confidence=0.8,
active_ready=True,
) )
} }
} }
@@ -153,3 +154,58 @@ def test_event_core_executes_allowed_active_decision(tmp_path: Path) -> None:
decision = [item.decision for item in audit if item.decision is not None][0] decision = [item.decision for item in audit if item.decision is not None][0]
assert calls == ["light.storage"] assert calls == ["light.storage"]
assert decision.executed is True assert decision.executed is True
def test_active_requires_dry_run_readiness(tmp_path: Path) -> None:
stores = FutureStores(tmp_path)
stores.save_runtime(
RuntimeState(
entities={
"light.storage": EntityState(
entity_id="light.storage",
domain="light",
state="off",
)
}
)
)
stores.save_learning(
LearningState(
profiles={
"light.storage": LearningProfile(
actuator_entity_id="light.storage",
patterns=[
BehaviorPatternV2(
actuator_entity_id="light.storage",
target_state="on",
trigger_entity_id="binary_sensor.storage_door",
trigger_state="on",
support=3,
confidence=0.95,
)
],
)
}
)
)
stores.save_control(
stores.control().model_copy(
update={
"profiles": {
"light.storage": ControlProfile(
actuator_entity_id="light.storage",
stage=SafetyStage.ACTIVE,
min_confidence=0.8,
)
}
}
)
)
audit = EventCore(stores).process_state_event(
StateEvent(entity_id="binary_sensor.storage_door", new_state="on")
)
decision = [item.decision for item in audit if item.decision is not None][0]
assert decision.allowed is False
assert "Active ist noch nicht freigegeben" in decision.blockers[0]