simo 2.0.42__py3-none-any.whl → 2.1.2__py3-none-any.whl

simo/{auto_update.py → management/auto_update.py}

@@ -26,6 +26,9 @@ def perform_update():
     if proc.returncode:
         raise Exception(err.decode())
 
+    from simo.management.install import install_dependencies
+    install_dependencies()
+
     proc = subprocess.Popen(
         [os.path.join(HUB_DIR, 'manage.py'), 'migrate'],
         cwd=HUB_DIR,

simo/{cli.py → management/copy_template.py}

@@ -1,6 +1,5 @@
-"""Console script for simo."""
+#!/usr/bin/env python
 import sys
-import click
 import os
 import shutil
 import simo
@@ -8,7 +7,7 @@ from django.template import Context, Engine
 from django.core.management.utils import get_random_secret_key
 
 
-def copy_default_template(to_directory='/etc/SIMO'):
+def copy_template(to_directory='/etc/SIMO'):
     template_file_extensions = ['.py', '.conf']
 
     context = Context({
@@ -49,18 +48,6 @@ def copy_default_template(to_directory='/etc/SIMO'):
                 os.makedirs(os.path.join(root, dirname), exist_ok=True)
 
 
-@click.command()
-def init():
-    copy_default_template()
-
-
-@click.group()
-def main(args=None):
-    pass
-
-
-main.add_command(init)
-
 
 if __name__ == "__main__":
-    sys.exit(main())  # pragma: no cover
+    sys.exit(copy_template())

simo/management/install.py

@@ -0,0 +1,258 @@
+#!/usr/bin/env python
+
+"""
+This should be called after simo has just been installed.
+It prepares and powers up SIMO.io hub.
+However it is not guaranteed to be fully operational.
+"""
+import os, sys, json, subprocess, socket, shutil, traceback
+import simo
+from django.template import Context, Engine
+from django.core.management.utils import get_random_secret_key
+
+
+
+def install_dependencies():
+
+    status = subprocess.call(
+        'apt install postgresql libpq-dev postgresql-client '
+        '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',
+        shell=True
+    )
+    if status != 0:
+        print("Unable install required packages.")
+        return
+
+    return True
+
+
+def get_ip():
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        # doesn't even have to be reachable
+        s.connect(('10.255.255.255', 1))
+        IP = s.getsockname()[0]
+    except Exception:
+        IP = '127.0.0.1'
+    finally:
+        s.close()
+    return IP
+
+
+def copy_template(to_directory='/etc/SIMO'):
+    template_file_extensions = ['.py', '.conf']
+
+    context = Context({
+        'secret_key': get_random_secret_key(),
+        'project_dir': to_directory,
+        'base_dir': to_directory
+    }, autoescape=False)
+    template_dir = os.path.join(
+        os.path.dirname(simo.__file__), '_hub_template'
+    )
+    prefix_length = len(template_dir) + 1
+    for root, dirs, files in os.walk(template_dir):
+        relative_dir = root[prefix_length:]
+        target_dir = os.path.join(to_directory, relative_dir)
+        os.makedirs(target_dir, exist_ok=True)
+        for filename in files:
+            if filename.endswith(('.pyo', '.pyc', '.py.class')):
+                # Ignore some files as they cause various breakages.
+                continue
+            old_path = os.path.join(root, filename)
+            new_path = os.path.join(target_dir, filename)
+            os.makedirs(target_dir, exist_ok=True)
+            fn, file_extension = os.path.splitext(new_path)
+            if file_extension in template_file_extensions:
+                with open(old_path, encoding='utf-8') as template_file:
+                    content = template_file.read()
+                template = Engine().from_string(content)
+                content = template.render(context)
+                with open(new_path, 'w', encoding='utf-8') as new_file:
+                    new_file.write(content)
+            else:
+                shutil.copyfile(old_path, new_path)
+            shutil.copymode(old_path, new_path)
+        for dirname in dirs[:]:
+            if dirname.startswith('.') or dirname == '__pycache__':
+                dirs.remove(dirname)
+            else:
+                os.makedirs(os.path.join(root, dirname), exist_ok=True)
+
+
+def install():
+    simo_directory = '/etc/SIMO'
+    installed_flag_file_path = os.path.join(simo_directory, 'is_installed.json')
+
+    if os.path.exists(installed_flag_file_path):
+        print("SIMO.io hub is already installed. ")
+        print(f"Please delete {installed_flag_file_path} file manually if you want to force this.")
+        return
+
+    step = 1
+    print(f"{step}.___________Install dependencies__________________")
+    status = subprocess.call(
+        'apt-add-repository ppa:mosquitto-dev/mosquitto-ppa -y', shell=True
+    )
+    if status != 0:
+        print("Unable to add mosquitto-dev dependency")
+        print("Installation failed!")
+        return
+
+    status = subprocess.call('apt-get update -y', shell=True)
+    if status != 0:
+        print("Unable to apt-update")
+        print("Installation failed!")
+        return
+    success = install_dependencies()
+    if not success:
+        print("Installation failed!")
+        return
+
+    step += 1
+    print(f"{step}.___________Copy default template__________________")
+
+    if os.path.exists(simo_directory):
+        print("Already exists!")
+    else:
+        try:
+            copy_template(simo_directory)
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
+            shutil.rmtree(simo_directory, ignore_errors=True)
+            return
+
+    step += 1
+    print(f"{step}.___________Configure supervisor__________________")
+
+    try:
+        os.remove('/etc/supervisor/conf.d/SIMO.conf', ignore_errors=True)
+    except:
+        pass
+    os.symlink(
+        f'{simo_directory}/hub/supervisor.conf',
+        '/etc/supervisor/conf.d/SIMO.conf'
+    )
+    status = subprocess.call(['supervisorctl', 'update', 'all'])
+    if status != 0:
+        sys.exit("INSTALLATION FAILED! Unable to start supervisord")
+
+
+
+    step += 1
+    print("%d._____________ Configure NGINX _________________________" % step)
+
+    try:
+        os.remove('/etc/nginx/sites-enabled/default')
+    except:
+        pass
+
+    os.symlink(
+        '/etc/SIMO/hub/nginx.conf', '/etc/nginx/sites-enabled/SIMO'
+    )
+
+    try:
+        os.remove('/etc/ssl/private/localhost.key')
+    except:
+        pass
+    try:
+        os.remove('/etc/ssl/certs/localhost.crt')
+    except:
+        pass
+
+    status = subprocess.call([
+        'openssl', 'req', '-x509', '-nodes', '-days', '36500',
+        '-newkey', 'rsa:2048',
+        '-subj', '/C=US/ST=Denial/L=Springfield/O=Dis/CN=simo.io',
+        '-keyout', '/etc/ssl/private/localhost.key',
+        '-out', '/etc/ssl/certs/localhost.crt'
+    ])
+    if status != 0:
+        sys.exit(
+            "INSTALLATION FAILED! Unable to prepare self signed certificate.")
+
+    status = subprocess.call(['service', 'nginx', 'reload'])
+    if status != 0:
+        sys.exit("INSTALLATION FAILED! Something is wrong witn NGINX conf.")
+
+    step += 1
+    print("%d._____________ Configure SSH and Firewall_____________" % step)
+    new_ssh_conf = ''
+    with open('/etc/ssh/sshd_config', 'r') as ssh_conf:
+        line = ssh_conf.readline()
+        while line:
+            if 'PasswordAuthentication' in line:
+                new_ssh_conf += 'PasswordAuthentication no'
+            else:
+                new_ssh_conf += line
+            line = ssh_conf.readline()
+    with open('/etc/ssh/sshd_config', 'w') as ssh_conf:
+        ssh_conf.write(new_ssh_conf)
+
+    status = subprocess.call(['service', 'ssh', 'restart'])
+    if status != 0:
+        sys.exit("INSTALLATION FAILED! Unable to restart SSH")
+
+    stats = []
+    stats.append(subprocess.call(['ufw', 'allow', 'ssh']))
+    stats.append(subprocess.call(['ufw', 'allow', 'http']))
+    stats.append(subprocess.call(['ufw', 'allow', 'https']))
+    stats.append(subprocess.call(['ufw', 'allow', '1194']))
+    stats.append(subprocess.call(['ufw', 'allow', '1883']))
+    if any(stats):
+        sys.exit("INSTALLATION FAILED! Unable to update UFW rules")
+
+    status = subprocess.call('echo y | ufw enable', shell=True)
+    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"
+
+        # Must be copied to /etc/timeshift.json to work
+        with open('/etc/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")
+
+    with open(installed_flag_file_path, 'w') as f:
+        f.write(json.dumps(True))
+
+    print("--------------------------------------------------------------")
+    print("DONE!")
+    print("Your SIMO.io Hub is Up and running at: https://%s/" % get_ip())
+
+
+if __name__ == "__main__":
+    sys.exit(init())

simo/{on_http_start.py → management/on_http_start.py}

@@ -2,6 +2,7 @@ import os
 import pwd
 import grp
 import subprocess
+import pkg_resources
 from django.conf import settings
 from django.template.loader import render_to_string
 
@@ -58,7 +59,8 @@ prepare_mosquitto()
 def update_auto_update():
     import simo
     auto_update_file_path = os.path.join(
-        os.path.dirname(simo.__file__), 'auto_update.py'
+        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)
@@ -75,4 +77,22 @@ def update_auto_update():
             cron_out.communicate(input=str.encode(auto_update_cron))
 
 
-update_auto_update()
+update_auto_update()
+
+
+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.")
+
+
+maybe_update_to_latest_immediately()

simo/settings.py

@@ -40,12 +40,14 @@ MEDIA_ROOT = os.path.join(VAR_DIR, 'media')
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 INSTALLED_APPS = [
-    'channels',
+    'daphne',
+    #'channels',
     'dal',
     'dal_select2',
     'django.forms',
 
     'django.contrib.auth',
+    'django.contrib.sites',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.gis',
@@ -58,9 +60,11 @@ INSTALLED_APPS = [
     'dynamic_preferences',
     'easy_thumbnails',
     'django_filters',
-    'adminsortable2',
+    'markdownify.apps.MarkdownifyConfig',
+
     'bootstrap4',
     'taggit',
+    'actstream',
 
     'simo.core',
     'simo.users',
@@ -70,6 +74,7 @@ INSTALLED_APPS = [
     'simo.fleet',
 
     'django.contrib.admin',
+    'adminsortable2',
 ]
 
 
@@ -90,7 +95,7 @@ MIDDLEWARE = [
 FILE_UPLOAD_MAX_MEMORY_SIZE = 20971520 # 20Mb
 
 ROOT_URLCONF = 'urls'
-WSGI_APPLICATION = 'simo.wsgi.application'
+#WSGI_APPLICATION = 'simo.wsgi.application'
 
 CHANNELS_URLCONF = 'simo.asgi'
 ASGI_APPLICATION = "asgi.application"
@@ -223,6 +228,8 @@ DEFAULT_FILE_STORAGE = 'simo.core.storage.ProxyingFileSystemStorage'
 THUMBNAIL_DEFAULT_STORAGE = DEFAULT_FILE_STORAGE
 
 
+SITE_ID = 1
+
 LOGGING = {
    'version': 1,
    'disable_existing_loggers': False,
@@ -273,5 +280,14 @@ LOCATION_FIELD = {
     'search.provider': 'nominatim',
 }
 
-
 TAGGIT_CASE_INSENSITIVE = True
+
+
+
+ACTSTREAM_SETTINGS = {
+    'MANAGER': 'simo.core.managers.ActionManager',
+    'FETCH_RELATIONS': True,
+    'USE_PREFETCH': True,
+    'USE_JSONFIELD': True,
+    'GFK_FETCH_DEPTH': 1,
+}

simo/users/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'users.apps.SIMOUsersAppConfig'

simo/users/apps.py

@@ -0,0 +1,9 @@
+from django.apps import AppConfig
+
+
+class SIMOUsersAppConfig(AppConfig):
+    name = 'simo.users'
+
+    def ready(self):
+        from actstream import registry
+        registry.register(self.get_model('User'))

simo/users/models.py

@@ -11,6 +11,7 @@ from django.dispatch import receiver
 from dirtyfields import DirtyFieldsMixin
 from django.contrib.gis.geos import Point
 from geopy.distance import distance
+from actstream import action
 from django.contrib.auth.models import (
     AbstractBaseUser, PermissionsMixin, UserManager as DefaultUserManager
 )
@@ -68,6 +69,10 @@ class PermissionsRole(models.Model):
 
 class UserManager(DefaultUserManager):
 
+    def get_queryset(self):
+        qs = super().get_queryset()
+        return qs.prefetch_related('instance_roles')
+
     def _create_user(self, name, email, password, **extra_fields):
         if not name:
             raise ValueError('The given name must be set')
@@ -115,6 +120,15 @@ def post_instance_user_save(sender, instance, created, **kwargs):
     dirty_fields = instance.get_dirty_fields()
     if 'at_home' in dirty_fields:
         def post_update():
+            if instance.at_home:
+                verb = 'came home'
+            else:
+                verb = 'left'
+            action.send(
+                instance.user, verb=verb,
+                instance_id=instance.instance.id,
+                action_type='user_presence', value=instance.at_home
+            )
             ObjectChangeEvent(
                 instance.instance, instance,  dirty_fields=dirty_fields
             ).publish()
@@ -291,9 +305,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     instance=self._instance, is_active=True
                 ).first()
             )
-        return bool(
-            self.instance_roles.filter(is_active=True).first()
-        )
+        return any([ir.is_active for ir in self.instance_roles.all()])
+
 
     @is_active.setter
     def is_active(self, val):

{simo-2.0.42.dist-info → simo-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.0.42
+Version: 2.1.2
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -17,7 +17,7 @@ Requires-Dist: djangorestframework ==3.14.0
 Requires-Dist: django-dynamic-preferences ==1.11.0
 Requires-Dist: django-formtools ==2.3
 Requires-Dist: easy-thumbnails ==2.8.5
-Requires-Dist: channels ==4.0.0
+Requires-Dist: channels ==4.1.0
 Requires-Dist: asgiref ==3.7.2
 Requires-Dist: django-filter ==2.4.0
 Requires-Dist: celery ==5.3.6
@@ -43,6 +43,8 @@ Requires-Dist: ansi2html ==1.7.0
 Requires-Dist: slugify ==0.0.1
 Requires-Dist: django-countries ==7.5.1
 Requires-Dist: librosa ==0.10.1
-Requires-Dist: daphne ==4.1.0
+Requires-Dist: daphne ==4.1.2
 Requires-Dist: Pillow ==9.5.0
+Requires-Dist: django-markdownify ==0.9.5
+Requires-Dist: django-activity-stream ==2.0.0