simo 2.6.3__py3-none-any.whl → 2.6.5__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
@@ -174,7 +177,10 @@ class PresenceLighting(Script):
             self._regulate()
 
     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):
@@ -226,8 +232,12 @@ 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:

simo/automation/forms.py

@@ -149,7 +149,7 @@ class ConditionForm(forms.Form):
         controller_val_type = type(component.controller.default_value)
         for val in values:
             val = val.strip()
-            if controller_val_type == 'bool':
+            if controller_val_type == bool:
                 if val.lower() in ('0', 'false', 'none', 'null'):
                     final_val = False
                 else:

simo/automation/gateways.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import logging
 import pytz
@@ -45,6 +46,7 @@ class ScriptRunHandler(multiprocessing.Process):
         self.logger = get_component_logger(self.component)
         sys.stdout = StreamToLogger(self.logger, logging.INFO)
         sys.stderr = StreamToLogger(self.logger, logging.ERROR)
+        self.component.meta['pid'] = os.getpid()
         self.component.set('running')
 
         if hasattr(self.component.controller, '_run'):

simo/automation/models.py

@@ -16,7 +16,7 @@ def post_script_change(sender, instance, created, **kwargs):
 
     def post_update():
         instance.controller.stop()
-        if instance.config.get('keep_alive') or instance.config('autostart'):
+        if instance.config.get('keep_alive') or instance.config.get('autostart'):
             time.sleep(2)
             instance.controller.start()
 

simo/automation/templates/automations/auto_away.py

@@ -1,4 +1,5 @@
 import time
+import random
 from django.utils import timezone
 from simo.core.middleware import get_current_instance
 from simo.core.models import Component
@@ -52,4 +53,6 @@ class Automation:
                     new_state = get_day_evening_night_morning(
                         self.sun, timezone.localtime()
                     )
-                    print(f"{new_state.upper()}!")
+                    print(f"{new_state.upper()}!")
+                    self.state.send(new_state)
+            time.sleep(random.randint(60, 120))

{simo-2.6.3.dist-info → simo-2.6.5.dist-info}/METADATA

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

{simo-2.6.3.dist-info → simo-2.6.5.dist-info}/RECORD

@@ -8,25 +8,25 @@ simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8
 simo/__pycache__/asgi.cpython-38.pyc,sha256=5W_YSKOIrRd6NQQuJDuA3Yuj688GzirXVVOyLe8wJIQ,845
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-38.pyc,sha256=Grz4Vv3nIjPYHWL7mzOBC3KMVB5Cf73cRVmjNBdTCAk,6149
+simo/__pycache__/settings.cpython-38.pyc,sha256=D6M7v6npEvxE6t4ks0xTW-9b6KeK6SzdCtiIM4mfJuE,6149
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
 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/forms.py,sha256=PxvKWKFm59-kItywVAdDxHGrxILxUoUk9QLr3RihVM0,10083
-simo/automation/gateways.py,sha256=1ByxQZPDARU006b30ua6unSbp25bcbyw1ETzQXWhrbU,9349
+simo/automation/controllers.py,sha256=pKC8kXiT8mvkLJChl10cdlgmeetG89wsY1xIW5ULvEs,10045
+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
-simo/automation/models.py,sha256=WuziHZ9rTcAnE5eYSDP8DOMu-PJQJROSaEqTBpCJK7o,923
+simo/automation/models.py,sha256=l45FHgeKGsfpLtd1X1PVFpIjB5JI4BlvKkodpcxm6aE,927
 simo/automation/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN4,1996
 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__/forms.cpython-38.pyc,sha256=F3jJAdRD3mEY2GGcCeI58UUnWIjTosfklfL2x5sJyA0,7720
-simo/automation/__pycache__/gateways.cpython-38.pyc,sha256=UhLcKI2kasoVnGCoe0M0-giBIVkWWuySMjKTgX2FdOs,7502
+simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=oswJRk8WGzzrNpg9S2LMl-zrAKaGxENacFzj6jT_tNI,7889
+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
-simo/automation/__pycache__/models.cpython-38.pyc,sha256=H_jWZ0dvJV5afCb5h8rOZ6nAuG2kCCrQbavz7V4nBZc,1228
+simo/automation/__pycache__/models.cpython-38.pyc,sha256=6gXdIMcrWaGACal2omj-b2if5JW8QvLIrtRfYVpDRQU,1230
 simo/automation/__pycache__/serializers.cpython-38.pyc,sha256=gWgcuPE8aY-TmuRLXCuSR74mvtKerpZ04m0MfPfw0AI,3405
 simo/automation/__pycache__/state.cpython-38.pyc,sha256=TO2IM6h2hbGVlOUcoMwHkDUF4V-54d_KVhcebMgNtCk,784
 simo/automation/migrations/0001_initial.py,sha256=VB6WIK1RlUdtqlWYCEhtnVE24odp2dfUvOVcxUZPpQ4,990
