simo 2.5.8__py3-none-any.whl → 2.5.9__py3-none-any.whl

simo/core/form_fields.py

@@ -26,10 +26,11 @@ class LazyChoicesMixin:
         return obj
 
     def optgroups(self, name, value, attrs=None):
-        for (val, display) in self.choices:
-            if val == value[0]:
-                self.choices = [(val, display)]
-                break
+        if len(value) == 2:
+            for (val, display) in self.choices:
+                if val == value[0]:
+                    self.choices = [(val, display)]
+                    break
         return super().optgroups(name, value, attrs)
 
 
@@ -67,7 +68,7 @@ class Select2ListChoiceField(Select2ListMixin, forms.ChoiceField):
 
 class Select2MultipleMixin:
 
-    def __init__(self, url, forward=None, *args, **kwargs):
+    def __init__(self, url=None, forward=None, *args, **kwargs):
         self.url = url
         self.forward = []
         if forward:
@@ -76,9 +77,9 @@ class Select2MultipleMixin:
         widget = Select2Multiple(
             url=url, forward=forward, attrs={'data-html': True}
         )
-        widget.choices = kwargs.pop('choices', None)
+        widget.choices = kwargs.pop('choices', [])
 
-        super().__init__(widget, *args, **kwargs)
+        super().__init__(widget=widget, *args, **kwargs)
 
 
 class Select2ModelMultipleChoiceField(

simo/core/forms.py

@@ -13,6 +13,7 @@ from dal import autocomplete
 from .models import (
     Icon, Category, Gateway, Component
 )
+from .form_fields import Select2ModelMultipleChoiceField
 from .widgets import SVGFileWidget, LogOutputWidget
 from .utils.formsets import FormsetField
 from .utils.validators import validate_slaves
@@ -459,19 +460,17 @@ class MultiSensorConfigForm(BaseComponentForm):
 
 
 class SwitchForm(BaseComponentForm):
-    slaves = forms.ModelMultipleChoiceField(
-        required=False,
+    slaves = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(
             base_type__in=(
                 'dimmer', 'switch', 'blinds', 'script'
             )
         ),
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(forward.Const(
-                ['dimmer', 'switch', 'blinds', 'script'], 'base_type'),
-            )
-        )
+        url='autocomplete-component',
+        forward=(forward.Const(
+            ['dimmer', 'switch', 'blinds', 'script'], 'base_type'),
+        ),
+        required=False
     )
 
     def __init__(self, *args, **kwargs):
@@ -596,29 +595,18 @@ class DimmerConfigForm(BaseComponentForm):
         initial=0.0, help_text="Minimum component value."
     )
     max = forms.FloatField(
-        initial=1.0, help_text="Maximum component value."
+        initial=100.0, help_text="Maximum component value."
     )
     value_units = forms.CharField(required=False)
-    inverse = forms.BooleanField(
-        label=_("Inverse dimmer signal"), required=False
-    )
-    slaves = forms.ModelMultipleChoiceField(
-        required=False,
+    slaves = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(
             base_type__in='dimmer',
         ),
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(forward.Const(['dimmer', ], 'base_type'),)
-        )
+        url='autocomplete-component',
+        forward=(forward.Const(['dimmer', ], 'base_type'),),
+        required=False
     )
 
