overwrite window added

deployment/configmap.yml

@@ -10,6 +10,7 @@ data:
   MQTT_BOX_TOPIC_PREFIXES: |
     {
       "high_temp": "heating/config/high_temp/",
+      "overwrite_window": "heating/overwrite_window",
       "cmd": "heating/command/"
     }
   MQTT_CENTRAL_TOPICS: |
@@ -25,7 +26,7 @@ data:
   MAINTENANCE_TEMPERATURE: "30.0"
   BOXES: |
     {
-      "box1": {
+      "patty": {
         "label": "patty",
         "windows": [ 
           { "topic": "homegear/instance1/plain/18/1/STATE", "label": "Garten rechts" },
@@ -33,7 +34,7 @@ data:
         ],
         "output_topic": "heating/homegear/instance1/set/39/1/SET_TEMPERATURE"
       },
-      "box2": {
+      "kueche": {
         "label": "kueche",
         "windows": [ 
           { "topic": "homegear/instance1/plain/37/1/STATE", "label": "Garten Fenster" },
@@ -43,27 +44,27 @@ data:
         ],
         "output_topic": "heating/homegear/instance1/set/40/1/SET_TEMPERATURE"
       },
-      "box3": {
+      "bad_oben": {
         "label": "bad_oben",
         "windows": [ 
         ],
         "output_topic": "heating/homegear/instance1/set/41/1/SET_TEMPERATURE"
       },
-      "box4": {
+      "schlafzimmer": {
         "label": "schlafzimmer",
         "windows": [ 
           { "topic": "homegear/instance1/plain/52/1/STATE", "label": "Strasse" }
         ],
         "output_topic": "heating/homegear/instance1/set/42/1/SET_TEMPERATURE"
       },
-      "box5": {
+      "wolfgang": {
         "label": "wolfgang",
         "windows": [ 
           { "topic": "homegear/instance1/plain/24/1/STATE", "label": "Garten" }
         ],
         "output_topic": "heating/homegear/instance1/set/43/1/SET_TEMPERATURE"
       },
-      "box6": {
+      "esszimmer": {
         "label": "esszimmer",
         "windows": [ 
           { "topic": "homegear/instance1/plain/26/1/STATE", "label": "Strasse rechts" },
@@ -71,7 +72,7 @@ data:
         ],
         "output_topic": "heating/homegear/instance1/set/45/1/SET_TEMPERATURE"
       },
-      "box7": {
+      "wohnzimmer": {
         "label": "wohnzimmer",
         "windows": [ 
           { "topic": "homegear/instance1/plain/28/1/STATE", "label": "Garten rechts" },
@@ -79,7 +80,7 @@ data:
         ],
         "output_topic": "heating/homegear/instance1/set/46/1/SET_TEMPERATURE"
       },
-      "box8": {
+      "bad_unten": {
         "label": "bad_unten",
         "windows": [ 
           { "topic": "homegear/instance1/plain/44/1/STATE", "label": "Strasse" }

src/main.py

@@ -66,7 +66,7 @@ try:
     box_topic_prefixes = json.loads(BOX_TOPIC_PREFIXES_CONFIG)
     
     # Validation: Check if the required keys are present
-    required_keys = {'high_temp', 'cmd'}
+    required_keys = {'high_temp', 'cmd', 'overwrite_window'}
     missing_keys = required_keys - box_topic_prefixes.keys()
     
     if missing_keys:

src/message_processor.py

@@ -20,6 +20,7 @@ def prepare_context(box_name, context):
 
     local_context['general_off'] = False
     local_context['maintenance_mode'] = False
+    local_context['overwrite_window'] = False
 
     local_context['window_state'] = {}
     for w in context['boxes'][box_name]['windows']:
@@ -35,8 +36,8 @@ def process_message(box_name, topic_key, payload, context):
     try:
         box = context['boxes'][box_name]
         local_context = box['context']
-        logger.info(f"Local context before: {local_context}")
+        logger.info(f"[{box_name}] Local context before: {local_context}")
-        logger.info(f"[{box_name}, {box['label']}] Processing message for '{topic_key}': {payload}")
+        logger.info(f"[{box_name}] Processing message for '{topic_key}': {payload}")
 
         match topic_key.split('/'):
             case [ primary_key, sub_key ] if primary_key == 'window':
@@ -45,6 +46,8 @@ def process_message(box_name, topic_key, payload, context):
                 result = process_high_temp(box_name, context, local_context, payload)
             case [ primary_key ] if primary_key == 'cmd':
                 result = process_cmd(box_name, context, local_context, payload)
+            case [ primary_key ] if primary_key == 'overwrite_window':
+                result = process_overwrite_window(box_name, context, local_context, payload)
             case [ primary_key ] if primary_key == 'general_off':
                 result = process_general_off(box_name, context, local_context, payload)
             case [ primary_key ] if primary_key == 'maintenance_mode':
@@ -60,7 +63,7 @@ def process_message(box_name, topic_key, payload, context):
             context['client'].publish(publish_topic, result_message)
             logger.info(f"[{box_name}] Result published on '{publish_topic}': {status} {result_message}")
 
-        logger.info(f"Local context after: {local_context}")
+        logger.info(f"[{box_name}] Local context after: {local_context}")
     except Exception as e:
         logger.error(f"[{box_name}] Error processing '{topic_key}': {e}") 
 
@@ -74,6 +77,7 @@ def _calculate_output_temperature(local_context):
         local_context['output_temperature'] = local_context['off_temperature']
         return
     # an open window shuts off the heating
+    if not local_context['overwrite_window']:
         for w in local_context['window_state'].values():
             if w == 'open':
                 local_context['output_temperature'] = local_context['off_temperature']
@@ -113,6 +117,11 @@ def process_cmd(box_name, context, local_context, payload):
         logger.error(f"Invalid cmd for {box_name} received: {payload}")
     return (local_context['output_temperature'], False)
 
+def process_overwrite_window(box_name, context, local_context, payload):
+    local_context['overwrite_window'] = (payload.lower() in ('true'))
+    _calculate_output_temperature(local_context)
+    return (local_context['output_temperature'], False)
+
 def process_high_temp(box_name, context, local_context, payload):
     local_context['high_temperature'] = payload
     _calculate_output_temperature(local_context)