@@ -36,7 +36,7 @@ simo/automation/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=yg99vG
 simo/automation/migrations/__pycache__/0002_update_helpers_in_scripts.cpython-38.pyc,sha256=O-e7CnihMInCHHBBBE6L28LeryhTECLAKQaeu2cFO5g,1039
 simo/automation/migrations/__pycache__/__init__.cpython-38.pyc,sha256=L2WU6Wk1EXhqcOKUNA9o--Z4G0aTQqwvRhKYxuUooAM,175
 simo/automation/templates/admin/controller_widgets/script.html,sha256=biUEMo5V35wqSrM97d5WqNDi47GNaDpi53I3YBfDLOs,1484
-simo/automation/templates/automations/auto_away.py,sha256=Vd8zixKvF4-ESn02X3fmK0FJIAQUoKEIl9ECdmxof3w,1802
+simo/automation/templates/automations/auto_away.py,sha256=asz9AJ8eLHkxkpvm5phZhUqCNpghd54TKgllmvYkBoM,1911
 simo/automation/templates/automations/auto_state_script.py,sha256=pEaeKNss7L-PnhlMUpEfNRqCjquq6FAGrjTZ92CMxUY,1001
 simo/automation/templates/automations/phones_sleep_script.py,sha256=b6JZkfXdhDd3FwDJWq93kxBsm80kNzMGPWAF5jcWTHo,2894
 simo/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -127,7 +127,7 @@ simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0
 simo/core/db_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/db_backend/base.py,sha256=wY5jsZ8hQpwot3o-7JNtDe33xy-vlfMLXa011htDojI,601
 simo/core/db_backend/__pycache__/__init__.cpython-38.pyc,sha256=sxC6PmFqnwe6RRKzSR7QtUFzRc_aRRR1fffsR3TPLRc,169
-simo/core/db_backend/__pycache__/base.cpython-38.pyc,sha256=pmAGMpazhXHIsPL5dXdJICmTzyRiiMIWDzHTGhLGoRQ,977
+simo/core/db_backend/__pycache__/base.cpython-38.pyc,sha256=mJMgw02ZMTB10eepCKgJhEWILAKdRFEX35Dt_1GOWhQ,977
 simo/core/drf_braces/README,sha256=sYqsYB38WGwrU_zg1ttz7Gv69wElhY9aP8VhCsb9AsU,126
 simo/core/drf_braces/__init__.py,sha256=YW_TchAczdYPAsb4DIJcKXU7qSUHF3T--Q6OW4YDybc,194
 simo/core/drf_braces/mixins.py,sha256=yIquEvCDuji1vf76hkzz3Q_DBuldXe64k4Sq2DD-dYI,1624
@@ -189,7 +189,7 @@ simo/core/management/commands/gateways_manager.py,sha256=oHzgC-eV4w_KHkiz6eCAlt3
 simo/core/management/commands/on_http_start.py,sha256=A2V40pyGY7AfONhtnxiGATOkqd0i9FUvRRxkwyAJF9k,2252
 simo/core/management/commands/run_gateway.py,sha256=bp0FQQoBeOSoxjHCCMicDL1fxPZZGyLgnq2QKht3bJo,645
 simo/core/management/commands/__pycache__/__init__.cpython-38.pyc,sha256=WKpfZZpAB9D7U4X6oWQIrU_H-6rUmq8Gl9fj9XaY2fw,178
-simo/core/management/commands/__pycache__/gateways_manager.cpython-38.pyc,sha256=g5xhLz6AgU7cGZ5EmoiBZIZuZbs9AN01ZRZEOCEFqeE,6031
+simo/core/management/commands/__pycache__/gateways_manager.cpython-38.pyc,sha256=ijlkNjiMXKNI_81RZJLLGG4dWvLQglOrOYt5zC5WbrQ,6031
 simo/core/management/commands/__pycache__/on_http_start.cpython-38.pyc,sha256=LQeFW3oYYRrEPEcGghyeahFE114-4VbnKH4XaVGcQcg,3235
 simo/core/migrations/0001_initial.py,sha256=0Uy7IqJxQQYlurs8Mw_RJy7NaWS7BU0VFmZBBz8YkQI,9220
 simo/core/migrations/0002_load_icons.py,sha256=s9TtGo5NWEyWV3BspfbDNAlWqmQWxmDj7GjEaJXruFk,2044
@@ -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.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.6.3.dist-info/METADATA,sha256=1fD00X5OHyD52gEQb3u4suJ38ESebO55Ccb1caEO5gc,1952
-simo-2.6.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.6.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.6.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.6.3.dist-info/RECORD,,
+simo-2.6.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.6.5.dist-info/METADATA,sha256=bqH7ricDLu2pweU223qNedu6xRzUm130-ZOrO192p9g,1952
+simo-2.6.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.6.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.6.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.6.5.dist-info/RECORD,,