simo 2.0.7__py3-none-any.whl → 2.0.9__py3-none-any.whl

simo/core/models.py

@@ -267,29 +267,38 @@ class Gateway(DirtyFieldsMixin, models.Model, SimoAdminMixin):
 
     def process_discovery(self, data):
         self.refresh_from_db()
+        if self.discovery.get('finished'):
+            print(
+                f"Gateway is not in pairing mode at the moment!"
+            )
+            return
+        if self.discovery['controller_uid'] != data.get('type'):
+            print(f"Gateway is not in pairing mode for {self.discovery['controller_uid']} "
+                  f"but not for {data.get('type')} at the moment!")
+            return
+
         from .utils.type_constants import CONTROLLER_TYPES_MAP
-        ControllerClass = CONTROLLER_TYPES_MAP.get(
-            self.discovery['controller_uid']
+        ControllerClass = CONTROLLER_TYPES_MAP.get(data.get('type'))
+        if not hasattr(ControllerClass, '_process_discovery'):
+            print(f"{data.get('type')} controller has no _process_discovery method." )
+            return
+
+        result = ControllerClass._process_discovery(
+            started_with=self.discovery['init_data'], data=data
         )
-        if ControllerClass and hasattr(
-            ControllerClass, '_process_discovery'
-        ):
-            result = ControllerClass._process_discovery(
-                started_with=self.discovery['init_data'], data=data
-            )
-            if result:
-                self.refresh_from_db()
-                if not isinstance(result, dict) and isinstance(result, Iterable):
-                    for res in result:
-                        if isinstance(res, models.Model):
-                            self.discovery['result'].append(res.pk)
-                        else:
-                            self.discovery['result'].append(res)
-                else:
-                    if isinstance(result, models.Model):
-                        self.discovery['result'].append(result.pk)
+        if result:
+            self.refresh_from_db()
+            if not isinstance(result, dict) and isinstance(result, Iterable):
+                for res in result:
+                    if isinstance(res, models.Model):
+                        self.discovery['result'].append(res.pk)
                     else:
-                        self.discovery['result'].append(result)
+                        self.discovery['result'].append(res)
+            else:
+                if isinstance(result, models.Model):
+                    self.discovery['result'].append(result.pk)
+                else:
+                    self.discovery['result'].append(result)
 
         self.save(update_fields=['discovery'])
 

simo/fleet/base_types.py

@@ -0,0 +1,5 @@
+from django.utils.translation import gettext_lazy as _
+
+BASE_TYPES = {
+    'dali': _("Dali Device"),
+}

simo/fleet/controllers.py

@@ -8,7 +8,7 @@ from simo.core.controllers import (
 )
 from simo.conf import dynamic_settings
 from simo.core.app_widgets import NumericSensorWidget
-from simo.core.controllers import Lock
+from simo.core.controllers import Lock, ControllerBase, SingleSwitchWidget
 from simo.core.utils.helpers import heat_index
 from simo.core.utils.serialization import (
     serialize_form_data, deserialize_form_data
@@ -24,7 +24,7 @@ from .forms import (
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MPC9808SensorConfigForm,
     DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
-    TTLockConfigForm, DALIDeviceConfigForm
+    TTLockConfigForm, DALIDeviceConfigForm, DaliSwitchForm
 )
 
 
@@ -91,14 +91,14 @@ class BurglarSmokeDetector(BinarySensor):
         ]
 
 
-class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
-    config_form = ColonelNumericSensorConfigForm
-    name = "Analog sensor"
-
-    def _get_occupied_pins(self):
-        return [
-            self.component.config['pin_no'],
-        ]
+# class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
+#     config_form = ColonelNumericSensorConfigForm
+#     name = "Analog sensor"
+#
+#     def _get_occupied_pins(self):
+#         return [
+#             self.component.config['pin_no'],
+#         ]
 
 
 class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
@@ -112,6 +112,7 @@ class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
 
 
 class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
+    manual_add = False
     app_widget = NumericSensorWidget
 
     def __init__(self, *args, **kwargs):
@@ -196,7 +197,7 @@ class Switch(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
 
 
 class PWMOutput(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
-    name = "PWM Output"
+    name = "Dimmer"
     config_form = ColonelPWMOutputConfigForm
 
     def _prepare_for_send(self, value):
@@ -303,7 +304,7 @@ class TTLock(FleeDeviceMixin, Lock):
         )
         GatewayObjectCommand(
             gateway, form_cleaned_data['colonel'],
-            command='discover-ttlock',
+            command='discover', type=self.uid
         ).publish()
 
     @classmethod
@@ -385,6 +386,14 @@ class TTLock(FleeDeviceMixin, Lock):
             command='call', method='delete_code', args=[str(code)]
         ).publish()
 
+    def clear_codes(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='clear_codes'
+        ).publish()
+
     def get_codes(self):
         GatewayObjectCommand(
             self.component.gateway,
@@ -410,6 +419,14 @@ class TTLock(FleeDeviceMixin, Lock):
             command='call', method='delete_fingerprint', args=[str(code)]
         ).publish()
 
+    def clear_fingerprints(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='clear_fingerprints'
+        ).publish()
+
     def get_fingerprints(self):
         GatewayObjectCommand(
             self.component.gateway,
@@ -419,11 +436,19 @@ class TTLock(FleeDeviceMixin, Lock):
         ).publish()
 
 
-class DALIDevice(FleeDeviceMixin):
+class DALIDevice(FleeDeviceMixin, ControllerBase):
     gateway_class = FleetGatewayHandler
     config_form = DALIDeviceConfigForm
+    name = "DALI Device"
     discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
 
+    base_type = 'dali'
+    default_value = False
+    app_widget = SingleSwitchWidget
+
+    def _validate_val(self, value, occasion=None):
+        pass
+
     @classmethod
     def init_discovery(self, form_cleaned_data):
         from simo.core.models import Gateway
@@ -434,14 +459,25 @@ class DALIDevice(FleeDeviceMixin):
         )
         GatewayObjectCommand(
             gateway, form_cleaned_data['colonel'],
-            command=f'discover-dali',
-            interface=form_cleaned_data['interface'].no
+            command='discover', type=self.uid,
+            i=form_cleaned_data['interface'].no
         ).publish()
 
     @classmethod
     def _process_discovery(cls, started_with, data):
