fix 2

.woodpecker/config.yml

@@ -1,9 +1,6 @@
 when:
   event: [tag]
 
-depends_on:
-  - namespace
-
 steps:
   apply_configuration:
     image: quay.io/wollud1969/k8s-admin-helper:0.3.4

.woodpecker/namespace.yml

@@ -1,5 +1,8 @@
 when:
   event: [tag]
+  ref:
+    exclude:
+      - refs/tags/*-configchange
 
 steps:
   create_namespace:

apps/abstraction/main.py

@@ -15,7 +15,7 @@ import uuid
 from aiomqtt import Client
 from pydantic import ValidationError
 
-from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState
+from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState, SwitchState
 from apps.abstraction.transformation import (
     transform_abstract_to_vendor,
     transform_vendor_to_abstract
@@ -174,6 +174,10 @@ async def handle_abstract_set(
             # Contact sensors are read-only - SET commands should not occur
             logger.warning(f"Contact sensor {device_id} received SET command - ignoring (read-only device)")
             return
+        elif device_type == "switch":
+            # Switches are read-only - SET commands should not occur
+            logger.warning(f"Switch {device_id} received SET command - ignoring (read-only device)")
+            return
     except ValidationError as e:
         logger.error(f"Validation failed for {device_type} SET {device_id}: {e}")
         return
@@ -227,6 +231,9 @@ async def handle_vendor_state(
         elif device_type == "three_phase_powermeter":
             # Validate three-phase powermeter state
             ThreePhasePowerState.model_validate(abstract_payload)
+        elif device_type == "switch":
+            # Validate switch state
+            SwitchState.model_validate(abstract_payload)
     except ValidationError as e:
         logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}")
         return

apps/abstraction/vendors/zigbee2mqtt.py

@@ -161,6 +161,24 @@ def transform_temp_humidity_sensor_to_abstract(payload: str) -> dict[str, Any]:
     return payload
 
 
+def transform_switch_to_vendor(payload: dict[str, Any]) -> str:
+    """Transform abstract switch payload to zigbee2mqtt format.
+    
+    Switches are read-only, so this should not be called for SET commands.
+    """
+    logger.warning("Switches are read-only - SET commands should not be used")
+    return json.dumps(payload)
+
+
+def transform_switch_to_abstract(payload: str) -> dict[str, Any]:
+    """Transform zigbee2mqtt switch payload to abstract format.
+    
+    Passthrough - zigbee2mqtt provides action, battery, linkquality directly.
+    """
+    payload = json.loads(payload)
+    return payload
+
+
 def transform_relay_to_vendor(payload: dict[str, Any]) -> str:
     """Transform abstract relay payload to zigbee2mqtt format.
     
@@ -204,6 +222,8 @@ HANDLERS = {
     ("temp_humidity_sensor", "to_abstract"): transform_temp_humidity_sensor_to_abstract,
     ("temp_humidity", "to_vendor"): transform_temp_humidity_sensor_to_vendor,
     ("temp_humidity", "to_abstract"): transform_temp_humidity_sensor_to_abstract,
+    ("switch", "to_vendor"): transform_switch_to_vendor,
+    ("switch", "to_abstract"): transform_switch_to_abstract,
     ("relay", "to_vendor"): transform_relay_to_vendor,
     ("relay", "to_abstract"): transform_relay_to_abstract,
 }

apps/api/main.py

@@ -127,14 +127,9 @@ async def redis_state_listener():
         
         logger.info("Redis state listener connected")
         
-        while True:
+        # listen() blocks async and waits for messages - prevents busy loop
-            try:
+        async for message in pubsub.listen():
-                message = await asyncio.wait_for(
+            if message["type"] == "message":
-                    pubsub.get_message(ignore_subscribe_messages=True),
-                    timeout=1.0
-                )
-                
-                if message and message["type"] == "message":
                 data = message["data"]
                 try:
                     state_data = json.loads(data)
@@ -146,9 +141,6 @@ async def redis_state_listener():
                 except Exception as e:
                     logger.warning(f"Failed to parse state data: {e}")
                 
-            except asyncio.TimeoutError:
-                pass  # No message, continue
-                
     except asyncio.CancelledError:
         logger.info("Redis state listener cancelled")
         raise
@@ -567,25 +559,31 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
             redis_client = None
             pubsub = None
         
-        # Heartbeat tracking
-        last_heartbeat = asyncio.get_event_loop().time()
         heartbeat_interval = 15  # Safari-friendly: shorter interval
         
+        # Use listen() iterator for blocking reads with heartbeat timeout
+        if pubsub:
+            listener = pubsub.listen()
+        else:
+            listener = None
+        
         while True:
             # Check if client disconnected
             if await request.is_disconnected():
                 logger.info("SSE client disconnected")
                 break
             
-            # Try to get message from Redis (if available)
+            # Try to get message from Redis with timeout for heartbeat
-            if pubsub:
+            if listener:
                 try:
+                    # Wait for message with heartbeat timeout
+                    # If no message arrives within timeout, send heartbeat
                     message = await asyncio.wait_for(
-                        pubsub.get_message(ignore_subscribe_messages=True),
+                        anext(listener),
-                        timeout=0.1
+                        timeout=heartbeat_interval
                     )
                     
-                    if message and message["type"] == "message":
+                    if message["type"] == "message":
                         data = message["data"]
                         logger.debug(f"Sending SSE message: {data[:100]}...")
                         
@@ -598,24 +596,21 @@ async def event_generator(request: Request) -> AsyncGenerator[str, None]:
                             logger.warning(f"Failed to parse state data for cache: {e}")
                         
                         yield f"event: message\ndata: {data}\n\n"
-                        last_heartbeat = asyncio.get_event_loop().time()
-                        continue  # Skip sleep, check for more messages immediately
                         
                 except asyncio.TimeoutError:
-                    pass  # No message, continue to heartbeat check
+                    # No message within heartbeat interval - send heartbeat
+                    yield ": ping\n\n"
+                except StopAsyncIteration:
+                    logger.warning("Redis listener stopped")
+                    break
                 except Exception as e:
                     logger.error(f"Redis error: {e}")
-                    # Continue with heartbeats even if Redis fails
+                    # Continue with heartbeat-only mode
-            
+                    listener = None
-            # Sleep briefly to avoid busy loop
+            else:
-            await asyncio.sleep(0.1)
+                # Heartbeat-only mode (no Redis)
-            
+                await asyncio.sleep(heartbeat_interval)
-            # Send heartbeat if interval elapsed
-            current_time = asyncio.get_event_loop().time()
-            if current_time - last_heartbeat >= heartbeat_interval:
-                # Comment-style ping (Safari-compatible, no event type)
                 yield ": ping\n\n"
-                last_heartbeat = current_time
             
     except asyncio.CancelledError:
         logger.info("SSE connection cancelled by client")

config/devices.yaml

@@ -326,41 +326,6 @@ devices:
     ieee_address: "0xf0d1b8be2409f569"
     model: "4058075729063"
     vendor: "LEDVANCE"
-- device_id: licht_flur_oben_am_spiegel
-  homekit_aid: 22
-  name: Spiegel
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-    color_temperature: true
-  topics:
-    state: "zigbee2mqtt/0x842e14fffefe4ba4"
-    set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
-  metadata:
-    friendly_name: "Licht Flur oben am Spiegel"
-    ieee_address: "0x842e14fffefe4ba4"
-    model: "LED1732G11"
-    vendor: "IKEA"
-- device_id: experimentlabtest
-  homekit_aid: 23
-  name: Test Lampe
-  type: light
-  cap_version: "light@1.2.0"
-  technology: zigbee2mqtt
-  features:
-    power: true
-    brightness: true
-  topics:
-    state: "zigbee2mqtt/0xf0d1b80000195038"
-    set: "zigbee2mqtt/0xf0d1b80000195038/set"
-  metadata:
-    friendly_name: "ExperimentLabTest"
-    ieee_address: "0xf0d1b80000195038"
-    model: "4058075208421"
-    vendor: "LEDVANCE"
 - device_id: thermostat_wolfgang
   homekit_aid: 24
   name: Heizung
@@ -506,21 +471,16 @@ devices:
   name: Heizung
   type: thermostat
   cap_version: "thermostat@1.0.0"
-  technology: max
+  technology: zigbee2mqtt
   features:
-    mode: true
+    heating: true
-    target: true
+    temperature_range:
-    current: false
+    - 5
+    - 30
+    temperature_step: 0.5
   topics:
-    set: "homegear/instance1/set/48/1/SET_TEMPERATURE"
+    state: "zigbee2mqtt/0x003c84fffebdcc28"
-    state: "homegear/instance1/plain/48/1/SET_TEMPERATURE"
+    set: "zigbee2mqtt/0x003c84fffebdcc28/set"
-  metadata:
-    friendly_name: "Thermostat Bad Unten"
-    location: "Bad Unten"
-    vendor: "eQ-3"
-    model: "MAX! Thermostat"
-    peer_id: "48"
-    channel: "1"
 - device_id: sterne_wohnzimmer
   homekit_aid: 32
   name: Sterne
@@ -843,17 +803,6 @@ devices:
   topics:
     state: "zigbee2mqtt/0xf0d1b8000017515d"
     set: "zigbee2mqtt/0xf0d1b8000017515d/set"
-- device_id: licht_kommode_schlafzimmer
-  homekit_aid: 65
-  name: Kommode Schlafzimmer
-  type: relay
-  cap_version: "relay@1.0.0"
-  technology: tasmota
-  features:
-    power: true
-  topics:
-    set: "cmnd/tasmota/04/POWER"
-    state: "stat/tasmota/04/POWER"
 - device_id: licht_fensterbank_esszimmer
   homekit_aid: 66
   name: Fensterbank Esszimmer
@@ -1177,3 +1126,29 @@ devices:
   topics:
     set: "pulsegen/command/5/18"
     state: "pulsegen/status/5"
+
+- device_id: licht_flur_oben_am_spiegel
+  homekit_aid: 95
+  name: Spiegel
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+  topics:
+    state: "zigbee2mqtt/0xf0d1b80000195038"
+    set: "zigbee2mqtt/0xf0d1b80000195038/set"
+- device_id: licht_kommode_schlafzimmer
+  homekit_aid: 96
+  name: Kommode Schlafzimmer
+  type: light
+  cap_version: "light@1.2.0"
+  technology: zigbee2mqtt
+  features:
+    power: true
+    brightness: true
+    color_temperature: true
+  topics:
+    state: "zigbee2mqtt/0x842e14fffefe4ba4"
+    set: "zigbee2mqtt/0x842e14fffefe4ba4/set"

config/rules.yaml

@@ -9,7 +9,7 @@ rules:
     thermostats:
     - thermostat_bad_unten
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_esszimmer
@@ -23,7 +23,7 @@ rules:
     thermostats:
     - thermostat_esszimmer
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -38,7 +38,7 @@ rules:
     thermostats:
     - thermostat_wohnzimmer
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -55,7 +55,7 @@ rules:
     thermostats:
     - thermostat_kueche
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -71,7 +71,7 @@ rules:
     thermostats:
     - thermostat_patty
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -85,7 +85,7 @@ rules:
     thermostats:
     - thermostat_schlafzimmer
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
     previous_target_ttl_secs: 86400
@@ -99,7 +99,7 @@ rules:
     thermostats:
     - thermostat_wolfgang
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20
 - id: window_setback_bad_oben
@@ -112,6 +112,6 @@ rules:
     thermostats:
     - thermostat_bad_oben
   params:
-    eco_target: 16.0
+    eco_target: 5.0
     open_min_secs: 20
     close_min_secs: 20

packages/home_capabilities/__init__.py

@@ -8,6 +8,8 @@ from packages.home_capabilities.contact_sensor import CAP_VERSION as CONTACT_SEN
 from packages.home_capabilities.contact_sensor import ContactState
 from packages.home_capabilities.temp_humidity_sensor import CAP_VERSION as TEMP_HUMIDITY_SENSOR_VERSION
 from packages.home_capabilities.temp_humidity_sensor import TempHumidityState
+from packages.home_capabilities.switch import CAP_VERSION as SWITCH_VERSION
+from packages.home_capabilities.switch import SwitchState
 from packages.home_capabilities.relay import CAP_VERSION as RELAY_VERSION
 from packages.home_capabilities.relay import RelayState
 from packages.home_capabilities.three_phase_powermeter import CAP_VERSION as THREE_PHASE_POWERMETER_VERSION
@@ -42,6 +44,8 @@ __all__ = [
     "CONTACT_SENSOR_VERSION",
     "TempHumidityState",
     "TEMP_HUMIDITY_SENSOR_VERSION",
+    "SwitchState",
+    "SWITCH_VERSION",
     "RelayState",
     "RELAY_VERSION",
     "DeviceTile",

packages/home_capabilities/switch.py

@@ -0,0 +1,69 @@
+"""Switch Capability - Wireless Button/Switch (read-only).
+
+This module defines the SwitchState model for wireless switches/buttons.
+These devices report action events (e.g., button presses) and are read-only devices.
+
+Capability Version: switch@1.0.0
+"""
+
+from datetime import datetime
+from typing import Annotated
+
+from pydantic import BaseModel, Field
+
+
+# Capability metadata
+CAP_VERSION = "switch@1.0.0"
+DISPLAY_NAME = "Switch"
+
+
+class SwitchState(BaseModel):
+    """State model for wireless switches/buttons.
+    
+    Wireless switches are read-only devices that report button actions such as
+    single press, double press, long press, etc. They typically also report 
+    battery level and signal quality.
+    
+    Attributes:
+        action: Action type (e.g., "single", "double", "long", "hold", etc.)
+        battery: Battery level percentage (0-100), optional
+        linkquality: MQTT link quality indicator, optional
+        voltage: Battery voltage in mV, optional
+        ts: Timestamp of the action event, optional
+    
+    Examples:
+        >>> SwitchState(action="single")
+        SwitchState(action='single', battery=None, ...)
+        
+        >>> SwitchState(action="double", battery=95, linkquality=87)
+        SwitchState(action='double', battery=95, linkquality=87, ...)
+    """
+    
+    action: str = Field(
+        ...,
+        description="Action type: 'single', 'double', 'long', 'hold', etc."
+    )
+    
+    battery: Annotated[int, Field(ge=0, le=100)] | None = Field(
+        None,
+        description="Battery level in percent (0-100)"
+    )
+    
+    linkquality: int | None = Field(
+        None,
+        description="Link quality indicator (typically 0-255)"
+    )
+    
+    voltage: int | None = Field(
+        None,
+        description="Battery voltage in millivolts"
+    )
+    
+    ts: datetime | None = Field(
+        None,
+        description="Timestamp of the action event"
+    )
+
+
+# Public API
+__all__ = ["SwitchState", "CAP_VERSION", "DISPLAY_NAME"]

tools/deploy-configuration.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+NAMESPACE=homea2
+
+kubectl create configmap home-automation-config \
+        --from-file=devices.yaml=config/devices.yaml \
+        --from-file=groups.yaml=config/groups.yaml \
+        --from-file=layout.yaml=config/layout.yaml \
+        --from-file=rules.yaml=config/rules.yaml \
+        --from-file=scenes.yaml=config/scenes.yaml \
+        --namespace=$NAMESPACE \
+        --dry-run=client -o yaml | kubectl apply -f - 
+
+kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
+