simo 2.5.29__py3-none-any.whl → 2.5.30__py3-none-any.whl

simo/generic/gateways.py

@@ -130,6 +130,8 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ('watch_timers', 1)
     )
 
+    terminating_scripts = set()
+
     def watch_thermostats(self):
         from .controllers import Thermostat
         drop_current_instance()
@@ -152,31 +154,25 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             alarm_clock.tick()
 
     def watch_scripts(self):
-        # observe running scripts and drop the ones that are no longer alive
         drop_current_instance()
-        dead_processes = []
-        for id, process in self.running_scripts.items():
+        # observe running scripts and drop the ones that are no longer alive
+        dead_scripts = False
+        for id, process in list(self.running_scripts.items()):
+            comp = Component.objects.filter(id=id).first()
             if process.is_alive():
-                if not Component.objects.filter(id=id).count():
+                if not comp and id not in self.terminating_scripts:
                     # script is deleted, or instance deactivated
-                    process.terminate()
+                    process.kill()
                 continue
-            component = Component.objects.filter(id=id).exclude(
-                value__in=('error', 'finished')
-            ).first()
-            if component:
-                logger = get_component_logger(component)
-                logger.log(logging.INFO, "-------DEAD!-------")
-                component.value = 'error'
-                component.save()
-            dead_processes.append(id)
-
-        for id in dead_processes:
-            self.running_scripts.pop(id)
-
-        if dead_processes:
-            # give 10s of air before we restart the scripts what were
-            # detected to be dead.
+            else:
+                if id not in self.terminating_scripts:
+                    dead_scripts = True
+                    logger = get_component_logger(comp)
+                    logger.log(logging.INFO, "-------DEAD!-------")
+                    self.stop_script(comp, 'error')
+
+        if dead_scripts:
+            # give 10s air before we wake these dead scripts up!
             return
 
         from simo.generic.controllers import Script
@@ -291,52 +287,68 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))
         if component.id in self.running_scripts:
-            if self.running_scripts[component.id].is_alive():
-                self.running_scripts[component.id].kill()
-                component.value = 'error'
-                component.save(update_fields=['value'])
+            if component.id not in self.terminating_scripts:
+                if component.value != 'running':
+                    component.value = 'running'
+                    component.save()
+                    return
+            else:
+                good_to_go = False
+                for i in range(12): # wait for 3s
+                    time.sleep(0.2)
+                    component.refresh_from_db()
+                    if component.id not in self.running_scripts:
+                        good_to_go = True
+                        break
+                if not good_to_go:
+                    return self.stop_script(component, 'error')
+
         self.running_scripts[component.id] = ScriptRunHandler(
             component.id, daemon=True
         )
         self.running_scripts[component.id].start()
 
     def stop_script(self, component, stop_status='stopped'):
+        self.terminating_scripts.add(component.id)
         if component.id not in self.running_scripts:
             if component.value == 'running':
                 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)
-            if stop_status == 'error':
-                logger.log(logging.INFO, "-------GATEWAY STOP-------")
-            else:
-                logger.log(logging.INFO, "-------STOP-------")
-            self.running_scripts[component.id].terminate()
 
-            def kill():
-                start = time.time()
-                terminated = False
-                while start > time.time() - 2:
-                    if not self.running_scripts[component.id].is_alive():
-                        terminated = True
-                        break
-                    time.sleep(0.1)
-                if not terminated:
-                    if stop_status == 'error':
-                        logger.log(logging.INFO, "-------GATEWAY KILL-------")
-                    else:
-                        logger.log(logging.INFO, "-------KILL!-------")
-                    self.running_scripts[component.id].kill()
+        tz = pytz.timezone(component.zone.instance.timezone)
+        timezone.activate(tz)
+        logger = get_component_logger(component)
+        if stop_status == 'error':
+            logger.log(logging.INFO, "-------GATEWAY STOP-------")
+        else:
+            logger.log(logging.INFO, "-------STOP-------")
+        self.running_scripts[component.id].terminate()
+
+        def kill():
+            start = time.time()
+            terminated = False
+            while start > time.time() - 2:
+                if not self.running_scripts[component.id].is_alive():
+                    terminated = True
+                    break
+                time.sleep(0.1)
+            if not terminated:
+                if stop_status == 'error':
+                    logger.log(logging.INFO, "-------GATEWAY KILL-------")
+                else:
+                    logger.log(logging.INFO, "-------KILL!-------")
+                self.running_scripts[component.id].kill()
 
