simo 2.3.7__py3-none-any.whl → 2.4.2__py3-none-any.whl

simo/fleet/forms.py

@@ -195,17 +195,15 @@ class ControlForm(forms.Form):
 
 
 class ColonelBinarySensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label='Port',
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     inverse = forms.TypedChoiceField(
         choices=((1, "Yes"), (0, "No")), coerce=int, initial=1,
@@ -283,17 +281,15 @@ class ColonelBinarySensorConfigForm(ColonelComponentForm):
 
 
 class ColonelButtonConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     action_method = forms.ChoiceField(
         label="Action method", initial='down',
@@ -322,19 +318,17 @@ class ColonelButtonConfigForm(ColonelComponentForm):
 
 
 class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(adc=True, input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'adc': True, 'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'adc': True, 'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     attenuation = forms.TypedChoiceField(
         initial=0, coerce=int, choices=(
@@ -375,19 +369,17 @@ class ColonelNumericSensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
 
 class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     read_frequency_s = forms.IntegerField(
         initial=60, min_value=1, max_value=60*60*24,
@@ -415,19 +407,17 @@ class DS18B20SensorConfigForm(ColonelComponentForm, NumericSensorForm):
 
 
 class ColonelDHTSensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'native': True, 'input': True}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'native': True, 'input': True}, 'filters'
+            )
+        ]
     )
     sensor_type = forms.TypedChoiceField(
         initial=11, coerce=int, choices=(
@@ -462,18 +452,16 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
 
 
 class BME680SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=118,
@@ -511,18 +499,16 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
 
 class MPC9808SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=24,
@@ -566,18 +552,16 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
 
 class ENS160SensorConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='i2c'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'i2c'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'i2c'}, 'filters'
+            )
+        ]
     )
     i2c_address = forms.TypedChoiceField(
         coerce=int, initial=83,
@@ -616,17 +600,15 @@ class ENS160SensorConfigForm(ColonelComponentForm):
 
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
-    pin = ColonelPinChoiceField(
+    pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(input=True, capacitive=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True, 'capacitive': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True, 'capacitive': True}, 'filters')
+        ]
     )
     threshold = forms.IntegerField(
         min_value=0, max_value=999999999, required=False, initial=1000,
@@ -740,17 +722,15 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
 
 
 class ColonelPWMOutputConfigForm(ColonelComponentForm):
-    output_pin = ColonelPinChoiceField(
+    output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     min = forms.FloatField(
         required=True, initial=0,
@@ -875,17 +855,15 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
 
 class ColonelRGBLightConfigForm(ColonelComponentForm):
-    output_pin = ColonelPinChoiceField(
+    output_pin = Select2ModelChoiceField(
         label="Port",
         queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True, 'native': True}, 'filters')
+        ]
     )
     num_leds = forms.IntegerField(
         label=_("Number of leds"), min_value=1, max_value=2000
@@ -998,17 +976,15 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
 
 
 class DualMotorValveForm(ColonelComponentForm):
-    open_pin = ColonelPinChoiceField(
+    open_pin = Select2ModelChoiceField(
         label="Open Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     open_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1017,17 +993,15 @@ class DualMotorValveForm(ColonelComponentForm):
         required=True, min_value=0.01, max_value=1000000000,
         initial=2, help_text="Time in seconds to open."
     )
-    close_pin = ColonelPinChoiceField(
+    close_pin = Select2ModelChoiceField(
         label="Close Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     close_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1064,32 +1038,28 @@ class DualMotorValveForm(ColonelComponentForm):
 
 
 class BlindsConfigForm(ColonelComponentForm):
-    open_pin = ColonelPinChoiceField(
+    open_pin = Select2ModelChoiceField(
         label="Open Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     open_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
     )
-    close_pin = ColonelPinChoiceField(
+    close_pin = Select2ModelChoiceField(
         label="Close Relay Port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
     close_action = forms.ChoiceField(
         choices=(('HIGH', "HIGH"), ('LOW', "LOW")),
@@ -1212,29 +1182,25 @@ class BlindsConfigForm(ColonelComponentForm):
 
 
 class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
-    power_pin = ColonelPinChoiceField(
+    power_pin = Select2ModelChoiceField(
         label="Power port",
         queryset=ColonelPin.objects.filter(output=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
     )
-    sensor_pin = ColonelPinChoiceField(
+    sensor_pin = Select2ModelChoiceField(
         label="Sensor port",
         queryset=ColonelPin.objects.filter(input=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'input': True}, 'filters')
-            ]
-        )
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
     )
     sensor_inverse = forms.TypedChoiceField(
         choices=((0, "No"), (1, "Yes")), coerce=int, initial=0,
@@ -1306,18 +1272,16 @@ class TTLockConfigForm(ColonelComponentForm):
 
 
 class DALIDeviceConfigForm(ColonelComponentForm):
-    interface = ColonelInterfacesChoiceField(
+    interface = Select2ModelChoiceField(
         queryset=Interface.objects.filter(type='dali'),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-interfaces',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const(
-                    {'type': 'dali'}, 'filters'
-                )
-            ]
-        )
+        url='autocomplete-interfaces',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const(
+                {'type': 'dali'}, 'filters'
+            )
+        ]
     )
 
     def clean_interface(self):

simo/fleet/migrations/0038_alter_colonel_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-09 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0037_alter_colonelpin_options_alter_colonelpin_no_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='type',
+            field=models.CharField(choices=[('4-relays', '4 Relay'), ('ample-wall', 'Ample Wall'), ('game-changer', 'Game Changer'), ('game-changer-mini', 'Game Changer Mini')], default='ample-wall', max_length=20),
+        ),
+    ]

simo/settings.py

@@ -65,6 +65,7 @@ INSTALLED_APPS = [
     'bootstrap4',
     'taggit',
     'actstream',
+    'django_object_actions',
 
     'simo.core',
     'simo.users',

simo/users/migrations/0033_alter_user_ssh_key.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-09 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0032_remove_userdevice_user_alter_userdevice_users'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='ssh_key',
+            field=models.TextField(blank=True, help_text='Will be placed in /root/.ssh/authorized_keys if user is active and is master of a hub.', null=True),
+        ),
+    ]

simo/users/models.py

@@ -252,10 +252,15 @@ class User(AbstractBaseUser, SimoAdminMixin):
         '''Used by API serializer to get users role on a given instance.'''
         if not self._instance:
             return None
-        for role in self.roles.all():
-            if role.instance == self._instance:
-                return role.id
-        return None
+        cache_key = f'user-{self.id}_instance-{self._instance.id}-role-id'
+        cached_val = cache.get(cache_key, 'expired')
+        if cached_val == 'expired':
+            for role in self.roles.all().select_related('instance'):
+                if role.instance == self._instance:
+                    cached_val = role.id
+                    cache.set(cache_key, role.id, 20)
+                    return cached_val
+        return cached_val
 
     @role_id.setter
     def role_id(self, id):
@@ -290,7 +295,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     )
                 ])
             cache.set(cache_key, instances, 10)
-        print("INSTANCES: ", instances)
         return instances
 
     @property
@@ -301,26 +305,44 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def is_active(self):
-        if self.is_master and not self.instance_roles.all():
-            # Master who have no roles on any instance are in GOD mode!
-            # It can not be disabled by anybody, nor it is seen by anybody. :)
-            return True
-        if self._instance:
-            return bool(
-                self.instance_roles.filter(
-                    instance=self._instance, is_active=True
-                ).first()
-            )
-        return any([ir.is_active for ir in self.instance_roles.all()])
+        if not self._instance:
+            cache_key = f'user-{self.id}_is_active'
+        else:
+            cache_key = f'user-{self.id}_is_active_instance-{self._instance.id}'
+        cached_value = cache.get(cache_key, 'expired')
+        if cached_value == 'expired':
+            if self.is_master and not self.instance_roles.all():
+                # Master who have no roles on any instance are in GOD mode!
+                # It can not be disabled by anybody, nor it is seen by anybody. :)
+                cached_value = True
+            elif self._instance:
+                cached_value = bool(
+                    self.instance_roles.filter(
+                        instance=self._instance, is_active=True
+                    ).first()
+                )
+            else:
+                cached_value = any(
+                    [ir.is_active for ir in self.instance_roles.all()]
+                )
+            cache.set(cache_key, cached_value, 20)
+        return cached_value
 
 
     @is_active.setter
     def is_active(self, val):
         if not self._instance:
             return
+
         self.instance_roles.filter(
             instance=self._instance
         ).update(is_active=bool(val))
+        cache_key = f'user-{self.id}_is_active_instance-{self._instance.id}'
+        try:
+            cache.delete(cache_key)
+        except:
+            pass
+
         rebuild_authorized_keys()
 
 

{simo-2.3.7.dist-info → simo-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.3.7
+Version: 2.4.2
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -49,4 +49,5 @@ Requires-Dist: django-markdownify ==0.9.5
 Requires-Dist: django-activity-stream ==2.0.0
 Requires-Dist: gunicorn ==23.0.0
 Requires-Dist: python-crontab ==3.2.0
+Requires-Dist: django-object-actions ==4.3.0