simo 2.0.30__py3-none-any.whl → 2.0.32__py3-none-any.whl

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(

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)
+        ).distinct():
             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,22 +318,27 @@ 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():
+            tz = pytz.timezone(component.zone.instance.timezone)
+            timezone.activate(tz)
             logger = get_component_logger(component)
-            logger.log(logging.INFO, "-------STOP-------")
+            if stop_status == 'error':
+                logger.log(logging.INFO, "-------GATEWAY STOP-------")
+            else:
+                logger.log(logging.INFO, "-------STOP-------")
             self.running_scripts[component.id].terminate()
 
             def kill():
@@ -337,12 +350,13 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                         break
                     time.sleep(0.1)
                 if not terminated:
-                    logger.log(
-                        logging.INFO, "-------KILL!-------"
-                    )
+                    if stop_status == 'error':
+                        logger.log(logging.INFO, "-------GATEWAY KILL-------")
+                    else:
+                        logger.log(logging.INFO, "-------KILL!-------")
                     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.30.dist-info → simo-2.0.32.dist-info}/METADATA

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

{simo-2.0.30.dist-info → simo-2.0.32.dist-info}/RECORD

@@ -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=vmkjiQLV6Ab8nm485WK4YCasJG9f-ak0iXpH11sQujo,24263
-simo/generic/gateways.py,sha256=LYCOOO6TffOiLvHYvJcMt6t_lkunlKfUNjhYghEKI2Q,17035
+simo/generic/forms.py,sha256=NPHNg_8BPTIJt-DR0-GkNWgVo9bE0_50PUWSnpIE4Dg,24262
+simo/generic/gateways.py,sha256=RcHubz3oyY_ysPLNPLRoyh8C6r-WfPzpD98OVkDvPPI,17731
 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=QCESCygqXCfTzPJ0HMgHEAzq-sZrHi-mOwg5gPm5erQ,17916
-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=IbRdwj0oIUyyuR-AOlaPmEwKXr5utWf0LsLTN-HHSuI,12962
 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.30.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.30.dist-info/METADATA,sha256=d5-fMPYcwWRAZCXV-9M_bSY14gqQ5M3h5wPaGm28Fzc,1730
-simo-2.0.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.30.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.30.dist-info/RECORD,,
+simo-2.0.32.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.32.dist-info/METADATA,sha256=z2RvhzDmB2eQsigSTU8ueR531aRvnhHR6AdMINLJucw,1730
+simo-2.0.32.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.32.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.32.dist-info/RECORD,,