simo 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

simo/fleet/forms.py

@@ -6,13 +6,16 @@ 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
 from simo.core.utils.validators import validate_slaves
 from simo.core.utils.admin import AdminFormActionForm
-from .models import Colonel, ColonelPin, I2CInterface, i2c_interface_no_choices
+from .models import Colonel, ColonelPin, Interface
+from .utils import INTERFACES_PINS_MAP
 
 
 class ColonelPinChoiceField(forms.ModelChoiceField):
@@ -23,6 +26,11 @@ class ColonelPinChoiceField(forms.ModelChoiceField):
     filter_by = 'colonel'
 
 
+class ColonelInterfacesChoiceField(forms.ModelChoiceField):
+    filter_by = 'colonel'
+
+
+
 class ColonelAdminForm(forms.ModelForm):
     log = forms.CharField(
         widget=forms.HiddenInput, required=False
@@ -52,51 +60,25 @@ class MoveColonelForm(AdminFormActionForm):
     )
 
 
-class I2CInterfaceAdminForm(forms.ModelForm):
-    scl_pin = ColonelPinChoiceField(
-        queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
-    )
-    sda_pin = ColonelPinChoiceField(
-        queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
-    )
+class InterfaceAdminForm(forms.ModelForm):
 
     class Meta:
-        model = I2CInterface
+        model = Interface
         fields = '__all__'
 
-    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(self):
+        if self.instance.pk:
+            return self.cleaned_data
 
-    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}!"
+        for pin_no in INTERFACES_PINS_MAP[self.cleaned_data['no']]:
+            cpin = ColonelPin.objects.get(
+                colonel=self.instance.colonel, no=pin_no
             )
-        return self.cleaned_data['sda_pin']
+            if cpin.occupied_by:
+                raise forms.ValidationError(
+                    f"Interface can not be created, because "
+                    f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                )
 
 
 class ColonelComponentForm(BaseComponentForm):
@@ -416,13 +398,16 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
 
 
 class BME680SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -437,15 +422,22 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class MPC9808SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -460,6 +452,10 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
     pin = ColonelPinChoiceField(
@@ -987,7 +983,6 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
 
 
 class TTLockConfigForm(ColonelComponentForm):
-    pass
 
     def clean(self):
         if not self.instance or not self.instance.pk:
@@ -1002,7 +997,6 @@ class TTLockConfigForm(ColonelComponentForm):
                 )
         return self.cleaned_data
 
-
     def save(self, commit=True):
         obj = super(ColonelComponentForm, self).save(commit)
         if commit:
@@ -1010,3 +1004,38 @@ class TTLockConfigForm(ColonelComponentForm):
             self.cleaned_data['colonel'].save()
         return obj
 
+
+
+class DALIDeviceConfigForm(ColonelComponentForm):
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='dali'),
+        widget=autocomplete.ListSelect2(
+            url='autocomplete-interfaces',
+            forward=[
+                forward.Self(),
+                forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'dali'}, 'filters'
+                )
+            ]
+        )
+    )
+
+    def save(self, commit=True):
+        self.instance.config['dali_interface'] = self.cleaned_data['interface'].no
+        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

@@ -1,10 +1,11 @@
 import datetime
+import time
 from django.utils import timezone
 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):
@@ -14,7 +15,7 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     periodic_tasks = (
         ('look_for_updates', 600),
         ('watch_colonels_connection', 30),
-        ('push_discoveries', 3),
+        ('push_discoveries', 6),
     )
 
     def _on_mqtt_message(self, client, userdata, msg):
@@ -37,13 +38,25 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     def push_discoveries(self):
         from .models import Colonel
         for gw in Gateway.objects.filter(
-            type=self.uid,
-            discovery__has_key='start',
+            type=self.uid, discovery__has_key='start',
         ).exclude(discovery__has_key='finished'):
+            if time.time() - gw.discovery.get('last_check') > 10:
+                gw.finish_discovery()
+                continue
+
             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/managers.py

@@ -22,11 +22,13 @@ class ColonelPinsManager(models.Manager):
         return qs
 
 
