simo 2.0.35__py3-none-any.whl → 2.0.38__py3-none-any.whl

simo/core/controllers.py

@@ -180,6 +180,16 @@ class ControllerBase(ABC):
             else:
                 return self.component.change_init_by
 
+    def _string_to_vals(self, v):
+        '''
+        Convert a string containing list of values to approporiate list of component values
+        :param v:
+        :return:
+        '''
+        val_type = type(self.default_value)
+        v = str(v).strip('(').strip('[').rstrip(')').rstrip(']')
+        return [val_type(val.strip()) for val in v.split(',')]
+
     def send(self, value):
         self.component.refresh_from_db()
 

simo/core/forms.py

@@ -291,7 +291,7 @@ class ComponentAdminForm(forms.ModelForm):
 
     class Meta:
         model = Component
-        fields = 'name', 'icon', 'zone', 'category', 'show_in_app', 'notes'
+        fields = 'name', 'icon', 'zone', 'category', 'show_in_app', 'notes',
         widgets = {
             'icon': autocomplete.ModelSelect2(
                 url='autocomplete-icon', attrs={'data-html': True}
@@ -466,6 +466,13 @@ class NumericSensorForm(BaseComponentForm):
             ValueLimitForm, can_delete=True, can_order=True, extra=0, max_num=3
         ), label="Graph Limits"
     )
+    value_units = forms.CharField(required=False)
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['value_units'].initial = self.controller.default_value_units
+
 
 
 class MultiSensorConfigForm(BaseComponentForm):
@@ -660,6 +667,7 @@ class DimmerConfigForm(BaseComponentForm):
     max = forms.FloatField(
         initial=1.0, help_text="Maximum component value."
     )
+    value_units = forms.CharField(required=False)
     inverse = forms.BooleanField(
         label=_("Inverse dimmer signal"), required=False
     )
@@ -676,6 +684,7 @@ class DimmerConfigForm(BaseComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.fields['value_units'].initial = self.controller.default_value_units
         if self.instance.pk:
             self.fields['slaves'].initial = self.instance.slaves.all()
 
@@ -704,6 +713,11 @@ class DimmerPlusConfigForm(BaseComponentForm):
     secondary_max = forms.FloatField(
         initial=1.0, help_text="Maximum secondary value."
     )
+    value_units = forms.CharField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['value_units'].initial = self.controller.default_value_units
 
 
 class RGBWConfigForm(BaseComponentForm):

simo/core/serializers.py

@@ -375,7 +375,6 @@ class ComponentSerializer(FormSerializer):
             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:

simo/core/utils/formsets.py

@@ -1,4 +1,3 @@
-import copy
 from django import forms
 from django.db import models
 from django.template.loader import render_to_string
@@ -148,10 +147,21 @@ class FormsetField(forms.Field):
             if formset_data.get('%s-%d-DELETE' % (prefix, i)) == 'on':
                 continue
             form_data = {}
+
             for field_name, field in self.formset_cls().form.declared_fields.items():
                 form_data[field_name] = formset_data.get(
                     '%s-%d-%s' % (prefix, i, field_name)
                 )
+
+            f_data = {}
+            for key, val in form_data.items():
+                f_data[f"{self.formset_cls.form.prefix}-{key}"] = val
+            form = self.formset_cls.form(f_data)
+            if form.is_valid():
+                form_data = form.cleaned_data
+
+            for field_name, field in self.formset_cls().form.declared_fields.items():
+
                 if isinstance(field, forms.models.ModelChoiceField):
                     if isinstance(form_data[field_name], models.Model):
                         form_data[field_name] = form_data[field_name].pk
@@ -164,13 +174,21 @@ class FormsetField(forms.Field):
                 elif isinstance(field, forms.fields.BooleanField):
                     form_data[field_name] = form_data[field_name] == 'on'
                 elif isinstance(field, forms.fields.IntegerField):
-                    form_data[field_name] = int(form_data[field_name])
+                    try:
+                        form_data[field_name] = int(form_data[field_name])
+                    except:
+                        form_data[field_name] = None
+
             if self.widget.formset.can_order:
                 form_data['order'] = int(formset_data.get(
                     '%s-%d-ORDER' % (prefix, i), 0
                 ))
+
+
             cleaned_value.append(form_data)
 
+
+
         if self.widget.formset.can_order:
             cleaned_value = sorted(cleaned_value, key=lambda d: d['order'])
             for i in range(len(cleaned_value)):

simo/core/utils/operations.py

@@ -0,0 +1,10 @@
+import operator
+
+OPERATIONS = {
+    '==': operator.eq,
+    '>': operator.gt,
+    '>=': operator.ge,
+    '<': operator.lt,
+    '<=': operator.le,
+    'in': lambda a, b: a in b
+}

simo/fleet/forms.py

@@ -84,8 +84,7 @@ class InterfaceAdminForm(forms.ModelForm):
 
 class ColonelComponentForm(BaseComponentForm):
     colonel = forms.ModelChoiceField(
-        label="Colonel", queryset=Colonel.objects.all(),
-        help_text="ATENTION! Changing Colonel after component creation is not recommended!"
+        label="Colonel", queryset=Colonel.objects.all()
     )
 
     def clean_colonel(self):
@@ -133,6 +132,7 @@ class ColonelComponentForm(BaseComponentForm):
                     updated_vals[key] = int(val)
             self.cleaned_data['controls'][i] = updated_vals
 
+        pins_in_use = []
         formset_errors = {}
         for i, control in enumerate(self.cleaned_data['controls']):
             if pin_instances[i].colonel != self.cleaned_data['colonel']:
@@ -144,6 +144,11 @@ class ColonelComponentForm(BaseComponentForm):
                 formset_errors[i] = {
                     'pin': f"{pin_instances[i]} is already occupied by {pin_instances[i].occupied_by}!"
                 }
+            elif pin_instances[i].no in pins_in_use:
+                formset_errors[i] = {
+                    'pin': f"{pin_instances[i].no} is already in use!"
+                }
+            pins_in_use.append(pin_instances[i].no)
 
         errors_list = []
         if formset_errors:
@@ -214,6 +219,22 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
                   "Set debounce value in milliseconds, to remediate this. "
                   "50ms offers a good starting point!"
     )
