better unit handling in semantic detection

Author: HolgerHees

python/shared/helper.py

@@ -68,7 +68,11 @@ def __call__(self, clazz):
         def init(self, *args, **kwargs):
             SimpleRule.__init__(self)
             #proxy.set_uid_prefix(self,classPackage,filePackage)
-            clazz.__init__(self, *args, **kwargs)
+            try:
+                clazz.__init__(self, *args, **kwargs)
+            except Exception as e:
+                self.log.error("Rule init failed:\n" + traceback.format_exc())
+                raise e
 
             self.triggerItems = {}
             _triggers = []

python/shared/semantic/command_processor.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import re
 
+from org.openhab.core.library.items import NumberItem
+
 from shared.helper import  sendCommandIfChanged, getItemState, getLanguage
 
 import importlib
@@ -428,11 +430,17 @@ def getAnswer(self,semantic_item):
         for tag in semantic_item.getItem().getTags():
             if tag not in SemanticConfig["answers"]:
                 continue
-            return SemanticConfig["answers"][tag].format(room=semantic_location.getItem().getLabel(),state=value)
+
+            answer = SemanticConfig["answers"][tag]["answer"]
+            unit = SemanticConfig["answers"][tag]["unit"]
+            if isinstance(semantic_item.getItem(), NumberItem):
+                if semantic_item.getItem().getUnit() is None:
+                    value = u"{} {}".format(value, unit)
+            return answer.format(room=semantic_location.getItem().getLabel(),state=value)
 
         semantic_reference = semantic_equipment if len(semantic_equipment.getChildren()) == 1 else semantic_item
 
-        return SemanticConfig["answers"]["Default"].format(equipment=semantic_reference.getItem().getLabel(),room=semantic_location.getItem().getLabel(),state=value)
+        return SemanticConfig["answers"]["Default"]["answer"].format(equipment=semantic_reference.getItem().getLabel(),room=semantic_location.getItem().getLabel(),state=value)
 
     def applyActions(self,actions,voice_command,dry_run):
         missing_locations = []

python/shared/semantic/config/semantic_config.py

@@ -14,10 +14,10 @@
         "ok_message": "ok"
     },
     "answers": {
-        "Temperature": u"The temperature in the {room} is {state} °C",
-        "Humidity": u"The humidity in the {room} is {state} %",
-        #"Light": u"The light in the {room} is {state}",
-        "Default": u"{equipment} in the {room} is {state}"
+        "Temperature": { "answer": u"The temperature in the {room} is {state}", "unit": "°C" },
+        "Humidity": { "answer": u"The humidity in the {room} is {state}", "unit": "%" },
+        #"Light": { "answer": u"The light in the {room} is {state}"  },
+        "Default": { "answer": u"{equipment} in the {room} is {state}" }
     },
     "states": {
         "ON": "on",

python/shared/semantic/config/semantic_config_de.py

@@ -16,10 +16,9 @@
         "ok_message": "ok"
     },
     "answers": {
-        "Temperature": u"Die Temperatur im {room} beträgt {state} °C",
-        "Humidity": u"Die Luftfeuchtigkeit im {room} beträgt {state} %",
-        #"Light": u"Das Licht im {room} ist {state}",
-        "Default": u"{equipment} im {room} ist {state}"
+        "Temperature": { "answer": u"Die Temperatur im {room} beträgt {state}", "unit": "°C" },
+        "Humidity": { "answer": u"Die Luftfeuchtigkeit im {room} beträgt {state}", "unit": "%" },
+        "Default": { "answer": u"{equipment} im {room} ist {state}" }
     },
     "states": {
         "ON": "on",

python/shared/semantic/model/semantic_model.py

@@ -117,7 +117,10 @@ def __init__(self,log,item_registry,config):
         for semantic_item in self.semantic_items.values():
             if semantic_item.item.getType() == "Group":
                 children = semantic_item.item.getMembers()
+                #self.log.info("-------------")
+                #self.log.info(semantic_item.item.getName())
                 for item in children:
+                    #self.log.info(item.getName())
                     semantic_item.children.append(self.semantic_items[item.getName()])
 
                 if semantic_item.getSemanticType() == "Location":