Compare commits
5 Commits
feature/au
...
v0.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 7ed667f954 | |||
| d6631fe752 | |||
| 9f4fc2f4ce | |||
| 5764b27bac | |||
| 9ddb86cc1a |
17
README.md
17
README.md
@@ -40,6 +40,7 @@ uvicorn app.main:app --reload
|
|||||||
```
|
```
|
||||||
|
|
||||||
4. Erreichbar unter:
|
4. Erreichbar unter:
|
||||||
|
- `http://127.0.0.1:8000/` - lokales Dashboard
|
||||||
- `http://127.0.0.1:8000/health` - Health-Check
|
- `http://127.0.0.1:8000/health` - Health-Check
|
||||||
- `http://127.0.0.1:8000/docs/` - OpenAPI-Dokumentation
|
- `http://127.0.0.1:8000/docs/` - OpenAPI-Dokumentation
|
||||||
- `http://127.0.0.1:8000/v1/entities` - Home-Assistant-Entities
|
- `http://127.0.0.1:8000/v1/entities` - Home-Assistant-Entities
|
||||||
@@ -72,6 +73,22 @@ dem Netz muss ein authentifizierender Reverse Proxy vorgeschaltet werden.
|
|||||||
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.
|
||||||
|
|
||||||
|
### Home-Assistant-Add-on
|
||||||
|
|
||||||
|
Das Repository ist zugleich ein Home-Assistant-Add-on-Repository. In Home Assistant
|
||||||
|
unter **Einstellungen → Add-ons → Add-on-Shop → Repositories** diese URL eintragen:
|
||||||
|
|
||||||
|
`http://192.168.6.31:3000/pino/sillyhome-next`
|
||||||
|
|
||||||
|
Danach **SillyHome Next** installieren und starten. Das Dashboard wird per Ingress
|
||||||
|
geöffnet. Das Add-on nutzt die Supervisor-API nur lesend; Automation-Entwürfe werden
|
||||||
|
lokal gespeichert und niemals automatisch ausgeführt.
|
||||||
|
|
||||||
|
Vor einem Update sollte in Home Assistant unter **Einstellungen → System → Backups**
|
||||||
|
eine Teil-Sicherung des Add-ons erstellt werden. Zur Wiederherstellung das gewünschte
|
||||||
|
Backup öffnen, **SillyHome Next** auswählen und wiederherstellen. Der erste produktive
|
||||||
|
Teststand `v0.3.0` wurde als HA-Backup `7df0fca0` gesichert.
|
||||||
|
|
||||||
### Tests
|
### Tests
|
||||||
```bash
|
```bash
|
||||||
pytest
|
pytest
|
||||||
|
|||||||
19
addon/Dockerfile
Normal file
19
addon/Dockerfile
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
FROM python:3.13-slim
|
||||||
|
|
||||||
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
|
PYTHONUNBUFFERED=1 \
|
||||||
|
PIP_NO_CACHE_DIR=1
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
COPY run.sh /run.sh
|
||||||
|
RUN chmod 0755 /run.sh
|
||||||
|
|
||||||
|
EXPOSE 8000
|
||||||
|
CMD ["/run.sh"]
|
||||||
23
addon/config.yaml
Normal file
23
addon/config.yaml
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
name: SillyHome Next
|
||||||
|
version: "0.3.0"
|
||||||
|
slug: sillyhome_next
|
||||||
|
description: Lokale HA-Analyse, Vorhersagen und sichere Automation-Entwürfe
|
||||||
|
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||||
|
arch:
|
||||||
|
- amd64
|
||||||
|
startup: application
|
||||||
|
boot: auto
|
||||||
|
init: false
|
||||||
|
ingress: true
|
||||||
|
ingress_port: 8000
|
||||||
|
panel_title: SillyHome Next
|
||||||
|
panel_icon: mdi:home-analytics
|
||||||
|
panel_admin: true
|
||||||
|
homeassistant_api: true
|
||||||
|
hassio_api: false
|
||||||
|
auth_api: false
|
||||||
|
options: {}
|
||||||
|
schema: {}
|
||||||
|
map:
|
||||||
|
- type: addon_config
|
||||||
|
read_only: false
|
||||||
11
addon/run.sh
Normal file
11
addon/run.sh
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
export SILLYHOME_HA_URL="${SILLYHOME_HA_URL:-http://supervisor/core}"
|
||||||
|
export SILLYHOME_HA_TOKEN="${SILLYHOME_HA_TOKEN:-${SUPERVISOR_TOKEN:-}}"
|
||||||
|
export SILLYHOME_MODEL_STORE=/data/models
|
||||||
|
export SILLYHOME_AUTOMATION_STORE=/data/automations
|
||||||
|
|
||||||
|
mkdir -p "$SILLYHOME_MODEL_STORE" "$SILLYHOME_AUTOMATION_STORE"
|
||||||
|
exec uvicorn app.main:app --app-dir /app --host 0.0.0.0 --port 8000 \
|
||||||
|
--proxy-headers --forwarded-allow-ips='*'
|
||||||
12
app/main.py
12
app/main.py
@@ -1,8 +1,11 @@
|
|||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
from collections.abc import AsyncIterator
|
from collections.abc import AsyncIterator
|
||||||
|
from pathlib import Path
|
||||||
from typing import cast
|
from typing import cast
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
|
from fastapi.responses import FileResponse
|
||||||
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
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.api.v1.automations import router as automations_router
|
||||||
@@ -41,7 +44,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
|||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
title="SillyHome Next API",
|
title="SillyHome Next API",
|
||||||
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
||||||
version="0.2.0",
|
version="0.3.0",
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
)
|
)
|
||||||
app.state.settings = load_settings()
|
app.state.settings = load_settings()
|
||||||
@@ -50,6 +53,9 @@ app.include_router(entities_router)
|
|||||||
app.include_router(automations_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)
|
||||||
|
|
||||||
|
STATIC_DIR = Path(__file__).with_name("static")
|
||||||
|
app.mount("/static", StaticFiles(directory=STATIC_DIR), name="static")
|
||||||
|
|
||||||
|
|
||||||
@app.get("/health")
|
@app.get("/health")
|
||||||
def health() -> dict[str, str]:
|
def health() -> dict[str, str]:
|
||||||
@@ -57,5 +63,5 @@ def health() -> dict[str, str]:
|
|||||||
|
|
||||||
|
|
||||||
@app.get("/")
|
@app.get("/")
|
||||||
def root() -> dict[str, str]:
|
def root() -> FileResponse:
|
||||||
return {"service": "sillyhome-next", "docs": "/docs"}
|
return FileResponse(STATIC_DIR / "index.html")
|
||||||
|
|||||||
149
app/static/index.html
Normal file
149
app/static/index.html
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||||
|
<title>SillyHome Next</title>
|
||||||
|
<style>
|
||||||
|
:root { color-scheme: dark; font-family: system-ui, sans-serif; background: #10151c; color: #eaf1f8; }
|
||||||
|
body { margin: 0; }
|
||||||
|
header { padding: 20px; background: linear-gradient(135deg,#142b3a,#193f36); }
|
||||||
|
h1,h2 { margin: 0 0 12px; }
|
||||||
|
header p { margin: 4px 0; color: #b9c9d6; }
|
||||||
|
main { display: grid; grid-template-columns: repeat(auto-fit,minmax(310px,1fr)); gap: 14px; padding: 14px; }
|
||||||
|
section { background: #18212b; border: 1px solid #2d3a47; border-radius: 12px; padding: 16px; }
|
||||||
|
.wide { grid-column: 1 / -1; }
|
||||||
|
.ok { color: #66dfa9; } .bad { color: #ff8f8f; }
|
||||||
|
label { display: block; margin: 9px 0 4px; color: #b9c9d6; }
|
||||||
|
input,select,textarea,button { box-sizing: border-box; width: 100%; border-radius: 7px; border: 1px solid #3b4b5b; padding: 9px; background: #101820; color: #fff; }
|
||||||
|
button { margin-top: 10px; background: #23715b; border: 0; font-weight: 700; cursor: pointer; }
|
||||||
|
button.secondary { background: #37495c; }
|
||||||
|
pre { white-space: pre-wrap; max-height: 310px; overflow: auto; background: #0d141b; padding: 10px; border-radius: 7px; }
|
||||||
|
table { width: 100%; border-collapse: collapse; font-size: .9rem; }
|
||||||
|
td,th { padding: 7px; border-bottom: 1px solid #2d3a47; text-align: left; }
|
||||||
|
.notice { border-left: 4px solid #e8b34b; padding-left: 10px; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<h1>SillyHome Next</h1>
|
||||||
|
<p>Lokale Home-Assistant-Analyse, Vorhersagen und kontrollierte Automation-Entwürfe.</p>
|
||||||
|
<p class="notice">Sicherheitsmodus: Entwürfe werden niemals automatisch in Home Assistant ausgeführt.</p>
|
||||||
|
</header>
|
||||||
|
<main>
|
||||||
|
<section>
|
||||||
|
<h2>Systemstatus</h2>
|
||||||
|
<div id="status">Prüfung läuft ...</div>
|
||||||
|
<button class="secondary" onclick="loadStatus()">Neu laden</button>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<h2>Entity Discovery</h2>
|
||||||
|
<label for="domain">Domain (optional)</label>
|
||||||
|
<input id="domain" placeholder="sensor">
|
||||||
|
<button onclick="discover()">HA-Entities analysieren</button>
|
||||||
|
<pre id="discovery">Noch nicht geladen.</pre>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<h2>Modell trainieren</h2>
|
||||||
|
<label for="train-model">Modell-ID</label><input id="train-model" value="home-model">
|
||||||
|
<label for="train-sensor">Sensor</label><input id="train-sensor" placeholder="sensor.temperatur">
|
||||||
|
<label for="train-feature">Merkmal</label><input id="train-feature" value="value">
|
||||||
|
<label for="train-values">Messwerte, komma-getrennt</label><input id="train-values" placeholder="19,20,21">
|
||||||
|
<button onclick="train()">Trainieren</button>
|
||||||
|
<pre id="training">Bereit.</pre>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<h2>Vorhersage</h2>
|
||||||
|
<label for="predict-model">Modell-ID</label><input id="predict-model" value="home-model">
|
||||||
|
<label for="predict-sensor">Sensor</label><input id="predict-sensor" placeholder="sensor.temperatur">
|
||||||
|
<label for="predict-feature">Merkmal</label><input id="predict-feature" value="value">
|
||||||
|
<label for="predict-value">Aktueller Wert</label><input id="predict-value" type="number" step="any">
|
||||||
|
<button onclick="predict()">Vorhersagen und erklären</button>
|
||||||
|
<pre id="prediction">Bereit.</pre>
|
||||||
|
</section>
|
||||||
|
<section class="wide">
|
||||||
|
<h2>Automation-Entwurf</h2>
|
||||||
|
<p>Der Entwurf muss explizit freigegeben werden. Auch danach wird nur YAML exportiert, nichts geschaltet.</p>
|
||||||
|
<div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(220px,1fr));gap:8px">
|
||||||
|
<div><label for="alias">Name</label><input id="alias" value="Licht bei Dunkelheit"></div>
|
||||||
|
<div><label for="trigger">Trigger-Entity</label><input id="trigger" placeholder="sensor.flur_illuminance"></div>
|
||||||
|
<div><label for="below">Unter Grenzwert</label><input id="below" type="number" value="10"></div>
|
||||||
|
<div><label for="service">Dienst</label><select id="service"><option>light.turn_on</option><option>light.turn_off</option><option>switch.turn_on</option><option>switch.turn_off</option></select></div>
|
||||||
|
<div><label for="target">Ziel-Entity</label><input id="target" placeholder="light.flur"></div>
|
||||||
|
</div>
|
||||||
|
<button onclick="createProposal()">Entwurf speichern</button>
|
||||||
|
<button class="secondary" onclick="loadProposals()">Entwürfe aktualisieren</button>
|
||||||
|
<div id="proposals"></div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
<script>
|
||||||
|
const pretty = value => JSON.stringify(value, null, 2);
|
||||||
|
async function api(path, options={}) {
|
||||||
|
const response = await fetch(path, {headers: {"Content-Type":"application/json"}, ...options});
|
||||||
|
const body = await response.json().catch(() => ({}));
|
||||||
|
if (!response.ok) throw new Error(body.detail || `${response.status} ${response.statusText}`);
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
async function loadStatus() {
|
||||||
|
const box=document.getElementById("status");
|
||||||
|
try {
|
||||||
|
const [health, ml, models]=await Promise.all([api("health"),api("ml/health"),api("ml/models")]);
|
||||||
|
box.innerHTML=`<p class="ok">API und ML bereit</p><p>Modelle: ${models.models.length}</p>`;
|
||||||
|
} catch(e) { box.innerHTML=`<p class="bad">${e.message}</p>`; }
|
||||||
|
}
|
||||||
|
async function discover() {
|
||||||
|
const out=document.getElementById("discovery"), domain=document.getElementById("domain").value.trim();
|
||||||
|
out.textContent="Lade ...";
|
||||||
|
try {
|
||||||
|
const rows=await api(`v1/discovery?learnable=true${domain?`&domain=${encodeURIComponent(domain)}`:""}`);
|
||||||
|
out.textContent=pretty({learnable_entities:rows.length, entities:rows.slice(0,100)});
|
||||||
|
} catch(e) { out.textContent=e.message; }
|
||||||
|
}
|
||||||
|
async function train() {
|
||||||
|
const out=document.getElementById("training");
|
||||||
|
try {
|
||||||
|
const values=document.getElementById("train-values").value.split(",").map(Number).filter(Number.isFinite);
|
||||||
|
if (!values.length) throw new Error("Mindestens einen Messwert eingeben.");
|
||||||
|
const sensor=document.getElementById("train-sensor").value.trim(), feature=document.getElementById("train-feature").value.trim();
|
||||||
|
const samples=values.map(value=>({sensor_id:sensor,values:{[feature]:value}}));
|
||||||
|
out.textContent=pretty(await api("ml/retrain",{method:"POST",body:JSON.stringify({modelId:document.getElementById("train-model").value,samples})}));
|
||||||
|
await loadStatus();
|
||||||
|
} catch(e) { out.textContent=e.message; }
|
||||||
|
}
|
||||||
|
async function predict() {
|
||||||
|
const out=document.getElementById("prediction");
|
||||||
|
try {
|
||||||
|
const feature=document.getElementById("predict-feature").value.trim();
|
||||||
|
out.textContent=pretty(await api("ml/predict",{method:"POST",body:JSON.stringify({
|
||||||
|
modelId:document.getElementById("predict-model").value,
|
||||||
|
sensor_id:document.getElementById("predict-sensor").value.trim(),
|
||||||
|
values:{[feature]:Number(document.getElementById("predict-value").value)}
|
||||||
|
})}));
|
||||||
|
} catch(e) { out.textContent=e.message; }
|
||||||
|
}
|
||||||
|
async function createProposal() {
|
||||||
|
try {
|
||||||
|
await api("v1/automations/proposals",{method:"POST",body:JSON.stringify({
|
||||||
|
alias:document.getElementById("alias").value,
|
||||||
|
description:"Manuell im SillyHome-Dashboard erstellter und nicht automatisch ausgeführter Entwurf.",
|
||||||
|
trigger:{entity_id:document.getElementById("trigger").value,below:Number(document.getElementById("below").value)},
|
||||||
|
action:{service:document.getElementById("service").value,entity_id:document.getElementById("target").value,data:{}}
|
||||||
|
})});
|
||||||
|
await loadProposals();
|
||||||
|
} catch(e) { alert(e.message); }
|
||||||
|
}
|
||||||
|
async function decide(id, revision, action) {
|
||||||
|
try { await api(`v1/automations/proposals/${id}/${action}`,{method:"POST",body:JSON.stringify({expected_revision:revision})}); await loadProposals(); }
|
||||||
|
catch(e) { alert(e.message); }
|
||||||
|
}
|
||||||
|
async function loadProposals() {
|
||||||
|
const box=document.getElementById("proposals");
|
||||||
|
try {
|
||||||
|
const rows=await api("v1/automations/proposals");
|
||||||
|
box.innerHTML=rows.length?`<table><tr><th>Name</th><th>Status</th><th>Aktion</th></tr>${rows.map(x=>`<tr><td>${x.alias}</td><td>${x.status}</td><td>${x.status==="draft"?`<button onclick="decide('${x.proposal_id}',${x.revision},'approve')">Freigeben</button><button class="secondary" onclick="decide('${x.proposal_id}',${x.revision},'reject')">Ablehnen</button>`:`${x.status==="approved"?`<a href="v1/automations/proposals/${x.proposal_id}/yaml">YAML laden</a>`:"-"}`}</td></tr>`).join("")}</table>`:"<p>Keine Entwürfe.</p>";
|
||||||
|
} catch(e) { box.textContent=e.message; }
|
||||||
|
}
|
||||||
|
loadStatus(); loadProposals();
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "sillyhome-next"
|
name = "sillyhome-next"
|
||||||
version = "0.2.0"
|
version = "0.3.0"
|
||||||
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
||||||
requires-python = ">=3.11"
|
requires-python = ">=3.11"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
|||||||
3
repository.yaml
Normal file
3
repository.yaml
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
name: SillyHome Next Add-ons
|
||||||
|
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||||
|
maintainer: Pino
|
||||||
12
tests/test_dashboard.py
Normal file
12
tests/test_dashboard.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
from fastapi.testclient import TestClient
|
||||||
|
|
||||||
|
from app.main import app
|
||||||
|
|
||||||
|
|
||||||
|
def test_dashboard_is_served_at_root() -> None:
|
||||||
|
with TestClient(app) as client:
|
||||||
|
response = client.get("/")
|
||||||
|
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert "SillyHome Next" in response.text
|
||||||
|
assert "Automation-Entwurf" in response.text
|
||||||
Reference in New Issue
Block a user