simo 2.5.6__py3-none-any.whl → 2.5.8__py3-none-any.whl

simo/core/management/_hub_template/hub/supervisor.conf

@@ -1,7 +1,23 @@
+# execute this on every program start
+[program:simo-start]
+directory={{ project_dir }}/hub/
+command={{ venv_path }}/python manage.py on_http_start
+process_name=%(program_name)s
+user=root
+stdout_logfile=/var/log/simo/start.log
+stdout_logfile_maxbytes=1MB
+stdout_logfile_backups=3
+redirect_stderr=true
+autostart=true
+autorestart=false
+stopwaitsecs=15
+killasgroup=true
+
+
 # using gunicorn for regular requests
 [program:simo-gunicorn]
 directory={{ project_dir }}/hub/
-command=/bin/sh -c "{{ venv_path }}/python manage.py on_http_start && {{ venv_path }}/gunicorn --workers 4 --timeout 120 --bind unix:/tmp/gunicorn.sock wsgi:application"
+command={{ venv_path }}/gunicorn --workers 2 --timeout 120 --bind unix:/tmp/gunicorn.sock wsgi:application
 process_name=%(program_name)s
 user=root
 stdout_logfile=/var/log/simo/gunicorn.log
@@ -10,9 +26,8 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
-stopasgroup=true
+stopwaitsecs=15
 killasgroup=true
-stopsignal=INT
 
 
 # using daphne for socket connections routed to /ws/ on nginx.conf
@@ -27,7 +42,7 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
-stopasgroup=true
+stopwaitsecs=15
 killasgroup=true
 
 
@@ -43,9 +58,10 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
-stopasgroup=true
+stopwaitsecs=15
 killasgroup=true
 
+
 [program:simo-celery-beat]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/celery -A celeryc.celery_app beat -l info --pidfile="/var/run/celerybeat.pid"
@@ -57,6 +73,9 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
+stopwaitsecs=15
+killasgroup=true
+
 
 [program:simo-celery-worker]
 directory={{ project_dir }}/hub/
@@ -69,3 +88,5 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
+stopwaitsecs=15
+killasgroup=false

simo/core/tasks.py

@@ -270,18 +270,46 @@ def sync_with_remote():
 @celery_app.task
 def clear_history():
     for instance in Instance.objects.all():
+        print(f"Clear history of {instance}")
         old_times = timezone.now() - datetime.timedelta(
             days=instance.history_days
         )
         ComponentHistory.objects.filter(
             component__zone__instance=instance, date__lt=old_times
         ).delete()
+        i = 0
+        delete_ids = []
+        for obj in ComponentHistory.objects.filter(
+            component__zone__instance=instance
+        ).order_by('-date').values('id').iterator():
+            if i < 5000:
+                continue
+            delete_ids.append(obj['id'])
+        ComponentHistory.objects.filter(id__in=delete_ids)
         HistoryAggregate.objects.filter(
             component__zone__instance=instance, start__lt=old_times
         ).delete()
+        i = 0
+        delete_ids = []
+        for obj in HistoryAggregate.objects.filter(
+            component__zone__instance=instance
+        ).order_by('-start').values('id').iterator():
+            if i < 1000:
+                continue
+            delete_ids.append(obj['id'])
+        HistoryAggregate.objects.filter(id__in=delete_ids)
         Action.objects.filter(
             data__instance_id=instance.id, timestamp__lt=old_times
         )
+        i = 0
+        delete_ids = []
+        for obj in Action.objects.filter(
+            data__instance_id=instance.id
+        ).order_by('-timestamp').values('id').iterator():
+            if i < 5000:
+                continue
+            delete_ids.append(obj['id'])
+        Action.objects.filter(id__in=delete_ids)
 
 
 @celery_app.task
@@ -343,6 +371,7 @@ def update():
 @celery_app.task
 def drop_fingerprints_learn():
     Instance.objects.filter(
+        is_active=True,
         learn_fingerprints__isnull=False,
         learn_fingerprints_start__lt=timezone.now() - datetime.timedelta(minutes=5)
     ).update(
@@ -376,7 +405,7 @@ def restart_postgresql():
 def low_battery_notifications():
     from simo.users.models import User
     from simo.notifications.utils import notify_users
-    for instance in Instance.objects.all():
+    for instance in Instance.objects.filter(is_active=True):
         timezone.activate(instance.timezone)
         if timezone.localtime().hour != 10:
             continue

simo/users/api.py

@@ -219,6 +219,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             ).exclude(id=user_device.id).update(is_primary=False)
         user_device.save()
 
