simo 2.0.25__py3-none-any.whl → 2.0.27__py3-none-any.whl

simo/core/api.py

@@ -217,7 +217,10 @@ class ComponentViewSet(
     @action(detail=True, methods=['post'])
     def subcomponent(self, request, pk=None, *args, **kwargs):
         component = self.get_object()
-        json_data = restore_json(request.data.dict())
+        data = request.data
+        if not isinstance(request.data, dict):
+            data = data.dict()
+        json_data = restore_json(data)
         subcomponent_id = json_data.pop('id', -1)
         try:
             subcomponent = component.slaves.get(pk=subcomponent_id)
@@ -237,13 +240,20 @@ class ComponentViewSet(
     @action(detail=True, methods=['post'])
     def controller(self, request, pk=None, *args, **kwargs):
         component = self.get_object()
+        data = request.data
+        if not isinstance(request.data, dict):
+            data = data.dict()
+        request_data = restore_json(data)
         return self.perform_controller_method(
-            restore_json(request.data.dict()), component
+            restore_json(request_data), component
         )
 
     @action(detail=False, methods=['post'])
     def control(self, request, *args, **kwargs):
-        request_data = restore_json(request.data.dict())
+        data = request.data
+        if not isinstance(request.data, dict):
+            data = data.dict()
+        request_data = restore_json(data)
         component = self.get_queryset().filter(id=request_data.pop('id', 0)).first()
         if not component:
             raise Http404()
@@ -262,6 +272,8 @@ class ComponentViewSet(
         return RESTResponse(resp_data)
 
 
+
+
 class HistoryResultsSetPagination(PageNumberPagination):
     page_size = 50
     page_size_query_param = 'page_size'

simo/core/forms.py

@@ -195,6 +195,9 @@ class ConfigFieldsMixin:
 
     def save(self, commit=True):
         for field_name in self.config_fields:
+            # support for partial forms
+            if field_name not in self.cleaned_data:
+                continue
             if isinstance(self.cleaned_data[field_name], models.Model):
                 self.instance.config[field_name] = \
                     self.cleaned_data[field_name].pk
@@ -282,6 +285,10 @@ class ComponentAdminForm(forms.ModelForm):
     has_icon = True
     has_alarm = True
 
+    # fields that can be edited via SIMO.io app by instance owners.
+    # Users who have is_owner enabled on their user role.
+    basic_fields = ['name', 'icon', 'zone', 'category']
+
     class Meta:
         model = Component
         fields = '__all__'
@@ -324,6 +331,27 @@ class ComponentAdminForm(forms.ModelForm):
                 self.instance.config = self.controller.default_config
                 self.instance.meta = self.controller.default_meta
 
+        self.cleanup_missing_keys(kwargs.get("data"))
+
+    def cleanup_missing_keys(self, data):
+        """
+        Removes missing keys from fields on form submission.
+        This avoids resetting fields that are not present in
+        the submitted data, which may be the sign of a buggy
+        or incomplete template.
+        Note that this cleanup relies on the HTML form being
+        patched to send all keys, even for checkboxes, via
+        input[type="hidden"] fields or some JS magic.
+        """
+        if data is None:
+            # not a form submission, don't modify self.fields
+            return
+
+        got_keys = data.keys()
+        field_names = self.fields.keys()
+        for missing in set(field_names) - set(got_keys):
+            del self.fields[missing]
+
     @classmethod
     def get_admin_fieldsets(cls, request, obj=None):
         main_fields = (
@@ -518,7 +546,7 @@ class SwitchForm(BaseComponentForm):
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
-        if commit:
+        if commit and 'slaves' in self.cleaned_data:
             obj.slaves.set(self.cleaned_data['slaves'])
         return obj
 

simo/core/migrations/0032_auto_20240506_0834.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.9 on 2024-05-06 08:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0031_auto_20240429_1231'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='order',
+            field=models.PositiveIntegerField(db_index=True),
+        ),
+        migrations.AlterField(
+            model_name='instance',
+            name='indoor_climate_sensor',
+            field=models.ForeignKey(blank=True, limit_choices_to={'base_type__in': ['numeric-sensor', 'multi-sensor']}, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.component'),
+        ),
+    ]

simo/core/permissions.py

@@ -59,6 +59,9 @@ class InstanceSuperuserCanEdit(BasePermission):
         if user_role.is_superuser:
             return True
 
+        if user_role.is_owner and request.method != 'DELETE':
+            return True
+
         return False
 
 
@@ -73,6 +76,8 @@ class ComponentPermission(BasePermission):
         user_role = request.user.get_role(view.instance)
         if user_role.is_superuser:
             return True
+        if user_role.is_owner and request.method != 'DELETE':
+            return True
         if request.method == 'POST' and user_role.component_permissions.filter(
             write=True, component=obj
         ).count():

simo/core/serializers.py

@@ -269,9 +269,10 @@ class ComponentSerializer(FormSerializer):
         )
 
         if not self.instance or isinstance(self.instance, Iterable):
-            form = self.Meta.form()
+            form = self.get_form()
         else:
-            form = self.Meta.form(instance=self.instance)
+            form = self.get_form(instance=self.instance)
+
         for field_name in form.fields:
             # if field is specified as excluded field
             if field_name in getattr(self.Meta, 'exclude', []):
@@ -355,7 +356,7 @@ class ComponentSerializer(FormSerializer):
 
     def get_form(self, data=None, **kwargs):
         self.set_form_cls()
-        if not self.instance:
+        if not self.instance or isinstance(self.instance, Iterable):
             #controller_uid = 'simo.generic.controllers.AlarmClock'
             controller_uid = self.context['request'].META.get('HTTP_CONTROLLER')
         else:
@@ -365,6 +366,16 @@ class ComponentSerializer(FormSerializer):
             controller_uid=controller_uid,
             **kwargs
         )
+        if not self.context['request'].user.is_master:
+            user_role = self.context['request'].user.get_role(
+                self.context['instance']
+            )
+            print("FORM BASIC FIELDS: ", form.basic_fields)
+            if not user_role.is_superuser and user_role.is_owner:
+                for field_name in list(form.fields.keys()):
+                    if field_name not in form.basic_fields:
+                        print("DELETE FIELD: ", field_name)
+                        del form.fields[field_name]
         return form
 
     def accomodate_formsets(self, form, data):
@@ -395,6 +406,7 @@ class ComponentSerializer(FormSerializer):
                 )
         form = self.get_form(instance=self.instance)
         a_data = self.accomodate_formsets(form, data)
