simo 2.0.11__py3-none-any.whl → 2.0.12__py3-none-any.whl

simo/core/api_meta.py

@@ -3,7 +3,9 @@ from django.utils.encoding import force_str
 from rest_framework import serializers
 from rest_framework.metadata import SimpleMetadata
 from rest_framework.utils.field_mapping import ClassLookupDict
-from .serializers import ComponentManyToManyRelatedField
+from .serializers import (
+    HiddenSerializerField, ComponentManyToManyRelatedField
+)
 
 
 class SIMOAPIMetadata(SimpleMetadata):
@@ -32,7 +34,8 @@ class SIMOAPIMetadata(SimpleMetadata):
         serializers.Serializer: 'nested object',
         serializers.RelatedField: 'related object',
         serializers.ManyRelatedField: 'many related objects',
-        ComponentManyToManyRelatedField: 'many related objects'
+        ComponentManyToManyRelatedField: 'many related objects',
+        HiddenSerializerField: 'hidden',
     })
 
     def get_field_info(self, field):

simo/core/forms.py

@@ -26,6 +26,15 @@ from .utils.formsets import FormsetField
 from .utils.validators import validate_slaves
 
 
+class HiddenField(forms.CharField):
+    '''
+        Hidden field used in API
+    '''
+    def __init__(self, *args, **kwargs):
+        super().__init__(widget=forms.HiddenInput())
+
+
+
 class HubConfigForm(forms.Form):
     name = forms.CharField(
         label=_("Hub Name"), required=True,
@@ -278,7 +287,7 @@ class ComponentAdminForm(forms.ModelForm):
         model = Component
         fields = '__all__'
         exclude = (
-            'gateway', 'controller_uid', 'base_type',
+            'gateway', 'controller_uid', 'base_type', 'instance_methods'
             'alive', 'value_type', 'value', 'arm_status',
         )
         widgets = {
@@ -291,7 +300,7 @@ class ComponentAdminForm(forms.ModelForm):
             'category': autocomplete.ModelSelect2(
                 url='autocomplete-category', attrs={'data-html': True}
             ),
-            'instance_methods': PythonCode
+            #'instance_methods': PythonCode
         }
 
     def __init__(self, *args, **kwargs):

simo/core/serializers.py

@@ -2,16 +2,18 @@ import inspect
 import datetime
 import json
 from django import forms
+from collections import OrderedDict
 from django.forms.utils import ErrorDict
 from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
 from simo.core.middleware import get_current_request
 from rest_framework import serializers
-from simo.core.forms import FormsetField
+from simo.core.forms import HiddenField, FormsetField
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
 from .drf_braces.serializers.form_serializer import (
     FormSerializer, FormSerializerBase, reduce_attr_dict_from_instance,
-    FORM_SERIALIZER_FIELD_MAPPING, set_form_partial_validation
+    FORM_SERIALIZER_FIELD_MAPPING, set_form_partial_validation,
+    find_matching_class_kwargs
 )
 from .forms import ComponentAdminForm
 from .models import Category, Zone, Icon, ComponentHistory
@@ -60,7 +62,6 @@ class CategorySerializer(serializers.ModelSerializer):
         return
 
 
-
 class ObjectSerializerMethodField(serializers.SerializerMethodField):
 
     def bind(self, field_name, parent):
@@ -83,6 +84,9 @@ class FormsetPrimaryKeyRelatedField(PrimaryKeyRelatedField):
 
 # TODO: if form field has initial value and is required, it is serialized as not required field, howerver when trying to submit it fails with a message, that field is required.
 
+class HiddenSerializerField(serializers.CharField):
+    pass
+
 
 class ComponentFormsetField(FormSerializer):
 
@@ -91,6 +95,7 @@ class ComponentFormsetField(FormSerializer):
         # we set it to proper formset form on __init__
         form = forms.Form
         field_mapping = {
+            HiddenField: HiddenSerializerField,
             forms.ModelChoiceField: FormsetPrimaryKeyRelatedField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
@@ -145,6 +150,11 @@ class ComponentFormsetField(FormSerializer):
         kwargs['style'] = {'form_field': form_field}
         if serializer_field_class == FormsetPrimaryKeyRelatedField:
             kwargs['queryset'] = form_field.queryset
+
+        attrs = find_matching_class_kwargs(form_field, serializer_field_class)
+        if 'choices' in attrs:
+            kwargs['choices'] = attrs['choices']
+
         return kwargs
 
     def to_representation(self, instance):
@@ -206,6 +216,7 @@ class ComponentSerializer(FormSerializer):
         form = ComponentAdminForm
         exclude = ('instance_methods', )
         field_mapping = {
+            HiddenField: HiddenSerializerField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
             forms.SlugField: serializers.CharField,
@@ -266,6 +277,7 @@ class ComponentSerializer(FormSerializer):
             ret[field_name].initial = form_field.initial
             ret[field_name].default = form_field.initial
 
+        print("Fields: ", ret)
         return ret
 
     def _get_field_kwargs(self, form_field, serializer_field_class):
@@ -279,6 +291,10 @@ class ComponentSerializer(FormSerializer):
             kwargs['formset_field'] = form_field
             kwargs['many'] = True
 
+        attrs = find_matching_class_kwargs(form_field, serializer_field_class)
+        if 'choices' in attrs:
+            kwargs['choices'] = form_field.choices
+
         return kwargs
 
     def set_form_cls(self):

simo/fleet/controllers.py

@@ -432,6 +432,30 @@ class TTLock(FleeDeviceMixin, Lock):
             command='call', method='get_fingerprints'
         ).publish()
 
+    def check_locked_status(self):
+        '''
+        Lock state is monitored by capturing adv data
+        periodically transmitted by the lock.
+        This data includes information about it's lock/unlock position
+        also if there are any new events in it that we are not yet aware of.
+
+        If anything new is observer, connection is made to the lock
+        and reported back to the system.
+        This helps to save batteries of a lock,
+        however it is not always as timed as we would want to.
+        Sometimes it can take even up to 20s for these updates to occur.
+
+        This method is here to force immediate connection to the lock
+        to check it's current status. After this method is called,
+        we might expect to receive an update within 2 seconds or less.
+        '''
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='check_locked_status'
+        ).publish()
+
     def _receive_meta(self, data):
         from simo.users.models import Fingerprint
         if 'codes' in data:

simo/fleet/forms.py

@@ -14,6 +14,7 @@ from simo.core.widgets import LogOutputWidget
 from simo.core.utils.easing import EASING_CHOICES
 from simo.core.utils.validators import validate_slaves
 from simo.core.utils.admin import AdminFormActionForm
+from simo.core.events import GatewayObjectCommand
 from .models import Colonel, ColonelPin, Interface
 from .utils import INTERFACES_PINS_MAP
 
@@ -984,6 +985,18 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
 
 class TTLockConfigForm(ColonelComponentForm):
 
+    door_sensor = forms.ModelChoiceField(
+        Component.objects.filter(base_type='binary-sensor'),
+        required=False,
+        help_text="Quickens up lock status reporting on open/close if provided.",
+        widget=autocomplete.ModelSelect2(
+            url='autocomplete-component', attrs={'data-html': True},
+            forward=(
+                forward.Const(['binary-sensor'], 'base_type'),
+            )
+        )
+    )
+
     def clean(self):
         if not self.instance or not self.instance.pk:
             from .controllers import TTLock
@@ -1002,6 +1015,11 @@ class TTLockConfigForm(ColonelComponentForm):
         if commit:
             self.cleaned_data['colonel'].components.add(obj)
             self.cleaned_data['colonel'].save()
+            if self.cleaned_data['door_sensor']:
+                GatewayObjectCommand(
+                    self.instance.gateway, self.cleaned_data['door_sensor'],
+                    command='watch_lock_sensor'
+                ).publish()
         return obj
 
 

simo/fleet/gateways.py

@@ -1,13 +1,16 @@
 import datetime
 import time
+import json
 from django.utils import timezone
+from simo.core.models import Component
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
 from simo.core.models import Gateway
-from simo.core.events import GatewayObjectCommand
+from simo.core.events import GatewayObjectCommand, get_event_obj
 from simo.core.utils.serialization import deserialize_form_data
 
 
+
 class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "SIMO.io Fleet"
     config_form = BaseGatewayForm
@@ -18,8 +21,41 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
         ('push_discoveries', 6),
     )
 