-    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()
-
     def clean_slaves(self):
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
@@ -626,7 +614,7 @@ class DimmerConfigForm(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/models.py

@@ -78,7 +78,8 @@ class Instance(DirtyFieldsMixin, models.Model, SimoAdminMixin):
     )
     location = PlainLocationField(null=True, blank=True, zoom=7)
     timezone = models.CharField(
-        max_length=50, db_index=True, choices=ALL_TIMEZONES_CHOICES
+        max_length=50, db_index=True, choices=ALL_TIMEZONES_CHOICES,
+        default='UTC'
     )
     units_of_measure = models.CharField(
         max_length=100, default='metric',

simo/core/serializers.py

@@ -13,8 +13,8 @@ from rest_framework.relations import Hyperlink, PKOnlyObject
 from actstream.models import Action
 from simo.core.forms import HiddenField, FormsetField
 from simo.core.form_fields import (
-    Select2ListChoiceField, Select2ListChoiceField,
-    Select2ModelChoiceField, Select2ListMultipleChoiceField
+    Select2ListChoiceField, Select2ModelChoiceField,
+    Select2ListMultipleChoiceField, Select2ModelMultipleChoiceField
 )
 from simo.core.models import Component
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
@@ -273,6 +273,7 @@ class ComponentSerializer(FormSerializer):
             Select2ModelChoiceField: ComponentPrimaryKeyRelatedField,
             forms.ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
+            Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
         }
 

simo/core/tasks.py

@@ -403,7 +403,6 @@ def restart_postgresql():
 
 @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.filter(is_active=True):
         timezone.activate(instance.timezone)

simo/fleet/forms.py

@@ -8,7 +8,7 @@ from dal import autocomplete
 from dal import forward
 from simo.core.models import Component
 from simo.core.forms import (
-    BaseComponentForm, ValueLimitForm, NumericSensorForm, SwitchForm
+    BaseComponentForm, ValueLimitForm, NumericSensorForm
 )
 from simo.core.utils.formsets import FormsetField
 from simo.core.widgets import LogOutputWidget
@@ -16,7 +16,10 @@ from simo.core.utils.easing import EASING_CHOICES
 from simo.core.utils.validators import validate_slaves
 from simo.core.utils.admin import AdminFormActionForm
 from simo.core.events import GatewayObjectCommand
-from simo.core.form_fields import Select2ModelChoiceField, Select2ListChoiceField
+from simo.core.form_fields import (
+    Select2ModelChoiceField, Select2ListChoiceField,
+    Select2ModelMultipleChoiceField
+)
 from .models import Colonel, ColonelPin, Interface
 from .utils import INTERFACES_PINS_MAP, get_all_control_input_choices
 
@@ -654,19 +657,16 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
                   "given amount of seconds after every turn on event."
     )
     inverse = forms.BooleanField(required=False)
-    slaves = forms.ModelMultipleChoiceField(
-        required=False,
+    slaves = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(
             base_type__in=(
                 'dimmer', 'switch', 'blinds', 'script'
             )
         ),
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(forward.Const(
-                ['dimmer', 'switch', 'blinds', 'script'], 'base_type'),
-            )
-        )
+        url='autocomplete-component',
+        forward=[
+            forward.Const(['dimmer', 'switch', 'blinds', 'script'], 'base_type')
+        ]
     )
 
     controls = FormsetField(
@@ -775,15 +775,13 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         help_text="ON value when used with toggle switch"
     )
 
-    slaves = forms.ModelMultipleChoiceField(
-        required=False,
+    slaves = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(
             base_type__in=('dimmer', ),
         ),
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(forward.Const(['dimmer', ], 'base_type'),)
-        )
+        url='autocomplete-component',
+        forward=(forward.Const(['dimmer', ], 'base_type'),),
+        required=False
     )
     controls = FormsetField(
         formset_factory(
@@ -1412,16 +1410,13 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
 
 class TTLockConfigForm(ColonelComponentForm):
 
-    door_sensor = forms.ModelChoiceField(
-        Component.objects.filter(base_type='binary-sensor'),
-        required=False,
-        help_text="Quickens up lock status reporting on open/close if provided.",
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const(['binary-sensor'], 'base_type'),
-            )
-        )
+    door_sensor = Select2ModelChoiceField(
+        queryset=Component.objects.filter(base_type='binary-sensor'),
+        url='autocomplete-component',
+        forward=(
+            forward.Const(['binary-sensor'], 'base_type'),
+        ), required=False,
+        help_text="Quickens up lock status reporting on open/close if provided."
     )
 
     def clean(self):
@@ -1591,18 +1586,16 @@ class DaliGearGroupForm(DALIDeviceConfigForm, BaseComponentForm):
         help_text="If provided, group will be turned off after "
                   "given amount of seconds after last turn on event."
     )