-                component.value = stop_status
-                component.save(update_fields=['value'])
-                self.running_scripts.pop(component.id)
-                logger.handlers = []
+            component.value = stop_status
+            component.save(update_fields=['value'])
+            self.terminating_scripts.remove(component.id)
+            # making sure it's fully killed along with it's child processes
+            self.running_scripts[component.id].kill()
+            self.running_scripts.pop(component.id, None)
+            logger.handlers = []
 
-            threading.Thread(target=kill, daemon=True).start()
+        threading.Thread(target=kill, daemon=True).start()
 
     def control_alarm_group(self, alarm_group, value):
         from simo.generic.controllers import AlarmGroup

simo/users/admin.py

@@ -134,7 +134,7 @@ class UserDeviceLog(admin.ModelAdmin):
         'speed_kmh', 'phone_on_charge'
     )
     list_display = (
-        'datetime', 'app_open', 'location', 'relay', 'speed_kmh',
+        'datetime', 'at_home', 'app_open', 'location', 'relay', 'speed_kmh',
         'phone_on_charge', 'users'
     )
     fields = readonly_fields

simo/users/migrations/0039_auto_20241117_1039.py

@@ -7,7 +7,9 @@ def forwards_func(apps, schema_editor):
     from simo.generic.scripting.helpers import haversine_distance
     UserDeviceReportLog = apps.get_model("users", "UserDeviceReportLog")
 
-    logs = UserDeviceReportLog.objects.all().select_related('instance')
+    logs = UserDeviceReportLog.objects.filter(
+        instance__isnull=False
+    ).select_related('instance')
 
     print("Calculate at_home on UserDeviceReportLog's!")
 

{simo-2.5.29.dist-info → simo-2.5.30.dist-info}/METADATA

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

{simo-2.5.29.dist-info → simo-2.5.30.dist-info}/RECORD

@@ -10344,7 +10344,7 @@ simo/generic/app_widgets.py,sha256=TPRLj4hri2hBuY6mrdwBiv-01z2hDxZmsup-GDD9LrM,9
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
 simo/generic/controllers.py,sha256=i-xKQ5PrNKwCuO0dFaHHUaD5rF9lDnq18ziVSNBENao,50134
 simo/generic/forms.py,sha256=tCbIZtbruBHjZRzulGXJQOjmxaGJ2uoKqjT1scScdDQ,29004
-simo/generic/gateways.py,sha256=MxPQzgEnnXSG-t6rErHZQJACFWegCWGaME640UIGrA8,15783
+simo/generic/gateways.py,sha256=0gDjWSCAt6MABR6k8xV7N1zXutDLCileGtAm6pSl4Q4,16165
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-qaQ,1757
@@ -10353,7 +10353,7 @@ simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=YZ5db6-FPynBi6ooPW5cr
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=-Y3fV0gbkye9WgWpdNY7qG9VvMWpFUT7Spl1eukztgQ,33352
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=Dd-hgbRNdIFzUDjSZ4yQp7wwR-ILBYQFI8MCob_ZYwQ,21232
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=aKjuAS278Gd_DneTpONP4xuaq51wQq_9lzZXPwwZ3i4,11851
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=uubZtp-UgEmKU4vG9ophnCZFEDqmKkeY1yyWUXzdmdY,12015
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=qJO5kvQLWhsQDOr1AtAtsAybuRWioxSkQei3Pc7rdP0,1737
@@ -10444,7 +10444,7 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 simo/notifications/migrations/__pycache__/0003_alter_notification_instance.cpython-38.pyc,sha256=awhD1F9RyK_706zVNM5io3WT_konFkKQgL7D5MkONwk,851
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
-simo/users/admin.py,sha256=WDNZLsOA86xMpqiL3x-rNGB9ankr8ep6NjDxB6fbxuY,6976
+simo/users/admin.py,sha256=2Ay47b1NWBfdUpMZ8qUFAbwiu7-P3JNxNpM7FKVwrLw,6987
 simo/users/api.py,sha256=pWmP201jyz7_KCC_c8Fsrnh1R0HoCkcHfwu4LYCIRfg,12373
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=KIw2AdjCUKfm_7Lql6aC4qdE6JznP0ECIMA5MVMLeiM,4251
@@ -10461,7 +10461,7 @@ simo/users/tasks.py,sha256=HJAqiyWGsaN3wSfquU0UyQ20jL-njXeaaTOdDT3TQ3s,979
 simo/users/utils.py,sha256=1HGSZyHRqQvdJ4RtAiZDg1juvgG8aOlrGXR7CcvsyQc,1886
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
-simo/users/__pycache__/admin.cpython-38.pyc,sha256=aTiBtHF-lQYKy3NMoVhqju2bctC_aHWKZtq-kaMUiMQ,7942
+simo/users/__pycache__/admin.cpython-38.pyc,sha256=-TXB5LGoAvCfgNhsqaB-1pgyyfW8lbuGcgD8F4HZojk,7947
 simo/users/__pycache__/api.cpython-38.pyc,sha256=4JQ61L-i0GXtnqlGgZfoHHQX9bd8xJc9kkEmvjHC_-Q,10172
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=jYS2hlbTZh_ZtPeWcN50pc0IpyfCSO7_MvIbuVwEp8M,3144
@@ -10515,7 +10515,7 @@ simo/users/migrations/0035_instanceuser_last_seen_speed_kmh_and_more.py,sha256=l
 simo/users/migrations/0036_instanceuser_phone_on_charge_user_phone_on_charge.py,sha256=uHXLRmFAASdB9sPivYkRu7WV4rxZDI3RaEwl2i7U_xg,615
 simo/users/migrations/0037_rename_last_seen_location_datetime_instanceuser_last_seen_and_more.py,sha256=8f_7fC7k0Dm-0gGVHMI9_490BbEC_SfuAPrAADrZ7BA,1543
 simo/users/migrations/0038_userdevicereportlog_at_home_and_more.py,sha256=qL1ZjUJDiSrJat59ToqpNBwnMMPb3Q5mwHq-qd1eFcI,691