+    def run(self, exit):
+        from simo.fleet.controllers import TTLock
+        self.door_sensors_on_watch = set()
+        for lock in Component.objects.filter(controller_uid=TTLock.uid):
+            if not lock.config.get('door_sensor'):
+                continue
+            door_sensor = Component.objects.filter(
+                id=lock.config['door_sensor']
+            ).first()
+            if not door_sensor:
+                continue
+            self.door_sensors_on_watch.add(door_sensor.id)
+            door_sensor.on_change(self.on_door_sensor)
+        super().run(exit)
+
+
     def _on_mqtt_message(self, client, userdata, msg):
-        pass
+        from simo.core.models import Component
+        payload = json.loads(msg.payload)
+        if payload.get('command') == 'watch_lock_sensor':
+            door_sensor = get_event_obj(payload, Component)
+            if not door_sensor:
+                return
+            print("Adding door sensor to lock watch!")
+            if door_sensor.id in self.door_sensors_on_watch:
+                return
+            self.door_sensors_on_watch.add(door_sensor.id)
+            door_sensor.on_change(self.on_door_sensor)
+
+    def on_door_sensor(self, sensor):
+        from simo.fleet.controllers import TTLock
+        for lock in Component.objects.filter(
+            controller_uid=TTLock.uid, config__door_sensor=sensor.id
+        ):
+            lock.check_locked_status()
 
     def look_for_updates(self):
         from .models import Colonel

