simo 2.0.1__py3-none-any.whl → 2.0.3__py3-none-any.whl

simo/core/controllers.py

@@ -762,6 +762,12 @@ class Lock(Switch):
     app_widget = LockWidget
     admin_widget_template = 'admin/controller_widgets/lock.html'
 
+    UNLOCKED = 0
+    LOCKED = 1
+    LOCKING = 2
+    UNLOCKING = 3
+    FAULT = 4
+
     def lock(self):
         self.turn_on()
 
@@ -769,11 +775,20 @@ class Lock(Switch):
         self.turn_off()
 
     def _receive_from_device(self, value, is_alive=True):
-        if type(value) in (int, bool):
+        if type(value) == bool:
             if value:
                 value = 'locked'
             else:
                 value = 'unlocked'
+        if type(value) == int:
+            values_map = {
+                self.UNLOCKED: 'unlocked',
+                self.LOCKED: 'locked',
+                self.LOCKING: 'locking',
+                self.UNLOCKING: 'unlocking',
+                self.FAULT: 'fault'
+            }
+            value = values_map.get(value, 'fault')
         return super()._receive_from_device(value, is_alive=is_alive)
 
     def _validate_val(self, value, occasion=None):

simo/core/socket_consumers.py

@@ -7,6 +7,7 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from channels.generic.websocket import AsyncWebsocketConsumer, WebsocketConsumer
 from simo.core.events import ObjectChangeEvent, get_event_obj
+from simo.core.utils.logs import capture_socket_errors
 import paho.mqtt.client as mqtt
 from simo.users.middleware import introduce
 from simo.core.models import Component, Gateway
@@ -14,6 +15,7 @@ from simo.core.utils.model_helpers import get_log_file_path
 from simo.core.middleware import introduce_instance
 
 
+@capture_socket_errors
 class SIMOWebsocketConsumer(WebsocketConsumer):
     headers = {}
 
@@ -24,6 +26,7 @@ class SIMOWebsocketConsumer(WebsocketConsumer):
         }
 
 
+@capture_socket_errors
 class LogConsumer(AsyncWebsocketConsumer):
     log_file = None
     in_error = False
@@ -123,6 +126,7 @@ class LogConsumer(AsyncWebsocketConsumer):
             self.log_file = None
 
 
+@capture_socket_errors
 class GatewayController(SIMOWebsocketConsumer):
     gateway = None
     _mqtt_client = None
@@ -178,6 +182,7 @@ class GatewayController(SIMOWebsocketConsumer):
                 pass
 
 
+@capture_socket_errors
 class ComponentController(SIMOWebsocketConsumer):
     component = None
     send_value = False

simo/core/utils/logs.py

@@ -1,4 +1,10 @@
 import logging
+from functools import wraps
+from inspect import iscoroutinefunction
+from logging import getLogger
+from channels.exceptions import AcceptConnection, DenyConnection, StopConsumer
+
+logger = getLogger()
 
 
 class StreamToLogger(object):
@@ -28,3 +34,31 @@ class StreamToLogger(object):
         if self.linebuf != '':
             self.logger.log(self.log_level, self.linebuf.rstrip())
         self.linebuf = ''
+
+
+
+
+def propagate_exceptions(func):
+    async def wrapper(*args, **kwargs):  # we're wrapping an async function
+        try:
+            return await func(*args, **kwargs)
+        except (AcceptConnection, DenyConnection, StopConsumer):  # these are handled by channels
+            raise
+        except Exception as exception:  # any other exception
+            # avoid logging the same exception multiple times
+            if not getattr(exception, "caught", False):
+                setattr(exception, "caught", True)
+                logger.error(
+                    "Exception occurred in {}:".format(func.__qualname__),
+                    exc_info=exception,
+                )
+            raise  # propagate the exception
+    return wraps(func)(wrapper)
+
+
+def capture_socket_errors(consumer_class):
+    for method_name, method in list(consumer_class.__dict__.items()):
+        if iscoroutinefunction(method):  # an async method
+            # wrap the method with a decorator that propagate exceptions
+            setattr(consumer_class, method_name, propagate_exceptions(method))
+    return consumer_class