-simo/users/migrations/0039_auto_20241117_1039.py,sha256=ycDT9Df-wwqA8kgurJKJvmgpOS8rVXGf-LyRny2reO8,1271
+simo/users/migrations/0039_auto_20241117_1039.py,sha256=e64AJM2ZId516Px-gmAxkp2NmSC5Vjo_BBTGbYrFuKY,1310
 simo/users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=e4XOKaYRb7l0P7cBnHHi5FQQJMlwjK0g7iqgM-xKmNI,4215
 simo/users/migrations/__pycache__/0002_componentpermission.cpython-38.pyc,sha256=pknJnpic8p6Vdx9DX41FfODXNnvexDswJtUCmC5w1tg,995
@@ -10557,7 +10557,7 @@ simo/users/migrations/__pycache__/0035_instanceuser_last_seen_speed_kmh_and_more
 simo/users/migrations/__pycache__/0036_instanceuser_phone_on_charge_user_phone_on_charge.cpython-38.pyc,sha256=y1ZDJ8VM5_vJOxTPRERjwukiGXJ89UhDc4bHiHZwQ_w,723
 simo/users/migrations/__pycache__/0037_rename_last_seen_location_datetime_instanceuser_last_seen_and_more.cpython-38.pyc,sha256=W4Rc6SRNNJ_yAYrEyoklD5LFmQPAL9mTDrXHMfP8R4I,1162
 simo/users/migrations/__pycache__/0038_userdevicereportlog_at_home_and_more.cpython-38.pyc,sha256=khDSeTH3-jJ4yO1D6-i3Pm_NekJkVwBSUJ-rAxu0cr4,836
-simo/users/migrations/__pycache__/0039_auto_20241117_1039.cpython-38.pyc,sha256=FPfaabra486XVaqIypzaxPDan5syNXDZQhZYw15-WBU,1342
+simo/users/migrations/__pycache__/0039_auto_20241117_1039.cpython-38.pyc,sha256=IEOIfvnUiV-GX9VI4W2UKJugC3nfwKfy7QdmS3pW6Ss,1377
 simo/users/migrations/__pycache__/__init__.cpython-38.pyc,sha256=NKq7WLgktK8WV1oOqCPbAbdkrPV5GRGhYx4VxxI4dcs,170
 simo/users/templates/conf/mosquitto.conf,sha256=1eIGNuRu4Y3hfAU6qiWix648eCRrw0oOT24PnyFI4ys,189
 simo/users/templates/conf/mosquitto_acls.conf,sha256=ga44caTDNQE0CBKw55iM2jOuna6-9fKGwAhjyERZdRE,500
@@ -10567,9 +10567,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.5.29.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.29.dist-info/METADATA,sha256=Z7DMwy0BRw9tBIl7NKt_TkJXKq0vnQFBiPg_3h9Xk2w,1953
-simo-2.5.29.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.29.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.29.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.29.dist-info/RECORD,,
+simo-2.5.30.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.30.dist-info/METADATA,sha256=rnYLYWnVpPGB86Gmr15dmR9wmv--Q42fKSUK_3Uu6iI,1953
+simo-2.5.30.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.30.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.30.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.30.dist-info/RECORD,,