simo/generic/controllers.py

@@ -5,6 +5,7 @@ import datetime
 import json
 from django.core.exceptions import ValidationError
 from django.utils import timezone
+from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django.urls import reverse_lazy
@@ -354,6 +355,20 @@ class AlarmGroup(ControllerBase):
         self.component.config['stats'] = stats
         self.component.save()
 
+    @cached_property
+    def events_map(self):
+        map = {}
+        for entry in self.component.config.get('breach_events', []):
+            if 'uid' not in entry:
+                continue
+            comp = Component.objects.filter(id=entry['component']).first()
+            if not comp:
+                continue
+            map[entry['uid']] = json.loads(json.dumps(entry))
+            map[entry['uid']].pop('uid')
+            map[entry['uid']]['component'] = comp
+        return map
+
 
 class WeatherForecast(ControllerBase):
     name = _("Weather Forecast")

simo/generic/forms.py

@@ -4,7 +4,7 @@ from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django.urls.base import get_script_prefix
 from django.contrib.contenttypes.models import ContentType
-from simo.core.forms import BaseComponentForm
+from simo.core.forms import HiddenField, BaseComponentForm
 from simo.core.models import Icon, Component
 from simo.core.controllers import (
     BinarySensor, NumericSensor, MultiSensor, Switch
@@ -18,6 +18,14 @@ from simo.core.utils.form_fields import ListSelect2Widget
 from simo.conf import dynamic_settings
 
 
+ACTION_METHODS = (
+    ('turn_on', "Turn ON"), ('turn_off', "Turn OFF"),
+    ('play', "Play"), ('pause', "Pause"), ('stop', "Stop"),
+    ('open', 'Open'), ('close', 'Close'),
+    ('lock', "Lock"), ('unlock', "Unlock"),
+)
+
+
 class ScriptConfigForm(BaseComponentForm):
     autostart = forms.BooleanField(
         initial=True, required=False,
@@ -149,6 +157,49 @@ class ThermostatConfigForm(BaseComponentForm):
         return super().save(commit)
 
 
+class AlarmBreachEventForm(forms.Form):
+    uid = HiddenField(required=False)
+    component = forms.ModelChoiceField(
+        Component.objects.all(),
+        widget=autocomplete.ModelSelect2(
+            url='autocomplete-component', attrs={'data-html': True},
+        ),
+    )
+    breach_action = forms.ChoiceField(
+        initial='turn_on', choices=ACTION_METHODS
+    )
+    disarm_action = forms.ChoiceField(
+        required=False, initial='turn_off', choices=ACTION_METHODS
+    )
+    delay = forms.IntegerField(
+        label="Delay (s)",
+        min_value=0, max_value=600, initial=0,
+        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):
+        if not self.cleaned_data.get('component'):
+            return self.cleaned_data
+        if not self.cleaned_data.get('breach_action'):
+            return self.cleaned_data
+        component = self.cleaned_data.get('component')
+        if not hasattr(component, self.cleaned_data['breach_action']):
+            self.add_error(
+                'breach_action',
+                f"{component} has no {self.cleaned_data['breach_action']} action!"
+            )
+        if self.cleaned_data.get('disarm_action'):
+            if not hasattr(component, self.cleaned_data['disarm_action']):
+                self.add_error(
+                    'disarm_action',
+                    f"{component} has no "
+                    f"{self.cleaned_data['disarm_action']} action!"
+                )
+        return self.cleaned_data
+
+
 # TODO: create control widget for admin use.
 class AlarmGroupConfigForm(BaseComponentForm):
     components = forms.ModelMultipleChoiceField(
@@ -167,11 +218,40 @@ class AlarmGroupConfigForm(BaseComponentForm):
         required=False,
         help_text="Defines if this is your main/top global alarm group."
     )
+    arming_locks = forms.ModelMultipleChoiceField(
+        Component.objects.filter(base_type='lock'),
+        label="Arming locks", required=False,
+        widget=autocomplete.ModelSelect2Multiple(
+            url='autocomplete-component', attrs={'data-html': True},
+            forward=(
+                forward.Const(['lock'], 'base_type'),
+            )
+        ),
+        help_text="Alarm group will get armed automatically whenever "
+                  "any of assigned locks get's locked. "
+    )
+    disarming_locks = forms.ModelMultipleChoiceField(
+        Component.objects.filter(base_type='lock'),
+        label="Disarming locks", required=False,
+        widget=autocomplete.ModelSelect2Multiple(
+            url='autocomplete-component', attrs={'data-html': True},
+            forward=(
+                forward.Const(['lock'], 'base_type'),
+            )
+        ),
+        help_text="Alarm group will be disarmed automatically whenever "
+                  "any of assigned locks get's unlocked. "
+    )
     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."
+        help_text="Notify active users on breach if "
+                  "not disarmed within given number of seconds. <br>"                  
+                  "Leave this empty to disable breach notifications."
+    )
+    breach_events = FormsetField(
+        formset_factory(
+            AlarmBreachEventForm, can_delete=True, can_order=True, extra=0
+        ), label='Breach events'
     )
     has_alarm = False
 
@@ -194,6 +274,14 @@ class AlarmGroupConfigForm(BaseComponentForm):
                 self.fields['is_main'].widget.attrs['disabled'] = 'disabled'
 
 
+    def clean_breach_events(self):
+        events = self.cleaned_data['breach_events']
+        for i, cont in enumerate(events):
+            if not cont.get('uid'):
+                cont['uid'] = get_random_string(6)
+        return events
+
+
     def recurse_check_alarm_groups(self, components, start_comp=None):
         for comp in components:
             check_cmp = start_comp if start_comp else comp
@@ -476,16 +564,8 @@ class StateSelectForm(BaseComponentForm):
     )
 
 
