simo 2.0.29__py3-none-any.whl → 2.0.31__py3-none-any.whl

simo/fleet/forms.py

@@ -1009,6 +1009,7 @@ class TTLockConfigForm(ColonelComponentForm):
         return self.cleaned_data
 
     def save(self, commit=True):
+        # TODO: after inclusion it was not assigned to proper colonel!
         obj = super(ColonelComponentForm, self).save(commit)
         if commit and 'door_sensor' in self.cleaned_data:
             GatewayObjectCommand(

simo/generic/forms.py

@@ -33,7 +33,7 @@ class ScriptConfigForm(BaseComponentForm):
     )
     keep_alive = forms.BooleanField(
         initial=True, required=False,
-        help_text="Wake up every 10s if not running."
+        help_text="Restart the script if it fails. "
     )
     code = forms.CharField(widget=PythonCode)
     log = forms.CharField(
@@ -58,7 +58,7 @@ class ScriptConfigForm(BaseComponentForm):
     def get_admin_fieldsets(cls, request, obj=None):
         base_fields = (
             'id', 'gateway', 'base_type', 'name', 'icon', 'zone', 'category',
-            'show_in_app', 'autostart',
+            'show_in_app', 'autostart', 'keep_alive',
             'code', 'control', 'log'
         )
 

simo/generic/gateways.py

@@ -216,7 +216,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         for script in Component.objects.filter(
             controller_uid=Script.uid,
             config__keep_alive=True
-        ).exclude(value='running'):
+        ).exclude(value__in=('running', 'stopped', 'finished')):
             self.start_script(script)
 
     def watch_watering(self):
@@ -252,12 +252,18 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         for component in Component.objects.filter(
             controller_uid=Script.uid, value='running'
         ):
-            component.value = 'stopped'
+            component.value = 'error'
             component.save()
 
+        # Start scripts that are designed to be autostarted
+        # as well as those who are designed to be kept alive, but
+        # got terminated unexpectedly
         for script in Component.objects.filter(
-            controller_uid=Script.uid, config__autostart=True
-        ):
+            controller_uid=Script.uid,
+        ).filter(
+            Q(config__autostart=True) |
+            Q(value='error', config__keep_alive=True)
+        ).disticnt():
             self.start_script(script)
 
         for cam in Component.objects.filter(
@@ -276,7 +282,9 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
         script_ids = [id for id in self.running_scripts.keys()]
         for id in script_ids:
-            self.stop_script(Component.objects.get(id=id))
+            self.stop_script(
+                Component.objects.get(id=id), 'error'
+            )
 
         while len(script_ids):
             time.sleep(0.1)
@@ -310,17 +318,17 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         if component.id in self.running_scripts:
             if self.running_scripts[component.id].is_alive():
                 self.running_scripts[component.id].kill()
-                component.value = 'stopped'
+                component.value = 'error'
                 component.save(update_fields=['value'])
         self.running_scripts[component.id] = ScriptRunHandler(
             component.id, daemon=True
         )
         self.running_scripts[component.id].start()
 
-    def stop_script(self, component):
+    def stop_script(self, component, stop_status='stopped'):
         if component.id not in self.running_scripts:
             if component.value == 'running':
-                component.value = 'stopped'
+                component.value = stop_status
                 component.save(update_fields=['value'])
             return
         if self.running_scripts[component.id].is_alive():
@@ -342,7 +350,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                     )
                     self.running_scripts[component.id].kill()
 
-                component.value = 'stopped'
+                component.value = stop_status
                 component.save(update_fields=['value'])
                 self.running_scripts.pop(component.id)
                 logger.handlers = []

{simo-2.0.29.dist-info → simo-2.0.31.dist-info}/METADATA

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

{simo-2.0.29.dist-info → simo-2.0.31.dist-info}/RECORD

@@ -69,7 +69,7 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=40wJ3mu0CnzexxDzXyDIlSxa
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=_Fpn-nG_lwHaMaOHwPofkz9O56bw6UjV6xkhXVhtFqs,19956
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=5MelLX2B-cQ0r9BUdLCUIUqnjvSccQ_BgWWiZ7sdGa0,19956
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
@@ -10175,7 +10175,7 @@ simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=rTxRFf-LKWAZxzixrsLZHHm51BmMx9a1PLdgf6inlNM,20533
-simo/fleet/forms.py,sha256=ivP30jRtABtf1NkAuOaRRwZB7khHIJ7XwEzS5aCF480,36881
+simo/fleet/forms.py,sha256=J3rjIvLgvd4lkxFM18ysf5int7fvLy5ARKYK5ca6O0U,36952
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=ve-97F1cwGt-AmwfSJK0d-57pP3NyZpeu0XlHu2oK28,14494
@@ -10192,7 +10192,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEE
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
 simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=l9bz18Qp33C12TJOKPSn9vIXnlBKnBusODNk7Fg64qA,18103
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=TH4NC-otAl9V6YlvrffE9sghlT-tw_3RFK1ztO-fzfg,27368
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=EohqxmZDPg_NVSy6v5kR9bsLcY-8J2UI91TcQkIFrXg,27368
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfrwAHkObVmErYzfRvjk,3569
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=pHNRUiPRjH0SLp14pzbSIxHi_-27SpZFgSh_7lzA8Wo,12359
@@ -10276,8 +10276,8 @@ simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
 simo/generic/controllers.py,sha256=WYuOUzDWvkYRaTvlbdGy_qmwp1o_ohqKDfV7OrOq2QU,52218
-simo/generic/forms.py,sha256=PcYe6emum8wEvnhUxXpEo2hXNZA6dk2YL2TYUN2YOxs,24249
-simo/generic/gateways.py,sha256=LYCOOO6TffOiLvHYvJcMt6t_lkunlKfUNjhYghEKI2Q,17035
+simo/generic/forms.py,sha256=NPHNg_8BPTIJt-DR0-GkNWgVo9bE0_50PUWSnpIE4Dg,24262
+simo/generic/gateways.py,sha256=Vw2r9wsIa86bs2nS-ExT31smpKnA19E0paiho7HeNX0,17390
 simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
@@ -10285,8 +10285,8 @@ simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFI
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQwWBPd_33u98JBcVtMVVCio,2374
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=e0bvgyePgJbIs1omBq0TRPlVSKar2sK_JbUKqDRj7mY,33235
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=oUFqYD3Tlm9AE1HMMlfnyWCnhtMY5hrF2U6rBgzYpU4,17911
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=e9_y6PdY05SDZkBT2u1V9jQUowC0hjqsquzWK2YXBjI,12695
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=du8pawGkAyGP51Cb6uWgvVLx48JZKNkVCdOpRmqQFaA,17915
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=LcBnE4rzzBOpVP1oI2mHSoB4dtZ4wP_vL0Y-YzTBVRE,12786
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=PzlZsM1jxo3FVb7QDm3bny8UFwTsGrMQe4mj4tJ06eQ,5675
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=piFHces0J9QuXu_CNBCQCYjoZEeoaxyVjLfJ9KaR8C8,1898
@@ -10456,8 +10456,8 @@ 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.0.29.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.29.dist-info/METADATA,sha256=-QXL9LMFmWhxr7ZZhTuZPEjsl3pr_dKvmNqpWXM9-ok,1730
-simo-2.0.29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.29.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.29.dist-info/RECORD,,
+simo-2.0.31.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.31.dist-info/METADATA,sha256=65C9h0Hq9Zg-Iob4o6DO_iM3KjIs6e2u5D5qoNdprYw,1730
+simo-2.0.31.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.31.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.31.dist-info/RECORD,,