simo 2.1.0__py3-none-any.whl → 2.1.3__py3-none-any.whl

simo/core/templates/admin/user_tools.html

@@ -16,9 +16,6 @@
       <i class="fas fa-sort-down"></i>
     </div>
     <div class="dropdown-content" style="right: 110px">
-      <a href="{% url 'setup-wizard' %}">
-        <i class="fas fa-magic"></i>  Core Setup Wizard
-      </a>
       <a href="{% url 'update' %}" title="Update hub" class="update_link">
         <i class="fas fa-angle-double-up"></i> Update
       </a>

simo/core/views.py

@@ -3,100 +3,17 @@ import threading
 import subprocess
 from django.contrib.auth.decorators import login_required
 from django.urls import reverse
-from django.shortcuts import get_object_or_404, render, redirect
-from django.http import FileResponse, HttpResponse, Http404
-from django.contrib.gis.geos import Point
+from django.shortcuts import redirect
+from django.http import HttpResponse, Http404
 from django.contrib import messages
-from simo.users.models import User
-from simo.conf import dynamic_settings
 from .models import Instance
 from .tasks import update as update_task, supervisor_restart
-from .forms import (
-    HubConfigForm, CoordinatesForm, TermsAndConditionsForm
-)
 from .middleware import introduce_instance
 
 
 def get_timestamp(request):
     return HttpResponse(time.time())
 
-
-@login_required
-def setup_wizard(request):
-
-    step = request.session.get('setup_wizard_step', 1)
-
-    if request.method == 'POST' and 'back' in request.POST and step > 1:
-        request.session['setup_wizard_step'] = step - 1
-        return redirect(request.path)
-
-    if step == 1:
-        cover_img = dynamic_settings['core__cover_image']
-        if cover_img:
-            cover_img.field.storage = cover_img.storage
-        initial = {
-            'name': dynamic_settings['core__hub_name'],
-            'uid': dynamic_settings['core__hub_uid'],
-            'time_zone': dynamic_settings['core__time_zone'],
-            'units_of_measure': dynamic_settings['core__units_of_measure'],
-            'cover_image': cover_img
-        }
-        form = HubConfigForm(initial=initial, user=request.user)
-        if request.method == 'POST':
-            form = HubConfigForm(
-                request.POST, request.FILES, initial=initial, user=request.user
-            )
-            if form.is_valid():
-                dynamic_settings['core__hub_name'] = form.cleaned_data['name']
-                dynamic_settings['core__hub_uid'] = form.cleaned_data['uid']
-                dynamic_settings['core__time_zone'] = form.cleaned_data[
-                    'time_zone'
-                ]
-                dynamic_settings['core__units_of_measure'] = form.cleaned_data[
-                    'units_of_measure'
-                ]
-                if not dynamic_settings['core__location_coordinates'] \
-                and request.POST.get('location-guess'):
-                    dynamic_settings['core__location_coordinates'] = \
-                        request.POST['location-guess']
-                if form.cleaned_data['cover_image']:
-                    dynamic_settings['core__cover_image'] = \
-                        form.cleaned_data['cover_image']
-                    dynamic_settings['core__cover_image_synced'] = False
-                request.session['setup_wizard_step'] = 2
-                return redirect(request.path)
-    elif step == 2:
-        initial = {
-            'location': dynamic_settings['core__location_coordinates'],
-            'share_location': dynamic_settings['core__share_location']
-        }
-        form = CoordinatesForm(initial=initial)
-        if request.method == 'POST':
-            form = CoordinatesForm(request.POST, initial=initial)
-            if form.is_valid():
-                dynamic_settings['core__location_coordinates'] = \
-                    form.cleaned_data['location']
-                dynamic_settings['core__share_location'] = \
-                    form.cleaned_data['share_location']
-                request.session['setup_wizard_step'] = 3
-                return redirect(request.path)
-    else:
-        form = TermsAndConditionsForm()
-        if request.method == 'POST':
-            form = TermsAndConditionsForm(request.POST)
-            if form.is_valid() and form.cleaned_data['accept']:
-                request.session.pop('setup_wizard_step')
-                messages.success(
-                    request, "Congratulations! "
-                             "Your Hub is now configured and restarting in the background. "
-                             "Will be fully ready in 30 seconds."
-                )
-                threading.Thread(target=supervisor_restart).start()
-                return redirect(reverse('admin:index'))
-
-    return render(request, 'setup_wizard/form.html', {'form': form, 'step': step})
-
-
 @login_required
 def update(request):
     if not request.user.is_superuser:

simo/fleet/controllers.py

@@ -158,7 +158,7 @@ class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.sys_temp_units = 'C'
-        if dynamic_settings['core__units_of_measure'] == 'imperial':
+        if self.component.zone.instance.units_of_measure == 'imperial':
             self.sys_temp_units = 'F'
 
     @property

simo/fleet/migrations/0037_alter_colonelpin_options_alter_colonelpin_no_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.10 on 2024-06-12 08:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0036_auto_20240605_0702'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='colonelpin',
+            options={'ordering': ('colonel', 'no')},
+        ),
+        migrations.AlterField(
+            model_name='colonelpin',
+            name='no',
+            field=models.PositiveIntegerField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='interfaceaddress',
+            name='address_type',
+            field=models.CharField(choices=[('i2c', 'I2C'), ('dali-gear', 'DALI Gear'), ('dali-group', 'DALI Gear Group'), ('dali-device', 'DALI Control Device')], db_index=True, max_length=100),
+        ),
+    ]

simo/generic/controllers.py

@@ -223,7 +223,7 @@ class Thermostat(ControllerBase):
     def default_config(self):
         min = 3
         max = 36
-        if dynamic_settings['core__units_of_measure'] == 'imperial':
+        if self.component.zone.instance.units_of_measure == 'imperial':
             min = 36
             max = 100
         return {
@@ -237,7 +237,7 @@ class Thermostat(ControllerBase):
         raise ValidationError("This component type does not accept set value!")
 
     def _get_default_user_config(self):
-        if dynamic_settings['core__units_of_measure'] == 'imperial':
+        if self.component.zone.instance.units_of_measure == 'imperial':
             target_temp = 70
             low_target = 60
             high_target = 75

simo/generic/forms.py

@@ -273,9 +273,6 @@ class ThermostatConfigForm(BaseComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if dynamic_settings['core__units_of_measure'] == 'imperial':
-            self.fields['min'].initial = 36
-            self.fields['max'].initial = 100
         if self.instance.pk:
             self.fields['mode'].initial = \
                 self.instance.config['user_config']['mode']

simo/generic/templates/admin/controller_widgets/weather_forecast.html

@@ -9,5 +9,5 @@
     position: relative;
     bottom: -4px;
 "></span>
- {{ obj.value.current.temp }}ᴼ {% if global_preferences.core__units_of_measure == 'metric' %}C{% else %}F{% endif %}
+ {{ obj.value.current.temp }}ᴼ {% if obj__zone__instance__units_of_measure == 'metric' %}C{% else %}F{% endif %}
 </div>

simo/{_hub_template → management/_hub_template}/hub/nginx.conf

@@ -4,7 +4,7 @@ server{
 
     charset     utf-8;
 
-    client_max_body_size 20M;
+    client_max_body_size 100M;
 
 
     location /protected/static {
@@ -55,7 +55,7 @@ server{
 
     ssl_session_cache shared:TLS:2m;
 
-    client_max_body_size 20M;
+    client_max_body_size 100M;
 
 
     location /protected/static {

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-2.1.0.dist-info → simo-2.1.3.dist-info}/METADATA

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