-ACTION_METHODS = (
-    ('turn_on', "Turn ON"), ('turn_off', "Turn OFF"),
-    ('play', "Play"), ('pause', "Pause"), ('stop', "Stop"),
-    ('open', 'Open'), ('close', 'Close'),
-    ('lock', "Lock"), ('unlock', "Unlock"),
-)
-
-
 class AlarmClockEventForm(forms.Form):
-    uid = forms.CharField(widget=forms.HiddenInput(), required=False)
+    uid = HiddenField(required=False)
     enabled = forms.BooleanField(initial=True)
     name = forms.CharField(max_length=30)
     component = forms.ModelChoiceField(

simo/generic/gateways.py

@@ -5,6 +5,7 @@ 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
@@ -165,7 +166,8 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ('watch_thermostats', 60),
         ('watch_alarm_clocks', 30),
         ('watch_scripts', 10),
-        ('watch_watering', 60)
+        ('watch_watering', 60),
+        ('watch_alarm_events', 1),
     )
 
     def watch_thermostats(self):
@@ -441,6 +443,27 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             else:
                 switch.turn_off()
 
+    def watch_alarm_events(self):
+        from .controllers import AlarmGroup
+        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'])
+
 
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"

simo/generic/models.py

@@ -1,3 +1,6 @@
+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
@@ -19,7 +22,6 @@ 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__notify_on_breach__gt=-1
     ).exclude(value='disarmed'):
         stats = {
             'disarmed': 0, 'pending-arm': 0, 'armed': 0, 'breached': 0
@@ -57,26 +59,44 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
                         'alarm', str(alarm_group_component), body,
                         component=alarm_group_component
                     )
