Add actuator sensor weighting controls
This commit is contained in:
@@ -9,7 +9,7 @@ from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from app.actuators.lifecycle import ActuatorReconciliationService
|
||||
from app.actuators.models import ActuatorRecord, ReconciliationState
|
||||
from app.actuators.models import ActuatorRecord, ReconciliationState, SensorWeightGroup
|
||||
from app.actuators.store import ActuatorStore
|
||||
from app.behavior.engine import BehaviorEngine
|
||||
from app.config import Settings
|
||||
@@ -44,6 +44,12 @@ class ManualAssignmentRequest(BaseModel):
|
||||
note: str | None = Field(default=None, max_length=500)
|
||||
|
||||
|
||||
class WeightOverrideRequest(BaseModel):
|
||||
sensor_weights: dict[str, float] = Field(default_factory=dict)
|
||||
sensor_weight_groups: list[SensorWeightGroup] = Field(default_factory=list)
|
||||
note: str | None = Field(default=None, max_length=500)
|
||||
|
||||
|
||||
class FeedbackRequest(BaseModel):
|
||||
correct: bool
|
||||
expected_state: str | None = Field(default=None, max_length=100)
|
||||
@@ -406,6 +412,27 @@ def set_manual_assignment(
|
||||
raise HTTPException(status_code=422, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.post("/{actuator_entity_id}/weights", response_model=ActuatorRecord)
|
||||
def set_weight_overrides(
|
||||
actuator_entity_id: str,
|
||||
payload: WeightOverrideRequest,
|
||||
request: Request,
|
||||
) -> ActuatorRecord:
|
||||
try:
|
||||
_validate_weight_payload(payload)
|
||||
record = _service(request).set_weight_overrides(
|
||||
actuator_entity_id,
|
||||
sensor_weights=payload.sensor_weights,
|
||||
sensor_weight_groups=payload.sensor_weight_groups,
|
||||
note=payload.note,
|
||||
)
|
||||
return record
|
||||
except KeyError as exc:
|
||||
raise HTTPException(status_code=404, detail=str(exc)) from exc
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=422, detail=str(exc)) from exc
|
||||
|
||||
|
||||
@router.post(
|
||||
"/{actuator_entity_id}/related-automations/refresh",
|
||||
response_model=ActuatorRecord,
|
||||
@@ -485,6 +512,20 @@ def _behavior(request: Request) -> BehaviorEngine:
|
||||
return engine
|
||||
|
||||
|
||||
def _validate_weight_payload(payload: WeightOverrideRequest) -> None:
|
||||
for entity_id, weight in payload.sensor_weights.items():
|
||||
if "." not in entity_id:
|
||||
raise ValueError(f"Ungültige Entity-ID: {entity_id}")
|
||||
if not 0.0 <= weight <= 1.0:
|
||||
raise ValueError(f"Ungültige Gewichtung für {entity_id}: {weight}")
|
||||
for group in payload.sensor_weight_groups:
|
||||
if not group.entity_ids:
|
||||
raise ValueError(f"Gruppe {group.name} enthält keine Entities.")
|
||||
for entity_id in group.entity_ids:
|
||||
if "." not in entity_id:
|
||||
raise ValueError(f"Ungültige Entity-ID in Gruppe {group.name}: {entity_id}")
|
||||
|
||||
|
||||
def _reconciliation_state_or_default(request: Request) -> ReconciliationState:
|
||||
store = getattr(request.app.state, "actuator_store", None)
|
||||
if not isinstance(store, ActuatorStore):
|
||||
|
||||
Reference in New Issue
Block a user