simo 2.2.11__py3-none-any.whl → 2.2.12__py3-none-any.whl

simo/core/dynamic_settings.py

@@ -57,17 +57,6 @@ class AutoUpdate(BooleanPreference):
     name = 'auto_update'
     default = True
 
-    def validate(self, value):
-        if value:
-            with open(os.path.join(settings.VAR_DIR, 'auto_update'), 'w') as f:
-                f.write("YES!")
-        else:
-            try:
-                os.remove(os.path.join(settings.VAR_DIR, 'auto_update'))
-            except:
-                pass
-        return
-
 
 @global_preferences_registry.register
 class NeedsMqttAclsRebuild(BooleanPreference):

simo/core/management/commands/on_http_start.py

@@ -55,53 +55,10 @@ def prepare_mosquitto():
     )
 
 
-def update_auto_update():
-    import simo
-    auto_update_file_path = os.path.join(
-        os.path.dirname(simo.__file__), 'management',
-        'auto_update.py'
-    )
-    st = os.stat(auto_update_file_path)
-    os.chmod(auto_update_file_path, st.st_mode | 0o111)
-
-    executable_path = '/usr/local/bin/simo-auto-update'
-    if os.geteuid() == 0:
-        # We are running as root!
-        if os.path.exists(executable_path):
-            # refresh the link if it already exists
-            os.remove(executable_path)
-            os.symlink(auto_update_file_path, executable_path)
-
-        if not os.path.islink(executable_path):
-            # There is no symbolic link yet made for auto updates.
-            # Let's make it!
-            os.symlink(auto_update_file_path, executable_path)
-            auto_update_cron = f'0 * * * * {executable_path} \n'
-            cron_out = subprocess.Popen(['crontab', '-'], stdin=subprocess.PIPE)
-            cron_out.communicate(input=str.encode(auto_update_cron))
-
-
-def maybe_update_to_latest_immediately():
-    from simo.core.tasks import update_latest_version_available, update
-    from simo.core.models import Instance
-    from simo.conf import dynamic_settings
-    update_latest_version_available()
-    if dynamic_settings['core__latest_version_available'] != \
-            pkg_resources.get_distribution('simo').version:
-        print("There is newer version, we should probably update!")
-        if not Instance.objects.all().count():
-            print("Yes let's do it asynchronously!")
-            return update.s()
-        print("Nope, we already have some instances running, "
-              "so we leave that for hub owners.")
-
-
-
 
 class Command(BaseCommand):
 
-
     def handle(self, *args, **options):
         prepare_mosquitto()
-        update_auto_update()
-        maybe_update_to_latest_immediately()
+        from simo.core.tasks import maybe_update_to_latest
+        maybe_update_to_latest.delay()

simo/core/tasks.py

@@ -325,15 +325,6 @@ def update():
     perform_update()
 
 
-@celery_app.task
-def update_latest_version_available():
-    resp = requests.get("https://pypi.org/pypi/simo/json")
-    if resp.status_code != 200:
-        print("Bad response from server")
-        return
-    latest = list(resp.json()['releases'].keys())[-1]
-    dynamic_settings['core__latest_version_available'] = latest
-    print("Got the latest version available!")
 
 
 @celery_app.task
@@ -392,11 +383,33 @@ def low_battery_notifications():
                 )
 
 
+@celery_app.task
+def maybe_update_to_latest():
+    from simo.core.models import Instance
+    from simo.conf import dynamic_settings
+    resp = requests.get("https://pypi.org/pypi/simo/json")
+    if resp.status_code != 200:
+        print("Bad response from server")
+        return
+    latest = list(resp.json()['releases'].keys())[-1]
+    dynamic_settings['core__latest_version_available'] = latest
+    if dynamic_settings['core__latest_version_available'] == \
+    pkg_resources.get_distribution('simo').version:
+        print("Up to date!")
+        return
+
+    if not Instance.objects.all().count() or dynamic_settings['auto_update']:
+        print("Need to update!!")
+        return update.s()
+
+    print("New version is available, but auto update is disabled.")
+
+
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(20, sync_with_remote.s())
     sender.add_periodic_task(60 * 60, clear_history.s())