-    members = forms.ModelMultipleChoiceField(
-        Component.objects.filter(
+    members = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
             controller_uid='simo.fleet.controllers.DALILamp',
         ),
         label="Members", required=True,
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const(
-                    ['simo.fleet.controllers.DALILamp', ], 'controller_uid'
-                ),
-            )
+        url='autocomplete-component',
+        forward=(
+            forward.Const(
+                ['simo.fleet.controllers.DALILamp', ], 'controller_uid'
+            ),
         )
     )
     on_value = forms.FloatField(

simo/generic/controllers.py

@@ -6,6 +6,7 @@ import json
 import requests
 import traceback
 import sys
+import random
 from bs4 import BeautifulSoup
 from django.core.exceptions import ValidationError
 from django.utils import timezone
@@ -43,7 +44,7 @@ from .app_widgets import (
 from .forms import (
     ScriptConfigForm, PresenceLightingConfigForm,
     ThermostatConfigForm, AlarmGroupConfigForm,
-    IPCameraConfigForm, WeatherForecastForm, GateConfigForm,
+    IPCameraConfigForm, WeatherForecastForm,
     WateringConfigForm, StateSelectForm,
     AlarmClockConfigForm
 )
@@ -155,11 +156,17 @@ class PresenceLighting(Script):
     light_org_values = {}
     is_on = False
     turn_off_task = None
+    last_presence = 0
 
     def _run(self):
         while True:
             self._on_sensor()
-            time.sleep(10)
+            hold_time = self.component.config.get('hold_time', 0) * 10
+            if self.last_presence and hold_time and (
+                time.time() - hold_time > self.last_presence
+            ):
+                self._turn_it_off()
+            time.sleep(random.randint(5, 15))
 
     def _on_sensor(self, sensor=None):
 
@@ -180,6 +187,9 @@ class PresenceLighting(Script):
         else:
             must_on = all(presence_values)
 
+        if sensor and must_on:
+            print("Presence detected!")
+
         additional_conditions_met = True
         for condition in self.component.config.get('conditions', []):
             if not additional_conditions_met:
@@ -198,17 +208,13 @@ class PresenceLighting(Script):
                 continue
 
             if not op(comp.value, condition['value']):
+                if sensor and must_on:
+                    print(f"Condition not met: [{comp} value:{comp.value} {condition['op']} {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()
@@ -224,16 +230,13 @@ class PresenceLighting(Script):
             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
-                    )
+                if not self.last_presence:
+                    self.last_presence = time.time()
 
     def _turn_it_off(self):
         print("Turn the lights OFF!")
         self.is_on = False
-        self.turn_off_task = None
+        self.last_presence = 0
         for id in self.component.config['lights']:
             comp = Component.objects.filter(id=id).first()
             if not comp or not comp.controller:

simo/generic/forms.py

@@ -16,7 +16,10 @@ from simo.core.utils.config_values import config_to_dict
 from simo.core.utils.formsets import FormsetField
 from simo.core.utils.helpers import get_random_string
 from simo.core.utils.form_fields import ListSelect2Widget
-from simo.conf import dynamic_settings
+from simo.core.form_fields import (
+    Select2ModelChoiceField, Select2ListChoiceField,
+    Select2ModelMultipleChoiceField
+)
 
 
 ACTION_METHODS = (
@@ -134,11 +137,9 @@ class ScriptConfigForm(BaseComponentForm):
 
 
 class ConditionForm(forms.Form):
-    component = forms.ModelChoiceField(
-        Component.objects.all(),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-        ),
+    component = Select2ModelChoiceField(
+        queryset=Component.objects.all(),
+        url='autocomplete-component',
     )
     op = forms.ChoiceField(
         initial="==", choices=(
@@ -200,19 +201,18 @@ class ConditionForm(forms.Form):
 
 
 class PresenceLightingConfigForm(BaseComponentForm):
-    lights = forms.ModelMultipleChoiceField(
-        Component.objects.filter(
+    lights = Select2ModelMultipleChoiceField(
+        queryset=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'),
-            )
+        url='autocomplete-component',
+        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. "
@@ -223,13 +223,13 @@ class PresenceLightingConfigForm(BaseComponentForm):
             (0, "0"), (1, "Original value before turning the lights on.")
         )
     )
-    presence_sensors = forms.ModelMultipleChoiceField(
-        Component.objects.filter(base_type='binary-sensor'),
+    presence_sensors = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
+            base_type__in=('binary-sensor', 'switch')
+        ),
         required=True,
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(forward.Const(['binary-sensor'], 'base_type'),)
-        )
+        url='autocomplete-component',
+        forward=(forward.Const(['binary-sensor', 'switch'], 'base_type'),)
     )
     act_on = forms.TypedChoiceField(
         coerce=int, initial=0, choices=(
@@ -263,6 +263,8 @@ class PresenceLightingConfigForm(BaseComponentForm):
         widget=forms.HiddenInput, required=False
     )
 
+    app_exclude_fields = ('alarm_category', 'code', 'log')
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.basic_fields.extend(
@@ -280,46 +282,53 @@ class PresenceLightingConfigForm(BaseComponentForm):
                 )
             )
 
+    def save(self, commit=True):
+        obj = super().save(commit)
+        if commit:
+            obj.controller.stop()
+            if self.cleaned_data.get('keep_alive') \
+                    or self.cleaned_data.get('autostart'):
+                time.sleep(2)
+                obj.controller.start()
+        return obj
+
 
 class ThermostatConfigForm(BaseComponentForm):
-    temperature_sensor = forms.ModelChoiceField(
-        Component.objects.filter(
+    temperature_sensor = Select2ModelChoiceField(
+        queryset=Component.objects.filter(
             base_type__in=(
                 NumericSensor.base_type,
                 MultiSensor.base_type
             )
         ),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([
-                    NumericSensor.base_type,
-                    MultiSensor.base_type
-                ], 'base_type'),
-            )
+        url='autocomplete-component',
+        forward=(
+            forward.Const([
+                NumericSensor.base_type,
+                MultiSensor.base_type
+            ], 'base_type'),
         )
     )
-    heater = forms.ModelChoiceField(
-        Component.objects.filter(base_type=Switch.base_type),
-        required=False, widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([
-                    Switch.base_type,
-                ], 'base_type'),
-            )
+    heater = Select2ModelChoiceField(
+        queryset=Component.objects.filter(base_type=Switch.base_type),
+        required=False,
+        url='autocomplete-component',
+        forward=(
+            forward.Const([
+                Switch.base_type,
+            ], 'base_type'),
         )
     )
-    cooler = forms.ModelChoiceField(
-        Component.objects.filter(base_type=Switch.base_type),
-        required=False, widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([
-                    Switch.base_type,
-                ], 'base_type'),
-            )
+    cooler = Select2ModelChoiceField(
+        queryset=Component.objects.filter(base_type=Switch.base_type),
+        required=False,
+        url='autocomplete-component',
+        forward=(
+            forward.Const([
+                Switch.base_type,
+            ], 'base_type'),
         )
+
     )
     mode = forms.ChoiceField(
         choices=(('heater', "Heater"), ('cooler', "Cooler"), ('auto', "Auto"),),
@@ -368,11 +377,9 @@ class ThermostatConfigForm(BaseComponentForm):
 
 class AlarmBreachEventForm(forms.Form):
     uid = HiddenField(required=False)
-    component = forms.ModelChoiceField(
-        Component.objects.all(),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-        ),
+    component = Select2ModelChoiceField(
+        queryset=Component.objects.all(),
+        url='autocomplete-component',
     )
     breach_action = forms.ChoiceField(
         initial='turn_on', choices=ACTION_METHODS
@@ -413,16 +420,14 @@ class AlarmBreachEventForm(forms.Form):
 
 # TODO: create control widget for admin use.
 class AlarmGroupConfigForm(BaseComponentForm):
-    components = forms.ModelMultipleChoiceField(
-        Component.objects.filter(
+    components = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
             Q(alarm_category__isnull=False) | Q(base_type='alarm-group')
         ),
         required=True,
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const(['security', 'fire', 'flood', 'other'], 'alarm_category'),
-            )
+        url='autocomplete-component',
+        forward=(
+            forward.Const(['security', 'fire', 'flood', 'other'], 'alarm_category'),
         )
     )
     is_main = forms.BooleanField(
@@ -439,28 +444,24 @@ class AlarmGroupConfigForm(BaseComponentForm):
         ),
         help_text="Arm automatically as soon as everybody leaves.<br>"
     )
-    arming_locks = forms.ModelMultipleChoiceField(
-        Component.objects.filter(base_type='lock'),
+    arming_locks = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(base_type='lock'),
         label="Arming locks", required=False,
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const(['lock'], 'base_type'),
-            )
+        url='autocomplete-component',
+        forward=(
+            forward.Const(['lock'], 'base_type'),
         ),
         help_text="Alarm group will get armed automatically whenever "
                   "any of assigned locks changes it's state to locked. <br>"
                   "If Arm on away is enabled and set to work with arming locks, "
                   "arming will take effect only after everybody leaves."
     )
-    disarming_locks = forms.ModelMultipleChoiceField(
-        Component.objects.filter(base_type='lock'),
+    disarming_locks = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(base_type='lock'),
         label="Disarming locks", required=False,
-        widget=autocomplete.ModelSelect2Multiple(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const(['lock'], 'base_type'),
-            )
+        url='autocomplete-component',
+        forward=(
+            forward.Const(['lock'], 'base_type'),
         ),
         help_text="Alarm group will be disarmed automatically whenever "
                   "any of assigned locks changes it's state to unlocked. "
@@ -584,58 +585,20 @@ class WeatherForecastForm(BaseComponentForm):
         return obj
 
 
-class GateConfigForm(BaseComponentForm):
-    open_closed_sensor = forms.ModelChoiceField(
-        Component.objects.filter(base_type=BinarySensor.base_type),
-        label="Open/Closed sensor",
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([BinarySensor.base_type], 'base_type'),
-            )
-        )
-    )
-    action_switch = forms.ModelChoiceField(
-        Component.objects.filter(base_type=Switch.base_type),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([Switch.base_type], 'base_type'),
-            )
-        )
-    )
-    action_method = forms.ChoiceField(
-        required=True, choices=(
-            ('click', "Click"),
-            ('toggle', "Toggle"),
-        ),
-        help_text="Action switch method to initiate move/stop event on "
-                  "your gate."
-    )
-    gate_open_duration = forms.FloatField(
-        label='Gate open duration', min_value=0.01, max_value=360000,
-        initial=30,
-        help_text="Time in seconds it takes for your gate to go "
-                  "from fully closed to fully open."
-    )
-
-
 
 class ContourForm(forms.Form):
     uid = forms.CharField(widget=forms.HiddenInput(), required=False)
     color = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     name = forms.CharField()
