groups and scenes initial
This commit is contained in:
@@ -25,11 +25,27 @@ from packages.home_capabilities import (
|
||||
ThermostatState,
|
||||
ContactState,
|
||||
TempHumidityState,
|
||||
RelayState
|
||||
RelayState,
|
||||
load_layout,
|
||||
)
|
||||
|
||||
# Import resolvers (must be before router imports to avoid circular dependency)
|
||||
from apps.api.resolvers import (
|
||||
DeviceDTO,
|
||||
resolve_group_devices,
|
||||
resolve_scene_step_devices,
|
||||
load_device_rooms,
|
||||
get_room,
|
||||
clear_room_cache,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# STATE CACHES
|
||||
# ============================================================================
|
||||
|
||||
# In-memory cache for last known device states
|
||||
# Will be populated from Redis pub/sub messages
|
||||
device_states: dict[str, dict[str, Any]] = {}
|
||||
@@ -57,6 +73,13 @@ app.add_middleware(
|
||||
)
|
||||
|
||||
|
||||
@app.on_event("startup")
|
||||
async def startup_event():
|
||||
"""Include routers after app is initialized to avoid circular imports."""
|
||||
from apps.api.routes.groups_scenes import router as groups_scenes_router
|
||||
app.include_router(groups_scenes_router, prefix="", tags=["groups", "scenes"])
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
async def health() -> dict[str, str]:
|
||||
"""Health check endpoint.
|
||||
@@ -207,6 +230,50 @@ def get_mqtt_settings() -> tuple[str, int]:
|
||||
return host, port
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# MQTT PUBLISH
|
||||
# ============================================================================
|
||||
|
||||
async def publish_abstract_set(device_type: str, device_id: str, payload: dict[str, Any]) -> None:
|
||||
"""
|
||||
Publish an abstract set command via MQTT.
|
||||
|
||||
This function encapsulates MQTT publishing logic so that group/scene
|
||||
execution doesn't need to know MQTT topic details.
|
||||
|
||||
Topic format: home/{device_type}/{device_id}/set
|
||||
Message format: {"type": device_type, "payload": payload}
|
||||
|
||||
Args:
|
||||
device_type: Device type (light, thermostat, relay, etc.)
|
||||
device_id: Device identifier
|
||||
payload: Command payload (e.g., {"power": "on", "brightness": 50})
|
||||
|
||||
Example:
|
||||
>>> await publish_abstract_set("light", "kueche_deckenlampe", {"power": "on", "brightness": 35})
|
||||
# Publishes to: home/light/kueche_deckenlampe/set
|
||||
# Message: {"type": "light", "payload": {"power": "on", "brightness": 35}}
|
||||
"""
|
||||
mqtt_host, mqtt_port = get_mqtt_settings()
|
||||
topic = f"home/{device_type}/{device_id}/set"
|
||||
message = {
|
||||
"type": device_type,
|
||||
"payload": payload
|
||||
}
|
||||
|
||||
try:
|
||||
async with Client(hostname=mqtt_host, port=mqtt_port) as client:
|
||||
await client.publish(
|
||||
topic=topic,
|
||||
payload=json.dumps(message),
|
||||
qos=1
|
||||
)
|
||||
logger.info(f"Published to {topic}: {message}")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to publish to {topic}: {e}")
|
||||
raise
|
||||
|
||||
|
||||
def get_redis_settings() -> tuple[str, str]:
|
||||
"""Get Redis settings from configuration.
|
||||
|
||||
@@ -291,8 +358,6 @@ async def get_layout() -> dict[str, Any]:
|
||||
Returns:
|
||||
dict: Layout configuration with rooms and device tiles
|
||||
"""
|
||||
from packages.home_capabilities import load_layout
|
||||
|
||||
try:
|
||||
layout = load_layout()
|
||||
|
||||
@@ -321,6 +386,23 @@ async def get_layout() -> dict[str, Any]:
|
||||
return {"rooms": []}
|
||||
|
||||
|
||||
@app.get("/devices/{device_id}/room")
|
||||
async def get_device_room(device_id: str) -> dict[str, str | None]:
|
||||
"""Get the room name for a specific device.
|
||||
|
||||
Args:
|
||||
device_id: Device identifier
|
||||
|
||||
Returns:
|
||||
dict: {"device_id": str, "room": str | null}
|
||||
"""
|
||||
room = get_room(device_id)
|
||||
return {
|
||||
"device_id": device_id,
|
||||
"room": room
|
||||
}
|
||||
|
||||
|
||||
@app.post("/devices/{device_id}/set", status_code=status.HTTP_202_ACCEPTED)
|
||||
async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str]:
|
||||
"""Set device state.
|
||||
|
||||
Reference in New Issue
Block a user