+        if data['discovery-result'] == 'fail':
+            if data['result'] == 1:
+                return {'error': 'DALI interface is unavailable!'}
+            else:
+                return {'error': 'Unknown error!'}
+
+        controller_cls = globals().get(data['result']['type'])
+
         started_with = deserialize_form_data(started_with)
-        form = TTLockConfigForm(controller_uid=cls.uid, data=started_with)
+        started_with['name'] += f" {data['result']['config']['da']}"
+        form = controller_cls.config_form(
+            controller_uid=controller_cls.uid, data=started_with
+        )
 
         if form.is_valid():
             new_component = form.save()
@@ -452,11 +488,9 @@ class DALIDevice(FleeDeviceMixin):
                 'config': {
                     'type': cls.uid.split('.')[-1],
                     'config': new_component.config,
-                    'val': False,
                 },
             }
             new_component.save()
-            new_component.gateway.finish_discovery()
             GatewayObjectCommand(
                 new_component.gateway, Colonel(
                     id=new_component.config['colonel']
@@ -470,6 +504,7 @@ class DALIDevice(FleeDeviceMixin):
 
 
 class DALIGear(DALIDevice):
+    manual_add = False
 
     def _send_to_device(self, value):
         GatewayObjectCommand(
@@ -481,13 +516,15 @@ class DALIGear(DALIDevice):
 
 
 class DALILamp(DALIGear, BaseSwitch):
+    family = 'dali'
     manual_add = False
     name = 'DALI Lamp'
-    discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
+    config_form = DaliSwitchForm
 
 
 class DALIDimmableLamp(DALIGear, BaseDimmer):
+    family = 'dali'
     manual_add = False
     name = 'DALI Dimmable Lamp'
-    discovery_msg = _("Please hook up your new DALI lamp to your DALI bus.")
+
 

simo/fleet/forms.py

@@ -6,7 +6,9 @@ from django.contrib.contenttypes.models import ContentType
 from dal import autocomplete
 from dal import forward
 from simo.core.models import Component
-from simo.core.forms import BaseComponentForm, ValueLimitForm, NumericSensorForm
+from simo.core.forms import (
+    BaseComponentForm, ValueLimitForm, NumericSensorForm, SwitchForm
+)
 from simo.core.utils.formsets import FormsetField
 from simo.core.widgets import LogOutputWidget
 from simo.core.utils.easing import EASING_CHOICES
@@ -64,7 +66,6 @@ class InterfaceAdminForm(forms.ModelForm):
         model = Interface
         fields = '__all__'
 
-
     def clean(self):
         if self.instance.pk:
             return self.cleaned_data
@@ -80,26 +81,6 @@ class InterfaceAdminForm(forms.ModelForm):
                 )
 
 
-
-    def clean_scl_pin(self):
-        if self.cleaned_data['scl_pin'].occupied_by \
-        and self.cleaned_data['scl_pin'].occupied_by  != self.instance:
-            raise forms.ValidationError(
-                f"This pin is already occupied by "
-                f"{self.cleaned_data['scl_pin'].occupied_by}!"
-            )
-        return self.cleaned_data['scl_pin']
-
-    def clean_sda_pin(self):
-        if self.cleaned_data['sda_pin'].occupied_by \
-                and self.cleaned_data['sda_pin'].occupied_by != self.instance:
-            raise forms.ValidationError(
-                f"This pin is already occupied by "
-                f"{self.cleaned_data['sda_pin'].occupied_by}!"
-            )
-        return self.cleaned_data['sda_pin']
-
-
 class ColonelComponentForm(BaseComponentForm):
     colonel = forms.ModelChoiceField(
         label="Colonel", queryset=Colonel.objects.all(),
@@ -1045,3 +1026,16 @@ class DALIDeviceConfigForm(ColonelComponentForm):
         return super().save(commit=commit)
 
 
+class DaliSwitchForm(DALIDeviceConfigForm, SwitchForm):
+
+    auto_off = forms.FloatField(
+        required=False, min_value=0.01, max_value=1000000000,
+        help_text="If provided, switch will be turned off after "
+                  "given amount of seconds after last turn on event."
+    )
+    inverse = forms.BooleanField(
+        label=_("Inverse switch value"), required=False
+    )
+
+
+

simo/fleet/gateways.py

@@ -5,7 +5,7 @@ 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.utils.serialization import deserialize_form_data
 
 
 class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
@@ -15,7 +15,7 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     periodic_tasks = (
         ('look_for_updates', 600),
         ('watch_colonels_connection', 30),
-        ('push_discoveries', 10),
+        ('push_discoveries', 6),
     )
 
     def _on_mqtt_message(self, client, userdata, msg):
@@ -47,7 +47,16 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
             colonel = Colonel.objects.get(
                 id=gw.discovery['init_data']['colonel']['val'][0]['pk']
             )
-            print("Publish discover-ttlock command!")
-            GatewayObjectCommand(
-                gw, colonel, command='discover-ttlock',
-            ).publish()
+            if gw.discovery['controller_uid'] == 'simo.fleet.controllers.TTLock':
+                GatewayObjectCommand(
+                    gw, colonel, command='discover',
+                    type=gw.discovery['controller_uid']
+                ).publish()
+            elif gw.discovery['controller_uid'] == 'simo.fleet.controllers.DALIDevice':
+                form_cleaned_data = deserialize_form_data(gw.discovery['init_data'])
+                GatewayObjectCommand(
+                    gw, colonel,
+                    command=f'discover',
+                    type=gw.discovery['controller_uid'],
+                    i=form_cleaned_data['interface'].no
+                ).publish()

simo/fleet/migrations/0033_auto_20240415_0736.py

@@ -7,7 +7,7 @@ def create_objects(apps, schema_editor):
     Interface = apps.get_model("fleet", "Interface")
     for i2c_i in I2CInterface.objects.filter(no__gt=0):
         Interface.objects.create(
-            colonel=i2c_i.colonel, type='i2c',
+            no=i2c_i.no, colonel=i2c_i.colonel, type='i2c',
             pin_a=i2c_i.scl_pin, pin_b=i2c_i.sda_pin
         )
 

simo/fleet/models.py

@@ -387,6 +387,7 @@ def post_interface_save(sender, instance, created, *args, **kwargs):
         )
         instance.pin_b.occupied_by = instance
         instance.pin_b.save()
+        instance.save()
 
 
 @receiver(post_delete, sender=Interface)

simo/fleet/socket_consumers.py

@@ -240,6 +240,8 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     ),
                     'config': comp.controller._get_colonel_config()
                 }