+
         form = self.get_form(
             data=a_data, instance=self.instance
         )
@@ -410,6 +422,7 @@ class ComponentSerializer(FormSerializer):
         a_data = self.accomodate_formsets(form, validated_data)
         form = self.get_form(instance=instance, data=a_data)
         if form.is_valid():
+            print("FORM FIELDS", form.fields)
             instance = form.save(commit=True)
             return instance
         raise serializers.ValidationError(form.errors)

simo/core/tasks.py

@@ -331,6 +331,30 @@ def restart_postgresql():
     proc.communicate()
 
 
+@celery_app.task
+def low_battery_notifications():
+    from simo.users.models import User
+    from simo.notifications.utils import notify_users
+    for instance in Instance.objects.all():
+        timezone.activate(instance.timezone)
+        if timezone.localtime().hour != 10:
+            continue
+        for comp in Component.objects.filter(
+            zone__instance=instance,
+            battery_level__isnull=False, battery_level__lt=20
+        ):
+            users = User.objects.filter(
+                roles__is_owner=True, roles__instance=comp.zone.instance
+            ).distinct()
+            if users:
+                notify_users(
+                    comp.zone.instance, 'warning',
+                    f"Low battery ({comp.battery_level}%) on {comp}",
+                    component=comp, users=users
+                )
+
+
+
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(1, watch_timers.s())
@@ -339,3 +363,4 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60 * 60 * 6, update_latest_version_available.s())
     sender.add_periodic_task(60, drop_fingerprints_learn.s())
     sender.add_periodic_task(60 * 60 * 24, restart_postgresql.s())
+    sender.add_periodic_task(60 * 60, low_battery_notifications.s())

simo/fleet/forms.py

@@ -91,13 +91,16 @@ class ColonelComponentForm(BaseComponentForm):
     def clean_colonel(self):
         if not self.instance.pk:
             return self.cleaned_data['colonel']
+        colonel = self.cleaned_data.get('colonel')
+        if not colonel:
+            return
         org = self.instance.config.get('colonel')
-        if org and org != self.cleaned_data['colonel'].id:
+        if org and org != colonel.id:
             raise forms.ValidationError(
                 "Changing colonel after component is created "
                 "it is not allowed!"
             )
-        return self.cleaned_data['colonel']
+        return colonel
 
     def _clean_pin(self, field_name):
         if self.cleaned_data[field_name].colonel != self.cleaned_data['colonel']:
@@ -153,7 +156,7 @@ class ColonelComponentForm(BaseComponentForm):
 
     def save(self, commit=True):
         obj = super().save(commit)
-        if commit:
+        if commit and 'colonel' in self.cleaned_data:
             self.cleaned_data['colonel'].components.add(obj)
             self.cleaned_data['colonel'].rebuild_occupied_pins()
             self.cleaned_data['colonel'].save()
@@ -211,7 +214,7 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
+        if 'colonel' not in self.cleaned_data:
             return self.cleaned_data
         if 'pin' not in self.cleaned_data:
             return self.cleaned_data
@@ -251,7 +254,8 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
 
 
     def save(self, commit=True):
-        self.instance.config['pin_no'] = self.cleaned_data['pin'].no
+        if 'pin' in self.cleaned_data:
+            self.instance.config['pin_no'] = self.cleaned_data['pin'].no
         return super().save(commit=commit)
 
 
@@ -291,7 +295,7 @@ class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
+        if 'colonel' not in self.cleaned_data:
             return self.cleaned_data
         if 'pin' not in self.cleaned_data:
             return self.cleaned_data
@@ -302,7 +306,8 @@ class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
 
     def save(self, commit=True):
-        self.instance.config['pin_no'] = self.cleaned_data['pin'].no
+        if 'pin' in self.cleaned_data:
+            self.instance.config['pin_no'] = self.cleaned_data['pin'].no
         return super().save(commit=commit)
 
 
@@ -329,7 +334,7 @@ class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
+        if 'colonel' not in self.cleaned_data:
             return self.cleaned_data
         if 'pin' not in self.cleaned_data:
             return self.cleaned_data
@@ -339,7 +344,8 @@ class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
         return self.cleaned_data
 
     def save(self, commit=True):
-        self.instance.config['pin_no'] = self.cleaned_data['pin'].no
+        if 'pin' in self.cleaned_data:
+            self.instance.config['pin_no'] = self.cleaned_data['pin'].no
         return super().save(commit=commit)
 
 
@@ -385,7 +391,8 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
         return self.cleaned_data
 
     def save(self, commit=True):
-        self.instance.config['pin_no'] = self.cleaned_data['pin'].no
+        if 'pin' in self.cleaned_data:
+            self.instance.config['pin_no'] = self.cleaned_data['pin'].no
         return super().save(commit=commit)
 
 
@@ -415,7 +422,8 @@ class BME680SensorConfigForm(ColonelComponentForm):
     )
 
     def save(self, commit=True):
-        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        if 'interface' in self.cleaned_data:
+            self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
         return super().save(commit=commit)
 
 
@@ -445,7 +453,8 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
     )
 
     def save(self, commit=True):
-        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        if 'interface' in self.cleaned_data:
+            self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
         return super().save(commit=commit)
 
 
@@ -472,7 +481,7 @@ class ColonelTouchSensorConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
+        if 'colonel' not in self.cleaned_data:
             return self.cleaned_data
         if 'pin' not in self.cleaned_data:
             return self.cleaned_data
@@ -483,7 +492,8 @@ class ColonelTouchSensorConfigForm(ColonelComponentForm):
 
 
     def save(self, commit=True):
-        self.instance.config['pin_no'] = self.cleaned_data['pin'].no
+        if 'pin' in self.cleaned_data:
+            self.instance.config['pin_no'] = self.cleaned_data['pin'].no
         return super().save(commit=commit)
 
 