-class I2CInterfacesManager(models.Manager):
+class InterfacesManager(models.Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
         instance = get_current_instance()
         if instance:
             qs = qs.filter(colonel__instance=instance)
-        return qs
+        return qs
+
+

simo/fleet/migrations/0032_auto_20240415_0736.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0031_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='logs_stream',
+            field=models.BooleanField(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!'),
+        ),
+        migrations.CreateModel(
+            name='Interface',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('no', models.PositiveIntegerField(choices=[(1, '1'), (2, '2')])),
+                ('type', models.CharField(choices=[('i2c', 'I2C'), ('dali', 'DALI')], max_length=20)),
+                ('pin_a', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_a', to='fleet.colonelpin')),
+                ('pin_b', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_b', to='fleet.colonelpin')),
+                ('colonel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='fleet.colonel')),
+            ],
+            options={
+                'unique_together': {('colonel', 'no')},
+            },
+        ),
+    ]

simo/fleet/migrations/0033_auto_20240415_0736.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations
+
+def create_objects(apps, schema_editor):
+    I2CInterface = apps.get_model("fleet", "I2CInterface")
+    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',
+            pin_a=i2c_i.scl_pin, pin_b=i2c_i.sda_pin
+        )
+
+
+def delete_objects(apps, schema_editor):
+    Interface = apps.get_model("fleet", "Interface")
+    Interface.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0032_auto_20240415_0736'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_objects, delete_objects),
+    ]

simo/fleet/models.py

@@ -1,5 +1,6 @@
 import requests
 import time
+from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db import models
 from django.db.models.signals import post_save, pre_delete, post_delete
@@ -11,8 +12,8 @@ from simo.core.models import Instance, Gateway, Component
 from simo.core.utils.helpers import get_random_string
 from simo.core.events import GatewayObjectCommand
 from .gateways import FleetGatewayHandler
-from .managers import ColonelsManager, ColonelPinsManager, I2CInterfacesManager
-from .utils import GPIO_PINS
+from .managers import ColonelsManager, ColonelPinsManager, InterfacesManager
+from .utils import GPIO_PINS, INTERFACES_PINS_MAP
 
 
 
@@ -181,10 +182,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 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()
+            if interface.sda_pin:
+                interface.sda_pin.occupied_by = interface
+                interface.sda_pin.save()
+            if interface.scl_pin:
+                interface.scl_pin.occupied_by = interface
+                interface.scl_pin.save()
 
 
     def move_to(self, other_colonel):
@@ -256,12 +259,6 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
                 capacitive=data.get('capacitive'), adc=data.get('adc'),
                 native=data.get('native'), note=data.get('note')
             )
-        if instance.type in ('ample-wall', 'game-changer'):
-            I2CInterface.objects.create(
-                colonel=instance, name='Main', no=0,
-                scl_pin=ColonelPin.objects.get(colonel=instance, no=4),
-                sda_pin=ColonelPin.objects.get(colonel=instance, no=15),
-            )
 
 
 @receiver(pre_delete, sender=Component)
@@ -310,7 +307,7 @@ class I2CInterface(models.Model):
         default=100000, help_text="100000 - is a good middle point!"
     )
 
-    objects = I2CInterfacesManager()
+    objects = InterfacesManager()
 
     class Meta:
         unique_together = 'colonel', 'no'
@@ -319,7 +316,7 @@ class I2CInterface(models.Model):
         return self.name
 
 
-@receiver(post_save, sender=I2CInterface)
+@receiver(post_delete, sender=I2CInterface)
 def post_i2c_interface_delete(sender, instance, *args, **kwargs):
     with transaction.atomic():
         ct = ContentType.objects.get_for_model(instance)
@@ -334,3 +331,75 @@ def post_i2c_interface_delete(sender, instance, *args, **kwargs):
         instance.scl_pin.save()
         instance.sda_pin.occupied_by = instance
         instance.sda_pin.save()
+
+
+class Interface(models.Model):
+    colonel = models.ForeignKey(
+        Colonel, on_delete=models.CASCADE, related_name='interfaces'
+    )
+    no = models.PositiveIntegerField(choices=((1, "1"), (2, "2")))
+    type = models.CharField(
+        max_length=20, choices=(('i2c', "I2C"), ('dali', "DALI"))
+    )
+    pin_a = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin A (scl)", null=True, related_name='interface_a',
+        editable=False
+    )
+    pin_b = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin B (sda)", null=True, related_name='interface_b',
+        editable=False
+    )
+
+    objects = InterfacesManager()
+
+    class Meta:
+        unique_together = 'colonel', 'no'
+
+    def __str__(self):
+        return f"{self.no} - {self.get_type_display()}"
+
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            for pin_no in INTERFACES_PINS_MAP[self.no]:
+                cpin = ColonelPin.objects.get(colonel=self.colonel, no=pin_no)
+                if cpin.occupied_by:
+                    raise ValidationError(
+                        f"Interface can not be created, because "
+                        f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                    )
+        return super().save(*args, **kwargs)
+
+
+@receiver(post_save, sender=Interface)
+def post_interface_save(sender, instance, created, *args, **kwargs):
+    if created:
+        instance.pin_a = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][0]
+        )
+        instance.pin_a.occupied_by = instance
+        instance.pin_a.save()
+        instance.pin_b = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][1]
+        )
+        instance.pin_b.occupied_by = instance
+        instance.pin_b.save()
+        instance.save()
+
+
+@receiver(post_delete, sender=Interface)
+def post_interface_delete(sender, instance, *args, **kwargs):
+    with transaction.atomic():
+        ct = ContentType.objects.get_for_model(instance)
+        for pin in ColonelPin.objects.filter(
+            occupied_by_content_type=ct,
+            occupied_by_id=instance.id
+        ):
+            pin.occupied_by_content_type = None
+            pin.occupied_by_content_id = None
+            pin.save()
+
+

