simo 2.6.4__py3-none-any.whl → 2.6.6__py3-none-any.whl

simo/automation/controllers.py

@@ -121,15 +121,18 @@ class PresenceLighting(Script):
     name = _("Presence lighting")
     config_form = PresenceLightingConfigForm
 
-    # script specific variables
-    sensors = {}
-    condition_comps = {}
-    light_org_values = {}
-    is_on = False
-    turn_off_task = None
-    last_presence = 0
-    hold_time = 60
-    conditions = []
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # script specific variables
+        self.sensors = {}
+        self.condition_comps = {}
+        self.light_org_values = {}
+        self.light_send_values = {}
+        self.is_on = False
+        self.turn_off_task = None
+        self.last_presence = 0
+        self.hold_time = 60
+        self.conditions = []
 
     def _run(self):
         self.hold_time = self.component.config.get('hold_time', 0) * 10
@@ -158,33 +161,36 @@ class PresenceLighting(Script):
                 self.condition_comps[comp.id] = comp
 
         while True:
-            self._regulate(on_val_change=False)
+            self._regulate()
             time.sleep(random.randint(5, 15))
 
     def _on_sensor(self, sensor=None):
         if sensor:
             self.sensors[sensor.id] = sensor
-            self._regulate()
+            self._regulate(on_sensor=True)
 
     def _on_condition(self, condition_comp=None):
         if condition_comp:
             for condition in self.conditions:
                 if condition['component'].id == condition_comp.id:
                     condition['component'] = condition_comp
-            self._regulate()
+            self._regulate(on_condition_change=True)
 
     def _on_light_change(self, light):
-        if self.is_on:
+        # change original value if it has been changed to something different
+        # than this script does.
+        if self.is_on and light.value != self.light_send_values[light.id]:
+            self.light_send_values[light.id] = light.value
             self.light_org_values[light.id] = light.value
 
-    def _regulate(self, on_val_change=True):
+    def _regulate(self, on_sensor=False, on_condition_change=False):
         presence_values = [s.value for id, s in self.sensors.items()]
         if self.component.config.get('act_on', 0) == 0:
             must_on = any(presence_values)
         else:
             must_on = all(presence_values)
 
-        if must_on and on_val_change:
+        if must_on and on_sensor:
             print("Presence detected!")
 
         additional_conditions_met = True
@@ -198,7 +204,7 @@ class PresenceLighting(Script):
 
             if condition['op'] == 'in':
                 if comp.value not in self._string_to_vals(condition['value']):