-                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()
+                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)
 
 
-@receiver(post_save, sender=Component)
-def set_initial_alarm_group_stats(sender, instance, created, *args, **kwargs):
-    if not created:
-        return
+@receiver(pre_save, sender=Component)
+def manage_alarm_groups(sender, instance, *args, **kwargs):
     if instance.controller_uid != AlarmGroup.uid:
         return
-    if instance.controller:
-        instance.controller.refresh_status()
+
+    if 'value' not in instance.get_dirty_fields():
+        return
+
+    if instance.value == 'breached':
+        instance.meta['breach_start'] = time.time()
+        instance.meta['events_triggered'] = []
+    elif instance.get_dirty_fields()['value'] == 'breached' \
+    and instance.value == 'disarmed':
+        instance.meta['breach_start'] = None
+        for event_uid in instance.meta.get('events_triggered', []):
+            event = instance.controller.events_map.get(event_uid)
+            if not event:
+                continue
+            if not event.get('disarm_action'):
+                continue
+            try:
+                getattr(event['component'], event['disarm_action'])()
+            except Exception:
+                print(traceback.format_exc(), file=sys.stderr)
 
 
 @receiver(post_delete, sender=Component)
@@ -91,3 +111,24 @@ def clear_alarm_group_config_on_component_delete(
             id for id in ag.config.get('components', []) if id != instance.id
         ]
         ag.save(update_fields=['config'])
+
+
+@receiver(post_save, sender=Component)
+def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
+    if instance.base_type != 'lock':
+        return
+    if 'value' not in instance.get_dirty_fields():
+        return
+    if instance.value == 'locked':
+        for ag in Component.objects.filter(
+            base_type=AlarmGroup.base_type,
+            config__arming_locks__contains=instance.id
+        ):
+            ag.arm()
+    elif instance.value == 'unlocked':
+        for ag in Component.objects.filter(
+            base_type=AlarmGroup.base_type,
+            config__arming_locks__contains=instance.id
+        ):
+            ag.disarm()
+

{simo-2.0.11.dist-info → simo-2.0.12.dist-info}/METADATA

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

{simo-2.0.11.dist-info → simo-2.0.12.dist-info}/RECORD

@@ -28,7 +28,7 @@ simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/admin.py,sha256=MoYz7B5YaTkF2JeacaqsR177N2IagKXc-rG0FTXjJ1w,17622
 simo/core/api.py,sha256=OVvv3a7KYJGbuUgSOfWzPg8hoCCRhdDejQ2kVs0H2p8,23803
 simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
