simo 2.8.3__py3-none-any.whl → 2.8.5__py3-none-any.whl

simo/automation/gateways.py

@@ -6,7 +6,6 @@ import json
 import time
 import multiprocessing
 import threading
-import traceback
 from django.conf import settings
 from django.utils import timezone
 from django.db import connection as db_connection
@@ -43,10 +42,7 @@ class ScriptRunHandler(multiprocessing.Process):
     def run(self):
         db_connection.connect()
         self.component = Component.objects.get(id=self.component_id)
-        try:
-            tz = pytz.timezone(self.component.zone.instance.timezone)
-        except:
-            tz = pytz.timezone('UTC')
+        tz = pytz.timezone(self.component.zone.instance.timezone)
         timezone.activate(tz)
         introduce_instance(self.component.zone.instance)
         self.logger = get_component_logger(self.component)
@@ -235,8 +231,10 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
     def watch_scripts(self):
         drop_current_instance()
         # observe running scripts and drop the ones that are no longer alive
-        dead_scripts = False
-        for id, process in list(self.running_scripts.items()):
+        for id, data in list(self.running_scripts.items()):
+            if time.time() - data['start_time'] < 5:
+                continue
+            process = data['proc']
 
             comp = Component.objects.filter(id=id).first()
             if comp and comp.value == 'finished':
@@ -252,12 +250,18 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     self.running_scripts.pop(id)
                 continue
             else:
+                # it as been observed that is_alive might sometimes report false
+                # however the process is actually still running
+                process.kill()
                 self.last_death = time.time()
                 self.running_scripts.pop(id, None) # no longer running for sure!
                 if not comp or comp.value != 'running':
                     continue
 
                 if id not in self.terminating_scripts: # was not intentionaly terminated
+                    if comp:
+                        tz = pytz.timezone(comp.zone.instance.timezone)
+                        timezone.activate(tz)
                     logger = get_component_logger(comp)
                     logger.log(logging.INFO, "-------DEAD!-------")
                     comp.value = 'error'
@@ -348,30 +352,35 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
 
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))
+
         if component.id in self.running_scripts:
-            if component.value in ('finished', 'error', 'stopped'):
-                try:
-                    self.running_scripts[component.id].kill()
-                except:
-                    pass
-                self.running_scripts.pop(component.id, None)
-            elif component.id not in self.terminating_scripts \
-            and self.running_scripts[component.id].is_alive():
+            # it appears that the script is running and is perfectly healthy
+            # so we make sure it has correct value, do nothing else and return!
+            if component.id not in self.terminating_scripts \
+            and self.running_scripts[component.id]['proc'].is_alive():
                 if component.value != 'running':
                     component.value = 'running'
                     component.save()
                 return
-            else:
-                try:
-                    self.running_scripts[component.id].kill()
-                except:
-                    pass
 
-        self.running_scripts[component.id] = ScriptRunHandler(
-            component.id, multiprocessing.Event(),
-            daemon=True
+            # script is in terminating state or is no longer alive
+            # since starting of a new script was requested, we kill it viciously
+            # and continue on!
+            try:
+                self.running_scripts[component.id]['proc'].kill()
+            except:
+                pass
+            self.running_scripts.pop(component.id, None)
+
+
+        process = ScriptRunHandler(
+            component.id, multiprocessing.Event(), daemon=True
         )
-        self.running_scripts[component.id].start()
+        process.start()
+        self.running_scripts[component.id] = {
+            'proc': process, 'start_time': time.time()
+        }
+
 
     def stop_script(self, component, stop_status='stopped'):
         self.terminating_scripts.add(component.id)
@@ -389,17 +398,17 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         elif stop_status == 'stopped':
             logger.log(logging.INFO, "-------STOP-------")
 
-        if self.running_scripts[component.id].exit_in_use.is_set()\
-        and not self.running_scripts[component.id].exin_in_use_fail.is_set():
-            self.running_scripts[component.id].exit_event.set()
+        if self.running_scripts[component.id]['proc'].exit_in_use.is_set()\
+        and not self.running_scripts[component.id]['proc'].exin_in_use_fail.is_set():
+            self.running_scripts[component.id]['proc'].exit_event.set()
         else:
-            self.running_scripts[component.id].terminate()
+            self.running_scripts[component.id]['proc'].terminate()
 
         def kill():
             start = time.time()
             terminated = False
             while start > time.time() - 2:
-                if not self.running_scripts[component.id].is_alive():
+                if not self.running_scripts[component.id]['proc'].is_alive():
                     terminated = True
                     break
                 time.sleep(0.1)
@@ -408,12 +417,12 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     logger.log(logging.INFO, "-------GATEWAY KILL-------")
                 else:
                     logger.log(logging.INFO, "-------KILL!-------")
-                self.running_scripts[component.id].kill()
+                self.running_scripts[component.id]['proc'].kill()
 
             component.set(stop_status)
             self.terminating_scripts.remove(component.id)
             # making sure it's fully killed along with it's child processes
-            self.running_scripts[component.id].kill()
+            self.running_scripts[component.id]['proc'].kill()
             self.running_scripts.pop(component.id, None)
             logger.handlers = []
 

simo/backups/tasks.py

@@ -315,7 +315,7 @@ def perform_backup():
 
     if other_month_folders:
         # delete old backups to free up at least 20G of space
-        while shutil.disk_usage('/media/backup').free < 20 * 1024 * 1024 * 1024:
+        while shutil.disk_usage(sd_mountpoint).free < 20 * 1024 * 1024 * 1024:
             remove_folder = other_month_folders.pop()[0]
             print(f"REMOVE: {remove_folder}")
             shutil.rmtree(remove_folder)

simo/core/controllers.py

@@ -289,6 +289,8 @@ class ControllerBase(ABC):
             actor = self._get_actor(value)
         if not actor:
             actor = get_current_user()
+        if actor:
+            introduce_user(actor)
 
         self.component.refresh_from_db()
         if value != self.component.value:

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

@@ -44,6 +44,7 @@ autostart=true
 autorestart=true
 stopwaitsecs=15
 killasgroup=true
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-gateways]

simo/core/models.py

@@ -14,6 +14,7 @@ from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from timezone_utils.choices import ALL_TIMEZONES_CHOICES
 from location_field.models.plain import PlainLocationField
+from actstream import action # do not delete from here!
 from model_utils import FieldTracker
 from dirtyfields import DirtyFieldsMixin
 from simo.core.utils.mixins import SimoAdminMixin

simo/core/templates/admin/component_history.html

@@ -2,7 +2,7 @@
   <h3>Value:</h3>
   <ul style="margin-left: 1.5em;">
   {% for history_item in value_history %}