-                    if must_on and on_val_change:
+                    if must_on and on_sensor:
                         print(
                             f"Condition not met: [{comp} value:{comp.value} "
                             f"{condition['op']} {condition['value']}]"
@@ -207,7 +213,7 @@ class PresenceLighting(Script):
                     break
 
             if not op(comp.value, condition['value']):
-                if must_on and on_val_change:
+                if must_on and on_sensor:
                     print(
                         f"Condition not met: [{comp} value:{comp.value} "
                         f"{condition['op']} {condition['value']}]"
@@ -215,7 +221,15 @@ class PresenceLighting(Script):
                 additional_conditions_met = False
                 break
 
-        if must_on and additional_conditions_met and not self.is_on:
+
+        if not self.is_on:
+            if not must_on:
+                return
+            if not additional_conditions_met:
+                return
+            if on_condition_change:
+                return
+
             print("Turn the lights ON!")
             self.is_on = True
             self.light_org_values = {}
@@ -226,11 +240,15 @@ class PresenceLighting(Script):
                 if not comp or not comp.controller:
                     continue
                 self.light_org_values[comp.id] = comp.value
-                print(f"Send {light_params['on_value']} to {comp}!")
-                comp.controller.send(light_params['on_value'])
+                on_val = light_params['on_value']
+                if type(comp.controller.default_value) == bool:
+                    on_val = bool(on_val)
+                print(f"Send {on_val} to {comp}!")
+                self.light_send_values[comp.id] = on_val
+                comp.controller.send(on_val)
             return
 
-        if self.is_on:
+        else:
             if not additional_conditions_met:
                 return self._turn_it_off()
             if not any(presence_values):

simo/notifications/api.py

@@ -34,7 +34,7 @@ class NotificationsViewSet(
                 archived = bool(int(self.request.query_params['archived']))
             except:
                 archived = False
-            qs = qs.objects.filter(
+            qs = qs.filter(
                 user_notifications__archived__isnull=not archived,
                 user_notifications__user=self.request.user
             )

{simo-2.6.4.dist-info → simo-2.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.6.4
+Version: 2.6.6
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.6.4.dist-info → simo-2.6.6.dist-info}/RECORD

@@ -13,7 +13,7 @@ simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDX
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
-simo/automation/controllers.py,sha256=gIkEOqq7IJ3BoDF40mN2aTGE8_yVwhQrO0RZlJYiYfg,9451
+simo/automation/controllers.py,sha256=Py62mo8boFsreiGVAnalJt_1SJePxD67aCGma6zGjWg,10206
 simo/automation/forms.py,sha256=wJMaXE5ngO_o60jqxnf4Om09q48yXpWwRna0FkQCZYs,10081
 simo/automation/gateways.py,sha256=7r33NOAiRd_RGMMm44i0KYzuAuweQnEF4HxLo-Rpexs,9408
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
@@ -22,7 +22,7 @@ simo/automation/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN
 simo/automation/state.py,sha256=aZZvNBae7unnux_zGHCIWCV2z47hVJc-DIL72Hqfkeo,600
 simo/automation/__pycache__/__init__.cpython-38.pyc,sha256=YmP0xAD-mxpQHgdTZeC64sXChA8TriMZD1jckNYi3xg,164
 simo/automation/__pycache__/app_widgets.cpython-38.pyc,sha256=7DfUA9V_1MiwrOe_ta-ts8dYY8xXb9UMg2_9A3XoRcs,523
-simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=JUQ105NN-9Si1pyCkqn4P_4yQ9NG7OnQfSRBzBaeth4,7535
+simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=s9YqMUTCzjIxNVrk36SrIvGrXWYLc9DR80Sa3orpg1o,7936
 simo/automation/__pycache__/forms.cpython-38.pyc,sha256=qxQZeTafJOT_lrXOKY6134XjIrx5OzABAZdncNnRV4E,7720
 simo/automation/__pycache__/gateways.cpython-38.pyc,sha256=W6OrugOLOGaYbibEWSs-zBZc8jQpNlO_NmJU-rmd6fU,7558
 simo/automation/__pycache__/helpers.cpython-38.pyc,sha256=4VSSarOFnUk_KExWwvDlx5dEhv8aHUCHMZDtGG--pUY,3627
@@ -10449,13 +10449,13 @@ simo/multimedia/migrations/__pycache__/0004_auto_20231023_1055.cpython-38.pyc,sh
 simo/multimedia/migrations/__pycache__/__init__.cpython-38.pyc,sha256=mCgSiQBphL85imdWyTi9-4zBDYF6HfXbhB0ycSPVVuA,175
 simo/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/notifications/admin.py,sha256=WQbN_bd2KRxVjbOajeworNrV9QlDNSadQT58La0Nn2M,1174
-simo/notifications/api.py,sha256=qzM-P3kq_YQ8_wHS8EMIutRbTvtqOXczQbJFb7EgQ08,1773
+simo/notifications/api.py,sha256=QrfFn5kBU0vlqi8X368w1-0iTmDGu_hmMxLW2R0OTTg,1765
 simo/notifications/models.py,sha256=QGDLGAi5gk8OTcvd7ho5WNdctDymWGmGF1ZqN4-G_ZA,2443
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
 simo/notifications/utils.py,sha256=uBl-Y7WGu00iaGM5rrdogcq0OMRVtyVfJF39-mdB3_k,1853
 simo/notifications/__pycache__/__init__.cpython-38.pyc,sha256=YvucUfu98XFvEEg1LYFMlOZJpo_jSGxTVrM-ylAFLOg,167
 simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=MScNrtVM1wavefsPfxy0A7LVyXKcbvEkLH9GJkgNOl8,1945
-simo/notifications/__pycache__/api.cpython-38.pyc,sha256=8dPiIMaFQlBFP01VwXbQ98udaZaqwibZJtz_Y2cXa8U,2073
+simo/notifications/__pycache__/api.cpython-38.pyc,sha256=eQmCHwTnr4zQ3ZY_SKZVCryiSEnzmyIjHQM13pZ5LT0,2071
 simo/notifications/__pycache__/models.cpython-38.pyc,sha256=PoqLuOnlaAWQQ-20AtqhvAlLSkakPmdn7J7wGvHNW3g,2449
 simo/notifications/__pycache__/serializers.cpython-38.pyc,sha256=7-eRGKYuQ4g1SpKOMpz17SIiu1HmaMoYv-cJbaO9QGA,1028
 simo/notifications/__pycache__/utils.cpython-38.pyc,sha256=6Tq7VkW-pZLzWzcxPtBU9MDFZLO7iLY8-ygyefoJ5OQ,1529
@@ -10599,9 +10599,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.6.4.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.6.4.dist-info/METADATA,sha256=NoyEMezGXQEMN7GPtCpiLjVhl1WvSZrArBjsdJc8h0U,1952
-simo-2.6.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.6.4.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.6.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.6.4.dist-info/RECORD,,
+simo-2.6.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.6.6.dist-info/METADATA,sha256=U_rJSOAn0Y32OcYjYKHpnflh2C1SLDSmOxb5f6rWXXM,1952
+simo-2.6.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.6.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.6.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.6.6.dist-info/RECORD,,