-simo/core/api_meta.py,sha256=li4KLFl6xTYOoD8pgS8PYcjqTZlzhXI0reAkt06PZFA,3404
+simo/core/api_meta.py,sha256=dZkz7z-7GaMPVAsfQxOYCvpYaMPx_v2zynbY6JM8oD8,3477
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
 simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
@@ -38,7 +38,7 @@ simo/core/controllers.py,sha256=2D7YCLktx7a-4tn80DenQP2CdY0dc2bWg6IRU69YTZ8,2724
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/forms.py,sha256=OQTPuacid9AoEvZ86G9p6ILuviqJCtSDuwk2WlLj43E,21484
+simo/core/forms.py,sha256=QSBxiVD-mHG6b5M9ALvSw4mKTzZb3e0TY_m7bqD152A,21686
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=WoQ4OX3akIvoroSYji-nLVqXBSJzCiC1u_IiWkKbKmA,2413
@@ -46,7 +46,7 @@ simo/core/middleware.py,sha256=64PYjnyRnYf4sgMvPfR0oQqf9UEtxUwnhJe3RV6z_HI,2040
 simo/core/models.py,sha256=j5AymbJFt5HOIOYsHJ8UUKhb1TvIoqgH0T1y3BeGJuM,19408
 simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=miEh2Sd47KmB0viyNlwrEG_1kxYiTUrvQQvisEoLYuA,15759
+simo/core/serializers.py,sha256=aiFddwjss4Zwf05S1bMcDIePNUeBDPyTtJabNrZB26c,16351
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
@@ -59,7 +59,7 @@ simo/core/__pycache__/__init__.cpython-38.pyc,sha256=y0IW37wBUIGa3Eh_ZG28pRqHKoL
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=GP3lRW8djW3w_k5jgzs_fuW7j8wnmeysZcDtm5RFnD0,13442
 simo/core/__pycache__/api.cpython-38.pyc,sha256=W-CdACWTu_ebqH52riswadzT7z2mNRZJU8HngqbYXzw,18874
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
-simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=bdk1PG7FuRfFwcvQtF103H0kQrx6Vt0JRiepktWEPh8,2730
+simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=7dDi_Aay7T4eSNYmEItMlb7yU91-5_pzEVg8GXXf4Qc,2783
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=9Es2wZNduzUJv-jZ_HX0-L3vqwpXWBbseEwoC5K6b-w,3465
 simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=SVl4fF0-yiq7e9gt08jIM6_rL4JYcR0cNHzR9jCEi1M,931
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
@@ -69,7 +69,7 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnV
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=KH1SBm1NaDv99yHONenWWJcd4XSIqQ5tqaF8LSoeDws,17843
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=Wn5ZNCT5nqYUQUghSbdppYa1v4Fd8tuEcZAYDbae8wo,18215
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
@@ -77,7 +77,7 @@ simo/core/__pycache__/middleware.cpython-38.pyc,sha256=bGOFJNEhJeLbpsZp8LYn1VA3p
 simo/core/__pycache__/models.cpython-38.pyc,sha256=Gm36LWRxswvWiB3Wz0F7g32ZVXugh7chSSBz1lgBPZs,16995
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=uygjPbfRQiEzyo5-McCxsuMDJLbDYO_TLu55U7bJbR0,1809
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=tJf8jV9pPJXnJjUPXCc103wQxC5ZrZaC9SlIR41JomQ,15707
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=8N_iZ3V8E5E-el3OQQRAMANJvNrYLGWb7hy91IHVtGc,16136
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=sgjH_wv-1U99auH5uHb3or0qettPeHAlsz8P7B03ajY,2430
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
@@ -116,7 +116,7 @@ simo/core/drf_braces/serializers/enforce_validation_serializer.py,sha256=CQnnx8E
 simo/core/drf_braces/serializers/form_serializer.py,sha256=CacYpFHLbBFT9Cyxuiya4ZpAH64m_D4oyUk-JgiyYDc,14818
 simo/core/drf_braces/serializers/swapping.py,sha256=8gQerjgEzFx9nzRFKfy66REA51GOlwX17NsmhWSiGgo,1790
 simo/core/drf_braces/serializers/__pycache__/__init__.cpython-38.pyc,sha256=tyqVhHyZyg_OeWz9jptQ7Ya4M-AtUq8EJDLVrRbgUow,181