simo/fleet/admin.py

@@ -1,3 +1,4 @@
+from threading import Timer
 from django.contrib import admin
 from django.utils.safestring import mark_safe
 from django.template.loader import render_to_string
@@ -78,6 +79,15 @@ class ColonelAdmin(admin.ModelAdmin):
             return qs
         return qs.filter(instance__in=request.user.instances)
 
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        # give it one second to finish up with atomic transaction and
+        # send update_config command.
+        def update_colonel_config(colonel):
+            colonel.update_config()
+        Timer(1, update_colonel_config, [obj]).start()
+
+
     def has_add_permission(self, request):
         return False
 

simo/fleet/controllers.py

@@ -308,6 +308,8 @@ class TTLock(FleeDeviceMixin, Lock):
     @classmethod
     def _process_discovery(cls, started_with, data):
         if data['discover-ttlock'] == 'fail':
+            if data['result'] == 0:
+                return {'error': 'Internal Colonel error. See Colonel logs.'}
             if data['result'] == 1:
                 return {'error': 'TTLock not found.'}
             elif data['result'] == 2:

simo/fleet/migrations/0027_auto_20240306_0802.py

@@ -7,7 +7,7 @@ from django.db import migrations
 
 def forwards_func(apps, schema_editor):
     from simo.fleet.utils import GPIO_PINS
-    from django.contrib.contenttypes.models import ContentType
+    #from django.contrib.contenttypes.models import ContentType
 
     Colonel = apps.get_model('fleet', "Colonel")
     ColonelPin = apps.get_model("fleet", "ColonelPin")
@@ -26,18 +26,18 @@ def forwards_func(apps, schema_editor):
             )
 
         for i2c in colonel.i2c_interfaces.all():
-            ct = ContentType.objects.get_for_model(i2c)
+            #ct = ContentType.objects.get_for_model(i2c)
 
             scl_pin = new_pins[colonel.id][i2c.scl_pin_no]
-            scl_pin.occupied_by_content_type = ct
-            scl_pin.occupied_by_id = i2c.id
+            #scl_pin.occupied_by_content_type = ct
+            #scl_pin.occupied_by_id = i2c.id
             scl_pin.save()
             i2c.scl_pin = scl_pin
             i2c.scl_pin.save()
 
             sda_pin = new_pins[colonel.id][i2c.sda_pin_no]
-            sda_pin.occupied_by_content_type = ct
-            sda_pin.occupied_by_id = i2c.id
+            #sda_pin.occupied_by_content_type = ct
+            #sda_pin.occupied_by_id = i2c.id
             sda_pin.save()
 
             i2c.sda_pin = sda_pin
@@ -48,7 +48,7 @@ def forwards_func(apps, schema_editor):
     for comp in Component.objects.filter(
         controller_uid__startswith='simo.fleet.'
     ):
-        ct = ContentType.objects.get_for_model(comp)
+        #ct = ContentType.objects.get_for_model(comp)
         try:
             colonel = Colonel.objects.get(id=comp.config['colonel'])
         except Exception as e:
@@ -64,8 +64,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['pin_no']]
             comp.config['pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
         if 'power_pin' in comp.config:
             comp.config['power_pin_no'] = comp.config.pop('power_pin')
@@ -77,8 +77,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['power_pin_no']]
             comp.config['power_pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
         if 'sensor_pin' in comp.config:
             comp.config['sensor_pin_no'] = comp.config.pop('sensor_pin')
@@ -90,8 +90,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['sensor_pin_no']]
             comp.config['sensor_pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
         if 'output_pin' in comp.config:
             comp.config['output_pin_no'] = comp.config.pop('output_pin')
@@ -103,8 +103,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['output_pin_no']]
             comp.config['output_pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
         if 'open_pin' in comp.config:
             comp.config['open_pin_no'] = comp.config.pop('open_pin')
@@ -116,8 +116,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['open_pin_no']]
             comp.config['open_pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
         if 'close_pin' in comp.config:
             comp.config['close_pin_no'] = comp.config.pop('close_pin')
@@ -129,8 +129,8 @@ def forwards_func(apps, schema_editor):
 
             pin = new_pins[colonel.id][comp.config['close_pin_no']]
             comp.config['close_pin'] = pin.pk
-            pin.occupied_by_content_type = ct
-            pin.occupied_by_id = comp.id
+            #pin.occupied_by_content_type = ct
+            #pin.occupied_by_id = comp.id
             pin.save()
 
         if 'controls' in comp.config:
@@ -146,8 +146,8 @@ def forwards_func(apps, schema_editor):
                 pin = new_pins[colonel.id][updated_controls['pin_no']]
                 updated_controls['pin'] = pin.pk
 
-                pin.occupied_by_content_type = ct
-                pin.occupied_by_id = comp.id
+                #pin.occupied_by_content_type = ct
+                #pin.occupied_by_id = comp.id
                 pin.save()
 
                 comp.config['controls'][i] = updated_controls

simo/fleet/models.py

@@ -82,8 +82,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
     occupied_pins = models.JSONField(default=dict, blank=True)
 
     logs_stream = models.BooleanField(
-        default=False, help_text="Might cause unnecessary overhead. "
-                                 "Better to leave this off if things are running smoothly."
+        default=False, help_text="ATENTION! Causes serious overhead and "
+                                 "significantly degrades the lifespan of a chip "
+                                 "due to a lot of writes to the memory. "                       
+                                 "It also causes Colonel websocket to run out of memory "
+                                 "and reset if a lot of data is being transmitted. "
+                                 "Leave this off, unleess you know what you are doing!"
     )
     pwm_frequency = models.IntegerField(default=1, choices=(
         (0, "3kHz"), (1, "22kHz")
@@ -161,10 +165,8 @@ class Colonel(DirtyFieldsMixin, models.Model):
     @transaction.atomic
     def rebuild_occupied_pins(self):
         for pin in ColonelPin.objects.filter(colonel=self):
-            if isinstance(pin.occupied_by, Component):
-                pin.occupied_by_content_type = None
-                pin.occupied_by_id = None
-                pin.save()
+            pin.occupied_by = None
+            pin.save()
 
         for component in self.components.all():
             try:
@@ -176,6 +178,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 pin.occupied_by = component
                 pin.save()
 
+        for interface in self.i2c_interfaces.all():
+            interface.sda_pin.occupied_by = interface
+            interface.sda_pin.save()
+            interface.scl_pin.occupied_by = interface
+            interface.scl_pin.save()
+
 
     @transaction.atomic()
     def move_to(self, other_colonel):
@@ -190,13 +198,11 @@ class Colonel(DirtyFieldsMixin, models.Model):
             self.components.remove(component)
             other_colonel.components.add(component)
 
-        self.rebuild_occupied_pins()
-        other_colonel.rebuild_occupied_pins()
-
         other_colonel.i2c_interfaces.all().delete()
 
         for i2c_interface in self.i2c_interfaces.all():
             I2CInterface.objects.create(
+                no=i2c_interface.no,
                 colonel=other_colonel, name=i2c_interface.name,
                 freq=i2c_interface.freq,
                 scl_pin=ColonelPin.objects.get(
@@ -207,6 +213,8 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 ),
             )
 
+        self.rebuild_occupied_pins()
+        other_colonel.rebuild_occupied_pins()
         self.update_config()
         other_colonel.update_config()
 
@@ -263,10 +271,7 @@ class ColonelPin(models.Model):
 
 @receiver(post_save, sender=Colonel)
 def after_colonel_save(sender, instance, created, *args, **kwargs):
-    if not created:
-        return
-
-    def after_update():
+    if created:
         for no, data in GPIO_PINS.get(instance.type).items():
             ColonelPin.objects.get_or_create(
                 colonel=instance, no=no,
@@ -280,9 +285,6 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
                 scl_pin=ColonelPin.objects.get(colonel=instance, no=4),
                 sda_pin=ColonelPin.objects.get(colonel=instance, no=15),
             )
-        instance.update_config()
-
-    transaction.on_commit(after_update)
 
 
 @receiver(pre_delete, sender=Component)

simo/fleet/serializers.py

@@ -45,3 +45,8 @@ class ColonelSerializer(serializers.ModelSerializer):
         for pin in obj.pins.all():
             result.append(ColonelPinSerializer(pin).data)
         return result
+
+    def update(self, instance, validated_data):
+        instance = super().update(instance, validated_data)
+        instance.update_config()
+        return instance

simo/fleet/socket_consumers.py

@@ -13,15 +13,18 @@ import paho.mqtt.client as mqtt
 from channels.generic.websocket import AsyncWebsocketConsumer
 from asgiref.sync import sync_to_async
 from simo.core.utils.model_helpers import get_log_file_path
+from simo.core.utils.logs import capture_socket_errors
 from simo.core.events import GatewayObjectCommand, get_event_obj
 from simo.core.models import Gateway, Instance, Component
 from simo.conf import dynamic_settings
 from simo.users.models import Fingerprint
+
 from .gateways import FleetGatewayHandler
 from .models import Colonel
 from .controllers import TTLock
 
 
+@capture_socket_errors
 class FleetConsumer(AsyncWebsocketConsumer):
     colonel = None
     colonel_logger = None
@@ -345,106 +348,110 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
 
     async def receive(self, text_data=None, bytes_data=None):
-        if text_data:
-            print(f"{self.colonel}: {text_data}")
-            data = json.loads(text_data)
-            if 'get_config' in data:
-                config = await self.get_config_data()
-                print("Send config: ", config)
-                await self.send_data({
-                    'command': 'set_config', 'data': config
-                }, compress=True)
-            elif 'comp' in data:
-                try:
+        try:
+            if text_data:
+                print(f"{self.colonel}: {text_data}")
+                data = json.loads(text_data)
+                if 'get_config' in data:
+                    config = await self.get_config_data()
+                    print("Send config: ", config)
+                    await self.send_data({
+                        'command': 'set_config', 'data': config
+                    }, compress=True)
+                elif 'comp' in data:
                     try:
-                        id=int(data['comp'])
-                    except:
-                        return
-
-                    component = await sync_to_async(
-                        Component.objects.get, thread_sensitive=True
-                    )(id=id)
-
-                    if 'val' in data:
-                        def receive_val(val):
-                            if data.get('actor'):
-                                fingerprint = Fingerprint.objects.filter(
-                                    value=f"ttlock-{component.id}-{data.get('actor')}",
-                                ).first()
-                                component.change_init_fingerprint = fingerprint
-                            component.controller._receive_from_device(
-                                val, bool(data.get('alive'))
-                            )
-                        await sync_to_async(
-                            receive_val, thread_sensitive=True
-                        )(data['val'])
-
-                    if 'options' in data:
-                        def receive_options(val):
-                            component.meta['options'] = val
-                            component.save()
-                        await sync_to_async(
-                            receive_options, thread_sensitive=True
-                        )(data['options'])
-
-                    if 'codes' in data and component.controller_uid == TTLock.uid:
-                        def save_codes(codes):
-                            component.meta['codes'] = codes
-                            for code in codes:
-                                Fingerprint.objects.get_or_create(
-                                    value=f"ttlock-{component.id}-code-{str(code)}",
-                                    defaults={'type': "TTLock code"}
-                                )
-                            component.save()
-                        await sync_to_async(
-                            save_codes, thread_sensitive=True
-                        )(data['codes'])
-                    if 'fingerprints' in data and component.controller_uid == TTLock.uid:
-                        def save_codes(codes):
-                            component.meta['fingerprints'] = codes
-                            for code in codes:
-                                Fingerprint.objects.get_or_create(
-                                    value=f"ttlock-{component.id}-finger-{str(code)}",
-                                    defaults={'type': "TTLock Fingerprint"}
+                        try:
+                            id=int(data['comp'])
+                        except:
+                            return
+
+                        component = await sync_to_async(
+                            Component.objects.get, thread_sensitive=True
+                        )(id=id)
+
+                        if 'val' in data:
+                            def receive_val(val):
+                                if data.get('actor'):
+                                    fingerprint = Fingerprint.objects.filter(
+                                        value=f"ttlock-{component.id}-{data.get('actor')}",
+                                    ).first()
+                                    component.change_init_fingerprint = fingerprint
+                                component.controller._receive_from_device(
+                                    val, bool(data.get('alive'))
                                 )
-                            component.save()
-                        await sync_to_async(
-                            save_codes, thread_sensitive=True
-                        )(data['fingerprints'])
-
-                except Exception as e:
-                    print(traceback.format_exc(), file=sys.stderr)
-
-            elif 'discover-ttlock' in data:
-                def process_discovery_result():
-                    self.gateway.refresh_from_db()
-                    if self.gateway.discovery.get('finished'):
-                        return Component.objects.filter(
-                            meta__finalization_data__temp_id=data['result']['id']
-                        ).first()
-                    try:
-                        self.gateway.process_discovery(data)
+                            await sync_to_async(
+                                receive_val, thread_sensitive=True
+                            )(data['val'])
+
+                        if 'options' in data:
+                            def receive_options(val):
+                                component.meta['options'] = val
+                                component.save()
+                            await sync_to_async(
+                                receive_options, thread_sensitive=True
+                            )(data['options'])
+
+                        if 'codes' in data and component.controller_uid == TTLock.uid:
+                            def save_codes(codes):
+                                component.meta['codes'] = codes
+                                for code in codes:
+                                    Fingerprint.objects.get_or_create(
+                                        value=f"ttlock-{component.id}-code-{str(code)}",
+                                        defaults={'type': "TTLock code"}
+                                    )
+                                component.save()
+                            await sync_to_async(
+                                save_codes, thread_sensitive=True
+                            )(data['codes'])
+                        if 'fingerprints' in data and component.controller_uid == TTLock.uid:
+                            def save_codes(codes):
+                                component.meta['fingerprints'] = codes
+                                for code in codes:
+                                    Fingerprint.objects.get_or_create(
+                                        value=f"ttlock-{component.id}-finger-{str(code)}",
+                                        defaults={'type': "TTLock Fingerprint"}
+                                    )
+                                component.save()
+                            await sync_to_async(
+                                save_codes, thread_sensitive=True
+                            )(data['fingerprints'])
+
                     except Exception as e:
                         print(traceback.format_exc(), file=sys.stderr)
-                    self.gateway.finish_discovery()
 
-                finished_comp = await sync_to_async(
-                    process_discovery_result, thread_sensitive=True
-                )()
-                if finished_comp:
-                    await self.send_data({
-                        'command': 'finalize',
-                        'data': finished_comp.meta['finalization_data']
-                    })
+                elif 'discover-ttlock' in data:
+                    def process_discovery_result():
+                        self.gateway.refresh_from_db()
+                        if self.gateway.discovery.get('finished'):
+                            return Component.objects.filter(
+                                meta__finalization_data__temp_id=data['result']['id']
+                            ).first()
+                        try:
+                            self.gateway.process_discovery(data)
+                        except Exception as e:
+                            print(traceback.format_exc(), file=sys.stderr)
+                        self.gateway.finish_discovery()
+
+                    finished_comp = await sync_to_async(
+                        process_discovery_result, thread_sensitive=True
+                    )()
+                    if finished_comp:
+                        await self.send_data({
+                            'command': 'finalize',
+                            'data': finished_comp.meta['finalization_data']
+                        })
 
-        elif bytes_data:
-            if not self.colonel_logger:
-                await self.start_logger()
+            elif bytes_data:
+                if not self.colonel_logger:
+                    await self.start_logger()
 
-            for logline in bytes_data.decode(errors='replace').split('\n'):
-                self.colonel_logger.log(logging.INFO, logline)
+                for logline in bytes_data.decode(errors='replace').split('\n'):
+                    self.colonel_logger.log(logging.INFO, logline)
+
+            await self.log_colonel_connected()
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
 
-        await self.log_colonel_connected()
 
 
     async def log_colonel_connected(self):

simo/generic/forms.py

@@ -167,6 +167,12 @@ class AlarmGroupConfigForm(BaseComponentForm):
         required=False,
         help_text="Defines if this is your main/top global alarm group."
     )
+    notify_on_breach = forms.IntegerField(
+        required=False, min_value=0,
+        help_text="Notify active users if "
+                  "not disarmed within given number of seconds "
+                  "after the breached."
+    )
     has_alarm = False
 
 

simo/generic/models.py

@@ -1,6 +1,4 @@
-from django.db import models
 from threading import Timer
-from django.utils.translation import gettext_lazy as _
 from django.db.models.signals import pre_save, post_save, post_delete
 from django.dispatch import receiver
 from simo.core.models import Instance, Component
@@ -20,7 +18,8 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
 
     for alarm_group in Component.objects.filter(
         controller_uid=AlarmGroup.uid,
-        config__components__contains=instance.id
+        config__components__contains=instance.id,
+        config__notify_on_breach__gt=-1
     ).exclude(value='disarmed'):
         stats = {
             'disarmed': 0, 'pending-arm': 0, 'armed': 0, 'breached': 0
@@ -33,7 +32,6 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
         alarm_group.config['stats'] = stats
         alarm_group.save(update_fields=['config'])
 
-        alarm_group_value = alarm_group.value
         if stats['disarmed'] == len(alarm_group.config['components']):
             alarm_group_value = 'disarmed'
         elif stats['armed'] == len(alarm_group.config['components']):
@@ -41,9 +39,11 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
         elif stats['breached']:
             if alarm_group.value != 'breached':
                 def notify_users_security_breach(alarm_group_component_id):
-                    from simo.notifications.utils import notify_users
-                    alarm_group_component = Component.objects.get(
-                        id=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'
@@ -51,16 +51,22 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
                     body = "Security Breach! " + '; '.join(
                         [str(c) for c in breached_components]
                     )
+                    from simo.notifications.utils import notify_users
                     notify_users(
+                        alarm_group_component.zone.instance,
                         'alarm', str(alarm_group_component), body,
                         component=alarm_group_component
                     )
-                t = Timer(1, notify_users_security_breach, [alarm_group.id])
+                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.set(alarm_group_value)
+        alarm_group.controller.set(alarm_group_value)
 
 
 @receiver(post_save, sender=Component)

simo/notifications/utils.py

@@ -14,7 +14,7 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
     )
     if not users:
         users = User.objects.filter(
-            instance_roles__instnace=instance,
+            instance_roles__instance=instance,
             instance_roles__is_active=True
         )
     for user in users:

{simo-2.0.1.dist-info → simo-2.0.3.dist-info}/METADATA

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

{simo-2.0.1.dist-info → simo-2.0.3.dist-info}/RECORD

@@ -34,7 +34,7 @@ simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=yqbIZqBksrAkEuHRbt6iExwPDDy0K5II2NzRCkmOvMU,589
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=bxJRpmREw8CsgDAiuVvpOl8HxHhZqrRM1qXTF_8afV4,26617
+simo/core/controllers.py,sha256=7M28j0I2Eh-Q7jIXZ7FMkNQoA7xluu67NSXhJXaW4gs,27018
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -48,7 +48,7 @@ simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=bkfXZgUzbXZOrJY69VIevBHNLWRd7DmgyFRh4arr-gs,15810
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
-simo/core/socket_consumers.py,sha256=R8zOkbZvsNf19NU9gz-2HzbTzpocb-j-jTGoC2KZxak,9488
+simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
 simo/core/tasks.py,sha256=se27V-noW02v4ZY2PMv0AJkXNsY3NtJ4G43__KLW7Kg,11005
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
@@ -10110,7 +10110,7 @@ simo/core/utils/form_fields.py,sha256=UOzYdPd71qgCw1H3qH01u85YjrOlETPJAHOJrZKhyD
 simo/core/utils/form_widgets.py,sha256=Zxn9jJqPle9Q_BKNJnyTDn7MosYwNp1TFu5LoKs0bfc,408
 simo/core/utils/formsets.py,sha256=1u34QGZ2P67cxZD2uUJS3lAf--E8XsiiqFmZ4P41Vw4,6463
 simo/core/utils/helpers.py,sha256=TOWy3slspaEYEhe9zDcb0RgzHUYslF6LZDlrWPGSqUI,3791
-simo/core/utils/logs.py,sha256=JBUHhnm9Cn81csrQ4xHbujBFRL9YWulMwUj_zJPNvyw,1057
+simo/core/utils/logs.py,sha256=Zn9JQxqCH9Odx2J1BWT84nFCfkJ4Z4p5X8psdll7hNc,2366
 simo/core/utils/mixins.py,sha256=X6kUPKAi_F-uw7tgm8LEaYalBXpvDA-yrLNFCGr2rks,259
 simo/core/utils/model_helpers.py,sha256=3IzJeOvBoYdUJVXCJkY20npOZXPjNPAiEFvuT0OPhwA,884
 simo/core/utils/relay.py,sha256=i1xy_nPTgY5Xn0l2W4lNI3xeVUpDQTUUfV3M8h2DeBg,457
@@ -10120,18 +10120,18 @@ simo/core/utils/validators.py,sha256=FRO6_K5HAO1OaC-LosApZjh-W3EA-IJZ53HnwEJgqiI
 simo/core/utils/__pycache__/api.cpython-38.pyc,sha256=CuJq9GKQC8gbeCxmH2wQHZUmkIihVILSEIAoVYCFwH0,1575
 simo/core/utils/__pycache__/serialization.cpython-38.pyc,sha256=zOo2M97bAC0Ed-iiNoVtcHvgdAYR8RwrF2bUwuf8Pus,1145
 simo/fleet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/fleet/admin.py,sha256=sN16en2sKYbApCHkitjOq6Fc5xagBTRSQ8tNCiVa1r0,5317
+simo/fleet/admin.py,sha256=Vxp3yTNRVoDif_hwwBW3weeMNakQ3iZo-GC0VvdScfQ,5699
 simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 simo/fleet/auto_urls.py,sha256=gAXTWUvsWkQHRdZGM_W_5iJBEsM4lY063kIx3f5LUqs,578
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=ELYfj2o1xrceg2tcprv6ofHA4WtYaWrFmgiIAthnCSw,13885
+simo/fleet/controllers.py,sha256=N8Qzdp2RPFrpZ_l9O4u8VjHWoY_WTWGg76s3V3oJqEs,13999
 simo/fleet/forms.py,sha256=UGj1mK2Zbl2LRlvLtEDObeGfC2wcuHleRbePo1_Vx6I,34972
 simo/fleet/gateways.py,sha256=xFsmF_SXYXK_kMJOCHkiInPJ_0VcPWz-kJDoMup2lT8,1576
 simo/fleet/managers.py,sha256=kpfvvfdH4LDxddIBDpdAb5gsVk8Gb0-L9biFcj9OFPs,807
-simo/fleet/models.py,sha256=iLIdmcWTr_j8R7wTHph3fAExek8UH4S1HJyJ-asTNgw,12420
+simo/fleet/models.py,sha256=Ro0ZkYB3a7ZhczVQOxjAobCRECIdN0Nj0yb5EBybvW0,12809
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
-simo/fleet/serializers.py,sha256=lVxqb4ldmJ5bUIklqeet5AIQak2Fbp_Tx5uKcP0eqmQ,1339
-simo/fleet/socket_consumers.py,sha256=HbkrV0i1TwBC38otu_2lzN6IlBdyZHVdXIVhU4y-YCM,18872
+simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
+simo/fleet/socket_consumers.py,sha256=o8yr27AYxKFStQGyXZrk7PP1P2fUgSjsWp76DojWqbM,19415
 simo/fleet/utils.py,sha256=D0EGFbDmW8zyhyxf5ozGtRpo4Sy5Ov6ZixukBK_e2Do,3462
 simo/fleet/views.py,sha256=PbdZpsM_7-oyKzuDX1A5WULNABA1_B7ISF70UJX97FE,1662
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
@@ -10175,7 +10175,7 @@ simo/fleet/migrations/0023_colonel_is_authorized.py,sha256=IoyPUR45axv9V6QsntPTj
 simo/fleet/migrations/0024_colonel_pwm_frequency.py,sha256=nfTDs3GeIEkkiuQMB3_tc8TuyZSNOdQ2KhnJKTtQ9XE,498
 simo/fleet/migrations/0025_auto_20240130_1334.py,sha256=dHcQnlF7LBp6ikx_s5AB_I19sQ-iMB8XJ1X1yoWVvBs,825
 simo/fleet/migrations/0026_rename_i2cinterface_scl_pin_and_more.py,sha256=SEQxhgFsxWaUmfXaMOHHj0q8EqF9bt9PTOVuVa6wrQs,2752
-simo/fleet/migrations/0027_auto_20240306_0802.py,sha256=ZWttZ54aoSrLBliHOiF9RL380gdNSlCEzlGJLX7fUnk,5951
+simo/fleet/migrations/0027_auto_20240306_0802.py,sha256=kOtLlCbbkqZu1zwzNZyA5rE_0TifF7tURdLCu_hzTLE,5972
 simo/fleet/migrations/0028_remove_i2cinterface_scl_pin_no_and_more.py,sha256=CeoFQPIu3jb4Gtyu5FhRjhl_mKhowMoEdtFU1oWD4UE,450
 simo/fleet/migrations/0029_alter_i2cinterface_scl_pin_and_more.py,sha256=aquymc1ZcUVgdrqZxl3viN6kiCHtw4HjgL6n4d0cSpQ,886
 simo/fleet/migrations/0030_colonelpin_label_alter_colonel_type.py,sha256=5T5bmQxPZrG0UseCLd7ssV-AeFF3O4T_DFxLu3whSqg,706
@@ -10217,9 +10217,9 @@ simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
 simo/generic/controllers.py,sha256=Fs95mRBJgT5ZNMnxxwQJ_94TJ7Y_O0IygWSgfjLZzU0,51912
-simo/generic/forms.py,sha256=KVGxTOqlqN9qSMrVBF2Mz2U39xZ_4s5ULHFprvAttb4,19959
+simo/generic/forms.py,sha256=HYctQMudlMpQRxkI67C6NShaM1dAzo0J-qbu-AFpozU,20194
 simo/generic/gateways.py,sha256=aHU0mA0ADNVzw3EXb8paXI5DI-gNd4CrGtaV5qDhILY,15499
-simo/generic/models.py,sha256=-y3DQmD1k5uGB4cwchrE2PL61217BL6quCjkUWV3x3k,3340
+simo/generic/models.py,sha256=d00Q-UXtt7mG9MdPpZ3mXnxKjwlTI2FgCEklZpGBk7s,3629
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
 simo/generic/static/weather_icons/01d@2x.png,sha256=TZfWi6Rfddb2P-oldWWcjUiuCHiU9Yrc5hyrQAhF26I,948
@@ -10266,7 +10266,7 @@ simo/notifications/admin.py,sha256=y_gmHYXbDh98LUUa-lp9DilTIgM6-pIujWPQPLQsJo8,8
 simo/notifications/api.py,sha256=GXQpq68ULBaJpU8w3SJKaCKuxYGWYehKnGeocGB1RVc,1783
 simo/notifications/models.py,sha256=VZcvweii59j89nPKlWeUSJ44Qz3ZLjJ6mXN6uB9F1Sw,2506
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
-simo/notifications/utils.py,sha256=M2UFufqAWD64kHw0rUDIr4nJ1ZkHd47sG_TVa4j918s,907
+simo/notifications/utils.py,sha256=5CtKOvX0vbWLXFvJD_8WfWulMEp1FuMwrfCGDLHySdA,907
 simo/notifications/migrations/0001_initial.py,sha256=Zh69AQ-EKlQKfqfnMDVRcxvo1MxRY-TFLCdnNcgqi6g,2003
 simo/notifications/migrations/0002_notification_instance.py,sha256=B3msbMeKvsuq-V7gvRADRjj5PFLayhi3pQvHZjqzO5g,563
 simo/notifications/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10343,8 +10343,8 @@ 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.0.1.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.1.dist-info/METADATA,sha256=UNG_zOqdwai9Z5jFbVFDrXcVozRzzHrASc4hdMZgKQM,1669
-simo-2.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.1.dist-info/RECORD,,
+simo-2.0.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.3.dist-info/METADATA,sha256=kIgoVnqVIeZ9Paw4f7G6PA41Nwe3dafpPmpEbRV5JU4,1669
+simo-2.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.3.dist-info/RECORD,,