-    sender.add_periodic_task(60 * 60, update_latest_version_available.s())
+    sender.add_periodic_task(60 * 60, maybe_update_to_latest.s())
     sender.add_periodic_task(60, drop_fingerprints_learn.s())
     sender.add_periodic_task(60 * 60 * 24, restart_postgresql.s())
     sender.add_periodic_task(60 * 60, low_battery_notifications.s())

simo/management/_hub_template/hub/supervisor.conf

@@ -1,7 +1,7 @@
 # using gunicorn for regular requests
 [program:simo-gunicorn]
 directory={{ project_dir }}/hub/
-command=/bin/sh -c "/usr/bin/python3 manage.py on_http_start && /usr/local/bin/gunicorn --workers 4 --timeout 120 --bind unix:/tmp/gunicorn.sock wsgi:application"
+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"
 process_name=%(program_name)s
 user=root
 stdout_logfile=/var/log/simo/gunicorn.log
@@ -14,7 +14,7 @@ autorestart=true
 # using daphne for socket connections routed to /ws/ on nginx.conf
 [program:simo-daphne]
 directory={{ project_dir }}/hub/
-command=/usr/local/bin/daphne -u /tmp/http.sock --access-log /dev/stdout --proxy-headers asgi:application
+command={{ venv_path }}/daphne -u /tmp/http.sock --access-log /dev/stdout --proxy-headers asgi:application
 process_name=%(program_name)s
 user=root
 stdout_logfile=/var/log/simo/daphne.log
@@ -26,7 +26,7 @@ autorestart=true
 
 
 [program:simo-gateways]
-command=/usr/bin/python3 {{ project_dir }}/hub/manage.py gateways_manager
+command={{ venv_path }}/python {{ project_dir }}/hub/manage.py gateways_manager
 process_name=%(program_name)s
 user=root
 stopsignal=INT
@@ -40,7 +40,7 @@ autorestart=true
 
 [program:simo-celery-beat]
 directory={{ project_dir }}/hub/
-command=/usr/local/bin/celery -A celeryc.celery_app beat -l info --pidfile="/var/run/celerybeat.pid"
+command={{ venv_path }}/celery -A celeryc.celery_app beat -l info --pidfile="/var/run/celerybeat.pid"
 process_name=%(program_name)s
 user=root
 stdout_logfile=/var/log/simo/celery_beat.log
@@ -52,7 +52,7 @@ autorestart=true
 
 [program:simo-celery-worker]
 directory={{ project_dir }}/hub/
-command=/usr/local/bin/celery -A celeryc.celery_app worker -l info --concurrency=4
+command={{ venv_path }}/celery -A celeryc.celery_app worker -l info --concurrency=4
 process_name=%(program_name)s
 user=root
 stdout_logfile=/var/log/simo/celery_worker.log

simo/management/install.py

@@ -19,7 +19,7 @@ def install_dependencies():
         'postgresql-client-common python3-pip redis-server supervisor '
         'mosquitto libopenjp2-7 libtiff5 pkg-config libcairo2-dev '
         'libgirepository1.0-dev libcairo2 libudev-dev gdal-bin net-tools '
-        'timeshift nginx postgis openvpn ffmpeg libsm6 libxext6 ssh keychain -y',
+        'nginx postgis openvpn ffmpeg libsm6 libxext6 ssh keychain -y',
         shell=True
     )
     if status != 0:
@@ -48,7 +48,8 @@ def copy_template(to_directory='/etc/SIMO'):
     context = Context({
         'secret_key': get_random_secret_key(),
         'project_dir': to_directory,
-        'base_dir': to_directory
+        'base_dir': to_directory,
+        'venv_path': os.path.dirname(sys.executable),
     }, autoescape=False)
     template_dir = os.path.join(
         os.path.dirname(simo.__file__), 'management', '_hub_template'
@@ -170,6 +171,7 @@ def install():
         os.remove('/etc/supervisor/conf.d/SIMO.conf')
     except:
         pass
+
     os.symlink(
         f'{simo_directory}/hub/supervisor.conf',
         '/etc/supervisor/conf.d/SIMO.conf'
@@ -247,45 +249,6 @@ def install():
     if status != 0:
         sys.exit("INSTALLATION FAILED! Unable to enable UFW")
 
-
-    step += 1
-    print("%d.__________ CONFIGURE TIMESHIFT _____________________" % step)
-
-    default_timeshift_file_path = '/etc/timeshift/default.json'
-    if not os.path.exists(default_timeshift_file_path):
-        default_timeshift_file_path = '/etc/timeshift/timeshift.json'
-    if not os.path.exists(default_timeshift_file_path):
-        default_timeshift_file_path = '/etc/default/timeshift.json'
-
-    if not os.path.exists(default_timeshift_file_path):
-        print("Unable to find default TimeShift config! Skip TimeShift configuration.")
-
-    else:
-
-        with open(default_timeshift_file_path, 'r') as conf_f:
-            timeshift_conf = json.loads(conf_f.read())
-
-        timeshift_conf['backup_device_uuid'] = subprocess.check_output(
-            "lsblk -no UUID $(df -P /etc/SIMO/hub/settings.py | awk 'END{print $1}')",
-            shell=True
-        ).decode()[:-1]
-        timeshift_conf['schedule_monthly'] = "true"
-        timeshift_conf['schedule_weekly'] = "true"
-        timeshift_conf['schedule_daily'] = "true"
-        timeshift_conf['exclude'] = []
-
-        # Must be copied to /etc/timeshift/timeshift.json to work
-        with open('/etc/timeshift/timeshift.json', 'w') as conf_f:
-            conf_f.write(json.dumps(timeshift_conf))
-
-        # status = subprocess.call([
-        #     '/usr/bin/timeshift', '--create',
-        #     '--comments', '"Initial backup"', '--tags', 'M'
-        # ])
-        # if status != 0:
-        #     print("Unable to start TimeShift")
-
-
     step += 1
     print("%d.__________ PUT UP INSTALL COMPLETE FLAG! _____________________" % step)
 

{simo-2.2.11.dist-info → simo-2.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.2.11
+Version: 2.2.12
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -33,7 +33,7 @@ Requires-Dist: itsdangerous ==2.0.1
 Requires-Dist: redis ==3.5.3
 Requires-Dist: django-redis ==4.12.1
 Requires-Dist: webservices ==0.7
-Requires-Dist: numpy ==1.24.4
+Requires-Dist: numpy ==1.26.4
 Requires-Dist: opencv-python ==4.5.4.60
 Requires-Dist: geopy ==2.2.0
 Requires-Dist: requests ==2.26.0

{simo-2.2.11.dist-info → simo-2.2.12.dist-info}/RECORD

@@ -24,7 +24,7 @@ simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2z
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
 simo/core/controllers.py,sha256=rLgJqnEMzRC0GpZnQb0m_Cz43Gp2zaYbODU7UUxE5oA,29602
-simo/core/dynamic_settings.py,sha256=U9pY7p_hoeD1LxobIvxZqQ7Zn_4MhYMqZvsr4O0PAYs,1871
+simo/core/dynamic_settings.py,sha256=txfRcU2QA_WF6-7Ykc4Hl5gpTkZzi94N8gmmvEolezM,1549
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=9tIjiEN3IE55GPyB4tOlfkd51JDne3-h8pKhpL3tLFE,2220
@@ -40,7 +40,7 @@ simo/core/serializers.py,sha256=quXznnTKCm57rvRgke0mBnlWmaO8C5scJ8R251wa1jY,2086
 simo/core/signal_receivers.py,sha256=9-qFCCeSLcMFEMg6QUtKOVgUsoNoqhzGoI98nuNSTEo,6228
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=pWVq9JGbZQIjwiG02KkfAqyAL8cYAiSA7AWJZbKFYfc,13846
+simo/core/tasks.py,sha256=HE3VsVGJjLKtlZyjYF-TQ2-9vChxZ2EtY6A5vNkZl-0,14235
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=VVqfEPzK0EdbVMMarkG8rd7cODG5QHpXnr3e8UdrTQE,2600
@@ -130,7 +130,7 @@ simo/core/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 simo/core/management/__pycache__/__init__.cpython-38.pyc,sha256=Ptf1WzljXMt3wP1tzOy6q3JfLERYDs66wSHBVdrzjHg,169
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/management/commands/gateways_manager.py,sha256=a_JmUG1SPJhbhPh5QdViCT5DL0YvKQH-KsO8ptLhB34,6970
-simo/core/management/commands/on_http_start.py,sha256=FuSm3pEOB4gfO_GFtx8lZXaeZaYnA6HbrEmtgoZF8-k,3457
+simo/core/management/commands/on_http_start.py,sha256=un8r0oOwU7niC7uHf63IFvFBVWkl4GeTLEkpmDUpanA,1802
 simo/core/management/commands/run_gateway.py,sha256=bp0FQQoBeOSoxjHCCMicDL1fxPZZGyLgnq2QKht3bJo,645
 simo/core/management/commands/update.py,sha256=Y2_6EL8E757nr-MjSuIpdSsEItI0yN42DT5P1e1zkno,175
 simo/core/management/commands/__pycache__/__init__.cpython-38.pyc,sha256=WKpfZZpAB9D7U4X6oWQIrU_H-6rUmq8Gl9fj9XaY2fw,178
@@ -10346,7 +10346,7 @@ simo/generic/templates/generic/controllers_info/stateselect.md,sha256=T0w3vJg02W
 simo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/management/auto_update.py,sha256=4MDrJHdtC5LxEJM258Y0kc5yI4yloeKhDjh-S2BN-ZQ,2115
 simo/management/copy_template.py,sha256=Iehq57FYMzdHNp3LU4ue6rr6AkRiGeOthG7PoGWd88Q,2002
-simo/management/install.py,sha256=hy2LB0sPNpaFHv2Wvp6CeiItvKJb3sFVU0lJuz02VDM,10127
+simo/management/install.py,sha256=hKyjqzE90cyCKYkXEyMhMToYk3xzNZgyjO7nPwrklJo,8668
 simo/management/__pycache__/__init__.cpython-38.pyc,sha256=ey9k5mPsmvAHRVf5Du6QUqy40LgBCAPN_B5EaR6h9Eg,164
 simo/management/__pycache__/auto_update.cpython-38.pyc,sha256=OAp7w4PdXY0xeo7Yof7O_x9y7qNMyZV4ZerRlswjQ2I,1681
 simo/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
@@ -10354,7 +10354,7 @@ simo/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDE
 simo/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
 simo/management/_hub_template/hub/nginx.conf,sha256=40hvXL42MeiqqkLURNcDQsRudv1dNFLJnvb2-Y3RCkk,2394
 simo/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/management/_hub_template/hub/supervisor.conf,sha256=M5FgVi6JS_nel6_Ptt4Dwz2Vugc0gFalxrs90a7R11E,1872
+simo/management/_hub_template/hub/supervisor.conf,sha256=tl1nW95DrVwcGxgLXAOgIn5ow1p_-LRNNE1bCEoq00k,1888
 simo/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/multimedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10513,9 +10513,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.2.11.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.2.11.dist-info/METADATA,sha256=MwJmlJfWOd9kH5Wrw9ZMSYFI7xVeyetdleeMo5LOJ5k,1881
-simo-2.2.11.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-simo-2.2.11.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.2.11.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.2.11.dist-info/RECORD,,
+simo-2.2.12.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.2.12.dist-info/METADATA,sha256=H_OyTQyMFUXkAZxf_qvyTv_9ecYRdM1azzwJd5dkI-g,1881
+simo-2.2.12.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+simo-2.2.12.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.2.12.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.2.12.dist-info/RECORD,,