@@ -528,35 +538,33 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.instance.pk:
+        self.basic_fields.append('auto_off')
+        if self.instance.pk and 'slaves' in self.fields:
             self.fields['slaves'].initial = self.instance.slaves.all()
 
     def clean_slaves(self):
+        if 'slaves' not in self.cleaned_data:
+            return
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
         return validate_slaves(self.cleaned_data['slaves'], self.instance)
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('output_pin'):
-            return self.cleaned_data
-
-        self._clean_pin('output_pin')
-
-        if not self.cleaned_data.get('controls'):
-            return self.cleaned_data
 
-        self._clean_controls()
+        if self.cleaned_data.get('output_pin'):
+            self._clean_pin('output_pin')
+        if self.cleaned_data.get('controls'):
+            self._clean_controls()
 
         return self.cleaned_data
 
 
     def save(self, commit=True):
-        self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+        if 'output_pin' in self.cleaned_data:
+            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
         obj = super().save(commit=commit)
-        if commit:
+        if commit and 'slaves' in self.cleaned_data:
             obj.slaves.set(self.cleaned_data['slaves'])
         return obj
 
@@ -628,7 +636,8 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.instance.pk:
+        self.basic_fields.extend(['turn_on_time', 'turn_off_time', 'skew'])
+        if self.instance.pk and 'slaves' in self.fields:
             self.fields['slaves'].initial = self.instance.slaves.all()
 
     def clean_slaves(self):
@@ -638,25 +647,18 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('output_pin'):
-            return self.cleaned_data
-
-        self._clean_pin('output_pin')
-
-        if not self.cleaned_data.get('controls'):
-            return self.cleaned_data
-
-        self._clean_controls()
-
+        if self.cleaned_data.get('output_pin'):
+            self._clean_pin('output_pin')
+        if self.cleaned_data.get('controls'):
+            self._clean_controls()
         return self.cleaned_data
 
 
     def save(self, commit=True):
-        self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+        if 'output_pin' in self.cleaned_data:
+            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
         obj = super().save(commit=commit)
-        if commit:
+        if commit and 'slaves' in self.cleaned_data:
             obj.slaves.set(self.cleaned_data['slaves'])
         return obj
 
@@ -716,7 +718,9 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
     )
 
     def save(self, commit=True):
-        self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+        if 'output_pin' in self.cleaned_data:
+            self.instance.config['output_pin_no'] = \
+                self.cleaned_data['output_pin'].no
         return super().save(commit)
 
     def clean_custom_timing(self):
@@ -740,31 +744,25 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('output_pin'):
-            return self.cleaned_data
-
-        if self.cleaned_data.get('color_order'):
-            if self.cleaned_data['has_white']:
-                if len(self.cleaned_data['color_order']) != 4:
-                    self.add_error(
-                        "color_order",
-                        _("4 colors expected for stripes with dedicated White led.")
-                    )
-            else:
-                if len(self.cleaned_data['color_order']) != 3:
-                    self.add_error(
-                        "color_order",
-                        _("3 colors expected for stripes without dedicated White led.")
-                    )
 
         self._clean_pin('output_pin')
-
-        if not self.cleaned_data.get('controls'):
-            return self.cleaned_data
-
-        self._clean_controls()
+        if self.cleaned_data.get('controls'):
+            self._clean_controls()
+
+        if 'color_order' in self.cleaned_data:
+            if self.cleaned_data.get('color_order'):
+                if self.cleaned_data['has_white']:
+                    if len(self.cleaned_data['color_order']) != 4:
+                        self.add_error(
+                            "color_order",
+                            _("4 colors expected for stripes with dedicated White led.")
+                        )
+                else:
+                    if len(self.cleaned_data['color_order']) != 3:
+                        self.add_error(
+                            "color_order",
+                            _("3 colors expected for stripes without dedicated White led.")
+                        )
 
         return self.cleaned_data
 
@@ -811,21 +809,19 @@ class DualMotorValveForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('open_pin'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('close_pin'):
-            return self.cleaned_data
-
-        self._clean_pin('open_pin')
-        self._clean_pin('close_pin')
-
+        if self.cleaned_data.get('open_pin'):
+            self._clean_pin('open_pin')
+        if self.cleaned_data.get('close_pin'):
+            self._clean_pin('close_pin')
         return self.cleaned_data
 
     def save(self, commit=True):
-        self.instance.config['open_pin_no'] = self.cleaned_data['open_pin'].no
-        self.instance.config['close_pin_no'] = self.cleaned_data['close_pin'].no
+        if 'open_pin' in self.cleaned_data:
+            self.instance.config['open_pin_no'] = \
+                self.cleaned_data['open_pin'].no
+        if 'close_pin' in self.cleaned_data:
+            self.instance.config['close_pin_no'] = \
+                self.cleaned_data['close_pin'].no
         return super().save(commit=commit)
 
 
@@ -903,40 +899,37 @@ class BlindsConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('open_pin'):
-            return self.cleaned_data
-        if not self.cleaned_data.get('close_pin'):
-            return self.cleaned_data
-
-        self._clean_pin('open_pin')
-        self._clean_pin('close_pin')
-
-        if 'controls' not in self.cleaned_data:
-            return self.cleaned_data
-
-        if len(self.cleaned_data['controls']) not in (0, 2):
-            self.add_error('controls', "Must have 0 or 2 controls")
-            return self.cleaned_data
-
-        if len(self.cleaned_data['controls']) == 2:
-            method = None
-            for c in self.cleaned_data['controls']:
-                if not method:
-                    method = c['method']
-                else:
-                    if c['method'] != method:
-                        self.add_error('controls', "Both must use the same control method.")
-                        return self.cleaned_data
-
-        self._clean_controls()
 
+        if self.cleaned_data.get('open_pin'):
+            self._clean_pin('open_pin')
+        if self.cleaned_data.get('close_pin'):
+            self._clean_pin('close_pin')
+
+        if 'controls' in self.cleaned_data:
+            if len(self.cleaned_data['controls']) not in (0, 2):
+                self.add_error('controls', "Must have 0 or 2 controls")
+                return self.cleaned_data
+
+            if len(self.cleaned_data['controls']) == 2:
+                method = None
+                for c in self.cleaned_data['controls']:
+                    if not method:
+                        method = c['method']
+                    else:
+                        if c['method'] != method:
+                            self.add_error('controls', "Both must use the same control method.")
+                            return self.cleaned_data
+
+            self._clean_controls()
         return self.cleaned_data
 
     def save(self, commit=True):
-        self.instance.config['open_pin_no'] = self.cleaned_data['open_pin'].no
-        self.instance.config['close_pin_no'] = self.cleaned_data['close_pin'].no
+        if 'open_pin' in self.cleaned_data:
+            self.instance.config['open_pin_no'] = \
+                self.cleaned_data['open_pin'].no
+        if 'close_pin' in self.cleaned_data:
+            self.instance.config['close_pin_no'] = \
+                self.cleaned_data['close_pin'].no
         return super().save(commit=commit)
 
 
@@ -952,9 +945,6 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
             ]
         )
     )