+        speed_kmh = 0
         for iu in request.user.instance_roles.filter(is_active=True):
             if location:
                 iu.at_home = haversine_distance(
@@ -226,7 +227,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
                 ) < dynamic_settings['users__at_home_radius']
             elif not relay:
                 iu.at_home = True
-            speed_kmh = 0
+
             if user_device.last_seen_location and iu.last_seen_location \
             and iu.last_seen > timezone.now() - datetime.timedelta(seconds=30):
                 if user_device.last_seen_location == iu.last_seen_location:

{simo-2.5.6.dist-info → simo-2.5.8.dist-info}/METADATA

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

{simo-2.5.6.dist-info → simo-2.5.8.dist-info}/RECORD

@@ -59,7 +59,7 @@ simo/core/serializers.py,sha256=Pa2lhJ6VgNalbH4awbKdGJCYAPNsu5WQWfo6Tz6LbOQ,2078
 simo/core/signal_receivers.py,sha256=qCpzEUv5Bl9--K8fe08GVDmE6EBOj292YBia1TYDdSE,9267
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=dLutVjQdAhZVFldQpWilQEYfPcTFqkAoyGao0MTuKJ0,14583
+simo/core/tasks.py,sha256=6Srcsq1szv7pU74Qp-Y4GUoRjvNPJI81jKsSWxqVcb8,15671
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=3SRZr00fyLQf8ja3U-9eekKt-ld5TvU1WQqUWprXfQ4,2390
@@ -153,7 +153,7 @@ simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZ
 simo/core/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
 simo/core/management/_hub_template/hub/nginx.conf,sha256=40hvXL42MeiqqkLURNcDQsRudv1dNFLJnvb2-Y3RCkk,2394
 simo/core/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/core/management/_hub_template/hub/supervisor.conf,sha256=6WemJ19T-mLiVGkQdfBxD3Y7UhU6exT0jizOwg2VQAk,2006
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=7oqtr3p8rUervmwdfMNdscpPPCTLCFgrn2W_ak7g0yk,2362
 simo/core/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10433,7 +10433,7 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 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=Xr7faGeupUKkpo1QLRm84OS63u-5Rf2ir_nVEaAPBZw,6839
-simo/users/api.py,sha256=JIjSCg_VOkYRYoKJrc9svJ1NpTuQjONX_sGnZ-am1sQ,12825
+simo/users/api.py,sha256=8MpsNiN_Cl8301iEf8KHCmzmmId1mivtSJKEj93y7Uk,12822
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=bBSNXQJ88TRXaQxyh1aETfmOIfiDr08Jnj8rSY9sHDk,4074
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
@@ -10450,7 +10450,7 @@ 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=tL8b3f181AjcN2dSsDUPkqjpZziEOtVzI535SbnbDzc,7793
-simo/users/__pycache__/api.cpython-38.pyc,sha256=M49GlN1f-IMXKpokLJVxcfVmXYxPneXQ9z9v0RFysQk,10411
+simo/users/__pycache__/api.cpython-38.pyc,sha256=OF-wQagTY0z45X7pjO7YiYX1kz4jkYagTpLHq1BUyyY,10411
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=n5nx2QSXNj2idzRcGE6bAagMN-8qxoCs580H1EFZXls,3105
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
@@ -10551,9 +10551,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.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.6.dist-info/METADATA,sha256=Q8JlXRCVfWvw15jO8jXZp65dGIWYlLNfz4u8gNIA5NI,1923
-simo-2.5.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.6.dist-info/RECORD,,
+simo-2.5.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.8.dist-info/METADATA,sha256=MS1IN9xaTOEDIMAGVtan3qT0-ejhkz04LhraYddcASA,1923
+simo-2.5.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.8.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.8.dist-info/RECORD,,