+    hold_time = forms.TypedChoiceField(
+        initial=0, coerce=int, choices=(
+            (0, "-----"),
+            (1, "10 s"), (2, "20 s"), (3, "30 s"), (4, "40 s"), (5, "50 s"),
+            (6, "1 min"), (9, "1.5 min"), (12, "2 min"), (18, "3 min"),
+            (30, "5 min"), (60, "10 min"), (120, "20 min"),
+        ), required=False,
+        help_text="Holds positive value for given amount of time "
+                  "after last negative value has been observed. "
+                  "Super useful with regular motion detectors for controlling "
+                  "lights or other means of automation."
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.basic_fields.append('hold_time')
 
     def clean(self):
         super().clean()
@@ -424,6 +445,17 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def clean(self):
+        if not self.cleaned_data.get('colonel'):
+            return self.cleaned_data
+        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
+            self.add_error(
+                'interface',
+                f"This interface is on {self.cleaned_data['interface'].colonel}, "
+                f"however we need an interface from {self.cleaned_data['colonel']}."
+            )
+        return self.cleaned_data
+
     def save(self, commit=True):
         if 'interface' in self.cleaned_data:
             self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
@@ -455,6 +487,17 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def clean(self):
+        if not self.cleaned_data.get('colonel'):
+            return self.cleaned_data
+        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
+            self.add_error(
+                'interface',
+                f"This interface is on {self.cleaned_data['interface'].colonel}, "
+                f"however we need an interface from {self.cleaned_data['colonel']}."
+            )
+        return self.cleaned_data
+
     def save(self, commit=True):
         if 'interface' in self.cleaned_data:
             self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
@@ -560,6 +603,14 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
         if self.cleaned_data.get('controls'):
             self._clean_controls()
 
+        if self.cleaned_data.get('output_pin') and self.cleaned_data.get('controls'):
+            for ctrl in self.cleaned_data['controls']:
+                if ctrl['pin'] == self.cleaned_data['output_pin']:
+                    self.add_error(
+                        "output_pin",
+                        "Can't be used as control pin at the same time!"
+                    )
+
         return self.cleaned_data
 
 
@@ -592,6 +643,7 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         required=True, initial=100,
         help_text="Maximum component value"
     )
+    value_units = forms.CharField(required=False)
     duty_min = forms.IntegerField(
         min_value=0, max_value=1023, required=True, initial=0,
         help_text="Minumum PWM signal output duty (0 - 1023)"
@@ -621,6 +673,7 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         required=True, initial=100,
         help_text="Component ON value when used with toggle switch"
     )