-simo/core/drf_braces/serializers/__pycache__/form_serializer.cpython-38.pyc,sha256=ko0jgtrD9XeMBwIN13gF3bepei_LL5FZgoI5GiiT3TY,13029
+simo/core/drf_braces/serializers/__pycache__/form_serializer.cpython-38.pyc,sha256=9_RxMMXVE2qQgShX4797uj_4nJPx9JQezwEn-g4c8j4,13029
 simo/core/drf_braces/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/drf_braces/tests/test_mixins.py,sha256=PlGkHrC8-lui2CcRu3PS3fKqEAP5lzdbzJFXAMu1CF8,4065
 simo/core/drf_braces/tests/test_parsers.py,sha256=Sv6v6TWTnup72a-gXely5g7x-n8EtOc_uhYF95YZBK8,2171
@@ -10168,9 +10168,9 @@ simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=8kLEGNrZ3v5H_X9t8CUi6E6g8hTVohILHxgMSVSrGgM,18515
-simo/fleet/forms.py,sha256=lWJ9luZiRJD4yLQCdCMmkvezk-vY3yVb3q7Y5C4r9qc,35649
-simo/fleet/gateways.py,sha256=EbSxv1DGSuv8MT7MmpZxKgV041umOteFW2Xo4LybzWI,2284
+simo/fleet/controllers.py,sha256=SypK2i_-0iNNVDr9CWtjFVUmFjC81mtwpAwRUI_xH-A,19561
+simo/fleet/forms.py,sha256=rLymJ2ovNgmwdKYJtxTfjuIm5Q4p3GLkIb7-Yo2DmS4,36375
+simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=J-rnn7Ew-7s3646NNRVY947Sbz21mUD_nBHtuHAKXds,14160
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
@@ -10184,9 +10184,9 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEEP5RFh6U6TGKyXDdiOE,565
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=3zVvD2Sp26JJfU_nQm8oe3O12-xXBQC7EKlaOpidDbw,16180
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=pHgx8ulx_2v0L0bkUHaW13Tn9KcfOP6ROhgHXPVvKJE,25510
-simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=xg7fW5JusYwl6epn5nEjxQJlFOyQ18SVybOaRBcpwl8,2418
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=H7RNRVGyT8ZNW3Z32sCePbALxq1huzwOroLPak2kLck,17163
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=-Sbb1kBxb246hV8A2ESlR4LVEISJNedVFiOK1IzRt6c,25954
+simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfrwAHkObVmErYzfRvjk,3569
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=S9pPqRjIxASXahoIOkkjQX7cBwjkdu4d2nXMju0-Cf8,12283
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
@@ -10261,25 +10261,25 @@ simo/fleet/migrations/__pycache__/0029_alter_i2cinterface_scl_pin_and_more.cpyth
 simo/fleet/migrations/__pycache__/0030_colonelpin_label_alter_colonel_type.cpython-38.pyc,sha256=sfglSDxXLKJ0qE8Dl3MYjv5hbszpDtb9CDxatoEzPSw,853
 simo/fleet/migrations/__pycache__/0031_alter_colonel_type.cpython-38.pyc,sha256=zXX254ZgEE4uSV8xnLdH9DM3qy-ICmbrT05i0Q287bU,733
 simo/fleet/migrations/__pycache__/0032_auto_20240415_0736.cpython-38.pyc,sha256=QD3JNIDQhzseXKLRYysYY3Q9_vDaurIhlWBcri83FMw,1655
