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

simo/asgi.py

@@ -21,8 +21,6 @@ for name, app in apps.app_configs.items():
         if isinstance(item, list) and var_name == 'urlpatterns':
             urlpatterns.extend(item)
 
-from .management.on_http_start import *
-
 application = ProtocolTypeRouter({
     "http": get_asgi_application(),
     'websocket': AuthMiddlewareStack(

simo/core/api.py

@@ -235,7 +235,6 @@ class ComponentViewSet(
 
             return RESTResponse(result)
 
-    # TODO: remove post when app is updated for all users
     @action(detail=True, methods=['post'])
     def subcomponent(self, request, pk=None, *args, **kwargs):
         component = self.get_object()

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

@@ -0,0 +1,64 @@
+from django.core.management.base import BaseCommand
+import os
+import pwd
+import grp
+import subprocess
+import pkg_resources
+from django.conf import settings
+from django.template.loader import render_to_string
+
+
+def prepare_mosquitto():
+    if os.geteuid() != 0:
+        return
+
+    from simo.users.models import User
+
+    users_file = '/etc/mosquitto/mosquitto_users'
+    if not os.path.exists(users_file):
+        with open(users_file, 'w') as f:
+            f.write('')
+
+        uid = pwd.getpwnam("mosquitto").pw_uid
+        gid = grp.getgrnam("mosquitto").gr_gid
+        os.chown(users_file, uid, gid)
+        os.chmod(users_file, 0o640)
+
+        acls_file = '/etc/mosquitto/acls.conf'
+        with open(acls_file, 'w') as f:
+            f.write('')
+
+        uid = pwd.getpwnam("mosquitto").pw_uid
+        gid = grp.getgrnam("mosquitto").gr_gid
+        os.chown(acls_file, uid, gid)
+        os.chmod(acls_file, 0o640)
+
+    ps = subprocess.Popen(
+        ['mosquitto_passwd /etc/mosquitto/mosquitto_users root'],
+        shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE
+    )
+    ps.communicate(f"{settings.SECRET_KEY}\n{settings.SECRET_KEY}".encode())
+
+    for user in User.objects.all():
+        user.update_mqtt_secret(reload=False)
+
+    from simo.users.utils import update_mqtt_acls
+
+    update_mqtt_acls()
+
+    if not os.path.exists('/etc/mosquitto/conf.d/simo.conf'):
+        with open('/etc/mosquitto/conf.d/simo.conf', 'w') as f:
+            f.write(render_to_string('conf/mosquitto.conf'))
+
+    subprocess.run(
+        ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
+    )
+
+
+
+class Command(BaseCommand):
+
+    def handle(self, *args, **options):
+        prepare_mosquitto()
+        from simo.core.tasks import maybe_update_to_latest
+        maybe_update_to_latest.delay()

simo/core/tasks.py

@@ -210,7 +210,6 @@ def sync_with_remote():
                         email=email, defaults={
                         'name': options.get('name'),
                         'is_master': options.get('is_hub_master', False),
-                        'ssh_key': options.get('ssh_key')
                     })
                     role = None
                     if options.get('is_hub_master') or options.get('is_superuser'):
@@ -236,9 +235,6 @@ def sync_with_remote():
                 if user.name != options.get('name'):
                     user.name = options['name']
                     user.save()
-                if user.ssh_key != options.get('ssh_key'):
-                    user.ssh_key = options['ssh_key']
-                    user.save()
 
                 avatar_url = options.get('avatar_url')
                 if avatar_url and user.avatar_url != avatar_url:
@@ -329,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
@@ -396,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/fleet/models.py

@@ -58,6 +58,7 @@ class Colonel(DirtyFieldsMixin, models.Model):
             ('4-relays', "4 Relay"),
             ('ample-wall', "Ample Wall"),
             ('game-changer', "Game Changer"),
+            ('game-changer-mini', "Game Changer Mini"),
         )
     )
     firmware_version = models.CharField(

simo/fleet/utils.py

@@ -54,7 +54,10 @@ BASE_ESP32_GPIO_PINS = {
     39: {'output': False, 'adc': True},
 }
 
-GPIO_PINS = {'generic': {}, '4-relays': {}, 'ample-wall': {}, 'game-changer': {}}
+GPIO_PINS = {
+    'generic': {}, '4-relays': {}, 'ample-wall': {},
+    'game-changer': {}, 'game-changer-mini': {}
+}
 
 for no, data in BASE_ESP32_GPIO_PINS.items():
     GPIO_PINS['generic'][no] = GPIO_PIN_DEFAULTS.copy()
@@ -90,6 +93,13 @@ for no in range(101, 139):
         'capacitive': False, 'note': ''
     }
 
+for no in range(101, 105):
+    GPIO_PINS['game-changer-mini'][no] = {
+        'output': True, 'input': True, 'default_pull': 'LOW',
+        'native': False, 'adc': False,
+        'capacitive': False, 'note': ''
+    }
+
 
 #4-relays
 for no, data in BASE_ESP32_GPIO_PINS.items():

simo/management/_hub_template/hub/supervisor.conf

@@ -1,7 +1,7 @@
 # using gunicorn for regular requests
 [program:simo-gunicorn]
 directory={{ project_dir }}/hub/
-command=/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/settings.py

@@ -197,7 +197,6 @@ REST_FRAMEWORK = {
 
 REDIS_DB = {
     'celery': 0, 'default_cache': 1, 'select2_cache': 2,
-    'fleet_rs485': 11, 'fleet_wifi': 12
 }
 
 CACHES = {

simo/users/admin.py

@@ -46,22 +46,6 @@ class PermissionsRoleAdmin(admin.ModelAdmin):
         return fields
 
 
-class UserDeviceInline(admin.TabularInline):
-    model = UserDevice
-    extra = 0
-    readonly_fields = 'token', 'os', 'last_seen', 'is_primary', 'more'
-    fields = readonly_fields
-
-    def has_delete_permission(self, request, obj=None):
-        return False
-
-    def has_add_permission(self, request, obj=None):
-        return False
-
-    def more(self, obj):
-        return mark_safe('<a href="%s">more >></a>' % obj.get_admin_url())
-
-
 class InstanceUserInline(admin.TabularInline):
     model = InstanceUser
     extra = 0
@@ -84,10 +68,9 @@ class UserAdmin(OrgUserAdmin):
         'last_seen_location',
     )
     readonly_fields = (
-        'name', 'email', 'avatar',
-        'last_action', 'ssh_key', 'is_active'
+        'name', 'email', 'avatar', 'last_action', 'is_active'
     )
-    inlines = UserDeviceInline, InstanceUserInline
+    inlines = InstanceUserInline,
 
     def name_display(self, obj=None):
         if not obj:
@@ -129,20 +112,18 @@ admin.site.unregister(Group)
 @admin.register(UserDeviceReportLog)
 class UserDeviceLogInline(admin.ModelAdmin):
     model = UserDeviceReportLog
-    readonly_fields = 'datetime', 'app_open', 'location', 'relay', 'user'
-    list_display = 'datetime', 'app_open', 'location', 'relay', 'user'
+    readonly_fields = 'datetime', 'app_open', 'location', 'relay', 'users'
+    list_display = 'datetime', 'app_open', 'location', 'relay', 'users'
     fields = readonly_fields
-    list_filter = 'user_device__user',
 
     def has_add_permission(self, request, obj=None):
         return False
 
-    def user(self, obj):
-        return mark_safe(
-            f'<a href="{obj.user_device.user.get_admin_url()}">'
-            f'{obj.user_device.user}'
-            f'</a>'
-        )
+    def users(self, obj):
+        return mark_safe(', '.join([
+            f'<a href="{user.get_admin_url()}">{user}</a>'
+            for user in obj.user_device.users.all()
+        ]))
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
@@ -155,9 +136,9 @@ class UserDeviceLogInline(admin.ModelAdmin):
 
 @admin.register(UserDevice)
 class UserDeviceAdmin(admin.ModelAdmin):
-    list_display = 'token', 'os', 'last_seen', 'is_primary', 'user'
+    list_display = 'token', 'os', 'last_seen', 'is_primary', 'users_display'
     readonly_fields = (
-        'user', 'token', 'os', 'last_seen',
+        'users_display', 'token', 'os', 'last_seen',
     )
     fields = readonly_fields + ('last_seen_location', 'is_primary')
 
@@ -167,6 +148,11 @@ class UserDeviceAdmin(admin.ModelAdmin):
             return qs
         return qs.filter(user__role__instance__in=request.user.instances)
 
+    def users_display(self, obj):
+        return ', '.join([str(u) for u in obj.users.all()])
+    users_display.short_description = 'Users'
+
+
 
 @admin.register(InstanceInvitation)
 class InstanceInvitationAdmin(admin.ModelAdmin):

simo/users/api.py

@@ -37,7 +37,7 @@ class UsersViewSet(mixins.RetrieveModelMixin,
 
         return queryset.filter(
             Q(roles__instance=self.instance) | Q(id=self.request.user.id)
-        )
+        ).distinct()
 
 
     def check_permission_to_change(self, request, target_user):
@@ -160,14 +160,13 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
                 status=status.HTTP_400_BAD_REQUEST
             )
 
-        defaults = {'os': request.data['os'], 'user': request.user}
+        defaults = {'os': request.data['os']}
         user_device, new = UserDevice.objects.get_or_create(
             token=request.data['device_token'],
             defaults=defaults
         )
-        if not new:
-            for key, val in defaults.items():
-                setattr(user_device, key, val)
+        user_device.users.add(request.user)
+
         try:
             location = Point(
                 *[float(c) for c in request.data.get('location').split(',')],
@@ -181,10 +180,18 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             user_device.last_seen_location = ','.join(
                 [str(i) for i in location]
             ) if location else None
+
         if request.data.get('app_open', False):
             user_device.is_primary = True
+            UserDevice.objects.filter(
+                users=request.user
+            ).exclude(id=user_device.id).update(is_primary=False)
         user_device.save()
 
+        request.user.last_seen_location = user_device.last_seen_location
+        request.user.last_seen_location_datetime = user_device.last_seen
+        request.user.save()
+
         relay = None
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
             relay = request.META.get('HTTP_HOST')

simo/users/migrations/0030_userdevice_users.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.10 on 2024-09-23 11:15
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0029_alter_instanceuser_instance'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userdevice',
+            name='users',
+            field=models.ManyToManyField(to=settings.AUTH_USER_MODEL),
+        ),
+    ]

