Merge pull request #1534 from Odianosen25/dev

appdaemon/threading.py

@@ -584,6 +584,8 @@ async def get_pinned_apps(self, thread):
     #
 
     async def check_constraint(self, key, value, app):
+        """Used to check Constraint"""
+
         unconstrained = True
         if key in app.list_constraints():
             method = getattr(app, key)
@@ -592,6 +594,8 @@ async def check_constraint(self, key, value, app):
         return unconstrained
 
     async def check_time_constraint(self, args, name):
+        """Used to check time Constraint"""
+
         unconstrained = True
         if "constrain_start_time" in args or "constrain_end_time" in args:
             if "constrain_start_time" not in args:
@@ -607,7 +611,9 @@ async def check_time_constraint(self, args, name):
 
         return unconstrained
 
-    async def check_days_constraint(self, args):
+    async def check_days_constraint(self, args, name):
+        """Used to check days Constraint"""
+
         unconstrained = True
         if "constrain_days" in args:
             days = args["constrain_days"]
@@ -621,10 +627,12 @@ async def check_days_constraint(self, args):
 
         return unconstrained
 
-    async def check_state_constraint(self, args, new_state):
+    async def check_state_constraint(self, args, new_state, name):
+        """Used to check state Constraint"""
+
         unconstrained = True
         if "constrain_state" in args:
-            unconstrained = utils.check_state(self.logger, new_state, args["constrain_state"])
+            unconstrained = utils.check_state(self.logger, new_state, args["constrain_state"], name)
 
         return unconstrained
 
@@ -793,7 +801,7 @@ async def dispatch_worker(self, name, args):
                     unconstrained = False
             if not await self.check_time_constraint(self.AD.app_management.app_config[name], name):
                 unconstrained = False
-            elif not await self.check_days_constraint(self.AD.app_management.app_config[name]):
+            elif not await self.check_days_constraint(self.AD.app_management.app_config[name], name):
                 unconstrained = False
 
         #
@@ -811,14 +819,14 @@ async def dispatch_worker(self, name, args):
                     unconstrained = False
             if not await self.check_time_constraint(myargs["kwargs"], name):
                 unconstrained = False
-            elif not await self.check_days_constraint(myargs["kwargs"]):
+            elif not await self.check_days_constraint(myargs["kwargs"], name):
                 unconstrained = False
 
             #
             # Lets determine the state constraint
             #
             if myargs["type"] == "state":
-                state_unconstrained = await self.check_state_constraint(myargs["kwargs"], myargs["new_state"])
+                state_unconstrained = await self.check_state_constraint(myargs["kwargs"], myargs["new_state"], name)
                 unconstrained = all((unconstrained, state_unconstrained))
 
         if unconstrained:

appdaemon/utils.py

@@ -185,7 +185,7 @@ def __init__(self, dict):
         self.__dict__ = AttrDict.from_nested_dict(dict)
 
 
-def check_state(logger, new_state, callback_state) -> bool:
+def check_state(logger, new_state, callback_state, name) -> bool:
 
     passed = False
 
@@ -200,7 +200,7 @@ def check_state(logger, new_state, callback_state) -> bool:
             passed = callback_state(new_state)
 
     except Exception as e:
-        logger.warning("Could not evaluate state check due to %s", e)
+        logger.warning("Could not evaluate state check due to %s, from %s", e, name)
         passed = False
 
     return passed

docs/HISTORY.rst

@@ -12,24 +12,10 @@ None
 
 - Fixed issue when when using `timeout` in listen event api, after the event is ran one gets an error in log
 - Fixed issue when an entity is deleted from HA, and it remains in AD
-
-**Breaking Changes**
-
-None
-
-4.2.1 - (2022-01-17)
---------------------
-
-**Features**
-
-- Docker: Added MQTT vars to dockerStart.sh - contributed by `Xavi Moreno <https://github.com/xaviml>`__
-
-**Fixes**
-
-- Fixed issue whereby `turn_on`, `turn_off` and `toggle` for some HASS entities didn't work
-- Fixed issue whereby `render_template` didn't work
-- FIxed issues with setup file saying support "python3 3.0"
+- Fixed issue with setup file saying support "python3 3.0"
+- FIxed issue with the inability to know which app's callback failed `constrain_state` check
 - Documentation fixes - contributed by `Rootie <https://github.com/Rootie>`__
+- Documentation fixes - contributed by `Jakob Ruhe <https://github.com/jakeru>`__
 - Bump black to 22.3.0 and run it on all files - contributed by `Jakob Ruhe <https://github.com/jakeru>`__
 - Bumped websocket-client from 1.2.3 to 1.3.3
 - Bumped azure-mgmt-storage from 19.0.0 to 20.0.0
@@ -50,6 +36,22 @@ None
 
 None
 
+4.2.1 - (2022-01-17)
+--------------------
+
+**Features**
+
+- Docker: Added MQTT vars to dockerStart.sh - contributed by `Xavi Moreno <https://github.com/xaviml>`__
+
+**Fixes**
+
+- Fixed issue whereby `turn_on`, `turn_off` and `toggle` for some HASS entities didn't work
+- Fixed issue whereby `render_template` didn't work
+
+**Breaking Changes**
+
+None
+
 4.2.0 (2022-01-03)
 ------------------