-    power_action = forms.ChoiceField(
-        choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
-    )
     sensor_pin = ColonelPinChoiceField(
         queryset=ColonelPin.objects.filter(input=True),
         widget=autocomplete.ListSelect2(
@@ -966,67 +956,28 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
             ]
         )
     )
-    sensor_pull = forms.ChoiceField(
-        choices=(
-            ('HIGH', "HIGH"), ('LOW', "LOW"), ("FLOATING", "leave floating"),
-        ),
-        help_text="If you are not sure what is this all about, "
-                  "you are most definitely want to pull this HIGH or LOW "
-                  "but not leave it floating!"
-    )
     sensor_inverse = forms.TypedChoiceField(
-        choices=((1, "Yes"), (0, "No")), coerce=int,
-        help_text="Hint: Set pull HIGH and inverse to Yes, to get ON signal when "
+        choices=((0, "No"), (1, "Yes")), coerce=int, initial=0,
+        help_text="Hint: Set to Yes, to get ON signal when "
                   "you deliver GND to the pin and OFF when you cut it out."
     )
 
-
     def clean(self):
         super().clean()
-        if not self.cleaned_data.get('colonel'):
-            return self.cleaned_data
-        if 'sensor_pin' not in self.cleaned_data:
-            return self.cleaned_data
-        if 'power_pin' not in self.cleaned_data:
-            return self.cleaned_data
-
-        self._clean_pin('sensor_pin')
-        self._clean_pin('power_pin')
-
-
-        if self.cleaned_data['sensor_pin'].no > 100:
-            if self.cleaned_data['sensor_pin'].no < 126:
-                if self.cleaned_data.get('sensor_pull') == 'HIGH':
-                    self.add_error(
-                        'sensor_pull',
-                        "Sorry, but this pin is already pulled LOW and "
-                        "it can not be changed by this setting. "
-                        "Please use 5kohm resistor to physically pull it HIGH "
-                        "if that's what you want to do."
-                    )
-            else:
-                if self.cleaned_data.get('sensor_pull') == 'LOW':
-                    self.add_error(
-                        'sensor_pull',
-                        "Sorry, but this pin is already pulled HIGH and "
-                        "it can not be changed by this setting. "
-                        "Please use 5kohm resistor to physically pull it LOW "
-                        "if that's what you want to do."
-                    )
-        elif self.cleaned_data.get('sensor_pull') != 'FLOATING':
-            if not self.cleaned_data['sensor_pin'].output:
-                self.add_error(
-                    'sensor_pin',
-                    f"Sorry, but {self.cleaned_data['sensor_pin']} "
-                    f"does not have internal pull HIGH/LOW"
-                    " resistance capability"
-                )
+        if 'sensor_pin' in self.cleaned_data:
+            self._clean_pin('sensor_pin')
+        if 'power_pin' in self.cleaned_data:
+            self._clean_pin('power_pin')
 
         return self.cleaned_data
 
     def save(self, commit=True):
-        self.instance.config['sensor_pin_no'] = self.cleaned_data['sensor_pin'].no
-        self.instance.config['power_pin_no'] = self.cleaned_data['power_pin'].no
+        if 'sensor_pin' in self.cleaned_data:
+            self.instance.config['sensor_pin_no'] = \
+                self.cleaned_data['sensor_pin'].no
+        if 'power_pin' in self.cleaned_data:
+            self.instance.config['power_pin_no'] = \
+                self.cleaned_data['power_pin'].no
         return super().save(commit=commit)
 
 
@@ -1059,18 +1010,14 @@ class TTLockConfigForm(ColonelComponentForm):
 
     def save(self, commit=True):
         obj = super(ColonelComponentForm, self).save(commit)
-        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()
+        if commit and 'door_sensor' in self.cleaned_data:
+            GatewayObjectCommand(
+                self.instance.gateway, self.cleaned_data['door_sensor'],
+                command='watch_lock_sensor'
+            ).publish()
         return obj
 
 
-
 class DALIDeviceConfigForm(ColonelComponentForm):
     interface = ColonelInterfacesChoiceField(
         queryset=Interface.objects.filter(type='dali'),
@@ -1087,7 +1034,9 @@ class DALIDeviceConfigForm(ColonelComponentForm):
     )
 
     def save(self, commit=True):
-        self.instance.config['dali_interface'] = self.cleaned_data['interface'].no
+        if 'interface' in self.cleaned_data:
+            self.instance.config['dali_interface'] = \
+                self.cleaned_data['interface'].no
         return super().save(commit=commit)
 
 

simo/generic/forms.py

@@ -137,8 +137,6 @@ class ThermostatConfigForm(BaseComponentForm):
             else:
                 self.fields['use_real_feel'].disabled = True
 