-simo/fleet/migrations/__pycache__/0033_auto_20240415_0736.cpython-38.pyc,sha256=zN3KrYHzE40Wfnt48zp7AGCIa8Jj9-fPXxo3adZIxwo,1046
+simo/fleet/migrations/__pycache__/0033_auto_20240415_0736.cpython-38.pyc,sha256=rZK8jUEeuXM7BZ7XCl0RHXXaGakzd_WcuFxmPjp5F_s,1046
 simo/fleet/migrations/__pycache__/0034_auto_20240418_0735.cpython-38.pyc,sha256=FEd_tw1GVVrRYd44Fdx1Yf-rsVIebHLel7jlv434A_E,924
 simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6RnVPRq4CaO13Lg7M0F-pxA_gqqZ6Mg,170
 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=Mn4jmOx-1Yb5rAZb9ZcfMcYBMf7r61NQV2p8JgxbYvQ,51675
-simo/generic/forms.py,sha256=p-gzH1z7J0CV8bKMmWTQluzpYmgc7fF1aEHL7eL-fJI,20075
-simo/generic/gateways.py,sha256=L3obiClEomiRbWfDu_LrMbhH9r7hUH4e0oBeLMXghXw,16027
-simo/generic/models.py,sha256=d00Q-UXtt7mG9MdPpZ3mXnxKjwlTI2FgCEklZpGBk7s,3629
+simo/generic/controllers.py,sha256=WYuOUzDWvkYRaTvlbdGy_qmwp1o_ohqKDfV7OrOq2QU,52218
+simo/generic/forms.py,sha256=lrdGgOuFxizUu2l5PbW8CUiI0V_L8xHl2pN_kZB9238,23160
+simo/generic/gateways.py,sha256=b3tQ2bAkDVYXCF5iZi2yi-6nZAM8WmHE9ICwxMyR0to,17034
+simo/generic/models.py,sha256=qRwZq92_suejbXSPTqbjIfICT0Y_ABywwYPa8DJ2V8A,5053
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQwWBPd_33u98JBcVtMVVCio,2374
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=3U3W-EgpKdqh7MN94ZaoCEGvY4SSq2zsTptJoZbysgM,32795
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=Uvh-YQxcN-0RCinRi13fyITM1Jxm6FwYQyXs3OLNruA,15699
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=syQzoWdRGcU4kKRMC8HfbQ9VQiGxMWkzYwJDqQcfDwg,11940
-simo/generic/__pycache__/models.cpython-38.pyc,sha256=ItjBjJaioJttzSUJsHCKV4xiqH6QX90kRw1C_Xx7mMk,3065
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=e0bvgyePgJbIs1omBq0TRPlVSKar2sK_JbUKqDRj7mY,33235
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=IOiN9D0NVn8e8OOieawG0QjSTZDcmFhGsf2i6oWaj5A,17430
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=a4lLIMPyxm9tNzIqorXHIPZFVTcXlPsM1ycJMghxcHA,12673
+simo/generic/__pycache__/models.cpython-38.pyc,sha256=j4jKYVTM4XUfFzxIaRFhYx0oRSYzDRn8YVQyCteEhtc,3881
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=piFHces0J9QuXu_CNBCQCYjoZEeoaxyVjLfJ9KaR8C8,1898
 simo/generic/static/weather_icons/01d@2x.png,sha256=TZfWi6Rfddb2P-oldWWcjUiuCHiU9Yrc5hyrQAhF26I,948
@@ -10444,8 +10444,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.11.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.11.dist-info/METADATA,sha256=Jht-Iw22NzZexiiYzADTUYitoe7_ld7aSBHpOZPpylc,1700
-simo-2.0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.11.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.11.dist-info/RECORD,,
+simo-2.0.12.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.12.dist-info/METADATA,sha256=WO2Mt2Kexp6wdYCPQ_aw7e4ebWdaCi8ZET12OdoZIs4,1700
+simo-2.0.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.12.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.12.dist-info/RECORD,,