+                if hasattr(comp.controller, 'family'):
+                    comp_config['family'] = comp.controller.family
                 slaves = [
                     s.id for s in comp.slaves.all()
                     if s.config.get('colonel') == self.colonel.id
@@ -313,16 +315,10 @@ class FleetConsumer(AsyncWebsocketConsumer):
                             'command': 'set_config', 'data': config
                         }, compress=True)
                     asyncio.run(send_config())
-                elif payload.get('command') == 'discover-ttlock':
-                    print("SEND discover-ttlock command!")
-                    asyncio.run(self.send_data({
-                        'command': 'discover-ttlock'
-                    }))
-                elif payload.get('command') == 'discover-dali':
-                    print("SEND discover-dali command!")
-                    asyncio.run(self.send_data({
-                        'command': 'discover-dali', 'i': payload['interface']
-                    }))
+                elif payload.get('command') == 'discover':
+                    print(f"SEND discover command for {payload['type']}")
+                    asyncio.run(self.send_data(payload))
+
                 elif payload.get('command') == 'finalize':
                     asyncio.run(self.send_data({
                         'command': 'finalize',
@@ -409,7 +405,7 @@ class FleetConsumer(AsyncWebsocketConsumer):
                                 save_codes, thread_sensitive=True
                             )(data['codes'])
                         if 'fingerprints' in data and component.controller_uid == TTLock.uid:
-                            def save_codes(codes):
+                            def save_fingerprints(codes):
                                 component.meta['fingerprints'] = codes
                                 for code in codes:
                                     Fingerprint.objects.get_or_create(
@@ -418,7 +414,7 @@ class FleetConsumer(AsyncWebsocketConsumer):
                                     )
                                 component.save()
                             await sync_to_async(
-                                save_codes, thread_sensitive=True
+                                save_fingerprints, thread_sensitive=True
                             )(data['fingerprints'])
 
                     except Exception as e:

simo/fleet/views.py

@@ -42,9 +42,9 @@ class PinsSelectAutocomplete(autocomplete.Select2QuerySetView):
         return qs
 
 
-class InterfaceSelectAutocomplete(autocomplete.Select2ListView):
+class InterfaceSelectAutocomplete(autocomplete.Select2QuerySetView):
 
-    def get_list(self):
+    def get_queryset(self):
         if not self.request.user.is_staff:
             return Interface.objects.none()
 

simo/generic/controllers.py

@@ -542,7 +542,7 @@ class Gate(ControllerBase, TimerMixin):
 
 
 class Blinds(ControllerBase, TimerMixin):
-    name = _("Blinds")
+    name = _("Blind")
     base_type = 'blinds'
     gateway_class = GenericGatewayHandler
     config_form = BlindsConfigForm

simo/users/api.py

@@ -227,11 +227,13 @@ class FingerprintViewSet(
     basename = 'fingerprints'
     serializer_class = FingerprintSerializer
 
-
     def get_queryset(self):
-        return Fingerprint.objects.filter(
+        qs = Fingerprint.objects.filter(
             Q(user=None) | Q(user__roles__instance=self.instance)
         )
+        if 'values' in self.request.GET:
+            qs = qs.filter(value__in=self.request.GET['values'].split(','))
+        return qs
 
     def check_can_manage_user(self, request):
         user_role = request.user.get_role(self.instance)

{simo-2.0.7.dist-info → simo-2.0.9.dist-info}/METADATA

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

{simo-2.0.7.dist-info → simo-2.0.9.dist-info}/RECORD

@@ -43,7 +43,7 @@ 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
 simo/core/middleware.py,sha256=64PYjnyRnYf4sgMvPfR0oQqf9UEtxUwnhJe3RV6z_HI,2040
-simo/core/models.py,sha256=VNoHjHUFQRvKH4ejv4kGv5E6a4bSOhuM8sfAlRYaj-g,19036
+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
@@ -63,7 +63,7 @@ simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=bdk1PG7FuRfFwcvQtF103H0kQrx
 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
-simo/core/__pycache__/base_types.cpython-38.pyc,sha256=Ukc5U63YJbyUcn0cwNMS8nteRSvEJmCszZUfHClKBtg,735
+simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CasZJN42cK_ymoQgn5E4s8oOkuZJ18fVHCgN4GPuT7c,735
 simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnVjdUnFCTlH0awAJxZt2Y,24110
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
@@ -74,7 +74,7 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0A
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=bGOFJNEhJeLbpsZp8LYn1VA3paLF5HULHQ6IFKa7Juc,2022
-simo/core/__pycache__/models.cpython-38.pyc,sha256=Hl9MXjnnmDTp826aEc5KLqPFl4ZzrT7HTVxVSz2-Vik,16695
+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
@@ -10165,32 +10165,34 @@ simo/fleet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/fleet/admin.py,sha256=aQulOPtrIQUKj8WvA4GfINfqVA52fcU72yK2hVlcmJ0,5681
 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=VxutXZSZaZHmXGYpqjsC_6DgJsF1ZDZeJwu3px79wSE,16683
-simo/fleet/forms.py,sha256=pR_KER9u9VtNb5NpSWwI7LrnBBtn9jbEXzUvyFRzoj0,35986
-simo/fleet/gateways.py,sha256=m-jF8S_kJCI-yLI0UmWm46xZrsHcvSfw2gozZWRoFfE,1707
+simo/fleet/controllers.py,sha256=LF5-Mst617BuZHyRErk_6diAk85pa5uelGoTelBY184,17743
+simo/fleet/forms.py,sha256=lWJ9luZiRJD4yLQCdCMmkvezk-vY3yVb3q7Y5C4r9qc,35649
+simo/fleet/gateways.py,sha256=EbSxv1DGSuv8MT7MmpZxKgV041umOteFW2Xo4LybzWI,2284
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
-simo/fleet/models.py,sha256=7ZZ1z_cId7z9bEzLHvEEDtpFwUMgIUDesr5hhveDcWg,14136
+simo/fleet/models.py,sha256=J-rnn7Ew-7s3646NNRVY947Sbz21mUD_nBHtuHAKXds,14160
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
-simo/fleet/socket_consumers.py,sha256=ii5L1di8iXzn-l91zVFQ_g9YQm_a-_Z-Dn5OnKbJ9FI,19876
+simo/fleet/socket_consumers.py,sha256=e_PtRWLPIrJxNBhtQIAC7idk1oaV-LVZWQchz5iffUk,19680
 simo/fleet/utils.py,sha256=2gcjbwQawsGw2edr_wm9q6XacGpYqO-gd4BF1t0Hg6U,3511
-simo/fleet/views.py,sha256=WMMG8rEJA6RTOf3U-2sYbiSH2Q3rBC-6kYg9KpYHtlI,1686
+simo/fleet/views.py,sha256=YKkcf8KcLgiPjr-brIHvu5yr1zZUIs8aytAgwdo49Pg,1694
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
 simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=Tw3g9JKzJ3ICjWnHQedU8qV7RSZeJL81jSYpvTLK5bM,5798
 simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYeYhfSiAgchyAs,3110
 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=sOxMEUCc347vDlsC2Pp9h5jxyhax2dFBAVEgP_aTN3s,14848
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=7AjtKMSUAuaxLIRx1lvEfRaAlujKRyIMK7gnJjru-fI,25650
-simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=Qpfw3NYxCS9tS63FaZz8fdL9fq5X1k5QcQlaJl-szb4,2152
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=2XWWfU0zkbha_MMPD0KbSOnh9CHUNLcsI-VKmr8Z7e0,15559
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=pHgx8ulx_2v0L0bkUHaW13Tn9KcfOP6ROhgHXPVvKJE,25510
+simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=xg7fW5JusYwl6epn5nEjxQJlFOyQ18SVybOaRBcpwl8,2418
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
-simo/fleet/__pycache__/models.cpython-38.pyc,sha256=1nBzbxLzIOYxss3wx0-lyGP-JCHnGdbADH_NDQ4If50,12273
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=S9pPqRjIxASXahoIOkkjQX7cBwjkdu4d2nXMju0-Cf8,12283
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=yuY2H7jcboQGZdjb5WIsgNHXFhI9IPMUrEu9NgSiXNo,2452
-simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=5bmMyD3gRyfR2Hbh0KwZwMPYzZR8NPWuMhN8PHWOqLg,14408
+simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=dAq59u6jcxHZ3W9dR0HSp_kfiZUhMPVja0SqJ38crhk,14399
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=dTuvW9MnhUycwdCc6eHYfHsMlvZw-CmEWXWYu18X8Uw,1955
-simo/fleet/__pycache__/views.cpython-38.pyc,sha256=HLHXI3JgCDUWP7oY944nBqpVVu0D6-qOuiSMraNUdq8,1825
+simo/fleet/__pycache__/views.cpython-38.pyc,sha256=7hhRBlf6Vczg0TTdwTE5Hc5B-F7VcvFg1iS6mfs-fgo,1790
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
 simo/fleet/migrations/0002_auto_20220422_0743.py,sha256=sFOfAjnQOzcJjE8lHrrHgTaGilJNYswMdXphgVzUZqY,825
 simo/fleet/migrations/0003_auto_20220422_0752.py,sha256=VcH7DyMAniEwT76hDVofS8FTNpM3nxz_J9AC2zKHDSA,543
@@ -10223,7 +10225,7 @@ simo/fleet/migrations/0029_alter_i2cinterface_scl_pin_and_more.py,sha256=aquymc1
 simo/fleet/migrations/0030_colonelpin_label_alter_colonel_type.py,sha256=5T5bmQxPZrG0UseCLd7ssV-AeFF3O4T_DFxLu3whSqg,706
 simo/fleet/migrations/0031_alter_colonel_type.py,sha256=Kv_Gld-X0NZ7d2P9WBXfIlhq4iPH1_NnzDrPyy9_Pos,522
 simo/fleet/migrations/0032_auto_20240415_0736.py,sha256=yBT48pIfDBm7J1Y3LrvNtmihRbwEXjmBGBB1ghc2z5Y,1800
-simo/fleet/migrations/0033_auto_20240415_0736.py,sha256=_7p3-Qdc7aaP4mDwny_ig5E4XoEm8t2PoZ3-UeQ4jio,758
+simo/fleet/migrations/0033_auto_20240415_0736.py,sha256=3ysmu-fkzwY_7l4tDIHEylcoqXGdW_KMKHs1J3_0i5w,771
 simo/fleet/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/fleet/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=9kc1UyMEYkRNVnZ7iwZbiW1t3qWXROvWrI2G1BdzIaA,1250
 simo/fleet/migrations/__pycache__/0002_auto_20220422_0743.cpython-38.pyc,sha256=8oxhGb7rL8QYKlBLU3pOYcd8aHeQWDB9I8awkK04mXg,841
@@ -10257,12 +10259,12 @@ 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=XBy2jZZ4kDRn06KC9YcHRnoaol8heCMAvHZ3BAELr2c,1031
+simo/fleet/migrations/__pycache__/0033_auto_20240415_0736.cpython-38.pyc,sha256=zN3KrYHzE40Wfnt48zp7AGCIa8Jj9-fPXxo3adZIxwo,1046
 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=hsjgCSpePeOndZP8PU5SoLid6URbJ5a5Yte2wbeRcT0,51676
+simo/generic/controllers.py,sha256=Mn4jmOx-1Yb5rAZb9ZcfMcYBMf7r61NQV2p8JgxbYvQ,51675
 simo/generic/forms.py,sha256=p-gzH1z7J0CV8bKMmWTQluzpYmgc7fF1aEHL7eL-fJI,20075
 simo/generic/gateways.py,sha256=BEHjNZ2VpblXxpuADZzRs4IAO7fsj2Heb2peGXFXNec,15156
 simo/generic/models.py,sha256=d00Q-UXtt7mG9MdPpZ3mXnxKjwlTI2FgCEklZpGBk7s,3629
@@ -10271,7 +10273,7 @@ simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5
 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=Qk5jyZd5-xs746pnJTTbT5g4kpZZOZ0FdkbtoRRmad4,32788
+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=43zzltUplgyKIBN9Knk-YNstFgm2Mjk2CvW6vwuzeio,11582
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=ItjBjJaioJttzSUJsHCKV4xiqH6QX90kRw1C_Xx7mMk,3065
@@ -10349,7 +10351,7 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/admin.py,sha256=IY501Ewbn8KkBJ3ryBPelHU37ac2--dd6NNGsmYQ6FE,6887
-simo/users/api.py,sha256=xJCCj75eQXdaYfiCxxG_rMDKzEZuYuCadOhOutqX2YY,9053
+simo/users/api.py,sha256=w5nmU-to1-ULnPcRKDpa6uaOUwWfbHMTQKfmSJx3qPg,9185
 simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3992
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
@@ -10364,7 +10366,7 @@ simo/users/utils.py,sha256=uOyCNHQJ_tpn054L89keuQwKAzFd0Y2VSUmDVPq6oaY,1335
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=9otuYxq331c4lGy0DR8pigaPpzq0lQ4nrNLhlYiFAF0,159
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=T7gzc4xv2JIh3nkJEr4aRZAzyaaweX4m9JXJ-xzwsd0,7705
-simo/users/__pycache__/api.cpython-38.pyc,sha256=PFpZ14CdzCg4nw8dPeWuF7nKnJSH8ipQT_efM-KiFTQ,7889
+simo/users/__pycache__/api.cpython-38.pyc,sha256=rFjlT4o4Ossop70GlljQPTm1-_TH-omnr8aDvOnMgH8,7981
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=MuOieBIXt6lrDx83-UQtdDyI_U8kE3pU9XR4yFLKBnE,3007
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
@@ -10437,8 +10439,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.7.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.7.dist-info/METADATA,sha256=D3DwzzxRfVOdr1NCw4Me2MvxkgLnZ-jPQdbnREr0oV0,1699
-simo-2.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.7.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.7.dist-info/RECORD,,
+simo-2.0.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.9.dist-info/METADATA,sha256=IBLtc0JzeJ7o-RPgd4LblELV30WxBumyHeejuRcT7EE,1699
+simo-2.0.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.9.dist-info/RECORD,,