-
-
     def save(self, commit=True):
         self.instance.value_units = self.cleaned_data[
             'temperature_sensor'
@@ -314,8 +312,9 @@ class AlarmGroupConfigForm(BaseComponentForm):
     def save(self, *args, **kwargs):
         self.instance.value_units = 'status'
         from .controllers import AlarmGroup
-        if self.fields['is_main'].widget.attrs.get('disabled'):
-            self.cleaned_data['is_main'] = self.fields['is_main'].initial
+        if 'is_main' in self.cleaned_data:
+            if self.fields['is_main'].widget.attrs.get('disabled'):
+                self.cleaned_data['is_main'] = self.fields['is_main'].initial
         obj = super().save(*args, **kwargs)
         if obj.config.get('is_main'):
             for c in Component.objects.filter(
@@ -366,8 +365,9 @@ class WeatherForecastForm(BaseComponentForm):
     def save(self, *args, **kwargs):
         self.instance.value_units = 'status'
         from .controllers import WeatherForecast
-        if self.fields['is_main'].widget.attrs.get('disabled'):
-            self.cleaned_data['is_main'] = self.fields['is_main'].initial
+        if 'is_main' in self.fields and 'is_main' in self.cleaned_data:
+            if self.fields['is_main'].widget.attrs.get('disabled'):
+                self.cleaned_data['is_main'] = self.fields['is_main'].initial
         obj = super().save(*args, **kwargs)
         if obj.config.get('is_main'):
             for c in Component.objects.filter(
@@ -541,11 +541,12 @@ class WateringConfigForm(BaseComponentForm):
         return contours
 
     def save(self, commit=True):
-        self.instance.config['program'] = self.controller._build_program(
-            self.cleaned_data['contours']
-        )
+        if 'contours' in self.cleaned_data:
+            self.instance.config['program'] = self.controller._build_program(
+                self.cleaned_data['contours']
+            )
         obj = super().save(commit=commit)
-        if commit:
+        if commit and 'contours' in self.cleaned_data:
             obj.slaves.clear()
             for contour in self.cleaned_data['contours']:
                 obj.slaves.add(
@@ -565,10 +566,6 @@ class StateForm(forms.Form):
     help_text = forms.CharField(required=False, widget=forms.Textarea(attrs={'rows': 3}))
     prefix = 'states'
 
-    def clean(self):
-        print("Let's clean the data! ", self.cleaned_data)
-        return self.cleaned_data
-
 
 class StateSelectForm(BaseComponentForm):
     states = FormsetField(
@@ -602,18 +599,20 @@ class AlarmClockEventForm(forms.Form):
         if not self.cleaned_data.get('play_action'):
             return self.cleaned_data
         component = self.cleaned_data.get('component')
-        if not hasattr(component, self.cleaned_data['play_action']):
-            self.add_error(
-                'play_action',
-                f"{component} has no {self.cleaned_data['play_action']} action!"
-            )
-        if self.cleaned_data.get('reverse_action'):
-            if not hasattr(component, self.cleaned_data['reverse_action']):
+        if 'play_action' in self.cleaned_data:
+            if not hasattr(component, self.cleaned_data['play_action']):
                 self.add_error(
-                    'reverse_action',
-                    f"{component} has no "
-                    f"{self.cleaned_data['reverse_action']} action!"
+                    'play_action',
+                    f"{component} has no {self.cleaned_data['play_action']} action!"
                 )
+        if 'reverse_action' in self.cleaned_data:
+            if self.cleaned_data.get('reverse_action'):
+                if not hasattr(component, self.cleaned_data['reverse_action']):
+                    self.add_error(
+                        'reverse_action',
+                        f"{component} has no "
+                        f"{self.cleaned_data['reverse_action']} action!"
+                    )
         return self.cleaned_data
 
 
@@ -633,7 +632,7 @@ class AlarmClockConfigForm(BaseComponentForm):
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
-        if commit:
+        if commit and 'default_events' in self.cleaned_data:
             obj.slaves.clear()
             for comp in self.cleaned_data['default_events']:
                 c = Component.objects.filter(pk=comp['component']).first()

simo/generic/models.py

@@ -125,11 +125,27 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
             base_type=AlarmGroup.base_type,
             config__arming_locks__contains=instance.id
         ):
-            if ag.config.get(
-                'arm_on_away', ''
-            ).startswith('on_away_and_locked'):
+            if ag.config.get('arm_on_away') in (None, 'on_away'):
                 continue
-            ag.arm()
+            users_at_home = InstanceUser.objects.filter(
+                instance=instance.instance, at_home=True
+            ).exclude(is_active=False).exclude(id=instance.id).count()
+            if users_at_home:
+                continue
+            if ag.config.get('arm_on_away') == 'on_away_and_locked':
+                print(f"Nobody is at home, lock was locked. Arm {ag}!")
+                ag.arm()
+                continue
+            locked_states = [
+                True if l['value'] == 'locked' else False
+                for l in Component.objects.filter(
+                    base_type='lock', id__in=ag.config.get('arming_locks', []),
+                ).values('value')
+            ]
+            if all(locked_states):
+                print(f"Nobody is at home, all locks are now locked. Arm {ag}!")
+                ag.arm()
+
     elif instance.value == 'unlocked':
         for ag in Component.objects.filter(
             base_type=AlarmGroup.base_type,
@@ -148,8 +164,8 @@ def bind_alarm_groups(sender, instance, created, *args, **kwargs):
         return
     users_at_home = InstanceUser.objects.filter(
         instance=instance.instance, at_home=True
-    ).exclude(is_active=False).exclude(id=instance.id)
-    if users_at_home.count():
+    ).exclude(is_active=False).exclude(id=instance.id).count()
+    if users_at_home:
         return
     for ag in Component.objects.filter(
         zone__instance=instance.instance,

simo/notifications/utils.py

@@ -6,9 +6,7 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
     assert severity in ('info', 'warning', 'alarm')
     notification = Notification.objects.create(
         instance=instance,
-        title='<strong>%s:</strong> %s' % (
-            instance.name, title
-        ),
+        title=f'{instance.name}: {title}',
         severity=severity, body=body,
         component=component
     )
@@ -18,6 +16,9 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
             instance_roles__is_active=True
         )
     for user in users:
+        # do not send emails to system users
+        if user.email.endswith('simo.io'):
+            continue
         if instance not in user.instances:
             continue
         if component and not component.can_write(user):

simo/users/migrations/0027_permissionsrole_can_manage_components.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2024-05-06 08:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0026_fingerprint_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='permissionsrole',
+            name='can_manage_components',
+            field=models.BooleanField(default=False, help_text='Can manage zones and basic component parameters via SIMO.io app.'),
+        ),
+    ]

simo/users/migrations/0028_auto_20240506_1146.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.9 on 2024-05-06 11:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0027_permissionsrole_can_manage_components'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='permissionsrole',
+            name='can_manage_components',
+        ),
+        migrations.AddField(
+            model_name='permissionsrole',
+            name='is_owner',
+            field=models.BooleanField(default=False, help_text='Can manage zones, basic component parametersand other things via SIMO.io app, but is not yet allowed to perform any serious system changes, like superusers can.'),
+        ),
+    ]