simo/users/migrations/0031_auto_20240923_1115.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.10 on 2024-09-23 10:54
+
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    UserDevice = apps.get_model("users", "UserDevice")
+
+    for ud in UserDevice.objects.all():
+        ud.users.add(ud.user)
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0030_userdevice_users'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/users/migrations/0032_remove_userdevice_user_alter_userdevice_users.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-09-23 11:40
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0031_auto_20240923_1115'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userdevice',
+            name='user',
+        ),
+        migrations.AlterField(
+            model_name='userdevice',
+            name='users',
+            field=models.ManyToManyField(related_name='devices', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

simo/users/models.py

@@ -164,9 +164,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
     )
     ssh_key = models.TextField(
         null=True, blank=True,
-        help_text="DO NOT EDIT IT MANUALLY! Comes from SIMO.io. <br>"
-                  "Will be placed in /root/.ssh/authorized_keys "
-                  "if user is active and has superuser rights."
+        help_text="Will be placed in /root/.ssh/authorized_keys "
+                  "if user is active and is master of a hub."
     )
     last_seen_location = PlainLocationField(
         zoom=7, null=True, blank=True, help_text="Sent by user mobile app"
@@ -390,22 +389,13 @@ class Fingerprint(models.Model):
 
 
 class UserDevice(models.Model, SimoAdminMixin):
-    user = models.ForeignKey(
-        User, on_delete=models.CASCADE, related_name='devices'
-    )
+    users = models.ManyToManyField(User, related_name='devices')
     os = models.CharField(max_length=100, db_index=True)
     token = models.CharField(max_length=1000, db_index=True, unique=True)
     is_primary = models.BooleanField(default=True, db_index=True)
     last_seen = models.DateTimeField(auto_now_add=True, db_index=True)
     last_seen_location = PlainLocationField(zoom=7, null=True, blank=True)
 
-    def save(self, *args, **kwargs):
-        if self.is_primary:
-            UserDevice.objects.filter(user=self.user).exclude(
-                pk=self.pk
-            ).update(is_primary=False)
-        return super().save(*args, **kwargs)
-
     class Meta:
         ordering = '-last_seen',
 
@@ -437,21 +427,15 @@ def set_user_at_home(sender, instance, created, **kwargs):
     if not created:
         return
 
-    if not instance.relay:
-        for item in InstanceUser.objects.filter(user=instance.user_device.user):
+    if not instance.location and not instance.relay:
+        for item in InstanceUser.objects.filter(
+            user__in=instance.user_device.users.all()
+        ):
             item.at_home = True
             item.save()
         return
-    if not instance.location:
-        return
-
-    instance.user_device.last_seen_location = instance.location
-    instance.user_device.save()
-    instance.user_device.user.last_seen_location = instance.location
-    instance.user_device.user.last_seen_location_datetime = timezone.now()
-    instance.user_device.user.save()
 
-    for hub_instance in Instance.objects.all():
+    for hub_instance in Instance.objects.filter(is_active=True):
         try:
             instance_location = Point(
                 [float(hub_instance.location.split(',')[0]),
@@ -471,7 +455,8 @@ def set_user_at_home(sender, instance, created, **kwargs):
             return
         else:
             for item in InstanceUser.objects.filter(
-                user=instance.user_device.user, instance=hub_instance
+                user__in=instance.user_device.users.all(),
+                instance=hub_instance
             ):
                 item.at_home = distance(
                     instance_location, log_location

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.2.10
+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.10.dist-info → simo-2.2.12.dist-info}/RECORD

@@ -1,20 +1,20 @@
 simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-simo/asgi.py,sha256=RphoxqFJjh8Tm8RGC2ztDfFedCyn3a3JQwsLMdAtuaM,863
+simo/asgi.py,sha256=L8CUVZLM32IMzWDZ4IShdDN-m69t7oxAUeHods4-xNM,822
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
 simo/scripting.py,sha256=PVIkGsiMDWj4CNTbOM3rq7pJ6ruavuns-ZMU7VudLa4,923
-simo/settings.py,sha256=p1T_M-eooNjIAcqRPTYsQRMTRNeOAgi24ZJ703nYKh4,6953
+simo/settings.py,sha256=E3hOPNASGnoNvhw_K3GbApsHjCnskJgEyeWYIQlEdxE,6913
 simo/urls.py,sha256=fRmAsNQ_pzFloimLmxNeDcR6hHRJ3rOoZ3kGy8zOQ_A,2402
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
 simo/__pycache__/asgi.cpython-38.pyc,sha256=UI_puPxc6q4otRqtz0IALTwrh00975iGxc0UyQgLreQ,891
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-38.pyc,sha256=ZdhdXOZPZOAljVIHlClO3YFQLpRlqi4LnwLKXcoCcRk,6108
+simo/__pycache__/settings.cpython-38.pyc,sha256=FOalzITYVDHyqsGfbl8zNws0oBITfcs5XgHPao0QyLg,6065
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=hoJ0OhfWL9T0d6JCY6_Gm3GR-nrgtDR2UQM67rMsjiE,18141
-simo/core/api.py,sha256=bA_dw4JRNQvmQ7yyet7P2nrIfTy86L0rlCsGE6VtUnA,28010
+simo/core/api.py,sha256=laWtqQUL0ngjTtdDGqcUH42WYzWd9WYJwcKL3yCsDk4,27952
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=EaiY-dCADP__9MvLpoHvhjytFT92IrxPZDv95xgqasU,4955
 simo/core/app_widgets.py,sha256=4Lh9FDzdkfh_mccJMe09dyRTT3Uqf9VXwbkurJ9E9oQ,2115
@@ -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,14 +40,14 @@ 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=BAnCnNPuHtZQL9CG4n_e6G_aKL0aZBZFjp-HOWQg4O0,14049
+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
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=ZJFM_XN0RmJMULQulgA_wFiOnEtsMoedcOWnXjH-Y8o,208
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=c5Q8YfIiLk25yVCxQvNsH-lwuOwfQa88X6xDYjOBogU,13428
-simo/core/__pycache__/api.cpython-38.pyc,sha256=RKwWpa0RqwMqDJ9U9AE6JIzrjIknt-Lsv0ZqENf6UzU,21838
+simo/core/__pycache__/api.cpython-38.pyc,sha256=Fs0SFPiz8rA0zUUDGEGnY6EAZuPuvwtvx9yByf6O3uQ,21838
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=6M9Cl_ha4y_Vf8Rv4GMYL8dcBCmp0KzYi6jn3SQTgys,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=VYx5ZeDyNBI4B_CBEIhV5B3GnLsMOx9s3rNZTSMODco,3703
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=vUCEAYqppjgRZYMs6pTuSxWWuZxreLygPuPBGw044dQ,3643
@@ -66,14 +66,14 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=UZTX3tUUHkigr_3GiSLbUX3RbJBg1_JBPiXy6saJ9GA,1911
-simo/core/__pycache__/models.cpython-38.pyc,sha256=nAgEN2wfcQkeWtRDwN_u-3mOn09irA2hFX23ziFJwIw,17911
+simo/core/__pycache__/models.cpython-38.pyc,sha256=h_neN4zzReOTuou4NX9RbgVJ8T47z0tLqSr37Fm1iHU,17874
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=fH4iyqd9DdzRLEu2b621-FeM-napR0M7hzBUTHo9Q3g,2972
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
 simo/core/__pycache__/serializers.cpython-38.pyc,sha256=PzKJTctrfXeTtD1QlRL5vKKIW4YxB5MuEPj_Z2w9Wgc,19495
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=3Bt9S47DR_ZFS3O-crElFgLLXPIYyDgPIc2ibwEkaic,4904
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=O3FjdRHaMDFiuOGMCrzaMjNYSpekogYXbEzD8IUfkv0,9604
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=WHUW2vB78F0J-E_JX5SNW8Yieugam8Jqerg88NRJTDE,9533
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=D7X_fFxYySe-mKNB4bEnIt9ubYM7CbbRcIpX52Ou4RE,2809
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -130,10 +130,12 @@ 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=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
 simo/core/management/commands/__pycache__/gateways_manager.cpython-38.pyc,sha256=pgEJdchhOcqKCpjdRMeF0_QKJfMmfSkl_W4TUwcgS9o,6031
+simo/core/management/commands/__pycache__/on_http_start.cpython-38.pyc,sha256=LQeFW3oYYRrEPEcGghyeahFE114-4VbnKH4XaVGcQcg,3235
 simo/core/migrations/0001_initial.py,sha256=0Uy7IqJxQQYlurs8Mw_RJy7NaWS7BU0VFmZBBz8YkQI,9220
 simo/core/migrations/0002_load_icons.py,sha256=s9TtGo5NWEyWV3BspfbDNAlWqmQWxmDj7GjEaJXruFk,2044
 simo/core/migrations/0003_create_default_zones_and_categories.py,sha256=g7Ee6_gLQvrhM9u2tgLpcYTN5xmsRtuvU3_Ya3yoxqM,395
@@ -10195,12 +10197,12 @@ simo/fleet/controllers.py,sha256=NOoM7XmMIJfqw92JE5PI6sQo-Vlzb67YDMtebUW7T9k,305
 simo/fleet/forms.py,sha256=YF34ZCDbLeAKpq4u0KTi8IsyqhDtNUWcal2DELRayuI,57668
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
-simo/fleet/models.py,sha256=t_oi6EYSkg8Y5p3trJPv4MqW6AyUcylge9Bfw83mWCg,16462
+simo/fleet/models.py,sha256=dJYDTHBz1OizzP51G0fdKHSuW98CsqBX-NhgjcVqYHY,16518
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=-16BjY_bp9VbDOYuD0V54h7r_RHpuLNkJX0SydWL9aU,2247
 simo/fleet/socket_consumers.py,sha256=aBNTxvYIw5a5l2ns9x0LnjVJvp4NValEJG4MT4hGAT0,17903
 simo/fleet/tasks.py,sha256=AGq9BXFNAqkhOANsPvId8yjEbDtVCB3MRsi_AKDpgIM,821
-simo/fleet/utils.py,sha256=BYqvLexbIJzBdPVPsPuMfkrzM0zHVwo0HPkCFBxOJEQ,4455
+simo/fleet/utils.py,sha256=4RaoxyOByh3_Svb-WgTdQjG6R6ZGRN4Zf7-daFc4H80,4708
 simo/fleet/views.py,sha256=OzsumjMjjt2WEXuThBzSAHcTNLU2dyBtvz4IyeHoAaA,3226
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
 simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=IqVvpyyOnHChnEc07GubvtH6Tk1PA0rcYGYrJDg0hm4,6503
@@ -10212,12 +10214,12 @@ simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=Pot0NMkAvOR6YEX0UYVApcG
 simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=LOxl1jynQbd_36Qa8eyTRkHLXiA575Ph29XVqGX0qsU,39066
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
-simo/fleet/__pycache__/models.cpython-38.pyc,sha256=GZ01BjdvTn6_XJBfV8VrSldJ67X06ne-xW4CsQ6N6Wc,13756
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=pEiMWANjJpKXSR60PosKCUQOKpo6tSvCeWX4VP-0Lns,13796
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=9ljhwoHkolcVrJwOVbYCbGPAUKgALRwor_M3W_K0adE,3173
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=oAnUJbrKjhC3-G-o4F-bx3ZztQf7JhmHi-Sh3cm4-4s,13549
 simo/fleet/__pycache__/tasks.cpython-38.pyc,sha256=RoNxL2WUiW67s9O9DjaYVVjCBSZu2nje0Qn9FJkWVS0,1116
-simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=e-cajNdKJjfBbZ9LdO7KUIccafp1xIIrVosjzM2v1BQ,3239
+simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=J2N68RzYUnzFeqKH50x9Vtrwd3nrkMKBWOfD99IvfIs,3344
 simo/fleet/__pycache__/views.cpython-38.pyc,sha256=qwW2t_SNX7lLBS1RvYuxYBk9XRkeUcir5O5VYcrjMLY,3136
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
 simo/fleet/migrations/0002_auto_20220422_0743.py,sha256=sFOfAjnQOzcJjE8lHrrHgTaGilJNYswMdXphgVzUZqY,825
@@ -10344,17 +10346,15 @@ 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/on_http_start.py,sha256=ZDotfMQaCjksD5FFf3eZYgJS-gd_-7eZhYTHLaD-448,3312
+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/__pycache__/on_http_start.cpython-38.pyc,sha256=ERfcMNz3QnqDJTJ4PwbmDfLgPCh5hrEcaedejARFkUQ,2864
 simo/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
 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=DpLGDoyTRs27tVN-vg5ANpUnDUC68cFdlBsAp-XEm78,1815
+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
@@ -10404,15 +10404,15 @@ simo/notifications/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=YnO
 simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.pyc,sha256=Gkb3Qwr_zglGibQg9g5ekIgxtGapS4ENXVWQVHqM56I,794
 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=6RKGnwcrmewJFPzpqnxYn8rxjHO4tJPVFJvA3eMum2s,6746
-simo/users/api.py,sha256=HUY4H9kK_HZKeN4VFERcbNDp6Mmp6p2LdDKBDFvWGUE,10096
+simo/users/admin.py,sha256=QQgan5_DyX22LdNFSWf2LHnTRO8gdQD4N295R-owuz0,6397
+simo/users/api.py,sha256=kUcdHm-WUn6z_AnFEXHnjYu8YX2MW1Z-NlAysRmSdLI,10333
 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
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=M_51bk9z4jn8e2Ci3pJfIqbf6cRNqfQNSOAg0vPl6Vo,175
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=F3rkYmofakoVzr7szjr8t8014-bbN_Nkv1TVOVKoIF8,19761
+simo/users/models.py,sha256=5ZMXBFExo1oO6vKYn4qOBSbgCp2kiAFNK82hm2k70vA,19195
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=a4R408ZgWVbF7OFw4bBfN33Wnn8ljqS8iFcsqmllkWU,2552
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10421,15 +10421,15 @@ simo/users/tasks.py,sha256=HJAqiyWGsaN3wSfquU0UyQ20jL-njXeaaTOdDT3TQ3s,979
 simo/users/utils.py,sha256=7gU_TDnAOsDYqJM0CFo8efPah2bTXfGpXxRqzD5RiSs,1270
 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=paoWxwJgOyDF7RT7LIviDqggdELG9-fbydc9UfqHV10,7500
-simo/users/__pycache__/api.cpython-38.pyc,sha256=QqQL0MyG8-_7HkqPvqwINuYoco-pJEQ8zT8Crr7t3Rc,8602
+simo/users/__pycache__/admin.cpython-38.pyc,sha256=zwD7hbwzZ4VwsQlrtG8j8KOqTRDQmhup-Y_hcbZDXD0,7315
+simo/users/__pycache__/api.cpython-38.pyc,sha256=25he7r5DHfcLYveXWhn6gQDV2R6YnpKbUVBNInR1q_s,8714
 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
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/managers.cpython-38.pyc,sha256=C5-diljm874RAFMTkZdcfzPhkHzlUGPAhz2gTvqkDy8,604
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=_EIJC_Q1XeqxI7yKr6dOw6tv6o_GkA3TaFZ9YH5de1g,18193
+simo/users/__pycache__/models.cpython-38.pyc,sha256=q5ROEWKeXud_MK3olV7aMTstmbl4hAYIjs7H8L_v4Jc,17817
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=PuMy6H0PhEhq89RFmdnFH4pMHB0N3w7opJEFS90JUCY,3477
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10466,6 +10466,9 @@ simo/users/migrations/0026_fingerprint_name.py,sha256=DPmfi1brbaPymdNiPgc7dINSKy
 simo/users/migrations/0027_permissionsrole_can_manage_components.py,sha256=VcGZE6u-q6UkGo7D01K_T1XBtIvIGe8SCk5ZPRrPpGo,485
 simo/users/migrations/0028_auto_20240506_1146.py,sha256=7RUFF2rJH-bnPeHwc77p8Q4kEAc3owyG4qp9Kc4aKhU,716
 simo/users/migrations/0029_alter_instanceuser_instance.py,sha256=5ebO0vX9lCnTXBMkWg8633sBCBLNtMLfbocVY-uyQhE,588
+simo/users/migrations/0030_userdevice_users.py,sha256=cYY7yChsxOOauHAPIQUzLjLLiOA6kkopTQBE-M9HH10,448
+simo/users/migrations/0031_auto_20240923_1115.py,sha256=RyhmpsxpSXK9Ejbh3cHm9fTnDOcLFQsTH9-2MpNK5YU,514
+simo/users/migrations/0032_remove_userdevice_user_alter_userdevice_users.py,sha256=pM0B4ghsw6LWDvT_9owUmqIHQiraauTGYm_EePhVBUQ,570
 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
@@ -10498,6 +10501,9 @@ simo/users/migrations/__pycache__/0028_auto_20240506_1146.cpython-38.pyc,sha256=
 simo/users/migrations/__pycache__/0029_alter_instanceuser_instance.cpython-38.pyc,sha256=2EsX6ksqPomNHiPCORDYENqn2yI7dQUK_4hMSpMVxDE,823
 simo/users/migrations/__pycache__/0029_alter_instanceuser_options_instanceuser_order.cpython-38.pyc,sha256=aqC63NS8xpFKzLuvL00_axUAvjTzqmvlgfkD03bzakg,721
 simo/users/migrations/__pycache__/0030_alter_instanceuser_options_remove_instanceuser_order.cpython-38.pyc,sha256=uC2t0g2AGdQ53Z621ZcS4-n6UGxjRUM6AFUAMrGIMnY,658
+simo/users/migrations/__pycache__/0030_userdevice_users.cpython-38.pyc,sha256=PWQ77FvS69xbGdzC9E7qXX9RLQ9QC4a__0h0oRAI7Ec,674
+simo/users/migrations/__pycache__/0031_auto_20240923_1115.cpython-38.pyc,sha256=0nT2ftDPi0yV6j-p9Am-nVsTy2kY0msM_f2k0eP9EoU,866
+simo/users/migrations/__pycache__/0032_remove_userdevice_user_alter_userdevice_users.cpython-38.pyc,sha256=SDKPEIkt9DYEBRm63GAnxG1yRKKm-JP3pizaJdbAUks,772
 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
@@ -10507,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.10.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.2.10.dist-info/METADATA,sha256=EEKuyC6CQhzBgYsGV0L6R-28zL45JxZuLNnulJrs5wU,1881
-simo-2.2.10.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
-simo-2.2.10.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.2.10.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.2.10.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,,

{simo-2.2.10.dist-info → simo-2.2.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

simo/management/on_http_start.py

@@ -1,103 +0,0 @@
-import os
-import pwd
-import grp
-import subprocess
-import pkg_resources
-from django.conf import settings
-from django.template.loader import render_to_string
-
-
-def prepare_mosquitto():
-    if os.geteuid() != 0:
-        return
-
-    from simo.users.models import User
-
-    users_file = '/etc/mosquitto/mosquitto_users'
-    if not os.path.exists(users_file):
-        with open(users_file, 'w') as f:
-            f.write('')
-
-        uid = pwd.getpwnam("mosquitto").pw_uid
-        gid = grp.getgrnam("mosquitto").gr_gid
-        os.chown(users_file, uid, gid)
-        os.chmod(users_file, 0o640)
-
-        acls_file = '/etc/mosquitto/acls.conf'
-        with open(acls_file, 'w') as f:
-            f.write('')
-
-        uid = pwd.getpwnam("mosquitto").pw_uid
-        gid = grp.getgrnam("mosquitto").gr_gid
-        os.chown(acls_file, uid, gid)
-        os.chmod(acls_file, 0o640)
-
-    ps = subprocess.Popen(
-        ['mosquitto_passwd /etc/mosquitto/mosquitto_users root'],
-        shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE
-    )
-    ps.communicate(f"{settings.SECRET_KEY}\n{settings.SECRET_KEY}".encode())
-
-    for user in User.objects.all():
-        user.update_mqtt_secret(reload=False)
-
-    from simo.users.utils import update_mqtt_acls
-
-    update_mqtt_acls()
-
-    if not os.path.exists('/etc/mosquitto/conf.d/simo.conf'):
-        with open('/etc/mosquitto/conf.d/simo.conf', 'w') as f:
-            f.write(render_to_string('conf/mosquitto.conf'))
-
-    subprocess.run(
-        ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
-    )
-
-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))
-
-
-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()