+
     slaves = forms.ModelMultipleChoiceField(
         required=False,
         queryset=Component.objects.filter(
@@ -639,7 +692,10 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.basic_fields.extend(['turn_on_time', 'turn_off_time', 'skew'])
+        self.fields['value_units'].initial = self.controller.default_value_units
+        self.basic_fields.extend(
+            ['value_units', 'turn_on_time', 'turn_off_time', 'skew']
+        )
         if self.instance.pk and 'slaves' in self.fields:
             self.fields['slaves'].initial = self.instance.slaves.all()
 
@@ -654,6 +710,13 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
             self._clean_pin('output_pin')
         if 'controls' in self.cleaned_data:
             self._clean_controls()
+        if self.cleaned_data.get('output_pin') and self.cleaned_data.get('controls'):
+            for ctrl in self.cleaned_data['controls']:
+                if ctrl['pin'] == self.cleaned_data['output_pin']:
+                    self.add_error(
+                        "output_pin",
+                        "Can't be used as control pin at the same time!"
+                    )
         return self.cleaned_data
 
 
@@ -754,6 +817,14 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
         if self.cleaned_data.get('controls'):
             self._clean_controls()
 
+        if self.cleaned_data.get('output_pin') and self.cleaned_data.get('controls'):
+            for ctrl in self.cleaned_data['controls']:
+                if ctrl['pin'] == self.cleaned_data['output_pin']:
+                    self.add_error(
+                        "output_pin",
+                        "Can't be used as control pin at the same time!"
+                    )
+
         if 'color_order' in self.cleaned_data:
             if self.cleaned_data.get('color_order'):
                 if self.cleaned_data['has_white']:
@@ -818,6 +889,12 @@ class DualMotorValveForm(ColonelComponentForm):
             self._clean_pin('open_pin')
         if self.cleaned_data.get('close_pin'):
             self._clean_pin('close_pin')
+        if self.cleaned_data.get('open_pin') \
+        and self.cleaned_data.get('close_pin') \
+        and self.cleaned_data['open_pin'] == self.cleaned_data['close_pin']:
+            self.add_error(
+                'close_pin', "Can't be the same as open pin!"
+            )
         return self.cleaned_data
 
     def save(self, commit=True):
@@ -905,6 +982,13 @@ class BlindsConfigForm(ColonelComponentForm):
     def clean(self):
         super().clean()
 
+        if self.cleaned_data.get('open_pin') \
+        and self.cleaned_data.get('close_pin') \
+        and self.cleaned_data['open_pin'] == self.cleaned_data['close_pin']:
+            self.add_error(
+                'close_pin', "Can't be the same as open pin!"
+            )
+
         if self.cleaned_data.get('open_pin'):
             self._clean_pin('open_pin')
         if self.cleaned_data.get('close_pin'):
@@ -926,6 +1010,23 @@ class BlindsConfigForm(ColonelComponentForm):
                             return self.cleaned_data
 
             self._clean_controls()
+
+            if self.cleaned_data.get('open_pin'):
+                for ctrl in self.cleaned_data['controls']:
+                    if ctrl['pin'] == self.cleaned_data['output_pin']:
+                        self.add_error(
+                            "open_pin",
+                            "Can't be used as control pin at the same time!"
+                        )
+
+            if self.cleaned_data.get('close_pin'):
+                for ctrl in self.cleaned_data['controls']:
+                    if ctrl['pin'] == self.cleaned_data['close_pin']:
+                        self.add_error(
+                            "close_pin",
+                            "Can't be used as control pin at the same time!"
+                        )
+
         return self.cleaned_data
 
     def save(self, commit=True):
@@ -974,6 +1075,13 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
         if 'power_pin' in self.cleaned_data:
             self._clean_pin('power_pin')
 
+        if self.cleaned_data.get('sensor_pin') \
+        and self.cleaned_data.get('power_pin') \
+        and self.cleaned_data['sensor_pin'] == self.cleaned_data['power_pin']:
+            self.add_error(
+                'power_pin', "Can't be the same as sensor pin!"
+            )
+
         return self.cleaned_data
 
     def save(self, commit=True):
@@ -1049,6 +1157,17 @@ class DALIDeviceConfigForm(ColonelComponentForm):
             )
         return self.cleaned_data['interface']
 
+    def clean(self):
+        if not self.cleaned_data.get('colonel'):
+            return self.cleaned_data
+        if self.cleaned_data['interface'].colonel != self.cleaned_data['colonel']:
+            self.add_error(
+                'interface',
+                f"This interface is on {self.cleaned_data['interface'].colonel}, "
+                f"however we need an interface from {self.cleaned_data['colonel']}."
+            )
+        return self.cleaned_data
+
     def save(self, commit=True, update_colonel_config=True):
         if 'interface' in self.cleaned_data:
             self.instance.config['dali_interface'] = \

simo/generic/controllers.py

@@ -15,6 +15,7 @@ from simo.users.utils import get_system_user
 from simo.core.events import GatewayObjectCommand
 from simo.core.models import RUN_STATUS_CHOICES_MAP, Component
 from simo.core.utils.helpers import get_random_string
+from simo.core.utils.operations import OPERATIONS
 from simo.core.controllers import (
     BEFORE_SEND, BEFORE_SET, ControllerBase,
     BinarySensor, NumericSensor, MultiSensor, Switch, Dimmer, DimmerPlus,
@@ -35,7 +36,8 @@ from .app_widgets import (
     WateringWidget, StateSelectWidget, AlarmClockWidget
 )
 from .forms import (
-    ScriptConfigForm, ThermostatConfigForm, AlarmGroupConfigForm,
+    ScriptConfigForm, PresenceLightingConfigForm,
+    ThermostatConfigForm, AlarmGroupConfigForm,
     IPCameraConfigForm, WeatherForecastForm, GateConfigForm,
     BlindsConfigForm, WateringConfigForm, StateSelectForm,
     AlarmClockConfigForm
@@ -99,6 +101,104 @@ class Script(ControllerBase, TimerMixin):
             self.send('start')
 
 
+class PresenceLighting(Script):
+    name = _("Presence lighting")
+    config_form = PresenceLightingConfigForm
+
+    # script specific variables
+    sensors = {}
+    light_org_values = {}
+    is_on = None
+    turn_off_task = None
+
+    def _run(self):
+        while True:
+            self._on_sensor()
+            time.sleep(10)
+
+    def _on_sensor(self, sensor=None):
+
+        self.component.refresh_from_db()
+        for id in self.component.config['presence_sensors']:
+            if id not in self.sensors:
+                sensor = Component.objects.filter(id=id).first()
+                if sensor:
+                    sensor.on_change(self._on_sensor)
+                    self.sensors[id] = sensor
+
+        if sensor:
+            self.sensors[sensor.id] = sensor
+
+        presence_values = [s.value for id, s in self.sensors.items()]
+        if self.component.config.get('act_on', 0):
+            must_on = any(presence_values)
+        else:
+            must_on = all(presence_values)
+
+        additional_conditions_met = True
+        for condition in self.component.config.get('conditions', []):
+            if not additional_conditions_met:
+                continue
+            comp = Component.objects.filter(
+                id=condition.get('component', 0)
+            ).first()
+            if not comp:
+                continue
+            op = OPERATIONS.get(condition.get('op'))
+            if not op:
+                continue
+            if condition['op'] == 'in':
+                if comp.value not in self._string_to_vals(condition['value']):
+                    additional_conditions_met = False
+                continue
+
+            if not op(comp.value, condition['value']):
+                additional_conditions_met = False
+
+        if must_on and not additional_conditions_met:
+            print("Presence detected, but additional conditions not met!")
+
+        if must_on and additional_conditions_met and not self.is_on:
+            print("Turn the lights ON!")
+            self.is_on = True
+            if self.turn_off_task:
+                self.turn_off_task.cancel()
+                self.turn_off_task = None
+            self.light_org_values = {}
+            for id in self.component.config['lights']:
+                comp = Component.objects.filter(id=id).first()
+                if not comp or not comp.controller:
+                    continue
+                self.light_org_values[comp.id] = comp.value
+                comp.controller.send(self.component.config['on_value'])
+            return
+
+        if self.is_on or self.is_on is None:
+            if not additional_conditions_met:
+                return self._turn_it_off()
+            if not any(presence_values):
+                if not self.component.config.get('hold_time', 0):
+                    return self._turn_it_off()
+                if not self.turn_off_task:
+                    self.turn_off_task = threading.Timer(
+                        self.component.config['hold_time'] * 10,
+                        self._turn_it_off
+                    )
+
+    def _turn_it_off(self):
+        print("Turn the lights OFF!")
+        self.is_on = False
+        self.turn_off_task = None
+        for id in self.component.config['lights']:
+            comp = Component.objects.filter(id=id).first()
+            if not comp or not comp.controller:
+                continue
+            if self.component.config['off_value'] == 0:
+                comp.send(0)
+            else:
+                comp.send(self.light_org_values.get(comp.id, 0))
+
+
 class Thermostat(ControllerBase):
     name = _("Thermostat")
     base_type = 'thermostat'

simo/generic/forms.py

@@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
 from simo.core.forms import HiddenField, BaseComponentForm
 from simo.core.models import Icon, Component
 from simo.core.controllers import (
-    BinarySensor, NumericSensor, MultiSensor, Switch
+    BEFORE_SET, BinarySensor, NumericSensor, MultiSensor, Switch
 )
 from simo.core.widgets import PythonCode, LogOutputWidget
 from dal import autocomplete, forward
@@ -72,6 +72,145 @@ class ScriptConfigForm(BaseComponentForm):
         return fieldsets
 
 
+class ConditionForm(forms.Form):
+    component = forms.ModelChoiceField(
+        Component.objects.all(),
+        widget=autocomplete.ModelSelect2(
+            url='autocomplete-component', attrs={'data-html': True},
+        ),
+    )
+    op = forms.ChoiceField(
+        initial="==", choices=(
+            ('==', "is equal to"),
+            ('>', "is greather than"), ('>=', "Is greather or equal to"),
+            ('<', "is lower than"), ('<=', "is lower or equal to"),
+            ('in', "is one of")
+        )
+    )
+    value = forms.CharField()
+    prefix = 'breach_events'
+
+    def clean(self):
+        if not self.cleaned_data.get('component'):
+            return self.cleaned_data
+        if not self.cleaned_data.get('op'):
+            return self.cleaned_data
+        component = self.cleaned_data.get('component')
+
+        if self.cleaned_data['op'] == 'in':
+            self.cleaned_data['value'] = self.cleaned_data['value']\
+                .strip('(').strip('[').rstrip(')').rstrip(']').strip()
+            values = self.cleaned_data['value'].split(',')
+        else:
+            values = [self.cleaned_data['value']]
+
+        final_values = []
+        controller_val_type = type(component.controller.default_value)
+        for val in values:
+            val = val.strip()
+            if controller_val_type == 'bool':
+                if val.lower() in ('0', 'false', 'none', 'null'):
+                    final_val = False
+                else:
+                    final_val = True
+            else:
+                try:
+                    final_val = controller_val_type(val)
+                except:
+                    self.add_error(
+                        'value', f"{val} bad value type for selected component."
+                    )
+                    continue
+            try:
+                component.controller._validate_val(final_val, BEFORE_SET)
+            except Exception as e:
+                self.add_error(
+                    'value', f"{val} is not compatible with selected component."
+                )
+                continue
+            final_values.append(final_val)
+
+        if self.cleaned_data['op'] == 'in':
+            self.cleaned_data['value'] = ', '.join(str(v) for v in final_values)
+        else:
+            self.cleaned_data['value'] = final_values[0]
+
+        return self.cleaned_data
+
+
+class PresenceLightingConfigForm(BaseComponentForm):
+    lights = forms.ModelMultipleChoiceField(
+        Component.objects.filter(
+            base_type__in=('switch', 'dimmer', 'rgbw-light', 'rgb-light')
+        ),
+        required=True,
+        widget=autocomplete.ModelSelect2Multiple(
+            url='autocomplete-component', attrs={'data-html': True},
+            forward=(
+                forward.Const(['switch', 'dimmer', 'rgbw-light', 'rgb-light'],
+                              'base_type'),
+            )
+        )
+    )
+    on_value = forms.IntegerField(
+        min_value=0, initial=100,
+        help_text="Value applicable for dimmers. "
+                  "Switches will receive tunrn on command."
+    )
+    off_value = forms.TypedChoiceField(
+        coerce=int, initial=1, choices=(
+            (0, "0"), (1, "Original value before turning the lights on.")
+        )
+    )
+    presence_sensors = forms.ModelMultipleChoiceField(
+        Component.objects.filter(base_type='binary-sensor'),
+        required=True,
+        widget=autocomplete.ModelSelect2Multiple(
+            url='autocomplete-component', attrs={'data-html': True},
+            forward=(forward.Const(['binary-sensor'], 'base_type'),)
+        )
+    )
+    act_on = forms.TypedChoiceField(
+        coerce=int, initial=0, choices=(
+            (0, "At least one sensor detects presence"),
+            (1, "All sensors detect presence"),
+        )
+    )
+    hold_time = forms.TypedChoiceField(
+        initial=3, coerce=int, required=False, choices=(
+            (0, '----'),
+            (1, "10 s"), (2, "20 s"), (3, "30 s"), (4, "40 s"), (5, "50 s"),
+            (6, "1 min"), (9, "1.5 min"), (12, "2 min"), (18, "3 min"),
+            (30, "5 min"), (60, "10 min"), (120, "20 min"),
+        ),
+        help_text="Hold off time after last presence detector is deactivated."
+    )
+    conditions = FormsetField(
+        formset_factory(
+            ConditionForm, can_delete=True, can_order=True, extra=0
+        ), label='Additional conditions'
+    )
+    log = forms.CharField(
+        widget=forms.HiddenInput, required=False
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            prefix = get_script_prefix()
+            if prefix == '/':
+                prefix = ''
+            self.fields['log'].widget = LogOutputWidget(
+                prefix + '/ws/log/%d/%d/' % (
+                    ContentType.objects.get_for_model(Component).id,
+                    self.instance.id
+                )
+            )
+
+
+
+
+
 class ThermostatConfigForm(BaseComponentForm):
     temperature_sensor = forms.ModelChoiceField(
         Component.objects.filter(
@@ -270,7 +409,6 @@ class AlarmGroupConfigForm(BaseComponentForm):
     )
     has_alarm = False
 
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         from .controllers import AlarmGroup
@@ -281,9 +419,10 @@ class AlarmGroupConfigForm(BaseComponentForm):
                     config__is_main=True
                 ).count()
             )
-            self.fields['is_main'].initial = first_alarm_group
-            if first_alarm_group:
-                self.fields['is_main'].widget.attrs['disabled'] = 'disabled'
+            if 'is_main' in self.fields:
+                self.fields['is_main'].initial = first_alarm_group
+                if first_alarm_group:
+                    self.fields['is_main'].widget.attrs['disabled'] = 'disabled'
         else:
             if self.instance.config.get('is_main'):
                 self.fields['is_main'].widget.attrs['disabled'] = 'disabled'

simo/generic/gateways.py

@@ -136,14 +136,22 @@ class ScriptRunHandler(multiprocessing.Process):
         sys.stderr = StreamToLogger(self.logger, logging.ERROR)
         self.component.value = 'running'
         self.component.save(update_fields=['value'])
-        code = self.component.config.get('code')
-        if not code:
-            self.component.value = 'finished'
-            self.component.save(update_fields=['value'])
-            return
+
+        if hasattr(self.component.controller, '_run'):
+            def run_code():
+                self.component.controller._run()
+        else:
+            code = self.component.config.get('code')
+            def run_code():
+                exec(code, globals())
+
+            if not code:
+                self.component.value = 'finished'
+                self.component.save(update_fields=['value'])
+                return
         print("------START-------")
         try:
-            exec(code, globals())
+            run_code()
         except:
             print("------ERROR------")
             self.component.value = 'error'
@@ -259,7 +267,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         # as well as those who are designed to be kept alive, but
         # got terminated unexpectedly
         for script in Component.objects.filter(
-            controller_uid=Script.uid,
+            base_type='script',
         ).filter(
             Q(config__autostart=True) |
             Q(value='error', config__keep_alive=True)
@@ -302,6 +310,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
         if isinstance(component.controller, Script):
             if payload.get('set_val') == 'start':
+                print("START THIS SCRIPT!!!", component)
                 self.start_script(component)
             elif payload.get('set_val') == 'stop':
                 self.stop_script(component)

simo/users/api.py

@@ -35,7 +35,9 @@ class UsersViewSet(mixins.RetrieveModelMixin,
             email__in=('system@simo.io', 'device@simo.io')
         ) # Exclude system user
 
-        return queryset.filter(roles__instance=self.instance)
+        return queryset.filter(
+            Q(roles__instance=self.instance) | Q(id=self.request.user.id)
+        )
 
 
     def check_permission_to_change(self, request, target_user):

simo/users/serializers.py

@@ -24,11 +24,12 @@ class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
         fields = (
-            'id', 'email', 'name', 'avatar', 'role', 'is_active',
+            'id', 'email', 'name', 'avatar', 'role', 'is_master', 'is_active',
             'at_home', 'last_action'
         )
         read_only_fields = (
-            'id', 'email', 'name', 'avatar', 'at_home', 'last_action', 'ssh_key'
+            'id', 'email', 'name', 'avatar', 'at_home', 'last_action', 'ssh_key',
+            'is_master'
         )
 
     def get_is_active(self, obj):

{simo-2.0.35.dist-info → simo-2.0.38.dist-info}/METADATA

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

{simo-2.0.35.dist-info → simo-2.0.38.dist-info}/RECORD

@@ -34,11 +34,11 @@ simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=yqbIZqBksrAkEuHRbt6iExwPDDy0K5II2NzRCkmOvMU,589
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=Z_sXPaehJcOS8Zz1UZZ2n7-1cjx3_B9dVjHBQHgjtTc,27281
+simo/core/controllers.py,sha256=oPyAKJjPMQFP-gz5V0aDfIxs__6v3b90DocX3R-8wjM,27639
 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=VoNKoLDR7AAJWHiEUTT8tYcNoVwZh4XxX1-lZEoRzpI,23688
+simo/core/forms.py,sha256=f0_qnyrIem9yj5BKDAenzG5XK_tW7PGKWLuLKb3wPgg,24252
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=Qdg2-Qh4dLbW0A5Dmtnpct6CUhEuuvdbIskBijQxopU,2360
@@ -46,7 +46,7 @@ simo/core/middleware.py,sha256=pO52hQOJV_JRmNyUe7zfufSnJFlRITOWX6jwkoPWJhk,2052
 simo/core/models.py,sha256=W5rShDy8l6GQzTRFiBZFAuibe_fg_LRwSNk973mv_m8,20134
 simo/core/permissions.py,sha256=yqVXq6SNZccSKcOoGdb0oh-WHsyTTtI9ovJdJyhjv28,2707
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=dbQ78K9ePBChFPjJHXGj8BkqXQfIFcfFpOtcupGUuz8,18337
+simo/core/serializers.py,sha256=7iE5_ke56GpcQ_cV6LgQIsfG3pAQXPc3t4e60HwogUs,18277
 simo/core/signal_receivers.py,sha256=C6Jk7wVEtyo4hwcrU7L0ijtpK0wce2MNwpyBgSfSJ-U,5467
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
@@ -57,7 +57,7 @@ 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=1OisxqtyWMbzpgeeu5vtBW3gp3Nts4Ei4ff1P-SPpq4,13545
-simo/core/__pycache__/api.cpython-38.pyc,sha256=RsMxUiiMEEXsSh2fBbrkjsIUOKUy81dmN9_20SB7CR8,19942
+simo/core/__pycache__/api.cpython-38.pyc,sha256=YBk4BVAMxAkShEyWgeTkHtTpr4P-tMwrTQI5TTP7vFE,19968
 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
@@ -65,11 +65,11 @@ simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=SVl4fF0-yiq7e9gt08jIM6_rL4
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
 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=HX7XcVpmNkqM8gVnWru43nmrkR5B9tlgWdZrosCaRjE,23978
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=Rsmre6XaYAbQH4aHHs6c-9EgmEZ8SyHm9Y7FYEteTpM,24542
 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=69AqXKv_0SgFX_m6PCC1VdBEGjgGz-kkBTCaxIQZ0t0,19936
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=ksJVqk2X2XV1SmWFeEP2DStU1wvPQ7GaKO0CaFj_pTE,20465
 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=ObkzRjSOs2UQmjwFWDvZHreNzc_P5k7dVA_f7L7S7Q4,2529
@@ -77,11 +77,11 @@ simo/core/__pycache__/middleware.cpython-38.pyc,sha256=ESR5JPtITo9flczO0672sfzYU
 simo/core/__pycache__/models.cpython-38.pyc,sha256=UNX6Btm5ZnpLzSCWgevQnSYzAyDWttA2Ivy7CGPu8DU,17288
 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=ltj2lqyqt2ctV6svTQ_VkTmq_aOx8iPhTdu5QQhScdk,17213
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=8QlBSWOtgmhTpFbMMgGoXtMoTMETSnpA37z2LBgRzNQ,17178
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=UcKT8RK_14CI-JEWfplnIxskmWec_w5-gqKUXITLDA4,4323
 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=7qQsnj1VkWTrYQNwfXH8SKkiaXBQteibciubKWPClXU,9139
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=yt2G8HPIkx1Djz4oVBfhUW9WOR9GOdxLhHFXViQJc6A,9139
 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
@@ -10149,12 +10149,13 @@ simo/core/utils/config_values.py,sha256=4HCQmv5wQdupd16WOp80oJSyU7EDccjUO6blX--d
 simo/core/utils/easing.py,sha256=N2NwD0CjLh82RGaYJKjyt-VVpVeS9z0mba8fqr8A1t0,1499
 simo/core/utils/form_fields.py,sha256=UOzYdPd71qgCw1H3qH01u85YjrOlETPJAHOJrZKhyD0,627
 simo/core/utils/form_widgets.py,sha256=Zxn9jJqPle9Q_BKNJnyTDn7MosYwNp1TFu5LoKs0bfc,408
-simo/core/utils/formsets.py,sha256=1u34QGZ2P67cxZD2uUJS3lAf--E8XsiiqFmZ4P41Vw4,6463
+simo/core/utils/formsets.py,sha256=ZpExLsnDihnrlsPfYQrwy5qx54IowEmL8hnlO7KlyqE,6924
 simo/core/utils/helpers.py,sha256=TOWy3slspaEYEhe9zDcb0RgzHUYslF6LZDlrWPGSqUI,3791
 simo/core/utils/json.py,sha256=x3kMiiK30vuyWSYfghLVsDKo0N2JlCxZ5n8cwel85Vk,464
 simo/core/utils/logs.py,sha256=Zn9JQxqCH9Odx2J1BWT84nFCfkJ4Z4p5X8psdll7hNc,2366
 simo/core/utils/mixins.py,sha256=X6kUPKAi_F-uw7tgm8LEaYalBXpvDA-yrLNFCGr2rks,259
 simo/core/utils/model_helpers.py,sha256=3IzJeOvBoYdUJVXCJkY20npOZXPjNPAiEFvuT0OPhwA,884
+simo/core/utils/operations.py,sha256=W234NEetDnMWP7_tvxJq5CWo_rT6Xhe4Cw7n9-VOpyU,176
 simo/core/utils/relay.py,sha256=i1xy_nPTgY5Xn0l2W4lNI3xeVUpDQTUUfV3M8h2DeBg,457
 simo/core/utils/serialization.py,sha256=v0HLQ98r3zOlsf6dv6S4WxOEt6BzmFz2eTXa_iuKjSM,2057
 simo/core/utils/type_constants.py,sha256=xR2HXZOw9GZhC47iO1Py5B8mpaQMPbzvqX5nHWakhsY,4116
@@ -10166,12 +10167,13 @@ simo/core/utils/__pycache__/config_values.cpython-38.pyc,sha256=fqTVDhkjaWFv14Pr
 simo/core/utils/__pycache__/easing.cpython-38.pyc,sha256=LupxHv19OiBqL0VXmTbMCtAOpgvBpq_b0XwLU8El-Jk,2137
 simo/core/utils/__pycache__/form_fields.cpython-38.pyc,sha256=nBk6k9aj6BpWwdkpceIXdl5NU0fB6NPFhSBPaA-VtPs,1252
 simo/core/utils/__pycache__/form_widgets.cpython-38.pyc,sha256=MYAYEq0I4P0WErG9FamTJYWue7-cPartAWbFAiSSg5w,908
-simo/core/utils/__pycache__/formsets.cpython-38.pyc,sha256=10Fe8s0Wx2ISyuKt9TX0rg7_vbFneV0Hvjbj8V4VIqA,4637
+simo/core/utils/__pycache__/formsets.cpython-38.pyc,sha256=vwlFLdQ2bpZgXNUpekhtapwfouNPCIRo-SMrgOdAIMA,4813
 simo/core/utils/__pycache__/helpers.cpython-38.pyc,sha256=jTGaN7kSJRwouP0EuYSaiJeMylo_RzJwSm-DKRwceHA,4291
 simo/core/utils/__pycache__/json.cpython-38.pyc,sha256=akSSiSUOnza4N15GAH399gTz-X8x-5gijxZdjZoPz5Q,504
 simo/core/utils/__pycache__/logs.cpython-38.pyc,sha256=BVVeQoOhfRHm3SHnCoE1d5G84kTpJZFmr_btc3jDYTU,2156
 simo/core/utils/__pycache__/mixins.cpython-38.pyc,sha256=8Js2T7jVQ7hugRUIRu3rdxW86dJW4KeUUWqKqSkIGb0,615
 simo/core/utils/__pycache__/model_helpers.cpython-38.pyc,sha256=QzO0rh1NuQePHDCSLmUCRrAZEnV4o8jh9CF_jp7IoUo,1351
+simo/core/utils/__pycache__/operations.cpython-38.pyc,sha256=1BUP7gbpBgX7mwWLpkmRH0eXgisbjn-6TIa8VDPj6v8,381
 simo/core/utils/__pycache__/relay.cpython-38.pyc,sha256=gs4iN9TWBo_JIW07emIggIcv6gHKuOY_4jfmAFhuL3k,697
 simo/core/utils/__pycache__/serialization.cpython-38.pyc,sha256=9nTbzozDi8Avl6krHvAo67CLdiTrYW0ij3hQtucHty0,1338
 simo/core/utils/__pycache__/type_constants.cpython-38.pyc,sha256=bEMvzkBxzc6MKq6gn9A6wszXzMjLTbX-V-IK4NMht8E,3363
@@ -10183,7 +10185,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=WCqOA5Qrn9RavdfcB8X06WwaTE-9TGUprTQHZ8V8-nA,23172
-simo/fleet/forms.py,sha256=Kvw-MG-3mI4OIPwo0uiJ_1E5QX3eIr8WR1_U2ggO3U0,43697
+simo/fleet/forms.py,sha256=VVjFlWfU2jSfRp8CW9ntEd21Mr272LacRokzMon-YdU,48870
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=bD5AebGFCAYGXPYhTA2nK1X9KpMG4WK4zFk9OzBDoHI,15301
@@ -10199,11 +10201,11 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEEP5RFh6U6TGKyXDdiOE,565
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=IInB1lBX4uFj1ZDyzCJEDABPXWTMwUpKBczkoJyj4SI,19842
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=aW_L2Q8y7YACrV6wlO3_JL-Id_16biEkXT_BAPnqzHg,31617
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=TN3yvfZJgS7FwzgP4S1aDoaOqxbKj2oXfXOxqbkIXJU,19856
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=0js770XdKp9PePLN-az0TLnpbfWE6u2Lwr8_sbfqOow,33943
 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=dQ5Fj9nXg7vgFfACzxWurhqGw8EnYa9Px7SwmGiAih4,12904
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=LjcLsSytCQd17xhH-5RrzvnZ6JYI1ilvNdCY2iUCsGc,12935
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=9ljhwoHkolcVrJwOVbYCbGPAUKgALRwor_M3W_K0adE,3173
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=0-WhvzVsVJ5A_AgoKnWKOJjoJioLDNsYX4C6bGJANwQ,13551
@@ -10285,18 +10287,18 @@ simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6Rn
 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=NPHNg_8BPTIJt-DR0-GkNWgVo9bE0_50PUWSnpIE4Dg,24262
-simo/generic/gateways.py,sha256=RcHubz3oyY_ysPLNPLRoyh8C6r-WfPzpD98OVkDvPPI,17731
+simo/generic/controllers.py,sha256=qbcKSrKLvi4DCN4Tt1GpHMScVSGz0snQRRuWi4_-r_s,55823
+simo/generic/forms.py,sha256=FVhQ-buK6vUp7x7PADWo31pPVtHWgBMgshnyH-CN8wI,29239
+simo/generic/gateways.py,sha256=dZQPzO23UbW9q4dEB9fqgt9Meg8mX94euXnRvfwxusY,18004
 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=du8pawGkAyGP51Cb6uWgvVLx48JZKNkVCdOpRmqQFaA,17915
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=IbRdwj0oIUyyuR-AOlaPmEwKXr5utWf0LsLTN-HHSuI,12962
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=6WhWx_QaWrYV_WqU5coEp9VFR11DxJVjPGTrhcUoYQ4,35583
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=LsYmGecSEdOnWnskBoTktLEUfYYKWMtd40lIGHbS-ZY,21207
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=B35GiB4wBRzvd91ugL89Z3vYADiLiERP0T-21CnLqKc,13324
 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
@@ -10372,14 +10374,14 @@ 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=6RKGnwcrmewJFPzpqnxYn8rxjHO4tJPVFJvA3eMum2s,6746
-simo/users/api.py,sha256=FVo2bHkGA9VKavyjQm8_wfvI5rQ5KcMZliRiTJjixmI,9462
+simo/users/api.py,sha256=vf11fV8ZCao3Q2TdUO8mDTF3n0N3JYad7CUhz7_ZrZQ,9516
 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
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
 simo/users/models.py,sha256=I_iAa-6CLORshmGszSl021zl97oaXNIEOZYMSq5Wn5M,18902
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
-simo/users/serializers.py,sha256=e6yIUsO7BfvrZ4IQHBn-FdpAUMgic5clmGQdTtRlGRY,2515
+simo/users/serializers.py,sha256=DwbFGi4WeTYXOSnfrBfd5rC5OGtevYurn27EaTVa1EU,2553
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
 simo/users/sso_views.py,sha256=-XI67TvQ7SN3goU4OuAHyn84u_1vtusvpn7Pu0K97zo,4648
 simo/users/tasks.py,sha256=v9J7t4diB0VnqUDVZAQ8H-rlr4ZR14bgEUuEGpODyOI,854
@@ -10387,14 +10389,14 @@ simo/users/utils.py,sha256=7gU_TDnAOsDYqJM0CFo8efPah2bTXfGpXxRqzD5RiSs,1270
 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=53Do-W6tvaOUPJ1BDx0abBbtvmQxAgdI2ShlqmYfUvI,7500
-simo/users/__pycache__/api.cpython-38.pyc,sha256=4Fmi4fvgQqc8bM1lyQFVN3nKyWol9RgnUvy7YSNhwuE,8256
+simo/users/__pycache__/api.cpython-38.pyc,sha256=GcGFVxv0GUcH-TVdvj3v3hty1snKJw3O3-f4PM8DIyM,8305
 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
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
 simo/users/__pycache__/models.cpython-38.pyc,sha256=D5N0lYn3U9jt0M8-Xiz94DbiPuJefZQ9AUFJqKrYmsg,17562
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
-simo/users/__pycache__/serializers.cpython-38.pyc,sha256=ylapsfu5qbSzbfX2lG3uc4wV6hhndFbIvI109lhhKOo,3461
+simo/users/__pycache__/serializers.cpython-38.pyc,sha256=tZzdmCdSnqekAgRl0kyq-msm7QfUA0J_IipfrysAMRM,3477
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
 simo/users/__pycache__/sso_views.cpython-38.pyc,sha256=sHEoxLOac3U3Epmhm197huFnW_J3gGCDZSji57itijU,3969
 simo/users/__pycache__/tasks.cpython-38.pyc,sha256=xq-XaJ5gzkpVVZRWe0bvGdA31Eh_WS2rKSY62p4eY5E,1111
@@ -10466,8 +10468,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.35.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.35.dist-info/METADATA,sha256=K3eQYM55-6gro2zNR8B_egdy6IPqogizV_qnB1CTwR0,1730
-simo-2.0.35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.35.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.35.dist-info/RECORD,,
+simo-2.0.38.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.38.dist-info/METADATA,sha256=lSORUFdH9kvVvxyK_3k0swsm7DHyYLhjUmxM_WTAFF8,1730
+simo-2.0.38.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.38.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.38.dist-info/RECORD,,