-    switch = forms.ModelChoiceField(
-        Component.objects.filter(
+    switch = Select2ModelChoiceField(
+        queryset=Component.objects.filter(
             base_type__in=(Switch.base_type, Dimmer.base_type)
         ),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([Switch.base_type], 'base_type'),
-            )
-        ),
+        url='autocomplete-component',
+        forward=(
+            forward.Const([Switch.base_type], 'base_type'),
+        )
     )
     runtime = forms.IntegerField(
         min_value=0,
@@ -748,11 +711,9 @@ class AlarmClockEventForm(forms.Form):
     uid = HiddenField(required=False)
     enabled = forms.BooleanField(initial=True)
     name = forms.CharField(max_length=30)
-    component = forms.ModelChoiceField(
-        Component.objects.all(),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-        ),
+    component = Select2ModelChoiceField(
+        queryset=Component.objects.all(),
+        url='autocomplete-component'
     )
     play_action = forms.ChoiceField(
         initial='turn_on', choices=ACTION_METHODS

simo/users/api.py

@@ -219,7 +219,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             ).exclude(id=user_device.id).update(is_primary=False)
         user_device.save()
 
-        speed_kmh = 0
+        speed_kmh = request.data.get('speed', 0) * 3.6
         for iu in request.user.instance_roles.filter(is_active=True):
             if location:
                 iu.at_home = haversine_distance(
@@ -228,20 +228,6 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             elif not relay:
                 iu.at_home = True
 
-            if user_device.last_seen_location and iu.last_seen_location \
-            and iu.last_seen > timezone.now() - datetime.timedelta(seconds=30):
-                if user_device.last_seen_location == iu.last_seen_location:
-                    speed_kmh = iu.last_seen_speed_kmh
-                else:
-                    seconds_passed = (timezone.now() - user_device.last_seen).seconds
-                    if not seconds_passed:
-                        speed_kmh = 0
-                    else:
-                        moved_distance = haversine_distance(
-                            iu.last_seen_location, user_device.last_seen_location
-                        )
-                        speed_mps = moved_distance / seconds_passed
-                        speed_kmh = speed_mps * 3.6
             iu.last_seen = user_device.last_seen
             iu.last_seen_location = user_device.last_seen_location
             iu.last_seen_speed_kmh = speed_kmh

{simo-2.5.8.dist-info → simo-2.5.9.dist-info}/METADATA

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

{simo-2.5.8.dist-info → simo-2.5.9.dist-info}/RECORD

@@ -46,20 +46,20 @@ simo/core/controllers.py,sha256=JvXdwXD7iotA7fIjZmBVshKLQGSt9Na48FMAyHRDh84,3561
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=fH6d5HcPdDqT3R7CZPdo69qTszJ23j3GJt3IFOso3WA,4757
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/form_fields.py,sha256=9tIjiEN3IE55GPyB4tOlfkd51JDne3-h8pKhpL3tLFE,2220
-simo/core/forms.py,sha256=nL_trDNs7RLic11zLSen4EobtywGx8igUMYe7Ojuv1k,21988
+simo/core/form_fields.py,sha256=wowWocYgxkKBr0WYzpKn4UvH4ScnImus56Tg2G8OPBc,2274
+simo/core/forms.py,sha256=O40apPH7a4qX4WdCc10A1aoAaGWOpKqmjB8d-OhEKCo,21523
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
 simo/core/middleware.py,sha256=hExD7Vmw7eitk0vAjOwKzkwrtuw8YxpflF92j_CA2YY,3193
-simo/core/models.py,sha256=dqwnGUc-BKefkWx4SfGDhiytP7vxAGFcKOlEXz2VhHA,22594
+simo/core/models.py,sha256=Z6WLvU4K-LWIXghCBwTyZAOW5n2hCFNU-pteiPnpOAQ,22617
 simo/core/permissions.py,sha256=v0iJM4LOeYoEfMiw3OLPYio272G1aUEAg_z9Wd1q5m0,2993
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=Pa2lhJ6VgNalbH4awbKdGJCYAPNsu5WQWfo6Tz6LbOQ,20782
+simo/core/serializers.py,sha256=JoMsGoeeTfnoNSdLPMlx4ZbaFyhtw5Kh4KpbAIUovX8,20869
 simo/core/signal_receivers.py,sha256=qCpzEUv5Bl9--K8fe08GVDmE6EBOj292YBia1TYDdSE,9267
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=6Srcsq1szv7pU74Qp-Y4GUoRjvNPJI81jKsSWxqVcb8,15671
+simo/core/tasks.py,sha256=M86_0KAK95hpfxD-mWLYtWU-6L7rHVkytlINjEdtimI,15632
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=3SRZr00fyLQf8ja3U-9eekKt-ld5TvU1WQqUWprXfQ4,2390
@@ -79,20 +79,20 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=s7onEMtWmHjvTGvWXIbpvWMW
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
 simo/core/__pycache__/events.cpython-38.pyc,sha256=yip7WSyX4pUy2wJE820W4fD7iwoIWGhdHfloFb_N0R8,5257
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/form_fields.cpython-38.pyc,sha256=u0voKXkA64xbH6LY_-jMBHQS4mOJZZeuB9WTvtv9JWE,3433
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=O_mCWAQHAJhiqcKLUina7tIFbw5uXwnLOYlJoWxqUDQ,17918
+simo/core/__pycache__/form_fields.cpython-38.pyc,sha256=phMdhDFRmaFDhJSnasAg8VKNP6PxkPjFqkLwEuWicIs,3465
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=vqU3No0S56V1q1RrY7y5otT-o0p-5qAiffvqECG2Gg8,17525
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-QWZfbkLiLlFOMtdU,4553
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=iOSTXSQl3sEsa-9kx_6w5zbEByRtfzJHT6XkUIYMGdE,2469
-simo/core/__pycache__/models.cpython-38.pyc,sha256=lNpWQXIobV40Pxnq3p5PO8vSE6vX-nFrKARsWlk-76E,18508
+simo/core/__pycache__/models.cpython-38.pyc,sha256=Nw2Fb11EwBdMVTHCpzkY6x0hRNCqRo0RtLNlRxS1VZE,18534
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=fH4iyqd9DdzRLEu2b621-FeM-napR0M7hzBUTHo9Q3g,2972
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=qIHxrurPk555mHc9P8Udg9eGv-ODw1FTmBS_jXrPuws,19220
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=S4eNvJkMZO98FQXgNGbeKBJihG5LXdnhl0tm2tjjXTE,19266
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=lBVca6zNPVn3Ev98ekjPGzBR1MJk4xI19CyMcm4lf6A,7056
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=qQZ1wP3ksyh6c6kmqMtkYxGs-MTTDhaqQDlYfK7vQ7c,10003
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=rhf1RimWBxylGo8nk0orAJ4SqTsLF0OKW2TThpREp54,10472
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=K_QM967bIJeU02DJu0Dm7j8RiFDKn_TLzX77YzNkA7c,2495
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -10222,7 +10222,7 @@ simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=fjri1GtCnflkkDpNqhTwy6i9CK6RDEB0Q_BtADzcG8E,29156
-simo/fleet/forms.py,sha256=XTkQUxce-6VPr7-HRONJnIzWZizeIUeA6DGqqTACInQ,62980
+simo/fleet/forms.py,sha256=344V3bLxXQdHiYzZYnwuKlyvc_6tVz8Z6XbBuSRN88s,62598
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=4ZHiT2yoUv3xnDzsMbPi0Z3DOvYzEfwYZw-jxFlqG30,16884
@@ -10239,7 +10239,7 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwn
 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=jtFHr_uyjCCeuidL-o-hGaf21u0fnxK_O6hTRdY6lpc,24906
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=8ARAilbCnSUjwluL0mmknFcNvBRn8oZ7b2-z8Yer6ns,42498
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=vGc539_6e6-Ap-qVPoHd78p2bThdVidhV8XUzW0wQu8,42296
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=ePD11IHU9AoiufsuwcgaXukCGkNE0dco-JPajXB96c0,13935
@@ -10336,8 +10336,8 @@ simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LS
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=vwYYVRKzKZ9XTvWTfEbaH4zpoHiDIHP6qFTNgZI-xvY,979
 simo/generic/base_types.py,sha256=Bvf3lv6PXx_SwtwBH7qpkwysWuloNcKNRh3LiuZf-Dc,359
-simo/generic/controllers.py,sha256=Xo0ZYQZfhDAwLq9H3uTrHWLj-HeLlxdXJ71dUESd41Y,49263
-simo/generic/forms.py,sha256=nDrvNGbWTE_MSZmSXrKj1bSn-Ylo4w7Y1z-SZRKRYW8,30840
+simo/generic/controllers.py,sha256=kGYdcuU7kpbhb6QeuOo4l-W82Zldh8vpdMnJRMKCkgU,49378
+simo/generic/forms.py,sha256=oAvWeYzLyWiNLRnXGa2124ICRD7GpLwwsF6i6L56HCI,29044
 simo/generic/gateways.py,sha256=dUzRBxVDdsx70mrCvxSQwhJr0ydQ5NtoLHoYeVLJmtA,15224
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
@@ -10345,8 +10345,8 @@ simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=dt7fSf38eDA5hVUvVfpytOKoAFLQJuFffoAfqhJUKNc,1846
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=8YDxrsRFGqaeBfSF3Y1WmIGDRHGH1Ww7dSBkxRxkKyc,511
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=HBZDEFhJAwd6YFWul_sX4OoA1r1m0DK1MLxJk9u70rk,32674
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=JM1UN13391udDpBvNsbZURX5onDhLrOLIun-kISmGac,22078
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=DsxStuB6A2NhZOqx2tcgMisR4Y2Tkkr30PAU45DHiok,32819
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=dJiITb6CUlTPS8qzBOOyRx0Xcj5vQ_xIQXnX27Pvw30,21268
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=IazhRBe-YZ9t7_wq1fULoyLnxn3frR967lAN9D7MbKY,11583
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
@@ -10433,7 +10433,7 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=Xr7faGeupUKkpo1QLRm84OS63u-5Rf2ir_nVEaAPBZw,6839
-simo/users/api.py,sha256=8MpsNiN_Cl8301iEf8KHCmzmmId1mivtSJKEj93y7Uk,12822
+simo/users/api.py,sha256=FdBd3D_TSrTXk1zTPtLTqppbDsf_siTvTHROjWe3Wzo,12066
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=bBSNXQJ88TRXaQxyh1aETfmOIfiDr08Jnj8rSY9sHDk,4074
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
@@ -10450,7 +10450,7 @@ simo/users/utils.py,sha256=1HGSZyHRqQvdJ4RtAiZDg1juvgG8aOlrGXR7CcvsyQc,1886
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=tL8b3f181AjcN2dSsDUPkqjpZziEOtVzI535SbnbDzc,7793
-simo/users/__pycache__/api.cpython-38.pyc,sha256=OF-wQagTY0z45X7pjO7YiYX1kz4jkYagTpLHq1BUyyY,10411
+simo/users/__pycache__/api.cpython-38.pyc,sha256=As8xBUdgmpVeUYCRCR5ZH0aU9vLdEXgnZL6TR3wAhrY,10200
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=n5nx2QSXNj2idzRcGE6bAagMN-8qxoCs580H1EFZXls,3105
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
@@ -10551,9 +10551,9 @@ 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.5.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.8.dist-info/METADATA,sha256=MS1IN9xaTOEDIMAGVtan3qT0-ejhkz04LhraYddcASA,1923
-simo-2.5.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.8.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.8.dist-info/RECORD,,
+simo-2.5.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.9.dist-info/METADATA,sha256=seKSLClAKBnMi8ejXmRi6A8gouqbRobDzkzLi4yiFvc,1923
+simo-2.5.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.9.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.9.dist-info/RECORD,,