Compare commits
3 Commits
feature/v1
...
v1.0.2
| Author | SHA1 | Date | |
|---|---|---|---|
| 63b8684197 | |||
| f8801e469a | |||
| 787516ac67 |
17
CHANGELOG.md
17
CHANGELOG.md
@@ -1,5 +1,22 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 1.0.2 - 2026-06-17
|
||||||
|
- v1.0-Abnahme als `docs/V1_0_ACCEPTANCE.md` dokumentiert: erledigte,
|
||||||
|
teilweise erledigte und offene v1.0.x-Punkte sind getrennt sichtbar.
|
||||||
|
- Dashboard-Startstatistik erweitert: Freigabebereitschaft, Aktiv/Shadow,
|
||||||
|
Gelernt/Wartet und gelernte Handlungen werden direkt im Startbereich
|
||||||
|
zusammengefasst.
|
||||||
|
|
||||||
|
## 1.0.1 - 2026-06-17
|
||||||
|
- Dashboard-UI nach v1-Korrektur neu strukturiert: feste Steuerungsleiste,
|
||||||
|
separate Geräteübersicht, klare Freigabe-/Detailfläche und Statusbereich.
|
||||||
|
- Orange bleibt Primärfarbe; Cyan ist die sichtbare Komplementärfarbe. Rote
|
||||||
|
Aktions- und Fehlerflächen wurden aus der Oberfläche entfernt.
|
||||||
|
- Startpfad weiter beschleunigt: Dashboard lädt nur noch lokale Startdaten.
|
||||||
|
HA-Discovery, Vorschläge und Automation-Refresh laufen erst nach Nutzeraktion.
|
||||||
|
- Detailansicht öffnet ohne automatische Automation-Discovery. Passende
|
||||||
|
Automationen können gezielt per Button neu gesucht werden.
|
||||||
|
|
||||||
## 1.0.0 - 2026-06-17
|
## 1.0.0 - 2026-06-17
|
||||||
- Neuer blockweiser Dashboard-Start über `/v1/actuators/dashboard`: lokale
|
- Neuer blockweiser Dashboard-Start über `/v1/actuators/dashboard`: lokale
|
||||||
Store-/Cache-Daten laden sofort, HA-Discovery und Vorschläge laufen
|
Store-/Cache-Daten laden sofort, HA-Discovery und Vorschläge laufen
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ nach einer ausdrücklichen Freigabe ausführen.
|
|||||||
[`docs/OPERATIONS.md`](docs/OPERATIONS.md)
|
[`docs/OPERATIONS.md`](docs/OPERATIONS.md)
|
||||||
- Version 1.0.0 bedienen und prüfen:
|
- Version 1.0.0 bedienen und prüfen:
|
||||||
[`docs/V1_0_0_OPERATING_GUIDE.md`](docs/V1_0_0_OPERATING_GUIDE.md)
|
[`docs/V1_0_0_OPERATING_GUIDE.md`](docs/V1_0_0_OPERATING_GUIDE.md)
|
||||||
|
- Version 1.0.x Abnahme und offene Punkte:
|
||||||
|
[`docs/V1_0_ACCEPTANCE.md`](docs/V1_0_ACCEPTANCE.md)
|
||||||
- Arbeitsregeln für Coding-Agenten: [`AGENTS.md`](AGENTS.md)
|
- Arbeitsregeln für Coding-Agenten: [`AGENTS.md`](AGENTS.md)
|
||||||
|
|
||||||
## Reifegrad
|
## Reifegrad
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
name: SillyHome Next
|
name: SillyHome Next
|
||||||
version: "1.0.0"
|
version: "1.0.2"
|
||||||
slug: sillyhome_next
|
slug: sillyhome_next
|
||||||
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
||||||
url: http://192.168.6.31:3000/pino/sillyhome-next
|
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||||
|
|||||||
@@ -208,7 +208,11 @@ def context_options(
|
|||||||
|
|
||||||
@router.get("/summary", response_model=list[ActuatorSummary])
|
@router.get("/summary", response_model=list[ActuatorSummary])
|
||||||
def list_configured_summary(request: Request) -> list[ActuatorSummary]:
|
def list_configured_summary(request: Request) -> list[ActuatorSummary]:
|
||||||
entity_map = {entity.entity_id: entity for entity in _load_cached_entities(request)}
|
records = _service(request).list_configured()
|
||||||
|
entity_map = _load_cached_entity_map(
|
||||||
|
request,
|
||||||
|
{record.actuator_entity_id for record in records},
|
||||||
|
)
|
||||||
return [
|
return [
|
||||||
ActuatorSummary(
|
ActuatorSummary(
|
||||||
actuator_entity_id=record.actuator_entity_id,
|
actuator_entity_id=record.actuator_entity_id,
|
||||||
@@ -247,7 +251,7 @@ def list_configured_summary(request: Request) -> list[ActuatorSummary]:
|
|||||||
),
|
),
|
||||||
updated_at=record.updated_at.isoformat(),
|
updated_at=record.updated_at.isoformat(),
|
||||||
)
|
)
|
||||||
for record in _service(request).list_configured()
|
for record in records
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -259,16 +263,12 @@ def dashboard_overview(request: Request) -> DashboardOverview:
|
|||||||
raw_entities = []
|
raw_entities = []
|
||||||
raw_updated_at = cache_payload.get("updated_at")
|
raw_updated_at = cache_payload.get("updated_at")
|
||||||
updated_at = raw_updated_at if isinstance(raw_updated_at, str) else None
|
updated_at = raw_updated_at if isinstance(raw_updated_at, str) else None
|
||||||
cached_entities = [
|
raw_groups = cache_payload.get("discovery_groups", [])
|
||||||
HaEntitySummary.model_validate(entity)
|
cached_groups = [
|
||||||
for entity in raw_entities
|
DashboardDiscoveryGroup.model_validate(group)
|
||||||
if isinstance(entity, dict)
|
for group in raw_groups
|
||||||
]
|
if isinstance(group, dict)
|
||||||
discovered = discover_entities(cached_entities) if cached_entities else []
|
] if isinstance(raw_groups, list) else []
|
||||||
group_counts: dict[tuple[str, str], int] = {}
|
|
||||||
for entity in discovered:
|
|
||||||
key = (entity.category, entity.role.value)
|
|
||||||
group_counts[key] = group_counts.get(key, 0) + 1
|
|
||||||
reconciliation = _reconciliation_state_or_default(request)
|
reconciliation = _reconciliation_state_or_default(request)
|
||||||
ws_status = getattr(request.app.state, "ws_status", None)
|
ws_status = getattr(request.app.state, "ws_status", None)
|
||||||
actuators = list_configured_summary(request)
|
actuators = list_configured_summary(request)
|
||||||
@@ -286,15 +286,12 @@ def dashboard_overview(request: Request) -> DashboardOverview:
|
|||||||
review_required=reconciliation.review_required,
|
review_required=reconciliation.review_required,
|
||||||
),
|
),
|
||||||
cache=EntityCacheStatus(
|
cache=EntityCacheStatus(
|
||||||
available=bool(cached_entities),
|
available=bool(raw_entities),
|
||||||
updated_at=updated_at,
|
updated_at=updated_at,
|
||||||
entity_count=len(cached_entities),
|
entity_count=len(raw_entities),
|
||||||
),
|
),
|
||||||
actuators=actuators,
|
actuators=actuators,
|
||||||
discovery_groups=[
|
discovery_groups=cached_groups,
|
||||||
DashboardDiscoveryGroup(category=category, role=role, count=count)
|
|
||||||
for (category, role), count in sorted(group_counts.items())
|
|
||||||
],
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -521,6 +518,30 @@ def _load_cached_entities(request: Request) -> list[HaEntitySummary]:
|
|||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
def _load_cached_entity_map(
|
||||||
|
request: Request,
|
||||||
|
entity_ids: set[str],
|
||||||
|
) -> dict[str, HaEntitySummary]:
|
||||||
|
if not entity_ids:
|
||||||
|
return {}
|
||||||
|
payload = _load_entity_cache_payload(request)
|
||||||
|
raw_entities = payload.get("entities", [])
|
||||||
|
if not isinstance(raw_entities, list):
|
||||||
|
return {}
|
||||||
|
result: dict[str, HaEntitySummary] = {}
|
||||||
|
for raw_entity in raw_entities:
|
||||||
|
if not isinstance(raw_entity, dict):
|
||||||
|
continue
|
||||||
|
entity_id = raw_entity.get("entity_id")
|
||||||
|
if not isinstance(entity_id, str) or entity_id not in entity_ids:
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
result[entity_id] = HaEntitySummary.model_validate(raw_entity)
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def _load_entity_cache_payload(request: Request) -> dict[str, object]:
|
def _load_entity_cache_payload(request: Request) -> dict[str, object]:
|
||||||
path = _entity_cache_path(request)
|
path = _entity_cache_path(request)
|
||||||
if not path.exists():
|
if not path.exists():
|
||||||
@@ -535,8 +556,16 @@ def _load_entity_cache_payload(request: Request) -> dict[str, object]:
|
|||||||
def _save_cached_entities(request: Request, entities: list[HaEntitySummary]) -> None:
|
def _save_cached_entities(request: Request, entities: list[HaEntitySummary]) -> None:
|
||||||
path = _entity_cache_path(request)
|
path = _entity_cache_path(request)
|
||||||
path.parent.mkdir(parents=True, exist_ok=True)
|
path.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
group_counts: dict[tuple[str, str], int] = {}
|
||||||
|
for entity in discover_entities(entities):
|
||||||
|
key = (entity.category, entity.role.value)
|
||||||
|
group_counts[key] = group_counts.get(key, 0) + 1
|
||||||
payload = {
|
payload = {
|
||||||
"updated_at": datetime.now(timezone.utc).isoformat(),
|
"updated_at": datetime.now(timezone.utc).isoformat(),
|
||||||
|
"discovery_groups": [
|
||||||
|
{"category": category, "role": role, "count": count}
|
||||||
|
for (category, role), count in sorted(group_counts.items())
|
||||||
|
],
|
||||||
"entities": [entity.model_dump(mode="json") for entity in entities],
|
"entities": [entity.model_dump(mode="json") for entity in entities],
|
||||||
}
|
}
|
||||||
temporary = path.with_suffix(".json.tmp")
|
temporary = path.with_suffix(".json.tmp")
|
||||||
|
|||||||
@@ -105,7 +105,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="1.0.0",
|
version="1.0.2",
|
||||||
lifespan=lifespan,
|
lifespan=lifespan,
|
||||||
)
|
)
|
||||||
app.state.settings = load_settings()
|
app.state.settings = load_settings()
|
||||||
|
|||||||
@@ -5,18 +5,51 @@
|
|||||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||||
<title>SillyHome Next</title>
|
<title>SillyHome Next</title>
|
||||||
<style>
|
<style>
|
||||||
:root { color-scheme: dark; font-family: system-ui, sans-serif; background: #111317; color: #f3f5f7; scroll-behavior:smooth; --accent:#ff8a1c; --accent-strong:#ffab45; --panel:#181c22; --panel-soft:#20262e; --border:#303842; }
|
:root {
|
||||||
body { margin: 0; font-size:15px; }
|
color-scheme: dark;
|
||||||
header { padding: 18px 20px; background: linear-gradient(135deg,#1c1f26,#3a2411 70%,#5c2d08); }
|
font-family: Inter, ui-sans-serif, system-ui, sans-serif;
|
||||||
h1,h2,h3 { margin: 0 0 12px; }
|
background:#0e1218;
|
||||||
header p { margin: 5px 0; color: #c3d1dc; }
|
color:#f4f7fb;
|
||||||
main { display: grid; grid-template-columns: minmax(280px,.82fr) minmax(0,1.38fr); gap: 12px; padding: 12px; max-width:1380px; margin:0 auto; }
|
scroll-behavior:smooth;
|
||||||
section { background: var(--panel); border: 1px solid var(--border); border-radius: 8px; padding: 12px; min-width:0; }
|
--accent:#ff8a1c;
|
||||||
section:target { outline:2px solid var(--accent); outline-offset:2px; }
|
--accent-strong:#ffb45b;
|
||||||
.wide { grid-column: 1 / -1; }
|
--complement:#1cc7ff;
|
||||||
.quick-nav { position:sticky; top:0; z-index:10; display:flex; gap:8px; overflow-x:auto; padding:10px 14px; background:rgba(17,19,23,.94); border-bottom:1px solid var(--border); backdrop-filter:blur(8px); }
|
--complement-soft:#123447;
|
||||||
.quick-nav a { flex:0 0 auto; padding:10px 12px; border-radius:999px; background:#222831; border:1px solid var(--border); color:#f3f5f7; text-decoration:none; font-weight:700; font-size:.92rem; }
|
--panel:#171d25;
|
||||||
.quick-nav a.primary { background:#8f4208; border-color:var(--accent); }
|
--panel-soft:#202833;
|
||||||
|
--panel-quiet:#111720;
|
||||||
|
--border:#314050;
|
||||||
|
--text-soft:#aebdcc;
|
||||||
|
--ok:#53e0a5;
|
||||||
|
--warn:#f3c969;
|
||||||
|
--bad:#8fb8ff;
|
||||||
|
}
|
||||||
|
* { box-sizing:border-box; }
|
||||||
|
body { margin:0; font-size:15px; background:var(--panel-quiet); }
|
||||||
|
h1,h2,h3 { margin:0 0 10px; letter-spacing:0; }
|
||||||
|
p { margin:6px 0; }
|
||||||
|
header { padding:18px 18px 14px; border-bottom:1px solid var(--border); background:#121821; }
|
||||||
|
.topbar { max-width:1480px; margin:0 auto; display:flex; align-items:flex-start; justify-content:space-between; gap:16px; }
|
||||||
|
.brand { display:grid; gap:5px; min-width:0; }
|
||||||
|
.brand-row { display:flex; align-items:center; gap:10px; flex-wrap:wrap; }
|
||||||
|
.brand-mark { width:34px; height:34px; border-radius:8px; display:grid; place-items:center; background:var(--accent); color:#201204; font-weight:900; }
|
||||||
|
header p { color:var(--text-soft); max-width:820px; }
|
||||||
|
.status-pill { display:flex; align-items:center; gap:8px; padding:8px 10px; border:1px solid var(--border); border-radius:8px; background:#101722; color:#d9e6f0; white-space:nowrap; }
|
||||||
|
.dot { width:9px; height:9px; border-radius:50%; background:var(--complement); box-shadow:0 0 0 3px rgba(28,199,255,.15); }
|
||||||
|
.quick-nav { position:sticky; top:0; z-index:10; display:flex; gap:8px; overflow-x:auto; padding:10px 18px; background:rgba(14,18,24,.96); border-bottom:1px solid var(--border); backdrop-filter:blur(8px); }
|
||||||
|
.quick-nav a { flex:0 0 auto; min-height:36px; display:grid; place-items:center; padding:8px 12px; border-radius:8px; background:#151c25; border:1px solid var(--border); color:#f3f7fb; text-decoration:none; font-weight:750; font-size:.92rem; }
|
||||||
|
.quick-nav a.primary { background:var(--accent); border-color:var(--accent); color:#211204; }
|
||||||
|
main { display:grid; grid-template-columns:minmax(270px,.72fr) minmax(0,1.58fr); grid-template-areas:"control board" "control detail" "status status" "guide guide"; gap:12px; padding:12px; max-width:1480px; margin:0 auto; }
|
||||||
|
section { background:var(--panel); border:1px solid var(--border); border-radius:8px; padding:12px; min-width:0; }
|
||||||
|
section:target { outline:2px solid var(--complement); outline-offset:2px; }
|
||||||
|
.control-panel { grid-area:control; align-self:start; position:sticky; top:58px; }
|
||||||
|
.board-panel { grid-area:board; }
|
||||||
|
.detail-panel { grid-area:detail; }
|
||||||
|
.status-panel { grid-area:status; }
|
||||||
|
.guide-panel { grid-area:guide; }
|
||||||
|
.panel-title { display:flex; align-items:center; justify-content:space-between; gap:10px; margin-bottom:8px; }
|
||||||
|
.toolbar { display:flex; flex-wrap:wrap; gap:8px; align-items:center; margin:10px 0; }
|
||||||
|
.toolbar button { margin-top:0; }
|
||||||
details.collapsible > summary,
|
details.collapsible > summary,
|
||||||
.manual-context > summary,
|
.manual-context > summary,
|
||||||
.group-panel > summary { cursor:pointer; font-weight:800; color:#eaf1f8; }
|
.group-panel > summary { cursor:pointer; font-weight:800; color:#eaf1f8; }
|
||||||
@@ -31,30 +64,30 @@
|
|||||||
.manual-context[open] > summary::after,
|
.manual-context[open] > summary::after,
|
||||||
.group-panel[open] > summary::after { content:"zuklappen"; }
|
.group-panel[open] > summary::after { content:"zuklappen"; }
|
||||||
.steps { display:grid; grid-template-columns:repeat(auto-fit,minmax(190px,1fr)); gap:10px; margin-top:12px; }
|
.steps { display:grid; grid-template-columns:repeat(auto-fit,minmax(190px,1fr)); gap:10px; margin-top:12px; }
|
||||||
.step { background:#12161c; border:1px solid var(--border); border-radius:8px; padding:10px; }
|
.step { background:#121922; border:1px solid var(--border); border-radius:8px; padding:10px; }
|
||||||
.step-number { display:inline-grid; place-items:center; width:28px; height:28px; border-radius:50%; background:var(--accent); color:#211204; font-weight:800; margin-bottom:8px; }
|
.step-number { display:inline-grid; place-items:center; width:28px; height:28px; border-radius:8px; background:var(--complement); color:#03151d; font-weight:900; margin-bottom:8px; }
|
||||||
.step p { margin:5px 0; }
|
.step p { margin:5px 0; }
|
||||||
.ok { color: #73e0a9; }
|
.ok { color: #73e0a9; }
|
||||||
.warn { color: #f3c969; }
|
.warn { color: #f3c969; }
|
||||||
.bad { color: #ff8f8f; }
|
.bad { color: var(--bad); }
|
||||||
label { display: block; margin: 9px 0 4px; color: #b9c9d6; }
|
label { display:block; margin:9px 0 4px; color:#c3d2df; font-weight:700; }
|
||||||
select,input,button { box-sizing: border-box; width: 100%; border-radius: 8px; border: 1px solid #3b4b5b; padding: 10px; background: #11161d; color: #fff; font:inherit; min-width:0; }
|
select,input,button { width:100%; border-radius:8px; border:1px solid #3b4b5b; padding:10px; background:#111821; color:#fff; font:inherit; min-width:0; }
|
||||||
select[multiple] { min-height:150px; }
|
select[multiple] { min-height:150px; }
|
||||||
button { min-height:44px; margin-top: 10px; background: var(--accent); color:#211204; border: 0; font-weight: 800; cursor: pointer; }
|
button { min-height:42px; margin-top:10px; background:var(--accent); color:#211204; border:0; font-weight:850; cursor:pointer; }
|
||||||
button.secondary { background: #37495c; }
|
button.secondary { background:var(--complement-soft); color:#dff6ff; border:1px solid #22607c; }
|
||||||
button.danger { background: #7b3434; }
|
button.danger { background:#2a3441; color:#f2f6fb; border:1px solid #536273; }
|
||||||
button.compact { width:auto; min-width:120px; margin-right:8px; }
|
button.compact { width:auto; min-width:112px; margin-right:8px; padding:8px 10px; min-height:36px; }
|
||||||
table { width: 100%; border-collapse: collapse; font-size: .92rem; }
|
table { width: 100%; border-collapse: collapse; font-size: .92rem; }
|
||||||
td,th { padding: 8px; border-bottom: 1px solid #2d3a47; text-align: left; vertical-align: top; }
|
td,th { padding: 8px; border-bottom: 1px solid #2d3a47; text-align: left; vertical-align: top; }
|
||||||
ul { margin: 8px 0; padding-left: 18px; }
|
ul { margin: 8px 0; padding-left: 18px; }
|
||||||
.notice { border-left: 4px solid var(--accent); padding-left: 10px; }
|
.notice { border-left:4px solid var(--complement); padding-left:10px; }
|
||||||
.grid-two { display:grid; grid-template-columns:repeat(auto-fit,minmax(240px,1fr)); gap:12px; }
|
.grid-two { display:grid; grid-template-columns:repeat(auto-fit,minmax(240px,1fr)); gap:12px; }
|
||||||
.chips { display:flex; flex-wrap:wrap; gap:6px; margin-top:8px; }
|
.chips { display:flex; flex-wrap:wrap; gap:6px; margin-top:8px; }
|
||||||
.chip { padding:4px 8px; border-radius:999px; background:#222831; border:1px solid var(--border); font-size:.85rem; }
|
.chip { padding:4px 8px; border-radius:8px; background:#222b36; border:1px solid var(--border); font-size:.85rem; }
|
||||||
.muted { color:#9fb0be; }
|
.muted { color:var(--text-soft); }
|
||||||
.card-list { display:grid; grid-template-columns:repeat(auto-fit,minmax(260px,1fr)); gap:10px; }
|
.card-list { display:grid; grid-template-columns:repeat(auto-fit,minmax(250px,1fr)); gap:10px; }
|
||||||
.actuator-card { background:#12161c; border:1px solid var(--border); border-radius:8px; padding:10px; min-width:0; }
|
.actuator-card { background:#121922; border:1px solid var(--border); border-radius:8px; padding:10px; min-width:0; }
|
||||||
.actuator-card.selected { border-color:var(--accent); box-shadow:0 0 0 1px rgba(255,138,28,.35); }
|
.actuator-card.selected { border-color:var(--complement); box-shadow:0 0 0 1px rgba(28,199,255,.35); }
|
||||||
.card-title { display:flex; justify-content:space-between; gap:10px; align-items:flex-start; margin-bottom:8px; }
|
.card-title { display:flex; justify-content:space-between; gap:10px; align-items:flex-start; margin-bottom:8px; }
|
||||||
.entity-id { overflow-wrap:anywhere; font-weight:800; }
|
.entity-id { overflow-wrap:anywhere; font-weight:800; }
|
||||||
.metric-grid { display:grid; grid-template-columns:repeat(auto-fit,minmax(120px,1fr)); gap:6px; margin:8px 0; }
|
.metric-grid { display:grid; grid-template-columns:repeat(auto-fit,minmax(120px,1fr)); gap:6px; margin:8px 0; }
|
||||||
@@ -63,16 +96,20 @@
|
|||||||
.actions { display:flex; flex-wrap:wrap; gap:8px; margin-top:10px; }
|
.actions { display:flex; flex-wrap:wrap; gap:8px; margin-top:10px; }
|
||||||
.actions button { flex:1 1 180px; margin-top:0; }
|
.actions button { flex:1 1 180px; margin-top:0; }
|
||||||
.detail-header { display:flex; justify-content:space-between; gap:12px; align-items:flex-start; flex-wrap:wrap; }
|
.detail-header { display:flex; justify-content:space-between; gap:12px; align-items:flex-start; flex-wrap:wrap; }
|
||||||
.manual-context { margin-top:12px; background:#12161c; border:1px solid var(--border); border-radius:8px; padding:10px; }
|
.manual-context { margin-top:12px; background:#121922; border:1px solid var(--border); border-radius:8px; padding:10px; }
|
||||||
.inline-controls { display:grid; grid-template-columns:repeat(auto-fit,minmax(160px,1fr)); gap:8px; margin:8px 0; }
|
.inline-controls { display:grid; grid-template-columns:repeat(auto-fit,minmax(160px,1fr)); gap:8px; margin:8px 0; }
|
||||||
.manual-entry { min-height:80px; resize:vertical; }
|
.manual-entry { min-height:80px; resize:vertical; }
|
||||||
textarea { box-sizing:border-box; width:100%; border-radius:10px; border:1px solid #3b4b5b; padding:12px; background:#101820; color:#fff; font:inherit; }
|
textarea { width:100%; border-radius:8px; border:1px solid #3b4b5b; padding:12px; background:#101820; color:#fff; font:inherit; }
|
||||||
optgroup { color:#cfe0ec; background:#101820; }
|
optgroup { color:#cfe0ec; background:#101820; }
|
||||||
code { color:#cfe0ec; overflow-wrap:anywhere; }
|
code { color:#cfe0ec; overflow-wrap:anywhere; }
|
||||||
|
.empty-state { min-height:140px; display:grid; place-items:center; text-align:center; border:1px dashed var(--border); border-radius:8px; background:#111821; color:var(--text-soft); padding:16px; }
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
header { padding:18px 14px; }
|
header { padding:16px 12px; }
|
||||||
header h1 { font-size:1.55rem; }
|
header h1 { font-size:1.55rem; }
|
||||||
|
.topbar { display:grid; }
|
||||||
|
.status-pill { width:max-content; }
|
||||||
main { display:block; padding:8px; }
|
main { display:block; padding:8px; }
|
||||||
|
.control-panel { position:static; }
|
||||||
section { margin-bottom:10px; padding:10px; border-radius:8px; }
|
section { margin-bottom:10px; padding:10px; border-radius:8px; }
|
||||||
.steps { grid-template-columns:1fr; }
|
.steps { grid-template-columns:1fr; }
|
||||||
.grid-two { grid-template-columns:1fr; }
|
.grid-two { grid-template-columns:1fr; }
|
||||||
@@ -91,55 +128,31 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<h1>SillyHome Next</h1>
|
<div class="topbar">
|
||||||
<p>Hier wählst du nur Geräte aus, deren Bedienung SillyHome lernen soll. Sensoren, Zusammenhänge und Modelle werden automatisch verwaltet.</p>
|
<div class="brand">
|
||||||
<p class="notice">Sicherer Start: Zuerst wird nur beobachtet und vorhergesagt. Ohne deine spätere Freigabe wird nichts geschaltet.</p>
|
<div class="brand-row">
|
||||||
|
<span class="brand-mark">SH</span>
|
||||||
|
<h1>SillyHome Next</h1>
|
||||||
|
</div>
|
||||||
|
<p>Arbeitsdashboard für gelernte Home-Assistant-Bedienung: Geräte auswählen, Lernstand prüfen, Freigaben steuern.</p>
|
||||||
|
<p class="notice">Sicherer Start: Zuerst wird nur beobachtet und vorhergesagt. Ohne deine spätere Freigabe wird nichts geschaltet.</p>
|
||||||
|
</div>
|
||||||
|
<div class="status-pill"><span class="dot"></span><span id="load-budget">Startdaten laden ...</span></div>
|
||||||
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<nav class="quick-nav" aria-label="Schnellnavigation">
|
<nav class="quick-nav" aria-label="Schnellnavigation">
|
||||||
<a class="primary" href="#choose">Gerät wählen</a>
|
<a class="primary" href="#choose">Steuerung</a>
|
||||||
<a href="#observed">Beobachtet</a>
|
<a href="#observed">Geräte</a>
|
||||||
<a href="#detail">Details</a>
|
<a href="#detail">Freigabe</a>
|
||||||
<a href="#status-section">Status</a>
|
<a href="#status-section">System</a>
|
||||||
<a href="#guide">Ablauf</a>
|
<a href="#guide">Ablauf</a>
|
||||||
</nav>
|
</nav>
|
||||||
<main>
|
<main>
|
||||||
<section class="wide" id="guide">
|
<section class="control-panel" id="choose">
|
||||||
<details class="collapsible">
|
<div class="panel-title">
|
||||||
<summary><span>So gehst du vor</span></summary>
|
<h2>Steuerung</h2>
|
||||||
<div class="steps">
|
<span class="chip">v1</span>
|
||||||
<div class="step">
|
|
||||||
<span class="step-number">1</span>
|
|
||||||
<h3>Aktor auswählen</h3>
|
|
||||||
<p><strong>Wo?</strong> Unten im Feld „Gerät auswählen“.</p>
|
|
||||||
<p><strong>Was passiert?</strong> SillyHome ordnet Raum, Sensoren, Zustände und vorhandene Historie automatisch zu.</p>
|
|
||||||
</div>
|
|
||||||
<div class="step">
|
|
||||||
<span class="step-number">2</span>
|
|
||||||
<h3>Wie gewohnt bedienen</h3>
|
|
||||||
<p><strong>Wo?</strong> Weiterhin in Home Assistant, an Schaltern oder über deine bisherigen Bedienwege.</p>
|
|
||||||
<p><strong>Was passiert?</strong> SillyHome lernt deine Handlungen und zeigt Vorhersagen an, schaltet aber noch nicht selbst.</p>
|
|
||||||
</div>
|
|
||||||
<div class="step">
|
|
||||||
<span class="step-number">3</span>
|
|
||||||
<h3>Später freigeben</h3>
|
|
||||||
<p><strong>Wo?</strong> In den Details des ausgewählten Geräts, sobald genug Verhalten gelernt wurde.</p>
|
|
||||||
<p><strong>Was passiert?</strong> Erst dann darf SillyHome passende Vorhersagen automatisch ausführen. Die Freigabe kann jederzeit gestoppt werden.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</details>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="status-section">
|
|
||||||
<h2>System & Cache</h2>
|
|
||||||
<p class="muted">Die Startansicht nutzt lokale Summaries und Cache-Daten. Home-Assistant-Discovery lädt im Hintergrund nach.</p>
|
|
||||||
<div id="status">Prüfung läuft ...</div>
|
|
||||||
<div class="chips" id="status-chips"></div>
|
|
||||||
<div id="dashboard-stats" class="metric-grid"></div>
|
|
||||||
<button class="secondary" onclick="loadOverview()">Dashboard aktualisieren</button>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="choose">
|
|
||||||
<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>
|
<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-input">Entitätsname oder Gerät aus Home Assistant</label>
|
<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">
|
<input id="actuator-input" list="actuator-options" placeholder="z. B. light.licht_abstellraum" autocomplete="off">
|
||||||
@@ -168,29 +181,79 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label for="actuator-search">Liste durchsuchen</label>
|
<label for="actuator-search">Liste durchsuchen</label>
|
||||||
<input id="actuator-search" placeholder="Raum, Gerät oder Entity" oninput="renderActuatorSelect()" autocomplete="off">
|
<input id="actuator-search" placeholder="Raum, Gerät oder Entity" oninput="renderActuatorSelect()" onfocus="ensureActuatorDiscovery()" autocomplete="off">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<label for="actuator-select">Oder aus Liste wählen</label>
|
<label for="actuator-select">Oder aus Liste wählen</label>
|
||||||
<select id="actuator-select" onchange="selectActuatorFromList()">
|
<select id="actuator-select" onchange="selectActuatorFromList()" onfocus="ensureActuatorDiscovery()">
|
||||||
<option value="">Geräteliste wird geladen ...</option>
|
<option value="">Geräteliste bei Bedarf laden</option>
|
||||||
</select>
|
</select>
|
||||||
<button onclick="configureActuator()">Gerät hinzufügen und Beobachtung starten</button>
|
<button onclick="configureActuator()">Gerät hinzufügen und Beobachtung starten</button>
|
||||||
|
<button class="secondary" onclick="ensureActuatorDiscovery()">Geräteliste laden</button>
|
||||||
<p id="actuator-config-result" class="muted">Noch kein Aktor ausgewählt.</p>
|
<p id="actuator-config-result" class="muted">Noch kein Aktor ausgewählt.</p>
|
||||||
|
<details class="manual-context">
|
||||||
|
<summary>Vorschläge anzeigen</summary>
|
||||||
|
<p class="muted">Vorschläge können Home Assistant stark abfragen und werden deshalb nicht beim Start geladen.</p>
|
||||||
|
<button class="secondary" onclick="loadActuatorSuggestions()">Vorschläge laden</button>
|
||||||
|
</details>
|
||||||
<div id="actuator-suggestions" class="card-list"></div>
|
<div id="actuator-suggestions" class="card-list"></div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="wide" id="observed">
|
<section class="board-panel" id="observed">
|
||||||
<h2>2. Beobachtete Geräte</h2>
|
<div class="panel-title">
|
||||||
<p class="muted">Öffne „Details“, um Lernfortschritt, aktuelle Vorhersage und den automatisch gefundenen Kontext zu sehen.</p>
|
<div>
|
||||||
|
<h2>Beobachtete Geräte</h2>
|
||||||
|
<p class="muted">Öffne „Details“, um Lernfortschritt, aktuelle Vorhersage und den automatisch gefundenen Kontext zu sehen.</p>
|
||||||
|
</div>
|
||||||
|
<button class="secondary compact" onclick="loadOverview()">Aktualisieren</button>
|
||||||
|
</div>
|
||||||
<div id="configured-actuators">Noch nicht geladen.</div>
|
<div id="configured-actuators">Noch nicht geladen.</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="wide" id="detail">
|
<section class="detail-panel" id="detail">
|
||||||
<h2>3. Lernfortschritt und Freigabe</h2>
|
<h2>Lernfortschritt und Freigabe</h2>
|
||||||
<p class="muted">Die Freigabe erscheint erst, wenn genug eindeutig zugeordnete Handlungen gelernt wurden. Vorher bleibt das Gerät sicher im Beobachtungsmodus.</p>
|
<p class="muted">Die Freigabe erscheint erst, wenn genug eindeutig zugeordnete Handlungen gelernt wurden. Vorher bleibt das Gerät sicher im Beobachtungsmodus.</p>
|
||||||
<div id="actuator-detail" class="muted">Öffne bei einem beobachteten Gerät die Details.</div>
|
<div id="actuator-detail" class="muted">Öffne bei einem beobachteten Gerät die Details.</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section class="status-panel" id="status-section">
|
||||||
|
<div class="panel-title">
|
||||||
|
<div>
|
||||||
|
<h2>System & Cache</h2>
|
||||||
|
<p class="muted">Die Startansicht nutzt lokale Summaries und Cache-Daten. Home-Assistant-Discovery lädt erst bei Bedarf.</p>
|
||||||
|
</div>
|
||||||
|
<button class="secondary compact" onclick="loadStatus()">Status prüfen</button>
|
||||||
|
</div>
|
||||||
|
<div id="status">Prüfung läuft ...</div>
|
||||||
|
<div class="chips" id="status-chips"></div>
|
||||||
|
<div id="dashboard-stats" class="metric-grid"></div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="guide-panel" id="guide">
|
||||||
|
<details class="collapsible">
|
||||||
|
<summary><span>So gehst du vor</span></summary>
|
||||||
|
<div class="steps">
|
||||||
|
<div class="step">
|
||||||
|
<span class="step-number">1</span>
|
||||||
|
<h3>Aktor auswählen</h3>
|
||||||
|
<p><strong>Wo?</strong> Links im Feld „Gerät auswählen“.</p>
|
||||||
|
<p><strong>Was passiert?</strong> SillyHome ordnet Raum, Sensoren, Zustände und vorhandene Historie automatisch zu.</p>
|
||||||
|
</div>
|
||||||
|
<div class="step">
|
||||||
|
<span class="step-number">2</span>
|
||||||
|
<h3>Wie gewohnt bedienen</h3>
|
||||||
|
<p><strong>Wo?</strong> Weiterhin in Home Assistant, an Schaltern oder über deine bisherigen Bedienwege.</p>
|
||||||
|
<p><strong>Was passiert?</strong> SillyHome lernt deine Handlungen und zeigt Vorhersagen an, schaltet aber noch nicht selbst.</p>
|
||||||
|
</div>
|
||||||
|
<div class="step">
|
||||||
|
<span class="step-number">3</span>
|
||||||
|
<h3>Später freigeben</h3>
|
||||||
|
<p><strong>Wo?</strong> In den Details des ausgewählten Geräts, sobald genug Verhalten gelernt wurde.</p>
|
||||||
|
<p><strong>Was passiert?</strong> Erst dann darf SillyHome passende Vorhersagen automatisch ausführen. Die Freigabe kann jederzeit gestoppt werden.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</details>
|
||||||
|
</section>
|
||||||
</main>
|
</main>
|
||||||
<script>
|
<script>
|
||||||
const escapeHtml = value => String(value ?? "")
|
const escapeHtml = value => String(value ?? "")
|
||||||
@@ -206,8 +269,10 @@ let manualContextState = {options: [], selected: new Set()};
|
|||||||
let cachedActuators = null;
|
let cachedActuators = null;
|
||||||
let cachedEntities = null;
|
let cachedEntities = null;
|
||||||
let cachedDiscovery = null;
|
let cachedDiscovery = null;
|
||||||
|
let discoveryLoadPromise = null;
|
||||||
const ACTUATOR_RESULT_LIMIT = 50;
|
const ACTUATOR_RESULT_LIMIT = 50;
|
||||||
const STATUS_TIMEOUT_MS = 2500;
|
const STATUS_TIMEOUT_MS = 2000;
|
||||||
|
const DASHBOARD_TIMEOUT_MS = 4500;
|
||||||
|
|
||||||
function uniqueValues(values) {
|
function uniqueValues(values) {
|
||||||
return [...new Set(values.filter(Boolean))];
|
return [...new Set(values.filter(Boolean))];
|
||||||
@@ -352,21 +417,27 @@ function optionGroups(entities, selectedIds = new Set()) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function loadOverview() {
|
async function loadOverview() {
|
||||||
|
const startedAt = performance.now();
|
||||||
|
const budget = document.getElementById("load-budget");
|
||||||
|
if (budget) budget.textContent = "Startdaten laden ...";
|
||||||
document.getElementById("configured-actuators").innerHTML = "<p class='muted'>Beobachtete Geräte werden geladen ...</p>";
|
document.getElementById("configured-actuators").innerHTML = "<p class='muted'>Beobachtete Geräte werden geladen ...</p>";
|
||||||
try {
|
try {
|
||||||
const dashboard = await api("v1/actuators/dashboard");
|
const dashboard = await apiWithTimeout("v1/actuators/dashboard", DASHBOARD_TIMEOUT_MS);
|
||||||
cachedActuators = dashboard.actuators || [];
|
cachedActuators = dashboard.actuators || [];
|
||||||
cachedEntities = [];
|
cachedEntities = [];
|
||||||
renderDashboardStatus(dashboard);
|
renderDashboardStatus(dashboard);
|
||||||
renderConfiguredActuators();
|
renderConfiguredActuators();
|
||||||
|
if (budget) budget.textContent = `Bereit in ${Math.round(performance.now() - startedAt)} ms`;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
document.getElementById("configured-actuators").innerHTML = `<p class="bad">${escapeHtml(error.message)}</p>`;
|
document.getElementById("configured-actuators").innerHTML = `<p class="bad">${escapeHtml(error.message)}</p>`;
|
||||||
await loadSummaryData();
|
if (budget) budget.textContent = "Startdaten verzögert";
|
||||||
renderConfiguredActuators();
|
try {
|
||||||
void loadStatus();
|
await loadSummaryData();
|
||||||
|
renderConfiguredActuators();
|
||||||
|
} catch (_) {
|
||||||
|
document.getElementById("configured-actuators").innerHTML = "<div class='empty-state'>Startdaten sind gerade nicht verfügbar.</div>";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void loadActuatorDiscovery();
|
|
||||||
void loadActuatorSuggestions();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadStatus() {
|
async function loadStatus() {
|
||||||
@@ -408,7 +479,16 @@ function renderDashboardStatus(dashboard) {
|
|||||||
const stats = document.getElementById("dashboard-stats");
|
const stats = document.getElementById("dashboard-stats");
|
||||||
const system = dashboard.system || {};
|
const system = dashboard.system || {};
|
||||||
const cache = dashboard.cache || {};
|
const cache = dashboard.cache || {};
|
||||||
|
const actuators = dashboard.actuators || [];
|
||||||
const discoveryGroups = dashboard.discovery_groups || [];
|
const discoveryGroups = dashboard.discovery_groups || [];
|
||||||
|
const activeCount = actuators.filter(record => record.behavior_mode === "active").length;
|
||||||
|
const shadowCount = actuators.filter(record => record.behavior_mode !== "active").length;
|
||||||
|
const readyCount = actuators.filter(record => record.activation_ready).length;
|
||||||
|
const pendingCount = actuators.filter(record =>
|
||||||
|
["pending_history", "pending_assignment", "archived"].includes(record.lifecycle_status)
|
||||||
|
).length;
|
||||||
|
const trainedCount = actuators.filter(record => record.behavior_status === "trained").length;
|
||||||
|
const sampleTotal = actuators.reduce((sum, record) => sum + Number(record.sample_count || 0), 0);
|
||||||
const cacheLabel = cache.available
|
const cacheLabel = cache.available
|
||||||
? `Cache aktuell mit ${cache.entity_count} Entities`
|
? `Cache aktuell mit ${cache.entity_count} Entities`
|
||||||
: "Cache wird nach Discovery aufgebaut";
|
: "Cache wird nach Discovery aufgebaut";
|
||||||
@@ -426,7 +506,11 @@ function renderDashboardStatus(dashboard) {
|
|||||||
`<span class="chip">Prüfen: ${escapeHtml(system.review_required ?? 0)}</span>`,
|
`<span class="chip">Prüfen: ${escapeHtml(system.review_required ?? 0)}</span>`,
|
||||||
].join("");
|
].join("");
|
||||||
stats.innerHTML = [
|
stats.innerHTML = [
|
||||||
`<div class="metric"><strong>Geladene Startdaten</strong>${escapeHtml((dashboard.actuators || []).length)} Geräte</div>`,
|
`<div class="metric"><strong>Geladene Startdaten</strong>${escapeHtml(actuators.length)} Geräte</div>`,
|
||||||
|
`<div class="metric"><strong>Freigabebereit</strong>${escapeHtml(readyCount)} Geräte</div>`,
|
||||||
|
`<div class="metric"><strong>Aktiv / Shadow</strong>${escapeHtml(activeCount)} / ${escapeHtml(shadowCount)}</div>`,
|
||||||
|
`<div class="metric"><strong>Gelernt / Wartet</strong>${escapeHtml(trainedCount)} / ${escapeHtml(pendingCount)}</div>`,
|
||||||
|
`<div class="metric"><strong>Gelernte Handlungen</strong>${escapeHtml(sampleTotal)}</div>`,
|
||||||
`<div class="metric"><strong>Discovery-Gruppen</strong>${escapeHtml(discoveryGroups.length)} Kategorien</div>`,
|
`<div class="metric"><strong>Discovery-Gruppen</strong>${escapeHtml(discoveryGroups.length)} Kategorien</div>`,
|
||||||
`<div class="metric"><strong>Cache-Zeitpunkt</strong>${escapeHtml(cache.updated_at || "noch offen")}</div>`,
|
`<div class="metric"><strong>Cache-Zeitpunkt</strong>${escapeHtml(cache.updated_at || "noch offen")}</div>`,
|
||||||
].join("");
|
].join("");
|
||||||
@@ -472,6 +556,21 @@ async function loadActuatorDiscovery() {
|
|||||||
renderActuatorDiscovery();
|
renderActuatorDiscovery();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function ensureActuatorDiscovery() {
|
||||||
|
const select = document.getElementById("actuator-select");
|
||||||
|
if (cachedDiscovery) {
|
||||||
|
renderActuatorDiscovery();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!discoveryLoadPromise) {
|
||||||
|
if (select) select.innerHTML = `<option value="">Geräteliste wird geladen ...</option>`;
|
||||||
|
discoveryLoadPromise = loadActuatorDiscovery().finally(() => {
|
||||||
|
discoveryLoadPromise = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
await discoveryLoadPromise;
|
||||||
|
}
|
||||||
|
|
||||||
function renderActuatorDiscovery() {
|
function renderActuatorDiscovery() {
|
||||||
const options = document.getElementById("actuator-options");
|
const options = document.getElementById("actuator-options");
|
||||||
const select = document.getElementById("actuator-select");
|
const select = document.getElementById("actuator-select");
|
||||||
@@ -607,7 +706,11 @@ async function configureActuator() {
|
|||||||
|| document.getElementById("actuator-select").value.trim()
|
|| document.getElementById("actuator-select").value.trim()
|
||||||
);
|
);
|
||||||
const result = document.getElementById("actuator-config-result");
|
const result = document.getElementById("actuator-config-result");
|
||||||
if (!actuatorId) return;
|
if (!actuatorId) {
|
||||||
|
await ensureActuatorDiscovery();
|
||||||
|
result.textContent = "Wähle ein Gerät aus der geladenen Liste oder trage eine Entity-ID ein.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
result.textContent = "Kontext wird automatisch analysiert ...";
|
result.textContent = "Kontext wird automatisch analysiert ...";
|
||||||
try {
|
try {
|
||||||
const record = await api("v1/actuators", {
|
const record = await api("v1/actuators", {
|
||||||
@@ -685,12 +788,7 @@ async function showActuator(actuatorId, evaluationMessage = "") {
|
|||||||
currentActuatorId = actuatorId;
|
currentActuatorId = actuatorId;
|
||||||
const box = document.getElementById("actuator-detail");
|
const box = document.getElementById("actuator-detail");
|
||||||
try {
|
try {
|
||||||
let record;
|
const record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}`);
|
||||||
try {
|
|
||||||
record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}/related-automations/refresh`, {method: "POST"});
|
|
||||||
} catch (_) {
|
|
||||||
record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}`);
|
|
||||||
}
|
|
||||||
await loadContextOptions(actuatorId);
|
await loadContextOptions(actuatorId);
|
||||||
const contexts = [
|
const contexts = [
|
||||||
record.assignment.selected_numeric_entity_id,
|
record.assignment.selected_numeric_entity_id,
|
||||||
@@ -820,6 +918,7 @@ async function showActuator(actuatorId, evaluationMessage = "") {
|
|||||||
</div>
|
</div>
|
||||||
<h3>Passende Home-Assistant-Automationen</h3>
|
<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>
|
<p class="muted">Bei einer Übernahme pausiert SillyHome diese Automationen. Beim Stoppen können sie gezielt fortgesetzt werden.</p>
|
||||||
|
<button class="secondary compact" onclick="refreshRelatedAutomations('${escapeHtml(record.actuator_entity_id)}')">Automationen neu suchen</button>
|
||||||
${automationControls}
|
${automationControls}
|
||||||
<h3>Welche Zusammenhänge automatisch verwendet werden</h3>
|
<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>"}
|
${evidence ? `<ul>${evidence}</ul>` : "<p class='warn'>Noch kein geeigneter Kontext erkannt. SillyHome prüft bei neuen HA-Daten erneut.</p>"}
|
||||||
@@ -972,6 +1071,17 @@ async function setRelatedAutomation(actuatorId, automationEntityId, enabled) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function refreshRelatedAutomations(actuatorId) {
|
||||||
|
try {
|
||||||
|
await api(`v1/actuators/${encodeURIComponent(actuatorId)}/related-automations/refresh`, {method: "POST"});
|
||||||
|
invalidateDashboardCache();
|
||||||
|
await loadConfiguredActuators();
|
||||||
|
await showActuator(actuatorId, "Passende Home-Assistant-Automationen neu geprüft.");
|
||||||
|
} catch (error) {
|
||||||
|
alert(error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function removeActuator(actuatorId) {
|
async function removeActuator(actuatorId) {
|
||||||
if (!confirm(`${actuatorId} aus SillyHome entfernen?`)) return;
|
if (!confirm(`${actuatorId} aus SillyHome entfernen?`)) return;
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ Diese Version stabilisiert den produktiven Kern: schnelle Dashboard-Nutzung,
|
|||||||
lokales Caching, klare Aktor-/Sensor-Kategorien und nachvollziehbare Freigabe
|
lokales Caching, klare Aktor-/Sensor-Kategorien und nachvollziehbare Freigabe
|
||||||
gelernter Aktionen.
|
gelernter Aktionen.
|
||||||
|
|
||||||
|
Die detaillierte Abnahme steht in
|
||||||
|
[`V1_0_ACCEPTANCE.md`](V1_0_ACCEPTANCE.md). Dort sind erledigte, teilweise
|
||||||
|
erledigte und fuer v1.0.x offene Punkte getrennt dokumentiert.
|
||||||
|
|
||||||
## Grundprinzip
|
## Grundprinzip
|
||||||
|
|
||||||
- Home Assistant bleibt die Quelle fuer aktuelle States und Services.
|
- Home Assistant bleibt die Quelle fuer aktuelle States und Services.
|
||||||
|
|||||||
80
docs/V1_0_ACCEPTANCE.md
Normal file
80
docs/V1_0_ACCEPTANCE.md
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
# SillyHome Next v1.0 Acceptance
|
||||||
|
|
||||||
|
Stand: 2026-06-17
|
||||||
|
|
||||||
|
Diese Abnahme trennt belegte Umsetzung von offenen v1.0.x-Nacharbeiten. Der
|
||||||
|
Funktionskern bleibt aktorzentriert: Nutzer waehlen Aktoren, SillyHome lernt
|
||||||
|
Kontext und Verhalten, laeuft zuerst im Shadow-Modus und schaltet erst nach
|
||||||
|
expliziter Freigabe.
|
||||||
|
|
||||||
|
## Erfuellt
|
||||||
|
|
||||||
|
- Versioniert, gepusht und installiert:
|
||||||
|
- `v1.0.0`: API-/Cache-Umbau
|
||||||
|
- `v1.0.1`: Dashboard-/Performance-Korrektur
|
||||||
|
- Startpfad:
|
||||||
|
- `/v1/actuators/dashboard` liefert lokale Startdaten aus Store und Cache.
|
||||||
|
- Dashboard blockiert nicht mehr auf Discovery, Vorschlaegen oder
|
||||||
|
Automation-Refresh.
|
||||||
|
- Frontend bricht den Startdaten-Request nach 4,5 Sekunden ab und bleibt
|
||||||
|
bedienbar.
|
||||||
|
- Cache:
|
||||||
|
- HA-Entity-Metadaten werden als `ha_entity_cache.json` gespeichert.
|
||||||
|
- Summary und Dashboard verwenden Friendly Name, Area und Device aus Cache.
|
||||||
|
- Keine externen Abfragen im Dashboard-Startpfad:
|
||||||
|
- Kein Cloud-Ping, keine Fremd-API.
|
||||||
|
- HA-Zugriffe bleiben lokal gegen Home Assistant.
|
||||||
|
- Dashboard:
|
||||||
|
- Orange ist Primaerfarbe.
|
||||||
|
- Cyan ist sichtbare Komplementaerfarbe.
|
||||||
|
- Rote UI-Flaechen wurden entfernt.
|
||||||
|
- Steuerung, beobachtete Geraete, Lernfortschritt/Freigabe und Systemstatus
|
||||||
|
sind getrennte Bereiche.
|
||||||
|
- Discovery, Vorschlaege und Automation-Suche laden erst bei Nutzeraktion.
|
||||||
|
- Lernfortschritt und Freigabe:
|
||||||
|
- Karten zeigen Modus, Status, Handlungen, Vorhersage und Freigabestatus.
|
||||||
|
- Detailansicht zeigt Zuordnung, Sicherheit, Lernstand, Vorhersage,
|
||||||
|
Feedback, passende HA-Automationen und verwendete Sensoren/Zustaende.
|
||||||
|
- Direkte HA-Nutzung:
|
||||||
|
- Aktor-Schaltungen laufen ueber Home-Assistant-Serviceaufrufe.
|
||||||
|
- Automation-Steuerung nutzt Home-Assistant-Endpunkte und gecachte
|
||||||
|
Automation-Metadaten.
|
||||||
|
- Qualitaet:
|
||||||
|
- `pytest -q`
|
||||||
|
- `ruff check .`
|
||||||
|
- `mypy app backend tests`
|
||||||
|
- `git diff --check`
|
||||||
|
|
||||||
|
## Teilweise Erfuellt
|
||||||
|
|
||||||
|
- Bessere Statistik:
|
||||||
|
- Startbereich zeigt Aktoren, Freigabebereitschaft, Aktiv/Shadow,
|
||||||
|
Gelernt/Wartet, gelernte Handlungen, Discovery-Gruppen und Cache-Zeitpunkt.
|
||||||
|
- Noch offen: Verlaufsgrafiken, p95-Latenzen und Trendstatistik je Aktor.
|
||||||
|
- Kontrollierte Abarbeitung und Queue:
|
||||||
|
- Reconciliation/Training laufen kontrolliert im Prozess und sind testbar.
|
||||||
|
- Noch offen: sichtbare Job-Queue mit Laufzeit, Fehlern und Retry-Status im
|
||||||
|
Dashboard.
|
||||||
|
- Saubere Issues:
|
||||||
|
- v1.0.0-Issues #41 bis #47 wurden geschlossen.
|
||||||
|
- Rueckblickend waren sie zu grob; v1.0.x bekommt feinere Folgeissues fuer
|
||||||
|
Statistik, Queue-Sichtbarkeit und Performance-Budgets.
|
||||||
|
|
||||||
|
## Offen Fuer v1.0.x
|
||||||
|
|
||||||
|
- Echte Dashboard-Performance-Budget-Tests, die Start-HTML und
|
||||||
|
`/v1/actuators/dashboard` gegen ein 5-Sekunden-Limit messen.
|
||||||
|
- Dashboard-Jobstatus fuer Reconciliation, Training, Discovery und
|
||||||
|
Automation-Refresh.
|
||||||
|
- Mehr Entscheidungsstatistik pro Aktor: welche Sensoren wie stark
|
||||||
|
beigetragen haben, wie sich Confidence und Sample Count entwickeln.
|
||||||
|
- Dokumentierte HA-Installationspruefung mit Supervisor-/Ingress-Hinweisen,
|
||||||
|
weil direkte Container-HTTP-Pruefung ausserhalb HA nicht immer routbar ist.
|
||||||
|
|
||||||
|
## Rollback
|
||||||
|
|
||||||
|
- Git-Bundle-Backups liegen unter
|
||||||
|
`/root/.openclaw/workspace/backups/sillyhome-next/`.
|
||||||
|
- Vor `v1.0.1` wurde ein Home-Assistant-Teilbackup des Add-ons angelegt.
|
||||||
|
Referenz: `18a5b387`.
|
||||||
|
- Letzter Vor-1.0-Stand: `v0.7.21`.
|
||||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "sillyhome-next"
|
name = "sillyhome-next"
|
||||||
version = "1.0.0"
|
version = "1.0.2"
|
||||||
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 = [
|
||||||
|
|||||||
@@ -9,11 +9,14 @@ def test_dashboard_is_served_at_root() -> None:
|
|||||||
|
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert "SillyHome Next" in response.text
|
assert "SillyHome Next" in response.text
|
||||||
|
assert "Arbeitsdashboard für gelernte Home-Assistant-Bedienung" in response.text
|
||||||
assert "So gehst du vor" in response.text
|
assert "So gehst du vor" in response.text
|
||||||
assert "Gerät zum Lernen auswählen" in response.text
|
assert "Steuerung" in response.text
|
||||||
assert "Entitätsname oder Gerät aus Home Assistant" in response.text
|
assert "Entitätsname oder Gerät aus Home Assistant" in response.text
|
||||||
assert "Oder aus Liste wählen" in response.text
|
assert "Oder aus Liste wählen" in response.text
|
||||||
assert "Liste durchsuchen" in response.text
|
assert "Liste durchsuchen" in response.text
|
||||||
|
assert "Geräteliste bei Bedarf laden" in response.text
|
||||||
|
assert "Vorschläge können Home Assistant stark abfragen" in response.text
|
||||||
assert "Wie gewohnt bedienen" in response.text
|
assert "Wie gewohnt bedienen" in response.text
|
||||||
assert "Ohne deine spätere Freigabe wird nichts geschaltet" 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 "Du wählst keine Sensoren und erstellst keine Regeln" in response.text
|
||||||
|
|||||||
Reference in New Issue
Block a user