-    <li>[{{ history_item.user }}] {{ history_item.date }} - <strong>{{ history_item.value }}</strong></li>
+    <li>[{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} - <strong>{{ history_item.value }}</strong></li>
   {% endfor %}
   </ul>
 {% endif %}
@@ -12,7 +12,7 @@
   <h3>Security:</h3>
   <ul style="margin-left: 1.5em;">
   {% for history_item in arm_status_history %}
-    <li>[{{ history_item.user }}] {{ history_item.date }} - <strong>{{ history_item.value }}</strong></li>
+    <li>[{{ history_item.user }}] {{ history_item.date|date:"Y-m-d H:i:s" }} - <strong>{{ history_item.value }}</strong></li>
   {% endfor %}
   </ul>
 {% endif %}

simo/fleet/admin.py

@@ -1,4 +1,5 @@
 from threading import Timer
+from actstream.models import actor_stream
 from django.contrib import admin
 from django.utils.safestring import mark_safe
 from django.template.loader import render_to_string
@@ -60,10 +61,8 @@ class ColonelAdmin(admin.ModelAdmin):
     readonly_fields = (
         'type', 'uid', 'connected', 'last_seen',
         'firmware_version', 'newer_firmware_available',
+        'history',
     )
-    fields = (
-        'name', 'instance', 'enabled', 'firmware_auto_update'
-    ) + readonly_fields + ('pwm_frequency', 'logs_stream', 'log', )
 
     actions = (
         'check_for_upgrade', 'update_firmware', 'update_config', 'restart',
@@ -73,6 +72,19 @@ class ColonelAdmin(admin.ModelAdmin):
 
     inlines = InterfaceInline, ColonelPinsInline
 
+    fieldsets = (
+        ("", {'fields': (
+            'name', 'instance', 'enabled', 'firmware_auto_update',
+            'type', 'uid', 'connected', 'last_seen',
+            'firmware_version', 'newer_firmware_available',
+            'pwm_frequency', 'logs_stream', 'log'
+        )}),
+        ("History", {
+            'fields': ('history',),
+            'classes': ('collapse',),
+        }),
+    )
+
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.filter(instance=get_current_instance())
@@ -165,6 +177,15 @@ class ColonelAdmin(admin.ModelAdmin):
             return mark_safe('<img src="%s" alt="True">' % static('admin/img/icon-yes.svg'))
         return mark_safe('<img src="%s" alt="False">' % static('admin/img/icon-no.svg'))
 
+    def history(self, obj):
+        if not obj:
+            return ''
+        actions = actor_stream(obj)[:100]
+        if not len(actions):
+            return ''
+        return render_to_string(
+            'admin/colonel_history.html', {'actions': actor_stream(obj)[:100]}
+        )
 
 @admin.register(Interface)
 class InterfaceAdmin(admin.ModelAdmin):

simo/fleet/apps.py

@@ -0,0 +1,10 @@
+from django.apps import AppConfig
+
+
+class SIMOFleetAppConfig(AppConfig):
+    name = 'simo.fleet'
+
+    def ready(self):
+        from actstream import registry
+        from simo.fleet.models import Colonel
+        registry.register(Colonel)

simo/fleet/models.py

@@ -1,5 +1,6 @@
 import requests
 import time
+from actstream import action
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db import models
@@ -281,6 +282,17 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
             Interface.objects.create(colonel=instance, no=1)
             Interface.objects.create(colonel=instance, no=2)
 
+    if 'socket_connected' in instance.get_dirty_fields():
+        if instance.socket_connected:
+            verb = 'connected'
+        else:
+            verb = 'disconnected'
+        action.send(
+            instance, target=instance, verb=verb,
+            instance_id=instance.instance.id,
+            action_type='colonel_status', value=verb
+        )
+
 
 @receiver(post_save, sender=Component)
 def post_component_save(sender, instance, created, *args, **kwargs):
@@ -472,7 +484,6 @@ def post_interface_save(sender, instance, created, *args, **kwargs):
 
 
 
-
 @receiver(post_delete, sender=Interface)
 def post_interface_delete(sender, instance, *args, **kwargs):
     with transaction.atomic():

simo/fleet/socket_consumers.py

@@ -5,6 +5,7 @@ import pytz
 import traceback
 import sys
 import zlib
+import time
 from django.db import transaction
 from logging.handlers import RotatingFileHandler
 from django.utils import timezone
@@ -27,10 +28,15 @@ from .controllers import TTLock
 
 @capture_socket_errors
 class FleetConsumer(AsyncWebsocketConsumer):
-    colonel = None
-    colonel_logger = None
-    connected = False
-    mqtt_client = None
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.colonel = None
+        self.colonel_logger = None
+        self.connected = False
+        self.mqtt_client = None
+        self.last_seen = 0
 
 
     async def disconnect(self, code):
@@ -189,10 +195,26 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     self.colonel.minor_upgrade_available
                 )
 
-            await asyncio.sleep(10)
+            await asyncio.sleep(2)
+
             # Default pinging system sometimes get's lost somewhere,
-            # therefore we use our own to ensure connection
+            # therefore we use our own to ensure connection and understand if
+            # colonel is connected or not
+
             await self.send_data({'command': 'ping'})
+            ping_start = time.time()
+            await asyncio.sleep(0.1)
+
+            while ping_start > self.last_seen:
+                if time.time() - ping_start > 3:
+                    def disconnect_socket():
+                        self.colonel.socket_connected = False
+                        self.colonel.save(update_fields=['socket_connected'])
+                    await sync_to_async(disconnect_socket, thread_sensitive=True)()
+                    break
+                await asyncio.sleep(0.1)
+
+
 
     async def firmware_update(self, to_version):
         print("Firmware update: ", str(self.colonel))
@@ -366,8 +388,9 @@ class FleetConsumer(AsyncWebsocketConsumer):
         drop_current_instance()
         try:
             if text_data:
-                print(f"{self.colonel}: {text_data}")
                 data = json.loads(text_data)
+                if 'ping' not in data:
+                    print(f"{self.colonel}: {text_data}")
                 if 'get_config' in data:
                     config = await self.get_config_data()
                     print("Send config: ", config)
@@ -453,6 +476,7 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
 
     async def log_colonel_connected(self):
+        self.last_seen = time.time()
 
         def save_last_seen():
             self.colonel.socket_connected = True

simo/fleet/tasks.py

@@ -5,6 +5,18 @@ from simo.core.middleware import drop_current_instance
 from celeryc import celery_app
 
 
+@celery_app.task
+def check_colonels_connected():
+    from .models import Colonel
+    drop_current_instance()
+    for lost_colonel in Colonel.objects.filter(
+        socket_connected=True,
+        last_seen__lt=timezone.now() - datetime.timedelta(seconds=20)
+    ):
+        lost_colonel.socket_connected = False
+        lost_colonel.save()
+
+
 @celery_app.task
 def check_colonel_components_alive():
     from simo.core.models import Component
@@ -24,4 +36,5 @@ def check_colonel_components_alive():
 
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
+    sender.add_periodic_task(10, check_colonels_connected.s())
     sender.add_periodic_task(20, check_colonel_components_alive.s())

simo/fleet/templates/admin/colonel_history.html

@@ -0,0 +1,5 @@
+<ul style="margin-left: 1.5em;">
+{% for action in actions %}
+	<li>{{ action.timestamp|date:"Y-m-d H:i:s" }} - <strong>{{ action.verb }}</strong></li>
+{% endfor %}
+</ul>

simo/generic/forms.py

@@ -157,6 +157,11 @@ class ThermostatConfigForm(BaseComponentForm):
 
 class AlarmBreachEventForm(forms.Form):
     uid = HiddenField(required=False)
+    threshold = forms.IntegerField(
+        label="Number of sensors breached",
+        min_value=1, max_value=5, initial=1,
+        help_text="React when at least given amount of sensors were breached."
+    )
     component = Select2ModelChoiceField(
         queryset=Component.objects.all(),
         url='autocomplete-component',
@@ -173,6 +178,7 @@ class AlarmBreachEventForm(forms.Form):
         help_text="Event will not fire if alarm group is disarmed "
                   "within given timeframe of seconds after the breach."
     )
+
     prefix = 'breach_events'
 
     def clean(self):

simo/generic/gateways.py

@@ -185,8 +185,6 @@ class GenericGatewayHandler(
         ('watch_thermostats', 60),
         ('watch_alarm_clocks', 30),
         ('watch_watering', 60),
-        ('watch_alarm_events', 1),
-        ('watch_timers', 1),
         ('watch_main_states', 60),
         ('watch_groups', 60)
     )
@@ -328,42 +326,6 @@ class GenericGatewayHandler(
             other_group.refresh_status()
 
 
-    def watch_alarm_events(self):
-        from .controllers import AlarmGroup
-        drop_current_instance()
-        for alarm in Component.objects.filter(
-            controller_uid=AlarmGroup.uid, value='breached',
-            meta__breach_start__gt=0
-        ):
-            for uid, event in alarm.controller.events_map.items():
-                if uid in alarm.meta.get('events_triggered', []):
-                    continue
-                if time.time() - alarm.meta['breach_start'] < event['delay']:
-                    continue
-                try:
-                    getattr(event['component'], event['breach_action'])()
-                except Exception:
-                    print(traceback.format_exc(), file=sys.stderr)
-                if not alarm.meta.get('events_triggered'):
-                    alarm.meta['events_triggered'] = [uid]
-                else:
-                    alarm.meta['events_triggered'].append(uid)
-                alarm.save(update_fields=['meta'])
-
-    def watch_timers(self):
-        drop_current_instance()
-        for component in Component.objects.filter(
-            meta__timer_to__gt=0
-        ).filter(meta__timer_to__lt=time.time()):
-            component.meta['timer_to'] = 0
-            component.meta['timer_start'] = 0
-            component.save()
-            try:
-                component.controller._on_timer_end()
-            except Exception as e:
-                print(traceback.format_exc(), file=sys.stderr)
-
-
     def set_get_day_evening_night_morning(self, state):
         if state.value  not in ('day', 'night', 'evening', 'morning'):
             return

simo/generic/models.py

@@ -1,12 +1,14 @@
 import time
 import sys
 import traceback
-from threading import Timer
 from django.db.models.signals import pre_save, post_save, post_delete
 from django.dispatch import receiver
-from simo.core.models import Instance, Component
+from simo.core.models import Component
 from simo.users.models import InstanceUser
-
+from .tasks import (
+    notify_users_on_alarm_group_breach,
+    fire_breach_events
+)
 
 
 @receiver(post_save, sender=Component)
@@ -21,7 +23,7 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
 
     from .controllers import AlarmGroup
 
-    for alarm_group in Component.objects.filter(
+    for ag in Component.objects.filter(
         controller_uid=AlarmGroup.uid,
         config__components__contains=instance.id,
     ).exclude(value='disarmed'):
@@ -30,48 +32,44 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
         }
         stats[instance.arm_status] += 1
         for slave in Component.objects.filter(
-            pk__in=alarm_group.config['components'],
+            pk__in=ag.config['components'],
         ).exclude(pk=instance.pk):
             stats[slave.arm_status] += 1
-        alarm_group.config['stats'] = stats
-        alarm_group.save(update_fields=['config'])
 
-        if stats['disarmed'] == len(alarm_group.config['components']):
+        print(f"STATS OF {ag} are: {stats}")
+        ag.config['stats'] = stats
+
+
+        if stats['disarmed'] == len(ag.config['components']):
             alarm_group_value = 'disarmed'
-        elif stats['armed'] == len(alarm_group.config['components']):
+        elif stats['armed'] == len(ag.config['components']):
             alarm_group_value = 'armed'
         elif stats['breached']:
-            if alarm_group.value != 'breached':
-                def notify_users_security_breach(alarm_group_component_id):
-                    alarm_group_component = Component.objects.filter(
-                        id=alarm_group_component_id, value='breached'
-                    ).first()
-                    if not alarm_group_component:
-                        return
-                    breached_components = Component.objects.filter(
-                        pk__in=alarm_group_component.config['components'],
-                        arm_status='breached'
-                    )
-                    body = "Security Breach! " + '; '.join(
-                        [str(c) for c in breached_components]
-                    )
-                    from simo.notifications.utils import notify_users
-                    notify_users(
-                        'alarm', str(alarm_group_component), body,
-                        component=alarm_group_component
-                    )
-                if alarm_group.config.get('notify_on_breach') is not None:
-                    t = Timer(
-                        # give it one second to finish with other db processes.
-                        alarm_group.config['notify_on_breach'] + 1,
-                        notify_users_security_breach, [alarm_group.id]
-                    )
-                    t.start()
             alarm_group_value = 'breached'
         else:
             alarm_group_value = 'pending-arm'
 
-        alarm_group.controller.set(alarm_group_value)
+        print(f"{ag} value: {alarm_group_value}")
+
+        if alarm_group_value == 'breached' and instance.arm_status == 'breached':
+            if ag.value != 'breached':
+                ag.meta['breach_times'] = [time.time()]
+            else:
+                ag.meta['breach_times'].append(time.time())
+
+        ag.save(update_fields=['meta', 'config'])
+        ag.controller.set(alarm_group_value)
+
+        if alarm_group_value == 'breached' and instance.arm_status == 'breached':
+            for event in ag.config['breach_events']:
+                if event['uid'] in ag.meta.get('events_triggered', []):
+                    continue
+                threshold = event.get('threshold', 1)
+                if len(ag.meta['breach_times']) < threshold:
+                    continue
+                fire_breach_events.apply_async(
+                    args=[ag.id], countdown=event['delay']
+                )
 
 
 @receiver(pre_save, sender=Component)
@@ -85,8 +83,14 @@ def manage_alarm_groups(sender, instance, *args, **kwargs):
         return
 
     if instance.value == 'breached':
-        instance.meta['breach_start'] = time.time()
         instance.meta['events_triggered'] = []
+
+        if instance.config.get('notify_on_breach') is not None:
+            notify_users_on_alarm_group_breach.apply_async(
+                args=[instance.id],
+                countdown=instance.config['notify_on_breach']
+            )
+
     elif instance.get_dirty_fields()['value'] == 'breached' \
     and instance.value == 'disarmed':
         instance.meta['breach_start'] = None

simo/generic/tasks.py

@@ -0,0 +1,80 @@
+import sys, traceback, time
+from celeryc import celery_app
+from simo.core.middleware import drop_current_instance, drop_current_instance
+
+
+@celery_app.task
+def notify_users_on_alarm_group_breach(ag_id):
+    from simo.core.models import Component
+    drop_current_instance()
+    ag = Component.objects.filter(id=ag_id).first()
+    if not ag:
+        return
+    if ag.value != 'breached':
+        # no longer breached, somebody disarmed it,
+        # no need to send any notifications
+        return
+
+    breached_components = Component.objects.filter(
+        pk__in=ag.config['components'],
+        arm_status='breached'
+    )
+    body = "Security Breach! " + '; '.join(
+        [str(c) for c in breached_components]
+    )
+    from simo.notifications.utils import notify_users
+    notify_users(
+        'alarm', str(ag), body, component=ag,
+        instance=ag.zone.instance
+    )
+
+
+@celery_app.task
+def fire_breach_events(ag_id):
+    from simo.core.models import Component
+    drop_current_instance()
+    ag = Component.objects.filter(id=ag_id).first()
+    if not ag:
+        return
+    if ag.value != 'breached':
+        # no longer breached, somebody disarmed it,
+        # no need to send any notifications
+        return
+    for uid, event in ag.controller.events_map.items():
+        if uid in ag.meta.get('events_triggered', []):
+            continue
+        threshold = event.get('threshold', 1)
+        if len(ag.meta['breach_times']) < threshold:
+            continue
+        if time.time() - ag.meta['breach_times'][threshold - 1] < event['delay']:
+            continue
+        try:
+            getattr(event['component'], event['breach_action'])()
+        except Exception:
+            print(traceback.format_exc(), file=sys.stderr)
+        if not ag.meta.get('events_triggered'):
+            ag.meta['events_triggered'] = [uid]
+        else:
+            ag.meta['events_triggered'].append(uid)
+        ag.save(update_fields=['meta'])
+
+
+@celery_app.task
+def watch_timers():
+    from simo.core.models import Component
+    drop_current_instance()
+    for component in Component.objects.filter(
+        meta__timer_to__gt=0
+    ).filter(meta__timer_to__lt=time.time()):
+        component.meta['timer_to'] = 0
+        component.meta['timer_start'] = 0
+        component.save()
+        try:
+            component.controller._on_timer_end()
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
+
+
+@celery_app.on_after_finalize.connect
+def setup_periodic_tasks(sender, **kwargs):
+    sender.add_periodic_task(1, watch_timers.s())

simo/settings.py

@@ -3,6 +3,7 @@ Django settings for SIMO.io project.
 """
 import sys
 import os
+import datetime
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = '/etc/SIMO'
@@ -288,4 +289,27 @@ ACTSTREAM_SETTINGS = {
     'USE_PREFETCH': True,
     'USE_JSONFIELD': True,
     'GFK_FETCH_DEPTH': 1,
-}
+}
+
+
+DATETIME_FORMAT = 'Y-m-d H:i:s'
+
+
+class TimestampedStream:
+    """Adds timestamps to all the prints"""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def write(self, data):
+        if data != '\n':
+            timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            self.stream.write(f'[{timestamp}] {data}')
+        else:
+            self.stream.write(data)
+
+    def flush(self):
+        self.stream.flush()
+
+
+sys.stdout = TimestampedStream(sys.stdout)

{simo-2.8.3.dist-info → simo-2.8.5.dist-info}/METADATA

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

{simo-2.8.3.dist-info → simo-2.8.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 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/settings.py,sha256=CjHxwQvyljm0qVOCHvi6gdMweDzEqAedXTmGMJ6rE1A,7009
+simo/settings.py,sha256=C04iruyTTGqrcYuZjW_EN7V8MNPWNnsde4dZiQ3tr4Y,7523
 simo/urls.py,sha256=d8g-wN0Xr2PVIV8RZl_h_PMN9KGZNIE9to2hQj1p1TU,2497
 simo/__pycache__/__init__.cpython-312.pyc,sha256=a12_Zr7kC5DXzcFxA5eMu-TiSU5xbdF5cdKq-gwc3x0,159
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
@@ -12,7 +12,7 @@ simo/__pycache__/celeryc.cpython-312.pyc,sha256=MQlG6VeEdCpXPpiiAwZavriWKwHbhwTM
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-312.pyc,sha256=q63YJWqaaaQLz3qXW8clENjvH1zUfY_k34_m56n5gRY,320
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-312.pyc,sha256=PE2CUT2j6Uj3xB5LpEEyw8q9MQLsoZPRgcOsUDh9y8o,6688
+simo/__pycache__/settings.cpython-312.pyc,sha256=lrMjm4OihDlNrull26G_TaWUEJkFbo4Po5ir5efSRU4,7886
 simo/__pycache__/settings.cpython-38.pyc,sha256=4w3ds3D9S78zbsovXsXC05PYBAafDrtsOhX14FT0YyE,6149
 simo/__pycache__/urls.cpython-312.pyc,sha256=mIg_YD7zgjmIzfWzpGpikMqanGKP2O-iuA1ixqQngnc,3689
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
@@ -21,7 +21,7 @@ simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
 simo/automation/controllers.py,sha256=66aGjlfgigcePXiLmDkbVrxbm-Z26klMKIiOvaMH71k,11545
 simo/automation/forms.py,sha256=UWnkxw8pILPK0smRPTo4SLgsZl78zOySx7JIc30Bgtk,10228
-simo/automation/gateways.py,sha256=MAzv-i8BemhqfNY2NTYYlyCGPfctyNh4_dXyIZYJRSE,15848
+simo/automation/gateways.py,sha256=8qgBDhkM_xYGmeEbnH5WXs5m3ihMp8Yzx7yj6XG8DNM,16382
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
 simo/automation/models.py,sha256=zt-jkzyq5ddqGT864OkJzCsvov2vZ0nO4ez3hAeZkXg,934
 simo/automation/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN4,1996
@@ -34,7 +34,7 @@ simo/automation/__pycache__/controllers.cpython-312.pyc,sha256=QV63g3UlpMAA-yCaZ
 simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=CL-0Tq9B4-E36fYfWT1XEBTq1dkq1W8003f6MrBnQU0,8391
 simo/automation/__pycache__/forms.cpython-312.pyc,sha256=63rU0rWZk-Rz5qoMZiXl743WPc9NVm5d8bSd8w52T4E,12347
 simo/automation/__pycache__/forms.cpython-38.pyc,sha256=cpA5hA2Iz3JsPC0Dq01ki1I7S9c5DKRcXveHApI1dJo,7772
-simo/automation/__pycache__/gateways.cpython-312.pyc,sha256=j4bG9KqBcCB8JD59frTl9VtP8n04mUPF_bd0vInDZfs,22223
+simo/automation/__pycache__/gateways.cpython-312.pyc,sha256=mQWn7s8qqF-CIw9Zn80RbbaFJjTiCdaN_grMsfwa-nY,22405
 simo/automation/__pycache__/gateways.cpython-38.pyc,sha256=nHujqChMCqqxHbZezP3MisavjKDhczqzFGurO10h-lc,11113
 simo/automation/__pycache__/helpers.cpython-312.pyc,sha256=aDFtzBE72szi4gzVxK_NiAEC__wCmdztw0UKu2lVU58,5853
 simo/automation/__pycache__/helpers.cpython-38.pyc,sha256=fNjSyn4Mfq7-JQx-bdsnj-rSxgu20dVJ9-5ZEMT6yiM,3627
@@ -61,7 +61,7 @@ simo/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/backups/admin.py,sha256=cEakxnQlOHvUf8LdBdekXpDAvnqPoVN8y7pnN3WK29A,2487
 simo/backups/dynamic_settings.py,sha256=Q52RLa3UQsmAhqkwR16cM6pbBnIbXqmVQ2oIUP2ZVD0,416
 simo/backups/models.py,sha256=-tgILgkqmBEuxBwoymKZN1a0UVQzmJvqWrIGYMMFDaQ,695
-simo/backups/tasks.py,sha256=Vz6hJGWzlfaHtXRkLMhCg8e3oH80aQtgc3YfDsRLpgg,13372
+simo/backups/tasks.py,sha256=UtWMsHONhL_rBAedCk7Mirbp0sZ-glF49bnR2mdTM4U,13370
 simo/backups/__pycache__/__init__.cpython-312.pyc,sha256=wl1RXj84eHmQ_WAvVl7oahd1qa8ezF1HcwRQzho7DyU,167
 simo/backups/__pycache__/__init__.cpython-38.pyc,sha256=vzOf-JIMeZ6P85FyvTpYev3mscFosUy-SJTshcQbOHU,161
 simo/backups/__pycache__/admin.cpython-312.pyc,sha256=4rXygr4247idEgFvadmM4L7-1rRChe7zgoGYTzo2UGI,3863
@@ -70,6 +70,7 @@ simo/backups/__pycache__/dynamic_settings.cpython-312.pyc,sha256=Sf8IorKxo6r3R0Q
 simo/backups/__pycache__/dynamic_settings.cpython-38.pyc,sha256=51gJFjn_XqQBRoHeubo6ppb9pNuFQKI5hAR0ms9flE8,731
 simo/backups/__pycache__/models.cpython-312.pyc,sha256=45nfTQzX8YuKI67KEe0nAdlZEQHAZjJu44NUr4PC5WI,1746
 simo/backups/__pycache__/models.cpython-38.pyc,sha256=zclX7HwOT4_izweyKNQ8LmgSHb3hNcYcfsSiwwfQoLY,1220
+simo/backups/__pycache__/tasks.cpython-312.pyc,sha256=Vg95hEynVXVA89bkG0BN5Cw6KkuVCV4JCiKLsd7xI_8,18369
 simo/backups/__pycache__/tasks.cpython-38.pyc,sha256=bKz_Rxt_H0lC0d9_4Dxqv7cirQDSH9LVurZZC0LU94s,9179
 simo/backups/migrations/0001_initial.py,sha256=0LzCusTUyYf61ksiepdnqXIuYYNTNd_djh_Wa484HA0,770
 simo/backups/migrations/0002_backuplog_backup_level_backup_size.py,sha256=w9T9MQWuecy91OZE1fMExriwPuXA8HMPKsPwXhmC8_k,1023
@@ -97,7 +98,7 @@ simo/core/auto_urls.py,sha256=FqKhH0fF7cGO6P2YrjblwG4JA2UkVXj3lreJUOB2Jq4,1194
 simo/core/autocomplete_views.py,sha256=x3MKOZvXYS3xVQ-V1S7Liv_U5bxr-uc0gePa85wv5nA,4561
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
-simo/core/controllers.py,sha256=Cy0-F4QEo-RbVkRpdfvl0sah9cUs4InP1T8shojaiKY,37355
+simo/core/controllers.py,sha256=4u67VNwU4Zts64aVddqhoPt9ZRbpTmAHPCdu-pFfIX0,37407
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
@@ -107,7 +108,7 @@ simo/core/gateways.py,sha256=Y2BME6zSyeUq_e-hzEUF6gErCUCP6nFxedkLZKiLVOo,4141
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=Ampwe5K7gfE6IJULNCV35V8ysmMOdS_wz7mRzfaLZUw,3014
 simo/core/middleware.py,sha256=zX6N4P_KR7gG8N2-NcR7jKtuCEhCGRh51g4EktAhP7w,3272
-simo/core/models.py,sha256=YjcTcBzesXwR5akdRXjM7wI2e1pYn379loBSaDWdDJM,23696
+simo/core/models.py,sha256=Nw-XT0v0y5pBYlKKhzoI68HiEMMTp7fqZQZgKmeOW7Q,23752
 simo/core/permissions.py,sha256=Ef4NO7QwwDd3Z-v61R0BeCBXxTOJz9qBvzRTIB5tHwI,2943
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=adqe8oYP5f7hGFXcxa-Zmce2KOwy3hZOaWE3MaAFtpM,23157
@@ -141,7 +142,7 @@ simo/core/__pycache__/base_types.cpython-312.pyc,sha256=Lnq2NL9B5hfwJARJYC447Rdv
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CX-qlF7CefRi_mCE954wYa9rUFR88mOl6g7fybDRu7g,803
 simo/core/__pycache__/context.cpython-312.pyc,sha256=8rsN2Er-Sx3rrVmO0Gk4cem3euGh0kTELXj667GGZ5E,2193
 simo/core/__pycache__/context.cpython-38.pyc,sha256=NlTHt2GvXxA21AhBkeyOLfRFUuXw7wmwqyNhhcDl2cw,1373
-simo/core/__pycache__/controllers.cpython-312.pyc,sha256=4QDs4cfrxPLcSnJLZFNn0XsGyvAy4GzNCVMr-qljNbM,52855
+simo/core/__pycache__/controllers.cpython-312.pyc,sha256=pNjKIaSvzEWJlI6_yQdmakyFYNgrxv6dyexVvoScUj4,52897
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=LtrQQ8egOIOuQbAckeM-z8OfbzS4W8VQ3vBnryAm3iU,32086
 simo/core/__pycache__/dynamic_settings.cpython-312.pyc,sha256=WUZ6XF4kZb6zPf541PkKmiQaBIw-r5C6F3EUUZiTEnE,3331
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
@@ -161,7 +162,7 @@ simo/core/__pycache__/managers.cpython-312.pyc,sha256=RpeR1Z0GtSZht4_a4iDfTU_E8P
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-312.pyc,sha256=2VhHTVY-rdPNqNX0wst2ioVbHD5uMqHkY-tpujLdpH0,4195
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=SgTLFNkKxvJ62hevSAVNZHgHdG_u2p7AZBhrj-jfFPs,2649
-simo/core/__pycache__/models.cpython-312.pyc,sha256=CVESJOD2imhwbhZ6i0KIs3M4equBtHT-TApdqZ10uoE,31932
+simo/core/__pycache__/models.cpython-312.pyc,sha256=z6RR7Rv4POCpVl5acn2VHVhLLRh59YhO1jq_JSO8CmI,31960
 simo/core/__pycache__/models.cpython-38.pyc,sha256=A4JsWsDMBaQ_U5sV5cX0c_Uox9mP5fAqn_712EjfNS4,19605
 simo/core/__pycache__/permissions.cpython-312.pyc,sha256=yqG6t9NZZtL30Hr7razjiG6JDGKiz0Qjcjxgv1C93vM,4450
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=UdtxCTXPEbe99vgZOfRz9wfKSYvUn9hSRbpIV9CJSyI,2988
@@ -252,7 +253,7 @@ simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZ
 simo/core/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
 simo/core/management/_hub_template/hub/nginx.conf,sha256=40hvXL42MeiqqkLURNcDQsRudv1dNFLJnvb2-Y3RCkk,2394
 simo/core/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/core/management/_hub_template/hub/supervisor.conf,sha256=-xFtt7cVyY-SCZ_6Z4yI1-1LNtd0f0EAM9zB5VbY9i8,2362
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=11c39qVa1V5qf6OOK2PJhqKJXi5wfMhQNwd-TdWq2yA,2393
 simo/core/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10307,7 +10308,7 @@ simo/core/templates/admin/action_intermediate_form.html,sha256=rOWF3UDv-SQZUfOzp
 simo/core/templates/admin/base.html,sha256=yACgUEp8VLmvWwlLM0ygaeorWdn6ykX-7NkXFz3iZAI,6281
 simo/core/templates/admin/clearable_easy_thumbnails_widget.html,sha256=Gh0z_KIEt3QC53HKJ_3QiPt9nIFCvwAx1gCny-dPHOM,704
 simo/core/templates/admin/component_change_list.html,sha256=N3seVjTkIRXIXKGsleB7oWUnPlMRXDIqOPqfEyq4PNE,3320
-simo/core/templates/admin/component_history.html,sha256=xiACt0w7EPrdmTOsi5XO07O-8LcL_XpCu9pSynmNNpI,541
+simo/core/templates/admin/component_history.html,sha256=7vkWSDu5xugkrb79IffJ-CZts9h2EMZr9Gi4tqHBc0I,579
 simo/core/templates/admin/formset_widget.html,sha256=NAonHNLyicsoE4Iir3My4AlVSz4Q7-1OA19zgsIOjJA,3563
 simo/core/templates/admin/index.html,sha256=AJpt1FA4g6IAFQA99-3glJ88RmoWJ0YXBIz_DUt-R14,4015
 simo/core/templates/admin/item_name_display.html,sha256=Y3zk-rc-y8_6dC6_WrSy6tx6Z-6IZzZ5w3a1hMxlpz4,357
@@ -10403,8 +10404,9 @@ simo/core/utils/__pycache__/type_constants.cpython-38.pyc,sha256=ERC5U7T5pThjLrs
 simo/core/utils/__pycache__/validators.cpython-312.pyc,sha256=w8-XwptooefG-7gIIngVt1WWssIqNU3P1jPHBoYSYH4,1879
 simo/core/utils/__pycache__/validators.cpython-38.pyc,sha256=gjeBOjL_keMoRDjdn8v-3F3wcjPIT3Xx5KpTalo0e-Y,1247
 simo/fleet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/fleet/admin.py,sha256=3udiNaNoL37699SN-rQqjvvZ0lO2pi2zvg9SqZPp5R0,6403
+simo/fleet/admin.py,sha256=J_kiwYIGMTxnRuytl_YoM7Pxrj5LzlN9xC8E7Ag5yvQ,7006
 simo/fleet/api.py,sha256=rJwAYJvp0uslW7O6Q4XOpOa8hfCdy3keUD7b3UNL43E,3424
+simo/fleet/apps.py,sha256=je8mRXMcRq4lABQZlyF2G2hOCkBUicR9I2jvrLDA8eI,238
 simo/fleet/auto_urls.py,sha256=vrfrooPyY4pDuQjya-eLxCgZldfhwbEeEiXa7diO_CY,847
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
@@ -10412,19 +10414,20 @@ simo/fleet/controllers.py,sha256=HV6onYd11YAc_f_8NFHAbv5IJZUEd1bDGTRMQtfFe-g,289
 simo/fleet/forms.py,sha256=VcqATlX-omZruUgUC2fJpeLNUGSR-szmf36_M3aa5dg,66850
 simo/fleet/gateways.py,sha256=C7dyapWDlJ5erYPNLkSoH50I8kj0lIXicSno0_CrdXc,5783
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
-simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
+simo/fleet/models.py,sha256=lPiIurCNK--4mPFsg_QLo6GHbpYfE8Aju_G4VAKsRLM,17895
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=PQnjp7LaEpMts-om2OPV5XOU9ut6KFWiePPDCXK0M98,2679
-simo/fleet/socket_consumers.py,sha256=3Ayry0PJgP5K2V7c-4a11QFOxfM8lOSXfIVhaBB8wTM,18820
-simo/fleet/tasks.py,sha256=NX_opj-rbkK9eeQMeRNwHj_ZJ0LC4rYOZovMg9_r0kA,904
+simo/fleet/socket_consumers.py,sha256=fFsnpAvItGT1tYbkAkpTxBjG5v0cT-o-fmQRM9S1wsg,19630
+simo/fleet/tasks.py,sha256=VSY0cMFIs7Ocjz0_HwRLp-yaDdBl1T8U9T-7b8Ggegc,1308
 simo/fleet/utils.py,sha256=wNJvURzLP3-aho3D3rfg07N9kWCaMIw5gOsmeeO9Nlg,4740
 simo/fleet/views.py,sha256=3F8im6BsSOaK3KEuBNESE4sDbS_dWHYaOdhTR4cCLjE,5189
 simo/fleet/__pycache__/__init__.cpython-312.pyc,sha256=-BZyG4uq87W18Ra1pKTjSzDgiLEAcw254NqdRX-vSJo,165
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
-simo/fleet/__pycache__/admin.cpython-312.pyc,sha256=rzG80aTmBCD-at2TNa6noEVx6vyz5R0YFOHVS-q3OgA,9351
+simo/fleet/__pycache__/admin.cpython-312.pyc,sha256=8TOuku1Atv-LyaVi4OICTc43iBFPgxCjrgjA9q6CN1s,9890
 simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=iweeu5AkaggBhQntP6-VF_eEodkNc6E7zKy0VjfwC2o,6652
 simo/fleet/__pycache__/api.cpython-312.pyc,sha256=OM7s1FqGqTC2vwOOto0GhZrObEnI58SxMcTWaPtHD4Y,5892
 simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rZ1mkfkaMBEXhi9sw_jTKdk2CPJhBNxoImtjQ3Rf1VY,4016
+simo/fleet/__pycache__/apps.cpython-312.pyc,sha256=S8OK4R0W9VbNfD4Nos_CybjZ3AXS8CxvRaRUJO57xQA,707
 simo/fleet/__pycache__/auto_urls.cpython-312.pyc,sha256=32yXKNoqMxNgYvsspUgx1A84LVQqr8LP4BRvURNCgeY,1026
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=jHsvfwAumiBusr91QK1-qC-nmpPEC3r2uMGG8g0fABE,769
 simo/fleet/__pycache__/base_types.cpython-312.pyc,sha256=cq-Pnje7FoMP608U_L_gsCfY_JMY23z87Uao-AxjNBw,304
@@ -10438,14 +10441,15 @@ simo/fleet/__pycache__/gateways.cpython-312.pyc,sha256=ZZGBAH2w9YmFvSrajZY8fUXd_
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=MIpXuGWitGNdsxJ99fWvMXJ6sVE96ac7iR4K4aM4Sds,5148
 simo/fleet/__pycache__/managers.cpython-312.pyc,sha256=sgcaERbhjilkFDCPqc8YZwSiEfRkXpufe0qDPqgLOiU,1733
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=Vmm23zoQnS3-uS5_WJt2n3wtjhLiEhLWaYxXJCU6Gts,1339
-simo/fleet/__pycache__/models.cpython-312.pyc,sha256=lnSAUceAf0DAo2Gqs3dPjZf37MSPtqkljOXG5A5up0I,24994
+simo/fleet/__pycache__/models.cpython-312.pyc,sha256=OkCAXSrrMaxfsclJQV0yhlcBFerKV-xA7FQfR-2e7e0,25400
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=AXk1Q_nnHDXirHYgM3EW5pLsrR2CaPWk4EuvGCuDUpI,14131
 simo/fleet/__pycache__/routing.cpython-312.pyc,sha256=vafYpGAtYc2NYxBQObMX6eIZfVZflOYgzjYv0SL1jAQ,385
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-312.pyc,sha256=reKKBMohl7vi7iJ6wjRbOBoFn7J9ny8EE9wv5spBHYM,4912
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=l_FzORWCM1hcSZV0AaGRO-p0CMTcEfqnLGgbn2IVvI0,3648
-simo/fleet/__pycache__/socket_consumers.cpython-312.pyc,sha256=1ZEKGEL8FDeALU-BLlap9rjHZKgc_FDtLr0INSWspGo,27221
+simo/fleet/__pycache__/socket_consumers.cpython-312.pyc,sha256=r2n7h89t1HgI16UdUsaR9nrFFPgb-b2z9emn2eMdPZQ,28536
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=lEC1SkY_KgRY0QoBUMPjnbFwSa7qmCf-4eNQ45hAy68,14141
+simo/fleet/__pycache__/tasks.cpython-312.pyc,sha256=1XDir2GWxl7c17n0ZuCxOFKsLjaCqXgqVT4TcDvzhm8,1817
 simo/fleet/__pycache__/tasks.cpython-38.pyc,sha256=RoNxL2WUiW67s9O9DjaYVVjCBSZu2nje0Qn9FJkWVS0,1116
 simo/fleet/__pycache__/utils.cpython-312.pyc,sha256=mrICzm_po8QGUaRddn0TvBp5RDLBe1Jklg7xZr0YduM,4995
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=obUd-X2Y-ybx4icqUWq_qwIxrP9yyarJjexWAfO4MTI,3344
@@ -10586,17 +10590,19 @@ simo/fleet/migrations/__pycache__/0044_auto_20241210_0707.cpython-312.pyc,sha256
 simo/fleet/migrations/__pycache__/0044_auto_20241210_0707.cpython-38.pyc,sha256=M99PMBDgOdS_0KIEhlUamHWeTVCTdIHFXIvYTRX15Z8,1029
 simo/fleet/migrations/__pycache__/__init__.cpython-312.pyc,sha256=1rujN3qD3L0Q2MRB-gxwRKyShgUTX9NBpDGaIl42ozU,176
 simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6RnVPRq4CaO13Lg7M0F-pxA_gqqZ6Mg,170
+simo/fleet/templates/admin/colonel_history.html,sha256=YfA6LDVExk1sAWhBuiCLA6vb3XcBNN7_fpJNZzGFtB0,169
 simo/fleet/templates/fleet/controllers_info/Button.md,sha256=GIuxqG617174NEtpPeCGVocxO4YMe7-CacgVSu_L5-E,739
 simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LSTY9YPFuVPIbVsYCAifcotrXJcOXl2k774_vo6nAE,770
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,856
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
 simo/generic/controllers.py,sha256=NZmrJ1BYzAwHJ1vN-OMvqnH13ihvjUhZqdxq-l__1Jk,46268
-simo/generic/forms.py,sha256=yCEmOy6Sm5moCh-9UTzqLDiI5xmzfm5LwEhZ2r9KRbw,26054
-simo/generic/gateways.py,sha256=d7sbt_GeeGGwp2hoD-FZNuyM6fNvEU51kiZyznZYcxg,17589
-simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
+simo/generic/forms.py,sha256=1Gt3FycP4Da8LbtOuOGTpLSf2dCDEE-Sdr_X3qlA1aw,26265
+simo/generic/gateways.py,sha256=kjqGMjlLXlGNreKLQtHoSnw4xan1IB8-KF8AqiZ82T0,16057
+simo/generic/models.py,sha256=59fkYowOX0imviIhA6uwupvuharrpBykmBm674rJNoI,7279
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=qesKZVhI56Kh7vdIUDD3hzDUi0FcXwIfcmE_a3YS6JQ,1772
+simo/generic/tasks.py,sha256=5jhi7Jv7lfaM3T8GArWKaDqQfuvdBsKqz5obN6NVUqk,2570
 simo/generic/__pycache__/__init__.cpython-312.pyc,sha256=-34GwswSg1zc1becA8lPwUpnd4ek2IoduCsIUr0KTNo,167
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-312.pyc,sha256=ywoKk91YSEZxpyt9haG509_c0G9DMJVpae_y1iiZxJU,1937
@@ -10605,16 +10611,17 @@ simo/generic/__pycache__/base_types.cpython-312.pyc,sha256=h8Mwu49i-zmwTbL33JaLJ
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
 simo/generic/__pycache__/controllers.cpython-312.pyc,sha256=TgHV-dNMJqYuFOgeJTxeh4Mihb4lHnfhid0CmdhZCR4,52737
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=jJjwKVaDYyazrRGNjUFoY74nr_jX_DEnsC9KjyxZCgc,30427
-simo/generic/__pycache__/forms.cpython-312.pyc,sha256=duBW82wI9zfyzPnIk4hLs_vx5Rfk4vSCh9n7cSNbgcc,34681
+simo/generic/__pycache__/forms.cpython-312.pyc,sha256=nTyrgmEmOrgORJSOxUI_i2O7wVUXCQL9MYhaT76Jmew,34869
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=k8lz3taXdWAg5P9jcnw66mWH51pCc4SOsg32kVEtBCg,19416
-simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=-ifxm5kYUvp6tRw3xr1EO7jCEXQ9_aQG3OdxAQvxHBg,21758
+simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=ixeotxPeqHkINziDnnkymlKR2wYMb5UR2sxiioMQxhY,19309
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=GIeMT51oZU2OCFD4eUDFdSRRYE0Qf14AcOr_gdUqG94,12705
-simo/generic/__pycache__/models.cpython-312.pyc,sha256=xriUzjkaM2Y4mT3jo2OPK-XGBroBBSFJfLqK0jMA4MA,10200
+simo/generic/__pycache__/models.cpython-312.pyc,sha256=ggaeX6BQa-0-KG50HadpRCWeW84Fbog0muT2gBkqLNQ,10190
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
 simo/generic/__pycache__/routing.cpython-312.pyc,sha256=_wQPZeAgwlGtnafw9VcabgqjyJxzDFywHBIFbGhzYRE,452
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-312.pyc,sha256=zERTr2bHXLKSXCoIov6MaFRrgfeS1A0IHCXbaPfVvK4,2814
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=FaVCf_uJI2uwj1Zz-jwsOXou65oV9gFCIB8e-YKquRk,1662
+simo/generic/__pycache__/tasks.cpython-312.pyc,sha256=zEyNpFVmEJoZdeYKNZ7cEmPtIyZMTwEqzZJZZwMYl-o,4494
 simo/generic/migrations/0001_initial.py,sha256=7FpPcfpRU5ya0b8s2KbxR5a3npf92YruvZltUybjzys,676
 simo/generic/migrations/0002_auto_20241126_0726.py,sha256=SX38JwP732QooOm5HM1Xo7Th_Mv_6YZloT3eozULOhs,922
 simo/generic/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10719,6 +10726,7 @@ simo/notifications/__pycache__/models.cpython-312.pyc,sha256=VKa2ZQxzBH22YAUlsmh
 simo/notifications/__pycache__/models.cpython-38.pyc,sha256=PoqLuOnlaAWQQ-20AtqhvAlLSkakPmdn7J7wGvHNW3g,2449
 simo/notifications/__pycache__/serializers.cpython-312.pyc,sha256=on-lu0Sj7vEl0_-2ul19Yk59gYHIFESXZKpA9RKNewQ,1226
 simo/notifications/__pycache__/serializers.cpython-38.pyc,sha256=7-eRGKYuQ4g1SpKOMpz17SIiu1HmaMoYv-cJbaO9QGA,1028
+simo/notifications/__pycache__/utils.cpython-312.pyc,sha256=o-CnxcAtX7tHo2CdGBKjLTd1OU3z57zUCaWlYzEuv88,2423
 simo/notifications/__pycache__/utils.cpython-38.pyc,sha256=4ZnI-pmWji84EXBkPrl4ir1kGjfanO4bH5--bLNRxCA,1648
 simo/notifications/migrations/0001_initial.py,sha256=Zh69AQ-EKlQKfqfnMDVRcxvo1MxRY-TFLCdnNcgqi6g,2003
 simo/notifications/migrations/0002_notification_instance.py,sha256=B3msbMeKvsuq-V7gvRADRjj5PFLayhi3pQvHZjqzO5g,563
@@ -10777,6 +10785,7 @@ simo/users/__pycache__/sso_urls.cpython-312.pyc,sha256=FQLOFu310j7pOhTNlg2wyUybq
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
 simo/users/__pycache__/sso_views.cpython-312.pyc,sha256=FZGDRdt7pb8qROe8ZAEGSTfeZtLCGNBvQiXpDtrc4dE,6011
 simo/users/__pycache__/sso_views.cpython-38.pyc,sha256=PLRF6FYCxRhnmgnN_gUS-pdQlH7lofLU1Xhgw3vDO_Y,4019
+simo/users/__pycache__/tasks.cpython-312.pyc,sha256=cu-VV1HWXToHR875DFC2E9_x1cn1mD5mXYqltk0QOuw,1955
 simo/users/__pycache__/tasks.cpython-38.pyc,sha256=XLMKt3suT7BlcXrJZoH9ZIhhtBuqyiW4lsOB9IbBkko,1225
 simo/users/__pycache__/utils.cpython-312.pyc,sha256=dJtfFncpI2QtTSZoUUNCfUsDoofOOfVtMRXNm5ZXC20,3515
 simo/users/__pycache__/utils.cpython-38.pyc,sha256=cgxUwEaBgxT360mw4E03J7u4vi3dhw6K3n7-8WNvyFU,1888
@@ -10924,9 +10933,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.8.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.8.3.dist-info/METADATA,sha256=e73yT_ZPrUBSQ9WeaC3C_Ha7RqPRz8oRME8ayRXL1X4,2008
-simo-2.8.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simo-2.8.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.8.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.8.3.dist-info/RECORD,,
+simo-2.8.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.8.5.dist-info/METADATA,sha256=J6rygMMxiXfeOMVZEhetZjpGJKHF_m2obJCRJ5D7y00,2008
+simo-2.8.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+simo-2.8.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.8.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.8.5.dist-info/RECORD,,