simo/users/models.py

@@ -35,6 +35,12 @@ class PermissionsRole(models.Model):
         help_text="Global role if instance is not set."
     )
     name = models.CharField(max_length=100, db_index=True)
+    is_owner = models.BooleanField(
+        default=False,
+        help_text="Can manage zones, basic component parameters"
+                  "and other things via SIMO.io app, but is not yet allowed "
+                  "to perform any serious system changes, like superusers can."
+    )
     can_manage_users = models.BooleanField(default=False)
     is_superuser = models.BooleanField(
         default=False,
@@ -213,12 +219,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
         return self.is_active and self.ssh_key and self.is_master
 
     def get_role(self, instance):
-        for role in self.roles.all():
-            if not role.instance:
-                return role
-        for role in self.roles.all():
-            if role.instance == instance:
-                return role
+        return self.roles.filter(instance=instance).first()
 
     def set_instance(self, instance):
         self._instance = instance

{simo-2.0.25.dist-info → simo-2.0.27.dist-info}/METADATA

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

{simo-2.0.25.dist-info → simo-2.0.27.dist-info}/RECORD

@@ -26,7 +26,7 @@ simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR9
 simo/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/admin.py,sha256=vZp2TZTt41YararDkIEs35X6ARqRp94wrIddsIfe-Bs,17738
-simo/core/api.py,sha256=9lPX8ShvAorn5p1qjPUxOKv_cmkOxoWyiIlHtCzgl5Q,23088
+simo/core/api.py,sha256=YLO6r1htHgBjokAHoTXCtEFmx_Ug5xIlPg6sQX-CT4A,23413
 simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=ySmmhtVrWatI3yqnYPuP5ipapmJfyfEbl32w-7_W5O4,3551
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
@@ -38,26 +38,26 @@ simo/core/controllers.py,sha256=iJ7cIGv2WhSGjyxCFfK49pZXuEMfSe75bMEAkRN8G4g,2710
 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=FnnK4pHZ8EaMvubN0NQbz2SdTTgMXvGM-heklzN4RZo,22465
+simo/core/forms.py,sha256=tsWBsoBJeUiXDVU6lKbMbnBZORmNrnK5XnoBS_9uWsU,23583
 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=pO52hQOJV_JRmNyUe7zfufSnJFlRITOWX6jwkoPWJhk,2052
 simo/core/models.py,sha256=m05fXzOtLrq4LEGknU1mjTHzaTmIEBi1zhwvtDWDknE,19773
-simo/core/permissions.py,sha256=m0GmmSeVQiXl1EZWgaVlK-Ud4lbwc1CLlcryomhKg6Y,2534
+simo/core/permissions.py,sha256=yqVXq6SNZccSKcOoGdb0oh-WHsyTTtI9ovJdJyhjv28,2707
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=kmja52o-BUOcUTX2ZsKWixvKRZSXB7lGe866Q1ajlmo,17563
+simo/core/serializers.py,sha256=vOrWlfSkmdyaG0VPM0fmRLd7OkkNNGyAkc6Q8Cwa_1Q,18179
 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
-simo/core/tasks.py,sha256=4QShdl39MB6InYfBYiGJ167ARKBhO7WHMvU7i-kvsRU,11325
+simo/core/tasks.py,sha256=PEGGsKBbkQOl3LhLfGR5orbYtCxzcv8peMLiVxgl3R0,12228
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=hlAKpAbCbqI3a-uL5tDp532T2oLFiF0MBzKUJ_SNzo0,5833
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=y0IW37wBUIGa3Eh_ZG28pRqHKoLiPyTgUX2OnbkEPlc,158
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=gZpNwM9f-JMbGe9sbQKt2hU2BBYhRzKSH9XRJYKN3Vo,13534
-simo/core/__pycache__/api.cpython-38.pyc,sha256=FaLLTnRx1VwRVRsuJKT3v2gWzLtI26iTq2BYb3lq0r4,18458
+simo/core/__pycache__/api.cpython-38.pyc,sha256=yL3vQiZ6McrOILD37EmuRdzZHZ0bPCsboDAeHZP_iyM,18581
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=94T3_rybn2T1_bkaDQnQRyjy21LBaGOnz-mmkJ6T0N8,2840
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=9Es2wZNduzUJv-jZ_HX0-L3vqwpXWBbseEwoC5K6b-w,3465
@@ -69,19 +69,19 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=40wJ3mu0CnzexxDzXyDIlSxa
 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=U5pV_JyfoGwymn3tsws8FR2GrxihjKFa5dmtdzijexA,19071
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=d0ruviTG6zihcc9hJ1TvVxPODwe7LJCyo_ZpLIUt5pI,19850
 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
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=ESR5JPtITo9flczO0672sfzYUxrc_cQU0e0w5DFL-60,2038
 simo/core/__pycache__/models.cpython-38.pyc,sha256=kYcojazryAAgZCXMoqqutIG2p8ofSKxza9TMx1SR2dQ,17233
-simo/core/__pycache__/permissions.cpython-38.pyc,sha256=uk2NsUixTKBM31T08YixwPO35TRp99hF5BmAf8bj5Vw,2720
+simo/core/__pycache__/permissions.cpython-38.pyc,sha256=flJOCh94U8mFhE0XWzUD0sGR6Xe1HlfG4hQtNSnAGZ4,2788
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=x-obnrdPnoYRhriP_51_Jy_0saCsasWdFQSH1kalVqo,16869
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=Pi9lddoS_DtMuA1iZ4mFHu_dG2mjouWxajM4udPQKqo,17185
 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
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=JTqXI_QPhU8u5c8MdhxILLKcn-5ZlIwtG1mGO4bgB7A,8474
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=8VyzcG4psw5cS2oTy8W7EVW_nP7fzhoMvxXczTe1rcw,9134
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=YrKRZPaV_JM4VGpdhVhsK-90UwUTOqp-V-Yj0SRGZgs,4212
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -173,6 +173,7 @@ simo/core/migrations/0028_rename_subcomponents_component_slaves.py,sha256=ioQcfO
 simo/core/migrations/0029_auto_20240229_1331.py,sha256=BYXPNwjXApAx7mxE5li3QssfksWTsSjDf_VPQ8iGV8c,1140
 simo/core/migrations/0030_alter_instance_timezone.py,sha256=XZuYr2eD9MvE21Jxfdat8RC3sbc7PaGUfNPaqqxBNzE,23248
 simo/core/migrations/0031_auto_20240429_1231.py,sha256=kskD8dylxqg-l-ZQgxl6ZdZd7iNcJ52rOGPJFa9s-wk,829
+simo/core/migrations/0032_auto_20240506_0834.py,sha256=w-dXSZVYZD0B6pRmMXLy27Y2twRR3WbN9WdNJCQqqwk,746
 simo/core/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=w6GiBXVxWj30Bg4Sn_pFVeA041d-pCrkaq8mR3KuF70,5381
 simo/core/migrations/__pycache__/0002_load_icons.cpython-38.pyc,sha256=Nb9RrPjVYo_RpZ5PmzoaEIWGCeVt4kicpmGiKlBrpIw,2123
@@ -205,6 +206,7 @@ simo/core/migrations/__pycache__/0028_rename_subcomponents_component_slaves.cpyt
 simo/core/migrations/__pycache__/0029_auto_20240229_1331.cpython-38.pyc,sha256=nO6lBU-1SxMQv67jQs7cGgNnot722UVL9pj3UE14I1k,1086
 simo/core/migrations/__pycache__/0030_alter_instance_timezone.cpython-38.pyc,sha256=paRgdijg5o8QzluT4GjSEQIMk6UAF7XmSwjqknXPE_4,16333
 simo/core/migrations/__pycache__/0031_auto_20240429_1231.cpython-38.pyc,sha256=Kl76gU1VUyTWMz9RIZUrbnb_xeteWLDSRfs_GtNCVow,863
+simo/core/migrations/__pycache__/0032_auto_20240506_0834.cpython-38.pyc,sha256=UhrErBBhvAOPVph1x3ibQvSrcVUrITIsU9CGmjT8nLk,895
 simo/core/migrations/__pycache__/__init__.cpython-38.pyc,sha256=VZmDQ57BTcebuM0KMhjiTOabgWZCBxQmSJzWZos9SO8,169
 simo/core/static/ansi_styles.css,sha256=4ieJGrjZPKyPSago9FdB_gflHoGE1vxCHi8qVn5tY-Y,37352
 simo/core/static/admin/Img/plus.svg,sha256=2NpSFPWqGIjpAQGFI7LDQHPKagEhYkJiJX95ufCoZaI,741
@@ -10173,7 +10175,7 @@ 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=rTxRFf-LKWAZxzixrsLZHHm51BmMx9a1PLdgf6inlNM,20533
-simo/fleet/forms.py,sha256=QzHmAsWC258w2mFkQrnxL0k7h3Y9aN8oduEmrPGnqI4,38430
+simo/fleet/forms.py,sha256=ivP30jRtABtf1NkAuOaRRwZB7khHIJ7XwEzS5aCF480,36881
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=ve-97F1cwGt-AmwfSJK0d-57pP3NyZpeu0XlHu2oK28,14494
@@ -10190,7 +10192,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEE
 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=l9bz18Qp33C12TJOKPSn9vIXnlBKnBusODNk7Fg64qA,18103
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=H3-EYmeHeNWIghaKBqduJk3DAKvayStrPrNp2i43274,27751
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=TH4NC-otAl9V6YlvrffE9sghlT-tw_3RFK1ztO-fzfg,27368
 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=pHNRUiPRjH0SLp14pzbSIxHi_-27SpZFgSh_7lzA8Wo,12359
@@ -10274,18 +10276,18 @@ 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=WYuOUzDWvkYRaTvlbdGy_qmwp1o_ohqKDfV7OrOq2QU,52218
-simo/generic/forms.py,sha256=U6MIS5U7jLG6XabqCZvrfSoiNCQiWZYE8VZPnyN3SJw,23757
+simo/generic/forms.py,sha256=uLZ25Fw1xGqyDBngWPve9EaHpyldFegY_TPBKV4Oby0,24051
 simo/generic/gateways.py,sha256=b3tQ2bAkDVYXCF5iZi2yi-6nZAM8WmHE9ICwxMyR0to,17034
-simo/generic/models.py,sha256=ni1cgqVZ8ttk1snW26EB-2dqsHRZkLg6463my_Cu3EU,6618
+simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 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=e0bvgyePgJbIs1omBq0TRPlVSKar2sK_JbUKqDRj7mY,33235
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=lqpRTX5rnrkyJZ5Dga4e9y2WJ81r394AW5DV4KkvxXQ,17856
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=U67jiwt6R8J547n7d84-_9mUxCXxKl-L0VFdYfo1aiM,17787
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=a4lLIMPyxm9tNzIqorXHIPZFVTcXlPsM1ycJMghxcHA,12673
-simo/generic/__pycache__/models.cpython-38.pyc,sha256=yr64EX5n9u9uaOHNbPhNIBoBJo4Y3V_lvDj1ggMAZCQ,5123
+simo/generic/__pycache__/models.cpython-38.pyc,sha256=PzlZsM1jxo3FVb7QDm3bny8UFwTsGrMQe4mj4tJ06eQ,5675
 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
@@ -10346,7 +10348,7 @@ simo/notifications/admin.py,sha256=y_gmHYXbDh98LUUa-lp9DilTIgM6-pIujWPQPLQsJo8,8
 simo/notifications/api.py,sha256=GXQpq68ULBaJpU8w3SJKaCKuxYGWYehKnGeocGB1RVc,1783
 simo/notifications/models.py,sha256=VZcvweii59j89nPKlWeUSJ44Qz3ZLjJ6mXN6uB9F1Sw,2506
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
-simo/notifications/utils.py,sha256=5CtKOvX0vbWLXFvJD_8WfWulMEp1FuMwrfCGDLHySdA,907
+simo/notifications/utils.py,sha256=VCBKcHrtZrdCalKe2w7umt7-trhG3vw-fKn1ndyr3CA,971
 simo/notifications/__pycache__/__init__.cpython-38.pyc,sha256=YvucUfu98XFvEEg1LYFMlOZJpo_jSGxTVrM-ylAFLOg,167
 simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=Fl4crSZTFQOTYQioV6ff9fBRV4MhNiwQgMS2VnmCI4M,1632
 simo/notifications/__pycache__/api.cpython-38.pyc,sha256=ys6E4AFghX6bq-rQ0gtA9s0Y2Hh-ypsWH8-Yz4edMrc,2073
@@ -10365,7 +10367,7 @@ simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=32Qv3d1gBqagX67irTmUzMY_svOhJA5ECK1TvXshRWw,18865
+simo/users/models.py,sha256=VJWjqDXZpCzsrTYeXmxc8JrsxmK0Ml9-X9eOHj4BP78,19005
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=e6yIUsO7BfvrZ4IQHBn-FdpAUMgic5clmGQdTtRlGRY,2515
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10380,7 +10382,7 @@ simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=MuOieBIXt6lrDx83-UQtd
 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
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=cyTY-fgeERHebof7-MSxJXfwlWkrwWZyqKT9fl198z0,17614
+simo/users/__pycache__/models.cpython-38.pyc,sha256=Hui7Uu0kCIENoQuDZ5xoCHVNqsoI_hygaxKAgqqyPo8,17739
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=ylapsfu5qbSzbfX2lG3uc4wV6hhndFbIvI109lhhKOo,3461
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10414,6 +10416,8 @@ simo/users/migrations/0023_auto_20240105_0719.py,sha256=OAkWJusXjzT6dx4EgwjvNvME
 simo/users/migrations/0024_fingerprint.py,sha256=0wfplJ3iHv_6heJx7yIQYX3D68Nf9pLPlIZoM5NcPk8,1021
 simo/users/migrations/0025_rename_name_fingerprint_type_and_more.py,sha256=Azw_a1qxIDttdG4m0DcLa82amv-mFsbW8PsjG9qFL0Y,466
 simo/users/migrations/0026_fingerprint_name.py,sha256=DPmfi1brbaPymdNiPgc7dINSKy97yVHdKpKp-ZfnS3I,428
+simo/users/migrations/0027_permissionsrole_can_manage_components.py,sha256=VcGZE6u-q6UkGo7D01K_T1XBtIvIGe8SCk5ZPRrPpGo,485
+simo/users/migrations/0028_auto_20240506_1146.py,sha256=7RUFF2rJH-bnPeHwc77p8Q4kEAc3owyG4qp9Kc4aKhU,716
 simo/users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/migrations/__pycache__/0001_initial.cpython-38.pyc,sha256=ngXA1QR-Qc2VS-BTTZWybVXiEfifIgKaVS6bADiN8nU,4269
 simo/users/migrations/__pycache__/0002_componentpermission.cpython-38.pyc,sha256=pknJnpic8p6Vdx9DX41FfODXNnvexDswJtUCmC5w1tg,995
@@ -10441,6 +10445,8 @@ simo/users/migrations/__pycache__/0023_auto_20240105_0719.cpython-38.pyc,sha256=
 simo/users/migrations/__pycache__/0024_fingerprint.cpython-38.pyc,sha256=QLW3v4BK78HL682qeHkK_aXZgCJSs9sIIte60ieF5ZY,1132
 simo/users/migrations/__pycache__/0025_rename_name_fingerprint_type_and_more.cpython-38.pyc,sha256=21CgVotrTT02MW58zqePt_-gsbpdN_m01T_SOHgWkBo,631
 simo/users/migrations/__pycache__/0026_fingerprint_name.cpython-38.pyc,sha256=Ti0NLIKb0Wffn33LCBQQ-cumFCX6JFxSi1FYoV8C0ZE,642
+simo/users/migrations/__pycache__/0027_permissionsrole_can_manage_components.cpython-38.pyc,sha256=Ju4FLSKUNoJ419bAp_Np_MKrSyxzlJnYGfeNYg7HC5M,721
+simo/users/migrations/__pycache__/0028_auto_20240506_1146.cpython-38.pyc,sha256=e8J_lTYJMixdqV37OgonG9ndd9gjn1E9hVj-jh4bxGw,874
 simo/users/migrations/__pycache__/__init__.cpython-38.pyc,sha256=NKq7WLgktK8WV1oOqCPbAbdkrPV5GRGhYx4VxxI4dcs,170
 simo/users/templates/conf/mosquitto.conf,sha256=1eIGNuRu4Y3hfAU6qiWix648eCRrw0oOT24PnyFI4ys,189
 simo/users/templates/conf/mosquitto_acls.conf,sha256=ga44caTDNQE0CBKw55iM2jOuna6-9fKGwAhjyERZdRE,500
@@ -10450,8 +10456,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.25.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.25.dist-info/METADATA,sha256=z4jsvR3Vf9Zbu9KiGZv12Q0IwiW5FHorEehCTxsVjx0,1730
-simo-2.0.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.25.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.25.dist-info/RECORD,,
+simo-2.0.27.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.27.dist-info/METADATA,sha256=ZfFs5I2gydjhtWLdXn1RkHW05xtXHAe7R9uZed92SUQ,1730
+simo-2.0.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.27.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.27.dist-info/RECORD,,