simo/fleet/socket_consumers.py

@@ -218,15 +218,14 @@ class FleetConsumer(AsyncWebsocketConsumer):
             }
         }
         config_data['settings'].update(instance_options)
-        i2c_interfaces = await sync_to_async(list, thread_sensitive=True)(
-            self.colonel.i2c_interfaces.all().select_related(
-                'scl_pin', 'sda_pin'
+        interfaces = await sync_to_async(list, thread_sensitive=True)(
+            self.colonel.interfaces.all().select_related(
+                'pin_a', 'pin_b'
             )
         )
-        for i2c_interface in i2c_interfaces:
-            config_data['interfaces']['i2c-%d' % i2c_interface.no] = {
-                'scl': i2c_interface.scl_pin.no, 'sda': i2c_interface.sda_pin.no,
-                'freq': i2c_interface.freq
+        for interface in interfaces:
+            config_data['interfaces'][f'{interface.type}-{interface.no}'] = {
+                'pin_a': interface.pin_a.no, 'pin_b': interface.pin_b.no,
             }
         components = await sync_to_async(
             list, thread_sensitive=True
@@ -241,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
@@ -314,11 +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':
+                    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',
@@ -405,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(
@@ -414,24 +414,27 @@ 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:
                         print(traceback.format_exc(), file=sys.stderr)
 
-                elif 'discover-ttlock' in data:
+                elif 'discovery-result' in data:
                     def process_discovery_result():
-                        self.gateway.refresh_from_db()
-                        if self.gateway.discovery.get('finished'):
-                            return Component.objects.filter(
+                        # check if component is already created
+                        if data['discovery-result'] == 'success':
+                            comp = Component.objects.filter(
                                 meta__finalization_data__temp_id=data['result']['id']
                             ).first()
+                            if comp:
+                                return comp
+
+                        self.gateway.refresh_from_db()
                         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

simo/fleet/utils.py

@@ -58,7 +58,7 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
 
 # ample-wall
 for no, data in BASE_ESP32_GPIO_PINS.items():
-    if no in (4, 12, 13, 14, 15, 23, 32, 33, 34, 36, 39):
+    if no in (12, 13, 14, 23, 32, 33, 34, 36, 39):
         GPIO_PINS['ample-wall'][no] = GPIO_PIN_DEFAULTS.copy()
         GPIO_PINS['ample-wall'][no].update(data)
 
@@ -114,3 +114,8 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
         GPIO_PINS['4-relays'][no]['note'] = 'Relay4'
     else:
         GPIO_PINS['4-relays'][no].update(data)
+
+
+INTERFACES_PINS_MAP = {
+    1: [13, 23], 2: [32, 33]
+}

simo/fleet/views.py

@@ -1,9 +1,8 @@
-from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponse, Http404
 from django.db.models import Q
 from dal import autocomplete
 from simo.core.utils.helpers import search_queryset
-from .models import Colonel, ColonelPin, I2CInterface
+from .models import Colonel, ColonelPin, Interface
 
 
 def colonels_ping(request):
@@ -43,20 +42,22 @@ class PinsSelectAutocomplete(autocomplete.Select2QuerySetView):
         return qs
 
 
-class I2CInterfaceSelectAutocomplete(autocomplete.Select2ListView):
+class InterfaceSelectAutocomplete(autocomplete.Select2QuerySetView):
 
-    def get_list(self):
+    def get_queryset(self):
         if not self.request.user.is_staff:
-            return []
+            return Interface.objects.none()
 
         try:
             colonel = Colonel.objects.get(
                 pk=self.forwarded.get("colonel")
             )
         except:
-            return []
+            return Interface.objects.none()
+
+        qs = Interface.objects.filter(colonel=colonel)
+
+        if self.forwarded.get('filters'):
+            qs = qs.filter(**self.forwarded.get('filters'))
 
-        return [
-            (i.no, i.get_no_display()) for i in
-            I2CInterface.objects.filter(colonel=colonel)
-        ]
+        return qs

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.6.dist-info → simo-2.0.8.dist-info}/METADATA

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