Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bd087728e1 | |||
| 10f9113547 | |||
| 47fa8eb0ce |
@@ -23,6 +23,12 @@ nach einer ausdrücklichen Freigabe ausführen.
|
||||
[`docs/V1_3_0_OPERATING_GUIDE.md`](docs/V1_3_0_OPERATING_GUIDE.md)
|
||||
- Version 1.4.0 deutsches Dashboard und gestufter Datenabruf:
|
||||
[`docs/V1_4_0_OPERATING_GUIDE.md`](docs/V1_4_0_OPERATING_GUIDE.md)
|
||||
- Version 1.5.0 Menü-Dashboard und kompakte Detaildaten:
|
||||
[`docs/V1_5_0_OPERATING_GUIDE.md`](docs/V1_5_0_OPERATING_GUIDE.md)
|
||||
- Version 1.5.1 Stabilisierung der Dashboard-Ladepfade:
|
||||
[`docs/V1_5_1_OPERATING_GUIDE.md`](docs/V1_5_1_OPERATING_GUIDE.md)
|
||||
- Version 1.5.2 Rollback-Speicher und HA-Timeouts:
|
||||
[`docs/V1_5_2_OPERATING_GUIDE.md`](docs/V1_5_2_OPERATING_GUIDE.md)
|
||||
- Arbeitsregeln für Coding-Agenten: [`AGENTS.md`](AGENTS.md)
|
||||
|
||||
## Reifegrad
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: SillyHome Next
|
||||
version: "1.4.0"
|
||||
version: "1.5.2"
|
||||
slug: sillyhome_next
|
||||
description: Lernt automatisch aus deinem Verhalten und steuert freigegebene Aktoren
|
||||
url: http://192.168.6.31:3000/pino/sillyhome-next
|
||||
|
||||
@@ -306,15 +306,25 @@ def list_configured_summary(request: Request) -> list[ActuatorSummary]:
|
||||
|
||||
@router.get("/dashboard", response_model=DashboardOverview)
|
||||
def dashboard_overview(request: Request) -> DashboardOverview:
|
||||
return _dashboard_overview(request, include_background=True)
|
||||
return _dashboard_overview(request, include_background=True, include_actuators=True)
|
||||
|
||||
|
||||
@router.get("/dashboard/start", response_model=DashboardOverview)
|
||||
def dashboard_start(request: Request) -> DashboardOverview:
|
||||
return _dashboard_overview(request, include_background=False)
|
||||
return _dashboard_overview(request, include_background=False, include_actuators=True)
|
||||
|
||||
|
||||
def _dashboard_overview(request: Request, *, include_background: bool) -> DashboardOverview:
|
||||
@router.get("/dashboard/system", response_model=DashboardOverview)
|
||||
def dashboard_system(request: Request) -> DashboardOverview:
|
||||
return _dashboard_overview(request, include_background=False, include_actuators=False)
|
||||
|
||||
|
||||
def _dashboard_overview(
|
||||
request: Request,
|
||||
*,
|
||||
include_background: bool,
|
||||
include_actuators: bool,
|
||||
) -> DashboardOverview:
|
||||
cache_payload = _load_entity_cache_payload(request)
|
||||
raw_entities = cache_payload.get("entities", [])
|
||||
if not isinstance(raw_entities, list):
|
||||
@@ -329,7 +339,7 @@ def _dashboard_overview(request: Request, *, include_background: bool) -> Dashbo
|
||||
] if include_background and isinstance(raw_groups, list) else []
|
||||
reconciliation = _reconciliation_state_or_default(request)
|
||||
ws_status = getattr(request.app.state, "ws_status", None)
|
||||
actuators = list_configured_summary(request)
|
||||
actuators = list_configured_summary(request) if include_actuators else []
|
||||
store = getattr(request.app.state, "actuator_store", None)
|
||||
jobs = (
|
||||
store.load_job_queue()
|
||||
@@ -348,7 +358,11 @@ def _dashboard_overview(request: Request, *, include_background: bool) -> Dashbo
|
||||
if reconciliation.last_completed_at is not None
|
||||
else None
|
||||
),
|
||||
configured_actuators=len(actuators),
|
||||
configured_actuators=(
|
||||
len(actuators)
|
||||
if include_actuators
|
||||
else reconciliation.configured_actuators
|
||||
),
|
||||
trained_models=reconciliation.trained_models,
|
||||
review_required=reconciliation.review_required,
|
||||
job_p95_duration_ms=job_p95_duration_ms,
|
||||
@@ -417,6 +431,47 @@ def get_actuator(actuator_entity_id: str, request: Request) -> ActuatorRecord:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.get("/{actuator_entity_id}/detail", response_model=ActuatorRecord)
|
||||
def get_actuator_detail(actuator_entity_id: str, request: Request) -> ActuatorRecord:
|
||||
try:
|
||||
record = _service(request).get_actuator(actuator_entity_id)
|
||||
except KeyError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
selected_ids = {
|
||||
entity_id
|
||||
for entity_id in [
|
||||
record.assignment.selected_numeric_entity_id,
|
||||
*record.assignment.selected_context_entity_ids,
|
||||
]
|
||||
if entity_id
|
||||
}
|
||||
compact_snapshots = [
|
||||
snapshot.model_copy(update={"patterns": []})
|
||||
for snapshot in record.behavior.model_snapshots[-3:]
|
||||
]
|
||||
compact_behavior = record.behavior.model_copy(
|
||||
update={
|
||||
"patterns": [],
|
||||
"model_snapshots": compact_snapshots,
|
||||
}
|
||||
)
|
||||
return record.model_copy(
|
||||
update={
|
||||
"behavior": compact_behavior,
|
||||
"numeric_candidates": [
|
||||
candidate
|
||||
for candidate in record.numeric_candidates
|
||||
if candidate.entity_id in selected_ids
|
||||
],
|
||||
"context_candidates": [
|
||||
candidate
|
||||
for candidate in record.context_candidates
|
||||
if candidate.entity_id in selected_ids
|
||||
],
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/{actuator_entity_id}", status_code=204)
|
||||
def delete_actuator(actuator_entity_id: str, request: Request) -> None:
|
||||
_service(request).delete_actuator(actuator_entity_id)
|
||||
|
||||
@@ -32,6 +32,8 @@ from app.ha.models import HaEntitySummary
|
||||
from app.ha.reader import HaReader
|
||||
|
||||
_MAX_PATTERNS = 500
|
||||
_MAX_MODEL_SNAPSHOTS = 3
|
||||
_MAX_SNAPSHOT_PATTERNS = 120
|
||||
_MAX_EXECUTION_EVENTS = 100
|
||||
_ACTION_LOGBOOK_TOLERANCE = timedelta(seconds=10)
|
||||
_CONTEXT_TRIGGER_TOLERANCE = timedelta(seconds=3)
|
||||
@@ -937,6 +939,11 @@ class BehaviorEngine:
|
||||
record: ActuatorRecord,
|
||||
behavior: BehaviorState,
|
||||
) -> ActuatorRecord:
|
||||
behavior = behavior.model_copy(
|
||||
update={
|
||||
"model_snapshots": _compact_model_snapshots(behavior.model_snapshots),
|
||||
}
|
||||
)
|
||||
updated = record.model_copy(
|
||||
update={
|
||||
"behavior": behavior,
|
||||
@@ -1132,10 +1139,19 @@ def _next_model_snapshots(
|
||||
high_confidence_sample_count=trusted_actions,
|
||||
average_confidence=round(average_confidence, 4),
|
||||
incorrect_feedback_count=incorrect_feedback_count,
|
||||
patterns=patterns,
|
||||
patterns=patterns[-_MAX_SNAPSHOT_PATTERNS:],
|
||||
reason=reason,
|
||||
)
|
||||
return [*existing, snapshot][-10:]
|
||||
return _compact_model_snapshots([*existing, snapshot])
|
||||
|
||||
|
||||
def _compact_model_snapshots(existing: list[ModelSnapshot]) -> list[ModelSnapshot]:
|
||||
return [
|
||||
snapshot.model_copy(
|
||||
update={"patterns": snapshot.patterns[-_MAX_SNAPSHOT_PATTERNS:]}
|
||||
)
|
||||
for snapshot in existing[-_MAX_MODEL_SNAPSHOTS:]
|
||||
]
|
||||
|
||||
|
||||
def _average(values: list[float]) -> float:
|
||||
|
||||
@@ -21,6 +21,7 @@ class Settings:
|
||||
prediction_interval_seconds: int = 60
|
||||
execution_cooldown_seconds: int = 900
|
||||
timezone: str = "Europe/Berlin"
|
||||
ha_timeout_seconds: int = 25
|
||||
|
||||
@property
|
||||
def ha_configured(self) -> bool:
|
||||
@@ -55,4 +56,5 @@ def load_settings() -> Settings:
|
||||
60, int(os.getenv("SILLYHOME_EXECUTION_COOLDOWN_SECONDS", "900"))
|
||||
),
|
||||
timezone=os.getenv("SILLYHOME_TIMEZONE", "Europe/Berlin"),
|
||||
ha_timeout_seconds=max(5, int(os.getenv("SILLYHOME_HA_TIMEOUT_SECONDS", "25"))),
|
||||
)
|
||||
|
||||
@@ -60,6 +60,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
||||
settings=HaClientSettings(
|
||||
url=cast(str, settings.ha_url),
|
||||
token=cast(str, settings.ha_token),
|
||||
timeout_seconds=settings.ha_timeout_seconds,
|
||||
)
|
||||
)
|
||||
app.state.ha_reader = HaReader(client=client)
|
||||
@@ -105,7 +106,7 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
||||
app = FastAPI(
|
||||
title="SillyHome Next API",
|
||||
description="Lokales Smart-Home-Intelligenzsystem für Home Assistant.",
|
||||
version="1.4.0",
|
||||
version="1.5.2",
|
||||
lifespan=lifespan,
|
||||
)
|
||||
app.state.settings = load_settings()
|
||||
@@ -213,8 +214,8 @@ async def _ha_event_listener(app: FastAPI, client: HaClient) -> None:
|
||||
try:
|
||||
async with websockets.connect(
|
||||
ws_url,
|
||||
ping_interval=20,
|
||||
ping_timeout=10,
|
||||
ping_interval=30,
|
||||
ping_timeout=30,
|
||||
) as websocket:
|
||||
auth_required_msg = await websocket.recv()
|
||||
auth_required_data = json.loads(auth_required_msg)
|
||||
|
||||
@@ -39,8 +39,10 @@
|
||||
.header-actions label { margin:0; font-size:.82rem; }
|
||||
.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); }
|
||||
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; }
|
||||
main { display:block; 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; }
|
||||
.app-view { display:none; }
|
||||
.app-view.active { display:block; }
|
||||
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; }
|
||||
@@ -54,6 +56,8 @@
|
||||
.manual-context > summary,
|
||||
.group-panel > summary { cursor:pointer; font-weight:800; color:#eaf1f8; }
|
||||
details.collapsible > summary { list-style:none; display:flex; justify-content:space-between; gap:10px; }
|
||||
.manual-context > summary,
|
||||
.group-panel > summary { display:flex; justify-content:space-between; gap:10px; align-items:center; }
|
||||
details.collapsible > summary::-webkit-details-marker,
|
||||
.manual-context > summary::-webkit-details-marker,
|
||||
.group-panel > summary::-webkit-details-marker { display:none; }
|
||||
@@ -118,7 +122,7 @@
|
||||
.topbar { display:grid; }
|
||||
.header-actions { min-width:0; }
|
||||
.status-pill { width:max-content; max-width:100%; white-space:normal; }
|
||||
main { display:block; padding:8px; }
|
||||
main { padding:8px; }
|
||||
.control-panel { position:static; }
|
||||
section { margin-bottom:10px; padding:10px; border-radius:8px; }
|
||||
.steps { grid-template-columns:1fr; }
|
||||
@@ -147,19 +151,20 @@
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<label for="section-jump">Menü</label>
|
||||
<select id="section-jump" onchange="jumpToSection(this.value)">
|
||||
<option value="#choose">Steuerung</option>
|
||||
<option value="#observed">Geräte</option>
|
||||
<option value="#detail">Freigabe</option>
|
||||
<option value="#status-section">System</option>
|
||||
<option value="#guide">Ablauf</option>
|
||||
<select id="section-jump" onchange="showView(this.value)">
|
||||
<option value="status-section">Startseite / System</option>
|
||||
<option value="observed">Lernen</option>
|
||||
<option value="detail">Details</option>
|
||||
<option value="choose">Discovery & Einrichtung</option>
|
||||
<option value="settings">Einstellungen</option>
|
||||
<option value="guide">Ablauf</option>
|
||||
</select>
|
||||
<div class="status-pill"><span class="dot"></span><span id="load-budget">Seite bereit, Status folgt ...</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
<main>
|
||||
<section class="control-panel" id="choose">
|
||||
<section class="control-panel app-view" id="choose">
|
||||
<div class="panel-title">
|
||||
<h2>Steuerung</h2>
|
||||
<span class="chip">v1</span>
|
||||
@@ -210,7 +215,7 @@
|
||||
<div id="actuator-suggestions" class="card-list"></div>
|
||||
</section>
|
||||
|
||||
<section class="board-panel" id="observed">
|
||||
<section class="board-panel app-view" id="observed">
|
||||
<div class="panel-title">
|
||||
<div>
|
||||
<h2>Beobachtete Geräte</h2>
|
||||
@@ -221,13 +226,13 @@
|
||||
<div id="configured-actuators">Noch nicht geladen.</div>
|
||||
</section>
|
||||
|
||||
<section class="detail-panel" id="detail">
|
||||
<section class="detail-panel app-view" id="detail">
|
||||
<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>
|
||||
<div id="actuator-detail" class="muted">Öffne bei einem beobachteten Gerät die Details.</div>
|
||||
</section>
|
||||
|
||||
<section class="status-panel" id="status-section">
|
||||
<section class="status-panel app-view active" id="status-section">
|
||||
<div class="panel-title">
|
||||
<div>
|
||||
<h2>System & Cache</h2>
|
||||
@@ -241,7 +246,30 @@
|
||||
<div id="job-queue" class="decision-list"></div>
|
||||
</section>
|
||||
|
||||
<section class="guide-panel" id="guide">
|
||||
<section class="guide-panel app-view" id="settings">
|
||||
<div class="panel-title">
|
||||
<div>
|
||||
<h2>Einstellungen</h2>
|
||||
<p class="muted">Sprache und Standardwerte für die Bedienoberfläche.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid-two">
|
||||
<div>
|
||||
<label for="language-select">Sprache</label>
|
||||
<select id="language-select" onchange="setLanguage(this.value)">
|
||||
<option value="de">Deutsch</option>
|
||||
<option value="en">English</option>
|
||||
</select>
|
||||
<p class="muted">Die API speichert stabile technische Werte. Die Oberfläche übersetzt sie in die gewählte Sprache.</p>
|
||||
</div>
|
||||
<div>
|
||||
<h3>Performance-Standard</h3>
|
||||
<p>Startansichten dürfen maximal 3 Sekunden brauchen. Schwere Daten werden nur nach Menüwechsel oder bei Bearbeitung geladen.</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section class="guide-panel app-view" id="guide">
|
||||
<details class="collapsible">
|
||||
<summary><span>So gehst du vor</span></summary>
|
||||
<div class="steps">
|
||||
@@ -358,14 +386,113 @@ const I18N = {
|
||||
error: "Fehler",
|
||||
},
|
||||
},
|
||||
en: {
|
||||
safety_stage: {
|
||||
observe: "Observe only",
|
||||
suggest: "Show suggestions",
|
||||
shadow: "Review mode without switching",
|
||||
partial: "Partial approval",
|
||||
active: "Active approval",
|
||||
},
|
||||
behavior_mode: {
|
||||
shadow: "Review mode",
|
||||
active: "Active",
|
||||
paused: "Paused",
|
||||
},
|
||||
behavior_status: {
|
||||
collecting: "Collecting examples",
|
||||
trained: "Learned",
|
||||
blocked: "Blocked",
|
||||
},
|
||||
lifecycle_status: {
|
||||
trained: "learned",
|
||||
pending_history: "collecting history",
|
||||
pending_assignment: "finding context",
|
||||
review_required: "review required",
|
||||
archived: "waiting",
|
||||
orphaned: "actuator missing",
|
||||
stale: "training stale",
|
||||
invalid: "invalid",
|
||||
},
|
||||
job_status: {
|
||||
pending: "waiting",
|
||||
running: "running",
|
||||
completed: "completed",
|
||||
failed: "failed",
|
||||
},
|
||||
job_kind: {
|
||||
discovery: "Discovery",
|
||||
reconciliation: "Reconciliation",
|
||||
training: "Training",
|
||||
evaluation: "Evaluation",
|
||||
automation_refresh: "Automation check",
|
||||
},
|
||||
severity: {
|
||||
info: "Info",
|
||||
warning: "Warning",
|
||||
critical: "Critical",
|
||||
},
|
||||
anomaly_category: {
|
||||
missing_context: "missing context",
|
||||
low_samples: "not enough samples",
|
||||
unclear_sources: "unclear sources",
|
||||
stale_training: "stale training",
|
||||
low_confidence_prediction: "low confidence",
|
||||
manual_block: "manual block",
|
||||
safety_blockers: "safety blockers",
|
||||
automation_conflict: "automation conflict",
|
||||
feedback_error_rate: "feedback error rate",
|
||||
},
|
||||
performance_status: {
|
||||
ok: "fast",
|
||||
slow: "too slow",
|
||||
running: "running",
|
||||
unknown: "unknown",
|
||||
},
|
||||
connection_status: {
|
||||
connected: "connected",
|
||||
disconnected: "disconnected",
|
||||
unavailable: "unavailable",
|
||||
error: "error",
|
||||
},
|
||||
},
|
||||
};
|
||||
const uiLang = "de";
|
||||
let uiLang = localStorage.getItem("sillyhome.ui.language") || "de";
|
||||
|
||||
function jumpToSection(target) {
|
||||
if (!target) return;
|
||||
document.querySelector(target)?.scrollIntoView({behavior: "smooth", block: "start"});
|
||||
}
|
||||
|
||||
function showView(viewId) {
|
||||
for (const section of document.querySelectorAll(".app-view")) {
|
||||
section.classList.toggle("active", section.id === viewId);
|
||||
}
|
||||
localStorage.setItem("sillyhome.ui.view", viewId);
|
||||
if (viewId === "status-section") {
|
||||
void loadSystemOverview();
|
||||
} else if (viewId === "observed") {
|
||||
void loadOverview();
|
||||
} else if (viewId === "settings") {
|
||||
syncSettingsView();
|
||||
}
|
||||
document.getElementById(viewId)?.scrollIntoView({behavior: "smooth", block: "start"});
|
||||
}
|
||||
|
||||
function setLanguage(language) {
|
||||
uiLang = I18N[language] ? language : "de";
|
||||
localStorage.setItem("sillyhome.ui.language", uiLang);
|
||||
syncSettingsView();
|
||||
if (cachedActuators) renderConfiguredActuators();
|
||||
void loadSystemOverview();
|
||||
if (currentActuatorId) void showActuator(currentActuatorId);
|
||||
}
|
||||
|
||||
function syncSettingsView() {
|
||||
const select = document.getElementById("language-select");
|
||||
if (select) select.value = uiLang;
|
||||
}
|
||||
|
||||
function translate(group, value, fallback = "") {
|
||||
if (value == null || value === "") return fallback || "offen";
|
||||
return I18N[uiLang]?.[group]?.[value] || fallback || String(value);
|
||||
@@ -401,6 +528,11 @@ async function apiWithTimeout(path, timeoutMs = STATUS_TIMEOUT_MS) {
|
||||
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
||||
try {
|
||||
return await api(path, {signal: controller.signal});
|
||||
} catch (error) {
|
||||
if (error?.name === "AbortError") {
|
||||
throw new Error("Zeitlimit erreicht; Daten laden im Hintergrund weiter.");
|
||||
}
|
||||
throw error;
|
||||
} finally {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
@@ -527,7 +659,7 @@ async function loadOverview() {
|
||||
if (budget) budget.textContent = "Startdaten laden ...";
|
||||
document.getElementById("configured-actuators").innerHTML = "<p class='muted'>Beobachtete Geräte werden geladen ...</p>";
|
||||
try {
|
||||
const dashboard = await apiWithTimeout("v1/actuators/dashboard/start", DASHBOARD_TIMEOUT_MS);
|
||||
const dashboard = await api("v1/actuators/dashboard/start");
|
||||
dashboard._load_elapsed_ms = Math.round(performance.now() - startedAt);
|
||||
cachedActuators = dashboard.actuators || [];
|
||||
cachedEntities = [];
|
||||
@@ -552,6 +684,28 @@ async function loadOverview() {
|
||||
scheduleDashboardExtras();
|
||||
}
|
||||
|
||||
async function loadSystemOverview() {
|
||||
const startedAt = performance.now();
|
||||
const budget = document.getElementById("load-budget");
|
||||
if (budget) budget.textContent = "Systemübersicht lädt ...";
|
||||
try {
|
||||
const dashboard = await api("v1/actuators/dashboard/system");
|
||||
dashboard._load_elapsed_ms = Math.round(performance.now() - startedAt);
|
||||
cachedActuators = dashboard.actuators || cachedActuators;
|
||||
renderDashboardStatus(dashboard);
|
||||
if (budget) {
|
||||
const loadMs = dashboard._load_elapsed_ms;
|
||||
budget.textContent = loadMs <= DASHBOARD_TIMEOUT_MS
|
||||
? `Systemübersicht bereit in ${loadMs} ms`
|
||||
: `Systemübersicht langsam: ${loadMs} ms`;
|
||||
}
|
||||
scheduleDashboardExtras();
|
||||
} catch (error) {
|
||||
document.getElementById("status").innerHTML = `<p class="warn">Systemübersicht verzögert: ${escapeHtml(error.message)}</p>`;
|
||||
if (budget) budget.textContent = "Systemübersicht verzögert";
|
||||
}
|
||||
}
|
||||
|
||||
function scheduleDashboardExtras() {
|
||||
const run = () => {
|
||||
void loadDashboardExtras();
|
||||
@@ -974,10 +1128,15 @@ function renderConfiguredActuators() {
|
||||
|
||||
async function showActuator(actuatorId, evaluationMessage = "") {
|
||||
currentActuatorId = actuatorId;
|
||||
for (const section of document.querySelectorAll(".app-view")) {
|
||||
section.classList.toggle("active", section.id === "detail");
|
||||
}
|
||||
document.getElementById("section-jump").value = "detail";
|
||||
localStorage.setItem("sillyhome.ui.view", "detail");
|
||||
const box = document.getElementById("actuator-detail");
|
||||
renderActuatorDetailShell(actuatorId);
|
||||
try {
|
||||
const record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}`);
|
||||
const record = await api(`v1/actuators/${encodeURIComponent(actuatorId)}/detail`);
|
||||
contextOptions = [];
|
||||
const contexts = [
|
||||
record.assignment.selected_numeric_entity_id,
|
||||
@@ -1177,9 +1336,7 @@ async function showActuator(actuatorId, evaluationMessage = "") {
|
||||
</div>
|
||||
</details>
|
||||
`;
|
||||
const learnedAutomationActions = record.behavior.patterns.filter(
|
||||
pattern => pattern.source === "automation",
|
||||
).length;
|
||||
const learnedAutomationActions = "wird bei Bedarf im Training ausgewertet";
|
||||
const relatedAutomations = record.behavior.related_automations || [];
|
||||
const manualContextIds = new Set(record.assignment.selected_context_entity_ids || []);
|
||||
const numericOptions = contextOptions.filter(entity => entity.domain === "sensor");
|
||||
@@ -1268,7 +1425,7 @@ async function showActuator(actuatorId, evaluationMessage = "") {
|
||||
<p><strong>Betriebsart:</strong> ${escapeHtml(behaviorLabel(record))}</p>
|
||||
<p><strong>Gelernte Handlungen:</strong> ${record.behavior.sample_count}</p>
|
||||
<p><strong>Davon eindeutig geregelt:</strong> ${record.behavior.high_confidence_sample_count}</p>
|
||||
<p><strong>Davon erkannte HA-Automationen:</strong> ${learnedAutomationActions}</p>
|
||||
<p><strong>Erkannte HA-Automationen:</strong> ${escapeHtml(learnedAutomationActions)}</p>
|
||||
<p><strong>Letztes Training:</strong> ${escapeHtml(formatDateTime(record.behavior.last_trained_at))}</p>
|
||||
<p><strong>Was noch passiert:</strong> ${escapeHtml(record.behavior.reason)}</p>
|
||||
<p><strong>Freigabestatus:</strong> <span class="${record.behavior.activation_ready ? "ok" : "warn"}">${escapeHtml(record.behavior.activation_reason)}</span></p>
|
||||
@@ -1304,7 +1461,6 @@ async function showActuator(actuatorId, evaluationMessage = "") {
|
||||
${currentContextControls}
|
||||
${manualAssignment}
|
||||
`;
|
||||
void hydrateContextOptions(record);
|
||||
document.getElementById("detail").scrollIntoView({behavior: "smooth", block: "start"});
|
||||
} catch (error) {
|
||||
box.textContent = error.message;
|
||||
@@ -1609,11 +1765,13 @@ async function removeActuator(actuatorId) {
|
||||
|
||||
async function startDashboard() {
|
||||
document.getElementById("status").innerHTML = "<p class='muted'>Status lädt nach ...</p>";
|
||||
document.getElementById("configured-actuators").innerHTML = "<div class='empty-state'>Geräte werden geladen.</div>";
|
||||
document.getElementById("configured-actuators").innerHTML = "<div class='empty-state'>Öffne „Lernen“, um Geräte zu laden.</div>";
|
||||
document.getElementById("actuator-detail").innerHTML = "<div class='empty-state'>Wähle später ein Gerät aus der Übersicht.</div>";
|
||||
syncSettingsView();
|
||||
document.getElementById("section-jump").value = "status-section";
|
||||
showView("status-section");
|
||||
await new Promise(resolve => requestAnimationFrame(resolve));
|
||||
await loadOverview();
|
||||
void loadStatus();
|
||||
setTimeout(() => void loadStatus(), 100);
|
||||
}
|
||||
|
||||
void startDashboard();
|
||||
|
||||
47
docs/V1_5_0_OPERATING_GUIDE.md
Normal file
47
docs/V1_5_0_OPERATING_GUIDE.md
Normal file
@@ -0,0 +1,47 @@
|
||||
# SillyHome Next v1.5.0 Operating Guide
|
||||
|
||||
v1.5.0 trennt Dashboard-Ansichten, Datenabruf und Detaildaten weiter auf. Ziel
|
||||
ist, dass die Seite auf mobiler Datenverbindung schneller nutzbar wird und keine
|
||||
schweren Lern-, Discovery- oder Detaildaten beim Start lädt.
|
||||
|
||||
## Menüstruktur
|
||||
|
||||
- Startseite / System: Systemübersicht, Cache, Performance, Status.
|
||||
- Lernen: konfigurierte Aktoren und Lernstand.
|
||||
- Details: genau ein ausgewählter Aktor.
|
||||
- Discovery & Einrichtung: Geräteliste, Vorschläge und neue Aktoren.
|
||||
- Einstellungen: Sprache und Standardverhalten.
|
||||
- Ablauf: Bedienhinweise.
|
||||
|
||||
Beim Öffnen der Seite wird immer nur die Startseite geladen. Andere Ansichten
|
||||
laden erst beim Öffnen.
|
||||
|
||||
## Kompakte Detaildaten
|
||||
|
||||
Neuer Endpunkt:
|
||||
|
||||
```text
|
||||
GET /v1/actuators/{actuator_entity_id}/detail
|
||||
```
|
||||
|
||||
Dieser Endpunkt entfernt große Musterlisten und Snapshot-Muster aus dem ersten
|
||||
Detailabruf. Geladen werden nur die Werte, die für die erste Detailansicht
|
||||
benötigt werden. Kontextvorschläge bleiben ein separater Abruf und laufen erst
|
||||
auf Nutzeraktion.
|
||||
|
||||
## Sprache
|
||||
|
||||
Die Sprache kann unter `Einstellungen` gewählt werden. Deutsch ist Standard.
|
||||
Technische API-Werte bleiben stabil, werden aber im Dashboard über die
|
||||
Sprachschicht angezeigt.
|
||||
|
||||
## Performance-Regeln
|
||||
|
||||
- Kein Discovery beim Start.
|
||||
- Keine Aufgabenliste beim Start.
|
||||
- Keine Kontextvorschläge beim Öffnen eines Aktors.
|
||||
- Keine Musterlisten im ersten Detailabruf.
|
||||
- Geräteübersicht rendert begrenzt und lädt weitere Karten per Button nach.
|
||||
|
||||
Die Angabe „bereit in X ms“ beschreibt nur den jeweiligen API-/Ansichtsabruf.
|
||||
Sie ist nicht gleichzusetzen mit der kompletten HA/Ingress-Navigationszeit.
|
||||
32
docs/V1_5_1_OPERATING_GUIDE.md
Normal file
32
docs/V1_5_1_OPERATING_GUIDE.md
Normal file
@@ -0,0 +1,32 @@
|
||||
# SillyHome Next v1.5.1 Operating Guide
|
||||
|
||||
v1.5.1 ist ein Stabilisierungshotfix für die nach v1.2.0 entstandenen
|
||||
Dashboard-Änderungen. Fachlich gehört diese Arbeit zur v1.2.x-Patchlinie; die
|
||||
höhere technische Versionsnummer ist nur nötig, weil Home Assistant bereits
|
||||
v1.5.0 installiert hat und Add-on-Updates monoton nach oben laufen.
|
||||
|
||||
## Korrekturen
|
||||
|
||||
- Die System-Startseite nutzt `GET /v1/actuators/dashboard/system` und lädt
|
||||
keine Aktorenliste.
|
||||
- Sichtbare 3-Sekunden-Abbrüche mit Browsertexten wie `signal is aborted
|
||||
without reason` wurden entfernt.
|
||||
- Startdaten und Detaildaten werden ohne künstlichen Frontend-Abbruch geladen.
|
||||
- Timeout-Meldungen werden deutsch und verständlich angezeigt, wenn sie bei
|
||||
Nebenprüfungen auftreten.
|
||||
- `summary`-Zeilen wie `anzeigenaufklappen` haben jetzt Abstand und Layout.
|
||||
|
||||
## Ladeverhalten
|
||||
|
||||
- Statische Seite wird sofort gerendert.
|
||||
- Systemdaten laden im Hintergrund.
|
||||
- Lernen/Geräte laden nur im Menü `Lernen`.
|
||||
- Discovery lädt nur im Menü `Discovery & Einrichtung`.
|
||||
- Aktorwerte laden erst beim Öffnen der Detailansicht.
|
||||
- Kontextvorschläge laden erst auf Nutzeraktion.
|
||||
|
||||
## Hinweis zur Performance-Anzeige
|
||||
|
||||
Die App zeigt keine echte HA/Ingress-Navigationszeit an. Gemessen werden nur
|
||||
einzelne interne Abrufe nach Start der Seite. Aussagen zur gesamten Ladezeit
|
||||
müssen über Browser/Ingress oder HA-Messung geprüft werden.
|
||||
32
docs/V1_5_2_OPERATING_GUIDE.md
Normal file
32
docs/V1_5_2_OPERATING_GUIDE.md
Normal file
@@ -0,0 +1,32 @@
|
||||
# SillyHome Next v1.5.2 Operating Guide
|
||||
|
||||
v1.5.2 begrenzt den Rollback-Speicher und entschärft Home-Assistant-Timeouts,
|
||||
die in den Add-on-Logs sichtbar wurden.
|
||||
|
||||
## Rollback-Speicher
|
||||
|
||||
- Pro Aktor bleiben maximal 3 Modell-Snapshots erhalten.
|
||||
- Pro Snapshot bleiben maximal 120 Muster erhalten.
|
||||
- Beim Speichern eines Aktors werden ältere oder zu große Snapshots automatisch
|
||||
gekappt.
|
||||
- Der kompakte Detail-Endpunkt liefert ebenfalls maximal 3 Rollback-Snapshots
|
||||
und keine Musterlisten.
|
||||
|
||||
Damit bleibt Rollback nutzbar, ohne dass die JSON-Dateien mit alten Modellen
|
||||
stark wachsen.
|
||||
|
||||
## Home-Assistant-Zugriffe
|
||||
|
||||
- REST-Zugriffe auf Home Assistant haben jetzt standardmäßig 25 Sekunden
|
||||
Timeout statt 10 Sekunden.
|
||||
- Der Wert ist über `SILLYHOME_HA_TIMEOUT_SECONDS` konfigurierbar.
|
||||
- WebSocket-Keepalive wurde auf 30 Sekunden Ping-Intervall und 30 Sekunden
|
||||
Ping-Timeout entschärft.
|
||||
|
||||
## Log-Einordnung
|
||||
|
||||
- `GET ... HTTP/1.1` ist bei Uvicorn/HA-Ingress normal und kein Fehler.
|
||||
- `Zeitüberschreitung beim Zugriff auf Home Assistant` bedeutet, dass HA selbst
|
||||
zu langsam geantwortet hat oder der Ingress/Netzpfad verzögert war.
|
||||
- `keepalive ping timeout` bedeutet, dass die HA-WebSocket-Verbindung nicht
|
||||
rechtzeitig geantwortet hat. SillyHome reconnectet automatisch.
|
||||
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "sillyhome-next"
|
||||
version = "1.4.0"
|
||||
version = "1.5.2"
|
||||
description = "Lokales Smart-Home-Intelligenzsystem für Home Assistant"
|
||||
requires-python = ">=3.11"
|
||||
dependencies = [
|
||||
|
||||
@@ -446,14 +446,17 @@ def test_dashboard_reports_performance_budget_and_anomalies(tmp_path: Path) -> N
|
||||
|
||||
dashboard_response = client.get("/v1/actuators/dashboard")
|
||||
start_response = client.get("/v1/actuators/dashboard/start")
|
||||
system_response = client.get("/v1/actuators/dashboard/system")
|
||||
anomalies_response = client.get("/v1/actuators/anomalies")
|
||||
|
||||
assert dashboard_response.status_code == 200
|
||||
assert start_response.status_code == 200
|
||||
assert system_response.status_code == 200
|
||||
system = dashboard_response.json()["system"]
|
||||
start_payload = start_response.json()
|
||||
assert start_payload["jobs"]["jobs"] == []
|
||||
assert start_payload["discovery_groups"] == []
|
||||
assert system_response.json()["actuators"] == []
|
||||
assert system["performance_budget_ms"] == 3000
|
||||
assert system["slow_job_count"] == 1
|
||||
assert system["performance_status"] == "slow"
|
||||
@@ -462,6 +465,23 @@ def test_dashboard_reports_performance_budget_and_anomalies(tmp_path: Path) -> N
|
||||
assert anomalies_response.json()
|
||||
|
||||
|
||||
def test_actuator_detail_uses_compact_payload(tmp_path: Path) -> None:
|
||||
with TestClient(app) as client:
|
||||
_install_service(tmp_path)
|
||||
client.get("/v1/actuators/discovery")
|
||||
client.post("/v1/actuators", json={"actuator_entity_id": "light.abstellkammer"})
|
||||
|
||||
response = client.get("/v1/actuators/light.abstellkammer/detail")
|
||||
|
||||
assert response.status_code == 200
|
||||
payload = response.json()
|
||||
assert payload["behavior"]["patterns"] == []
|
||||
assert all(
|
||||
snapshot["patterns"] == []
|
||||
for snapshot in payload["behavior"]["model_snapshots"]
|
||||
)
|
||||
|
||||
|
||||
def test_discovery_reads_entities_once_and_reuses_them(tmp_path: Path) -> None:
|
||||
with TestClient(app) as client:
|
||||
_install_service(tmp_path)
|
||||
|
||||
@@ -24,7 +24,7 @@ def test_dashboard_is_served_at_root() -> None:
|
||||
assert "SillyHome übernehmen lassen" in response.text
|
||||
assert "Passende Home-Assistant-Automationen" in response.text
|
||||
assert "Pausieren" in response.text
|
||||
assert "Davon erkannte HA-Automationen" in response.text
|
||||
assert "Erkannte HA-Automationen" in response.text
|
||||
assert "Aktuelle Situation auswerten" in response.text
|
||||
assert "Kontext selbst festlegen" in response.text
|
||||
assert "Entity-IDs manuell ergänzen" in response.text
|
||||
|
||||
@@ -92,11 +92,11 @@ def test_ha_event_listener_processes_state_change(tmp_path: Path) -> None:
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
connect.assert_called_once_with(
|
||||
"ws://homeassistant:8123/api/websocket",
|
||||
ping_interval=20,
|
||||
ping_timeout=10,
|
||||
)
|
||||
connect.assert_called_once_with(
|
||||
"ws://homeassistant:8123/api/websocket",
|
||||
ping_interval=30,
|
||||
ping_timeout=30,
|
||||
)
|
||||
assert fake_ws.sent == [
|
||||
{"type": "auth", "access_token": "test-token"},
|
||||
{"id": 1, "type": "subscribe_events", "event_type": "state_changed"},
|
||||
|
||||
Reference in New Issue
Block a user