Compare commits
3 Commits
v0.2.0
...
feature/au
| Author | SHA1 | Date | |
|---|---|---|---|
| 2f7f49b8a0 | |||
| 6f9b5ea48f | |||
| 0de537572d |
@@ -1,3 +1,4 @@
|
|||||||
SILLYHOME_HA_URL=http://homeassistant.local:8123
|
SILLYHOME_HA_URL=http://homeassistant.local:8123
|
||||||
SILLYHOME_HA_TOKEN=REPLACE_ME_WITH_LONG_LIVED_TOKEN
|
SILLYHOME_HA_TOKEN=REPLACE_ME_WITH_LONG_LIVED_TOKEN
|
||||||
SILLYHOME_MODEL_STORE=.model_store
|
SILLYHOME_MODEL_STORE=.model_store
|
||||||
|
SILLYHOME_AUTOMATION_STORE=.automation_store
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
- Deterministische, nutzerverständliche Erklärungen für jede Modellvorhersage
|
||||||
|
- Persistenter Automation-Freigabeprozess mit sicherem YAML-Export
|
||||||
|
|
||||||
## 0.2.0 - 2026-06-13
|
## 0.2.0 - 2026-06-13
|
||||||
- Klassifizierte Home-Assistant-Entity-Discovery mit Lernrelevanz und Filtern
|
- Klassifizierte Home-Assistant-Entity-Discovery mit Lernrelevanz und Filtern
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
|
|||||||
PYTHONUNBUFFERED=1 \
|
PYTHONUNBUFFERED=1 \
|
||||||
PIP_NO_CACHE_DIR=1 \
|
PIP_NO_CACHE_DIR=1 \
|
||||||
SILLYHOME_MODEL_STORE=/app/data/models
|
SILLYHOME_MODEL_STORE=/app/data/models
|
||||||
|
ENV SILLYHOME_AUTOMATION_STORE=/app/data/automations
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -14,7 +15,7 @@ COPY app ./app
|
|||||||
COPY backend ./backend
|
COPY backend ./backend
|
||||||
RUN python -m pip install --upgrade pip && \
|
RUN python -m pip install --upgrade pip && \
|
||||||
python -m pip install . && \
|
python -m pip install . && \
|
||||||
mkdir -p /app/data/models && \
|
mkdir -p /app/data/models /app/data/automations && \
|
||||||
chown -R sillyhome:sillyhome /app/data
|
chown -R sillyhome:sillyhome /app/data
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ uvicorn app.main:app --reload
|
|||||||
- `http://127.0.0.1:8000/ml/health` - Registry-/Serving-Health
|
- `http://127.0.0.1:8000/ml/health` - Registry-/Serving-Health
|
||||||
- `POST http://127.0.0.1:8000/ml/retrain` - Modell-Metadaten aktualisieren
|
- `POST http://127.0.0.1:8000/ml/retrain` - Modell-Metadaten aktualisieren
|
||||||
- `POST http://127.0.0.1:8000/ml/evaluate` - MAE/RMSE/Coverage berechnen
|
- `POST http://127.0.0.1:8000/ml/evaluate` - MAE/RMSE/Coverage berechnen
|
||||||
|
- `POST http://127.0.0.1:8000/v1/automations/proposals` - sicheren Entwurf anlegen
|
||||||
|
|
||||||
Ohne vollständige HA-Konfiguration liefert `/v1/entities` bewusst `503`.
|
Ohne vollständige HA-Konfiguration liefert `/v1/entities` bewusst `503`.
|
||||||
|
|
||||||
@@ -66,6 +67,7 @@ dem Netz muss ein authentifizierender Reverse Proxy vorgeschaltet werden.
|
|||||||
- `SILLYHOME_HA_URL` – Basis-URL deiner Home-Assistant-Instanz (z. B. `http://homeassistant.local:8123`)
|
- `SILLYHOME_HA_URL` – Basis-URL deiner Home-Assistant-Instanz (z. B. `http://homeassistant.local:8123`)
|
||||||
- `SILLYHOME_HA_TOKEN` – Long-Lived Access Token eines dedizierten HA-Benutzers mit minimalen Rechten
|
- `SILLYHOME_HA_TOKEN` – Long-Lived Access Token eines dedizierten HA-Benutzers mit minimalen Rechten
|
||||||
- `SILLYHOME_MODEL_STORE` – Verzeichnis für persistierte Modell-Metadaten
|
- `SILLYHOME_MODEL_STORE` – Verzeichnis für persistierte Modell-Metadaten
|
||||||
|
- `SILLYHOME_AUTOMATION_STORE` – Verzeichnis für Automation-Entwürfe
|
||||||
|
|
||||||
Niemals Administrator-Tokens oder Passwörter eintragen. `.env` gehört nicht ins
|
Niemals Administrator-Tokens oder Passwörter eintragen. `.env` gehört nicht ins
|
||||||
Versionskontrollsystem.
|
Versionskontrollsystem.
|
||||||
|
|||||||
77
app/api/v1/automations.py
Normal file
77
app/api/v1/automations.py
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException, Request, Response, status
|
||||||
|
|
||||||
|
from app.automations.models import (
|
||||||
|
AutomationProposal,
|
||||||
|
ProposalDecision,
|
||||||
|
ProposalStatus,
|
||||||
|
)
|
||||||
|
from app.automations.store import AutomationStore
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/v1/automations", tags=["automations"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/proposals", response_model=AutomationProposal, status_code=201)
|
||||||
|
def create_proposal(payload: AutomationProposal, request: Request) -> AutomationProposal:
|
||||||
|
if payload.trigger.above is None and payload.trigger.below is None:
|
||||||
|
raise HTTPException(status_code=422, detail="Trigger benötigt above oder below.")
|
||||||
|
return _store(request).create(payload.model_copy(update={"status": ProposalStatus.DRAFT}))
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/proposals", response_model=list[AutomationProposal])
|
||||||
|
def list_proposals(request: Request) -> list[AutomationProposal]:
|
||||||
|
return _store(request).list()
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/proposals/{proposal_id}/approve", response_model=AutomationProposal)
|
||||||
|
def approve(
|
||||||
|
proposal_id: str,
|
||||||
|
payload: ProposalDecision,
|
||||||
|
request: Request,
|
||||||
|
) -> AutomationProposal:
|
||||||
|
return _decide(request, proposal_id, ProposalStatus.APPROVED, payload.expected_revision)
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/proposals/{proposal_id}/reject", response_model=AutomationProposal)
|
||||||
|
def reject(
|
||||||
|
proposal_id: str,
|
||||||
|
payload: ProposalDecision,
|
||||||
|
request: Request,
|
||||||
|
) -> AutomationProposal:
|
||||||
|
return _decide(request, proposal_id, ProposalStatus.REJECTED, payload.expected_revision)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/proposals/{proposal_id}/yaml")
|
||||||
|
def export_yaml(proposal_id: str, request: Request) -> Response:
|
||||||
|
try:
|
||||||
|
content = _store(request).export_yaml(proposal_id)
|
||||||
|
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
|
||||||
|
return Response(content=content, media_type="application/yaml")
|
||||||
|
|
||||||
|
|
||||||
|
def _decide(
|
||||||
|
request: Request,
|
||||||
|
proposal_id: str,
|
||||||
|
decision: ProposalStatus,
|
||||||
|
expected_revision: int,
|
||||||
|
) -> AutomationProposal:
|
||||||
|
try:
|
||||||
|
return _store(request).decide(proposal_id, decision, expected_revision)
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
def _store(request: Request) -> AutomationStore:
|
||||||
|
store = getattr(request.app.state, "automation_store", None)
|
||||||
|
if not isinstance(store, AutomationStore):
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||||
|
detail="Automation Store nicht initialisiert.",
|
||||||
|
)
|
||||||
|
return store
|
||||||
3
app/automations/__init__.py
Normal file
3
app/automations/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from app.automations.store import AutomationStore
|
||||||
|
|
||||||
|
__all__ = ["AutomationStore"]
|
||||||
41
app/automations/models.py
Normal file
41
app/automations/models.py
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from enum import StrEnum
|
||||||
|
from uuid import uuid4
|
||||||
|
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
|
class ProposalStatus(StrEnum):
|
||||||
|
DRAFT = "draft"
|
||||||
|
APPROVED = "approved"
|
||||||
|
REJECTED = "rejected"
|
||||||
|
|
||||||
|
|
||||||
|
class NumericStateTrigger(BaseModel):
|
||||||
|
entity_id: str = Field(pattern=r"^sensor\.[a-z0-9_]+$")
|
||||||
|
above: float | None = None
|
||||||
|
below: float | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class ServiceAction(BaseModel):
|
||||||
|
service: str = Field(pattern=r"^(light|switch|climate|fan|cover)\.[a-z0-9_]+$")
|
||||||
|
entity_id: str = Field(pattern=r"^(light|switch|climate|fan|cover)\.[a-z0-9_]+$")
|
||||||
|
data: dict[str, str | int | float | bool] = Field(default_factory=dict)
|
||||||
|
|
||||||
|
|
||||||
|
class AutomationProposal(BaseModel):
|
||||||
|
proposal_id: str = Field(default_factory=lambda: uuid4().hex)
|
||||||
|
alias: str = Field(min_length=1, max_length=120)
|
||||||
|
description: str = Field(min_length=1, max_length=500)
|
||||||
|
trigger: NumericStateTrigger
|
||||||
|
action: ServiceAction
|
||||||
|
status: ProposalStatus = ProposalStatus.DRAFT
|
||||||
|
created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
|
||||||
|
updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
|
||||||
|
revision: int = 1
|
||||||
|
|
||||||
|
|
||||||
|
class ProposalDecision(BaseModel):
|
||||||
|
expected_revision: int = Field(ge=1)
|
||||||
124
app/automations/store.py
Normal file
124
app/automations/store.py
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from pathlib import Path
|
||||||
|
from threading import RLock
|
||||||
|
|
||||||
|
from app.automations.models import AutomationProposal, ProposalStatus
|
||||||
|
|
||||||
|
|
||||||
|
class AutomationStore:
|
||||||
|
def __init__(self, root: str | Path) -> None:
|
||||||
|
self._root = Path(root).resolve()
|
||||||
|
self._root.mkdir(parents=True, exist_ok=True)
|
||||||
|
self._lock = RLock()
|
||||||
|
|
||||||
|
def create(self, proposal: AutomationProposal) -> AutomationProposal:
|
||||||
|
with self._lock:
|
||||||
|
target = self._target(proposal.proposal_id)
|
||||||
|
if target.exists():
|
||||||
|
raise ValueError("Automation-Vorschlag existiert bereits.")
|
||||||
|
self._persist(proposal)
|
||||||
|
return proposal
|
||||||
|
|
||||||
|
def list(self) -> list[AutomationProposal]:
|
||||||
|
with self._lock:
|
||||||
|
return [self._load(path) for path in sorted(self._root.glob("*.json"))]
|
||||||
|
|
||||||
|
def get(self, proposal_id: str) -> AutomationProposal:
|
||||||
|
with self._lock:
|
||||||
|
target = self._target(proposal_id)
|
||||||
|
if not target.exists():
|
||||||
|
raise KeyError("Automation-Vorschlag nicht gefunden.")
|
||||||
|
return self._load(target)
|
||||||
|
|
||||||
|
def decide(
|
||||||
|
self,
|
||||||
|
proposal_id: str,
|
||||||
|
status: ProposalStatus,
|
||||||
|
expected_revision: int,
|
||||||
|
) -> AutomationProposal:
|
||||||
|
if status is ProposalStatus.DRAFT:
|
||||||
|
raise ValueError("Entscheidung darf nicht auf draft gesetzt werden.")
|
||||||
|
with self._lock:
|
||||||
|
proposal = self.get(proposal_id)
|
||||||
|
if proposal.revision != expected_revision:
|
||||||
|
raise ValueError("Revision stimmt nicht mit dem aktuellen Vorschlag überein.")
|
||||||
|
if proposal.status is not ProposalStatus.DRAFT:
|
||||||
|
raise ValueError("Über den Vorschlag wurde bereits entschieden.")
|
||||||
|
updated = proposal.model_copy(
|
||||||
|
update={
|
||||||
|
"status": status,
|
||||||
|
"updated_at": datetime.now(timezone.utc),
|
||||||
|
"revision": proposal.revision + 1,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
self._persist(updated)
|
||||||
|
return updated
|
||||||
|
|
||||||
|
def export_yaml(self, proposal_id: str) -> str:
|
||||||
|
proposal = self.get(proposal_id)
|
||||||
|
if proposal.status is not ProposalStatus.APPROVED:
|
||||||
|
raise ValueError("Nur freigegebene Vorschläge dürfen exportiert werden.")
|
||||||
|
trigger_lines = [
|
||||||
|
"trigger:",
|
||||||
|
" - platform: numeric_state",
|
||||||
|
f" entity_id: {proposal.trigger.entity_id}",
|
||||||
|
]
|
||||||
|
if proposal.trigger.above is not None:
|
||||||
|
trigger_lines.append(f" above: {proposal.trigger.above}")
|
||||||
|
if proposal.trigger.below is not None:
|
||||||
|
trigger_lines.append(f" below: {proposal.trigger.below}")
|
||||||
|
action_lines = [
|
||||||
|
"action:",
|
||||||
|
f" - service: {proposal.action.service}",
|
||||||
|
" target:",
|
||||||
|
f" entity_id: {proposal.action.entity_id}",
|
||||||
|
]
|
||||||
|
if proposal.action.data:
|
||||||
|
action_lines.append(" data:")
|
||||||
|
action_lines.extend(
|
||||||
|
f" {key}: {_yaml_scalar(value)}"
|
||||||
|
for key, value in sorted(proposal.action.data.items())
|
||||||
|
)
|
||||||
|
return "\n".join(
|
||||||
|
[
|
||||||
|
f"alias: {_yaml_scalar(proposal.alias)}",
|
||||||
|
f"description: {_yaml_scalar(proposal.description)}",
|
||||||
|
*trigger_lines,
|
||||||
|
*action_lines,
|
||||||
|
"mode: single",
|
||||||
|
"",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def _target(self, proposal_id: str) -> Path:
|
||||||
|
if len(proposal_id) != 32 or not proposal_id.isalnum():
|
||||||
|
raise ValueError("Ungültige proposal_id.")
|
||||||
|
return self._root / f"{proposal_id}.json"
|
||||||
|
|
||||||
|
def _persist(self, proposal: AutomationProposal) -> None:
|
||||||
|
target = self._target(proposal.proposal_id)
|
||||||
|
temporary = target.with_suffix(".json.tmp")
|
||||||
|
temporary.write_text(
|
||||||
|
json.dumps(proposal.model_dump(mode="json"), ensure_ascii=True, sort_keys=True) + "\n",
|
||||||
|
encoding="utf-8",
|
||||||
|
)
|
||||||
|
os.replace(temporary, target)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _load(path: Path) -> AutomationProposal:
|
||||||
|
try:
|
||||||
|
return AutomationProposal.model_validate_json(path.read_text(encoding="utf-8"))
|
||||||
|
except ValueError as exc:
|
||||||
|
raise ValueError(f"Ungültiger Automation-Vorschlag: {path.name}") from exc
|
||||||
|
|
||||||
|
|
||||||
|
def _yaml_scalar(value: str | int | float | bool) -> str:
|
||||||
|
if isinstance(value, bool):
|
||||||
|
return "true" if value else "false"
|
||||||
|
if isinstance(value, (int, float)):
|
||||||
|
return str(value)
|
||||||
|
return json.dumps(value, ensure_ascii=True)
|
||||||
@@ -9,6 +9,7 @@ class Settings:
|
|||||||
ha_url: str | None = None
|
ha_url: str | None = None
|
||||||
ha_token: str | None = None
|
ha_token: str | None = None
|
||||||
model_store: str = ".model_store"
|
model_store: str = ".model_store"
|
||||||
|
automation_store: str = ".automation_store"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ha_configured(self) -> bool:
|
def ha_configured(self) -> bool:
|
||||||
@@ -20,4 +21,5 @@ def load_settings() -> Settings:
|
|||||||
ha_url=os.getenv("SILLYHOME_HA_URL") or os.getenv("HA_URL"),
|
ha_url=os.getenv("SILLYHOME_HA_URL") or os.getenv("HA_URL"),
|
||||||
ha_token=os.getenv("SILLYHOME_HA_TOKEN") or os.getenv("HA_TOKEN"),
|
ha_token=os.getenv("SILLYHOME_HA_TOKEN") or os.getenv("HA_TOKEN"),
|
||||||
model_store=os.getenv("SILLYHOME_MODEL_STORE", ".model_store"),
|
model_store=os.getenv("SILLYHOME_MODEL_STORE", ".model_store"),
|
||||||
|
automation_store=os.getenv("SILLYHOME_AUTOMATION_STORE", ".automation_store"),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ from typing import cast
|
|||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
|
|
||||||
from app.api.v1.entities import router as entities_router
|
from app.api.v1.entities import router as entities_router
|
||||||
|
from app.api.v1.automations import router as automations_router
|
||||||
|
from app.automations.store import AutomationStore
|
||||||
from app.config import load_settings
|
from app.config import load_settings
|
||||||
from app.core.exception_handlers import register_exception_handlers
|
from app.core.exception_handlers import register_exception_handlers
|
||||||
from app.ha.client import HaClient, HaClientSettings
|
from app.ha.client import HaClient, HaClientSettings
|
||||||
@@ -18,6 +20,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
|||||||
settings = app.state.settings
|
settings = app.state.settings
|
||||||
client: HaClient | None = None
|
client: HaClient | None = None
|
||||||
app.state.registry = ModelRegistry(settings.model_store)
|
app.state.registry = ModelRegistry(settings.model_store)
|
||||||
|
app.state.automation_store = AutomationStore(settings.automation_store)
|
||||||
if hasattr(app.state, "ha_reader"):
|
if hasattr(app.state, "ha_reader"):
|
||||||
del app.state.ha_reader
|
del app.state.ha_reader
|
||||||
if settings.ha_configured:
|
if settings.ha_configured:
|
||||||
@@ -44,6 +47,7 @@ app = FastAPI(
|
|||||||
app.state.settings = load_settings()
|
app.state.settings = load_settings()
|
||||||
register_exception_handlers(app)
|
register_exception_handlers(app)
|
||||||
app.include_router(entities_router)
|
app.include_router(entities_router)
|
||||||
|
app.include_router(automations_router)
|
||||||
init_ml_routes(app, model_store=app.state.settings.model_store)
|
init_ml_routes(app, model_store=app.state.settings.model_store)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ __all__ = [
|
|||||||
"FeatureStore",
|
"FeatureStore",
|
||||||
"FeatureVector",
|
"FeatureVector",
|
||||||
"FeatureModel",
|
"FeatureModel",
|
||||||
|
"FeatureExplanation",
|
||||||
"PredictionResult",
|
"PredictionResult",
|
||||||
"Predictor",
|
"Predictor",
|
||||||
"RetrainingResult",
|
"RetrainingResult",
|
||||||
@@ -13,6 +14,7 @@ __all__ = [
|
|||||||
"retrain_model",
|
"retrain_model",
|
||||||
]
|
]
|
||||||
from app.ml.feature_store import FeatureStore, FeatureVector
|
from app.ml.feature_store import FeatureStore, FeatureVector
|
||||||
|
from app.ml.explanation import FeatureExplanation
|
||||||
from app.ml.predictor import PredictionResult, Predictor
|
from app.ml.predictor import PredictionResult, Predictor
|
||||||
from app.ml.retraining import RetrainingResult, RetrainingService, retrain_model
|
from app.ml.retraining import RetrainingResult, RetrainingService, retrain_model
|
||||||
from app.ml.training import FeatureModel, TrainedArtifact, TrainingPipeline
|
from app.ml.training import FeatureModel, TrainedArtifact, TrainingPipeline
|
||||||
|
|||||||
57
app/ml/explanation.py
Normal file
57
app/ml/explanation.py
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
from app.ml.training import FeatureModel
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class FeatureExplanation:
|
||||||
|
feature: str
|
||||||
|
current_value: float
|
||||||
|
predicted_value: float
|
||||||
|
change: float
|
||||||
|
direction: str
|
||||||
|
sample_count: int
|
||||||
|
historical_mean: float
|
||||||
|
historical_range: tuple[float, float]
|
||||||
|
standard_deviation: float
|
||||||
|
trend_per_step: float
|
||||||
|
confidence: float
|
||||||
|
summary: str
|
||||||
|
|
||||||
|
|
||||||
|
def explain_feature(
|
||||||
|
feature_name: str,
|
||||||
|
current_value: float,
|
||||||
|
predicted_value: float,
|
||||||
|
model: FeatureModel,
|
||||||
|
) -> FeatureExplanation:
|
||||||
|
change = predicted_value - current_value
|
||||||
|
direction = _direction(change)
|
||||||
|
summary = (
|
||||||
|
f"{feature_name}: {direction}; Prognose {predicted_value:.3f} "
|
||||||
|
f"aus aktuellem Wert {current_value:.3f} und Trend {model.slope:+.3f}. "
|
||||||
|
f"Basis: {model.sample_count} Messwerte, Mittelwert {model.mean:.3f}, "
|
||||||
|
f"Confidence {model.confidence:.0%}."
|
||||||
|
)
|
||||||
|
return FeatureExplanation(
|
||||||
|
feature=feature_name,
|
||||||
|
current_value=current_value,
|
||||||
|
predicted_value=predicted_value,
|
||||||
|
change=change,
|
||||||
|
direction=direction,
|
||||||
|
sample_count=model.sample_count,
|
||||||
|
historical_mean=model.mean,
|
||||||
|
historical_range=(model.minimum, model.maximum),
|
||||||
|
standard_deviation=model.standard_deviation,
|
||||||
|
trend_per_step=model.slope,
|
||||||
|
confidence=model.confidence,
|
||||||
|
summary=summary,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _direction(change: float) -> str:
|
||||||
|
if abs(change) < 1e-12:
|
||||||
|
return "stabil"
|
||||||
|
return "steigend" if change > 0 else "fallend"
|
||||||
@@ -5,6 +5,7 @@ import math
|
|||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import Sequence
|
from typing import Sequence
|
||||||
|
|
||||||
|
from app.ml.explanation import FeatureExplanation, explain_feature
|
||||||
from app.ml.feature_store import FeatureVector
|
from app.ml.feature_store import FeatureVector
|
||||||
from app.ml.registry.model_registry import ModelRegistry
|
from app.ml.registry.model_registry import ModelRegistry
|
||||||
from app.ml.training import TrainedArtifact, TrainingPipeline
|
from app.ml.training import TrainedArtifact, TrainingPipeline
|
||||||
@@ -19,6 +20,7 @@ class PredictionResult:
|
|||||||
predictions: dict[str, float]
|
predictions: dict[str, float]
|
||||||
confidence: float
|
confidence: float
|
||||||
model_type: str
|
model_type: str
|
||||||
|
explanations: dict[str, FeatureExplanation]
|
||||||
|
|
||||||
|
|
||||||
class Predictor:
|
class Predictor:
|
||||||
@@ -52,13 +54,21 @@ class Predictor:
|
|||||||
)
|
)
|
||||||
|
|
||||||
predictions: dict[str, float] = {}
|
predictions: dict[str, float] = {}
|
||||||
|
explanations: dict[str, FeatureExplanation] = {}
|
||||||
confidences: list[float] = []
|
confidences: list[float] = []
|
||||||
for feature_name in feature_names:
|
for feature_name in feature_names:
|
||||||
model = sensor_models[feature_name]
|
model = sensor_models[feature_name]
|
||||||
current_value = float(entity.values[feature_name])
|
current_value = float(entity.values[feature_name])
|
||||||
if not math.isfinite(current_value):
|
if not math.isfinite(current_value):
|
||||||
raise ValueError("Vorhersagewerte müssen endlich sein.")
|
raise ValueError("Vorhersagewerte müssen endlich sein.")
|
||||||
predictions[feature_name] = model.forecast(current_value)
|
predicted_value = model.forecast(current_value)
|
||||||
|
predictions[feature_name] = predicted_value
|
||||||
|
explanations[feature_name] = explain_feature(
|
||||||
|
feature_name,
|
||||||
|
current_value,
|
||||||
|
predicted_value,
|
||||||
|
model,
|
||||||
|
)
|
||||||
confidences.append(model.confidence)
|
confidences.append(model.confidence)
|
||||||
|
|
||||||
return PredictionResult(
|
return PredictionResult(
|
||||||
@@ -67,6 +77,7 @@ class Predictor:
|
|||||||
predictions=predictions,
|
predictions=predictions,
|
||||||
confidence=sum(confidences) / len(confidences),
|
confidence=sum(confidences) / len(confidences),
|
||||||
model_type=artifact.model_type,
|
model_type=artifact.model_type,
|
||||||
|
explanations=explanations,
|
||||||
)
|
)
|
||||||
|
|
||||||
def predict_batch(
|
def predict_batch(
|
||||||
|
|||||||
@@ -35,6 +35,22 @@ class PredictResponse(BaseModel):
|
|||||||
predictions: dict[str, float]
|
predictions: dict[str, float]
|
||||||
confidence: float
|
confidence: float
|
||||||
model_type: str
|
model_type: str
|
||||||
|
explanations: dict[str, "FeatureExplanationResponse"]
|
||||||
|
|
||||||
|
|
||||||
|
class FeatureExplanationResponse(BaseModel):
|
||||||
|
feature: str
|
||||||
|
current_value: float
|
||||||
|
predicted_value: float
|
||||||
|
change: float
|
||||||
|
direction: str
|
||||||
|
sample_count: int
|
||||||
|
historical_mean: float
|
||||||
|
historical_range: tuple[float, float]
|
||||||
|
standard_deviation: float
|
||||||
|
trend_per_step: float
|
||||||
|
confidence: float
|
||||||
|
summary: str
|
||||||
|
|
||||||
|
|
||||||
class BatchRequest(BaseModel):
|
class BatchRequest(BaseModel):
|
||||||
@@ -182,6 +198,10 @@ def predict(payload: PredictRequest, request: Request) -> PredictResponse:
|
|||||||
predictions=prediction.predictions,
|
predictions=prediction.predictions,
|
||||||
confidence=prediction.confidence,
|
confidence=prediction.confidence,
|
||||||
model_type=prediction.model_type,
|
model_type=prediction.model_type,
|
||||||
|
explanations={
|
||||||
|
name: FeatureExplanationResponse(**explanation.__dict__)
|
||||||
|
for name, explanation in prediction.explanations.items()
|
||||||
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -208,6 +228,10 @@ def predict_batch(payload: BatchRequest, request: Request) -> BatchResponse:
|
|||||||
predictions=prediction.predictions,
|
predictions=prediction.predictions,
|
||||||
confidence=prediction.confidence,
|
confidence=prediction.confidence,
|
||||||
model_type=prediction.model_type,
|
model_type=prediction.model_type,
|
||||||
|
explanations={
|
||||||
|
name: FeatureExplanationResponse(**explanation.__dict__)
|
||||||
|
for name, explanation in prediction.explanations.items()
|
||||||
|
},
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return BatchResponse(predictions=responses)
|
return BatchResponse(predictions=responses)
|
||||||
|
|||||||
@@ -8,8 +8,10 @@ services:
|
|||||||
required: false
|
required: false
|
||||||
environment:
|
environment:
|
||||||
SILLYHOME_MODEL_STORE: /app/data/models
|
SILLYHOME_MODEL_STORE: /app/data/models
|
||||||
|
SILLYHOME_AUTOMATION_STORE: /app/data/automations
|
||||||
volumes:
|
volumes:
|
||||||
- model-data:/app/data/models
|
- model-data:/app/data/models
|
||||||
|
- automation-data:/app/data/automations
|
||||||
read_only: true
|
read_only: true
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /tmp
|
- /tmp
|
||||||
@@ -21,3 +23,4 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
model-data:
|
model-data:
|
||||||
|
automation-data:
|
||||||
|
|||||||
14
docs/automations.md
Normal file
14
docs/automations.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Automation-Vorschläge
|
||||||
|
|
||||||
|
SillyHome Next führt Automationen niemals automatisch aus. Der Workflow ist:
|
||||||
|
|
||||||
|
1. Vorschlag als `draft` erstellen.
|
||||||
|
2. Inhalt und Ziel-Entity prüfen.
|
||||||
|
3. Mit aktueller Revision explizit freigeben oder ablehnen.
|
||||||
|
4. Nur freigegebene Vorschläge als Home-Assistant-YAML exportieren.
|
||||||
|
5. Das YAML außerhalb von SillyHome Next in Home Assistant importieren.
|
||||||
|
|
||||||
|
Erlaubt sind numerische Sensor-Trigger und Aktionsdienste aus den Domains
|
||||||
|
`light`, `switch`, `climate`, `fan` und `cover`. Shell-Kommandos, Skripte und
|
||||||
|
beliebige Service-Domains werden abgewiesen. Eine einmal getroffene Entscheidung
|
||||||
|
kann nicht überschrieben werden; Änderungen benötigen einen neuen Vorschlag.
|
||||||
@@ -63,10 +63,25 @@ Einzelne Vorhersage für einen Sensor.
|
|||||||
"sensor_id": "sensor.kitchen",
|
"sensor_id": "sensor.kitchen",
|
||||||
"predictions": {"temperature": 21.4},
|
"predictions": {"temperature": 21.4},
|
||||||
"confidence": 0.78,
|
"confidence": 0.78,
|
||||||
"model_type": "statistical_baseline"
|
"model_type": "statistical_baseline",
|
||||||
|
"explanations": {
|
||||||
|
"temperature": {
|
||||||
|
"direction": "steigend",
|
||||||
|
"change": 0.4,
|
||||||
|
"sample_count": 24,
|
||||||
|
"historical_mean": 20.7,
|
||||||
|
"trend_per_step": 0.4,
|
||||||
|
"summary": "temperature: steigend; Prognose ..."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Die Erklärung nennt pro Merkmal den aktuellen und prognostizierten Wert,
|
||||||
|
Richtung, Veränderung, Datenbasis, historischen Bereich, Streuung, Trend und
|
||||||
|
Confidence. Sie wird deterministisch aus den gespeicherten Modellparametern
|
||||||
|
erzeugt.
|
||||||
|
|
||||||
### `POST /ml/retrain`
|
### `POST /ml/retrain`
|
||||||
|
|
||||||
Trainiert die Artefakt-Metadaten aus neuen Sensordaten. Existiert `modelId`
|
Trainiert die Artefakt-Metadaten aus neuen Sensordaten. Existiert `modelId`
|
||||||
|
|||||||
59
tests/api/test_automations.py
Normal file
59
tests/api/test_automations.py
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from app.automations.store import AutomationStore
|
||||||
|
from app.main import app
|
||||||
|
|
||||||
|
|
||||||
|
def _payload() -> dict[str, object]:
|
||||||
|
return {
|
||||||
|
"alias": "Licht bei Dunkelheit",
|
||||||
|
"description": "Schaltet das Flurlicht unter dem Helligkeitsgrenzwert ein.",
|
||||||
|
"trigger": {"entity_id": "sensor.hall_illuminance", "below": 10},
|
||||||
|
"action": {
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"entity_id": "light.hall",
|
||||||
|
"data": {"brightness_pct": 40},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_proposal_requires_explicit_approval_before_yaml(tmp_path: Path) -> None:
|
||||||
|
with TestClient(app) as client:
|
||||||
|
app.state.automation_store = AutomationStore(tmp_path)
|
||||||
|
created = client.post("/v1/automations/proposals", json=_payload())
|
||||||
|
proposal_id = created.json()["proposal_id"]
|
||||||
|
blocked = client.get(f"/v1/automations/proposals/{proposal_id}/yaml")
|
||||||
|
approved = client.post(
|
||||||
|
f"/v1/automations/proposals/{proposal_id}/approve",
|
||||||
|
json={"expected_revision": 1},
|
||||||
|
)
|
||||||
|
exported = client.get(f"/v1/automations/proposals/{proposal_id}/yaml")
|
||||||
|
assert created.status_code == 201
|
||||||
|
assert created.json()["status"] == "draft"
|
||||||
|
assert blocked.status_code == 409
|
||||||
|
assert approved.json()["status"] == "approved"
|
||||||
|
assert "service: light.turn_on" in exported.text
|
||||||
|
|
||||||
|
|
||||||
|
def test_proposal_rejects_unsafe_service_domain(tmp_path: Path) -> None:
|
||||||
|
payload = _payload()
|
||||||
|
payload["action"] = {
|
||||||
|
"service": "shell_command.run",
|
||||||
|
"entity_id": "light.hall",
|
||||||
|
"data": {},
|
||||||
|
}
|
||||||
|
with TestClient(app) as client:
|
||||||
|
app.state.automation_store = AutomationStore(tmp_path)
|
||||||
|
response = client.post("/v1/automations/proposals", json=payload)
|
||||||
|
assert response.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
def test_proposal_requires_numeric_threshold(tmp_path: Path) -> None:
|
||||||
|
payload = _payload()
|
||||||
|
payload["trigger"] = {"entity_id": "sensor.hall_illuminance"}
|
||||||
|
with TestClient(app) as client:
|
||||||
|
app.state.automation_store = AutomationStore(tmp_path)
|
||||||
|
response = client.post("/v1/automations/proposals", json=payload)
|
||||||
|
assert response.status_code == 422
|
||||||
@@ -143,6 +143,10 @@ def test_predict_returns_numeric_forecast_and_confidence(tmp_path: Path) -> None
|
|||||||
assert response.json()["predictions"] == {"temperature": 22.0}
|
assert response.json()["predictions"] == {"temperature": 22.0}
|
||||||
assert 0.0 < response.json()["confidence"] <= 1.0
|
assert 0.0 < response.json()["confidence"] <= 1.0
|
||||||
assert response.json()["model_type"] == "statistical_baseline"
|
assert response.json()["model_type"] == "statistical_baseline"
|
||||||
|
explanation = response.json()["explanations"]["temperature"]
|
||||||
|
assert explanation["direction"] == "steigend"
|
||||||
|
assert explanation["change"] == 1.0
|
||||||
|
assert explanation["sample_count"] == 2
|
||||||
|
|
||||||
|
|
||||||
def test_evaluate_returns_real_error_metrics(tmp_path: Path) -> None:
|
def test_evaluate_returns_real_error_metrics(tmp_path: Path) -> None:
|
||||||
|
|||||||
53
tests/automations/test_store.py
Normal file
53
tests/automations/test_store.py
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from app.automations.models import (
|
||||||
|
AutomationProposal,
|
||||||
|
NumericStateTrigger,
|
||||||
|
ProposalStatus,
|
||||||
|
ServiceAction,
|
||||||
|
)
|
||||||
|
from app.automations.store import AutomationStore
|
||||||
|
|
||||||
|
|
||||||
|
def proposal() -> AutomationProposal:
|
||||||
|
return AutomationProposal(
|
||||||
|
alias="Wohnzimmer bei Kälte heizen",
|
||||||
|
description="Aktiviert den Heizmodus unter 18 Grad.",
|
||||||
|
trigger=NumericStateTrigger(entity_id="sensor.living_room_temperature", below=18.0),
|
||||||
|
action=ServiceAction(
|
||||||
|
service="climate.set_temperature",
|
||||||
|
entity_id="climate.living_room",
|
||||||
|
data={"temperature": 21.0},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_store_persists_approval_and_exports_yaml(tmp_path: Path) -> None:
|
||||||
|
store = AutomationStore(tmp_path)
|
||||||
|
created = store.create(proposal())
|
||||||
|
approved = store.decide(created.proposal_id, ProposalStatus.APPROVED, 1)
|
||||||
|
yaml = AutomationStore(tmp_path).export_yaml(created.proposal_id)
|
||||||
|
assert approved.status is ProposalStatus.APPROVED
|
||||||
|
assert approved.revision == 2
|
||||||
|
assert "platform: numeric_state" in yaml
|
||||||
|
assert "service: climate.set_temperature" in yaml
|
||||||
|
assert "temperature: 21.0" in yaml
|
||||||
|
|
||||||
|
|
||||||
|
def test_store_requires_approval_and_current_revision(tmp_path: Path) -> None:
|
||||||
|
store = AutomationStore(tmp_path)
|
||||||
|
created = store.create(proposal())
|
||||||
|
with pytest.raises(ValueError, match="freigegebene"):
|
||||||
|
store.export_yaml(created.proposal_id)
|
||||||
|
with pytest.raises(ValueError, match="Revision"):
|
||||||
|
store.decide(created.proposal_id, ProposalStatus.APPROVED, 2)
|
||||||
|
|
||||||
|
|
||||||
|
def test_store_allows_only_one_decision(tmp_path: Path) -> None:
|
||||||
|
store = AutomationStore(tmp_path)
|
||||||
|
created = store.create(proposal())
|
||||||
|
store.decide(created.proposal_id, ProposalStatus.REJECTED, 1)
|
||||||
|
with pytest.raises(ValueError, match="bereits entschieden"):
|
||||||
|
store.decide(created.proposal_id, ProposalStatus.APPROVED, 2)
|
||||||
34
tests/ml/test_explanation.py
Normal file
34
tests/ml/test_explanation.py
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from app.ml.explanation import explain_feature
|
||||||
|
from app.ml.training import FeatureModel
|
||||||
|
|
||||||
|
|
||||||
|
def _model(slope: float) -> FeatureModel:
|
||||||
|
return FeatureModel(
|
||||||
|
sample_count=4,
|
||||||
|
mean=20.0,
|
||||||
|
standard_deviation=1.0,
|
||||||
|
minimum=18.0,
|
||||||
|
maximum=22.0,
|
||||||
|
slope=slope,
|
||||||
|
intercept=18.5,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_explain_feature_describes_rising_forecast() -> None:
|
||||||
|
explanation = explain_feature("temperature", 21.0, 21.5, _model(0.5))
|
||||||
|
|
||||||
|
assert explanation.direction == "steigend"
|
||||||
|
assert explanation.change == 0.5
|
||||||
|
assert explanation.historical_range == (18.0, 22.0)
|
||||||
|
assert "4 Messwerte" in explanation.summary
|
||||||
|
assert "Trend +0.500" in explanation.summary
|
||||||
|
|
||||||
|
|
||||||
|
def test_explain_feature_describes_stable_and_falling_forecasts() -> None:
|
||||||
|
stable = explain_feature("humidity", 50.0, 50.0, _model(0.0))
|
||||||
|
falling = explain_feature("temperature", 21.0, 20.5, _model(-0.5))
|
||||||
|
|
||||||
|
assert stable.direction == "stabil"
|
||||||
|
assert falling.direction == "fallend"
|
||||||
@@ -33,6 +33,11 @@ def test_predict_returns_statistical_forecast() -> None:
|
|||||||
assert result.predictions == {"temperature": 22.0}
|
assert result.predictions == {"temperature": 22.0}
|
||||||
assert 0.0 < result.confidence <= 1.0
|
assert 0.0 < result.confidence <= 1.0
|
||||||
assert result.model_type == "statistical_baseline"
|
assert result.model_type == "statistical_baseline"
|
||||||
|
explanation = result.explanations["temperature"]
|
||||||
|
assert explanation.direction == "steigend"
|
||||||
|
assert explanation.current_value == 21.0
|
||||||
|
assert explanation.predicted_value == 22.0
|
||||||
|
assert explanation.sample_count == 2
|
||||||
|
|
||||||
|
|
||||||
def test_predict_rejects_unknown_sensor() -> None:
|
def test_predict_rejects_unknown_sensor() -> None:
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ def test_load_settings_reads_documented_environment(monkeypatch: MonkeyPatch) ->
|
|||||||
monkeypatch.setenv("SILLYHOME_HA_URL", "http://ha.local:8123")
|
monkeypatch.setenv("SILLYHOME_HA_URL", "http://ha.local:8123")
|
||||||
monkeypatch.setenv("SILLYHOME_HA_TOKEN", "secret")
|
monkeypatch.setenv("SILLYHOME_HA_TOKEN", "secret")
|
||||||
monkeypatch.setenv("SILLYHOME_MODEL_STORE", "/tmp/models")
|
monkeypatch.setenv("SILLYHOME_MODEL_STORE", "/tmp/models")
|
||||||
|
monkeypatch.setenv("SILLYHOME_AUTOMATION_STORE", "/tmp/automations")
|
||||||
|
|
||||||
settings = load_settings()
|
settings = load_settings()
|
||||||
|
|
||||||
assert settings.ha_url == "http://ha.local:8123"
|
assert settings.ha_url == "http://ha.local:8123"
|
||||||
assert settings.ha_token == "secret"
|
assert settings.ha_token == "secret"
|
||||||
assert settings.model_store == "/tmp/models"
|
assert settings.model_store == "/tmp/models"
|
||||||
|
assert settings.automation_store == "/tmp/automations"
|
||||||
assert settings.ha_configured
|
assert settings.ha_configured
|
||||||
|
|||||||
Reference in New Issue
Block a user