simo 2.0.32__py3-none-any.whl → 2.0.33__py3-none-any.whl

simo/fleet/forms.py

@@ -647,9 +647,9 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
     def clean(self):
         super().clean()
-        if self.cleaned_data.get('output_pin'):
+        if 'output_pin' in self.cleaned_data:
             self._clean_pin('output_pin')
-        if self.cleaned_data.get('controls'):
+        if 'controls' in self.cleaned_data:
             self._clean_controls()
         return self.cleaned_data
 
@@ -745,7 +745,9 @@ class ColonelRGBLightConfigForm(ColonelComponentForm):
     def clean(self):
         super().clean()
 
-        self._clean_pin('output_pin')
+        if 'output_pin' in self.cleaned_data:
+            self._clean_pin('output_pin')
+
         if self.cleaned_data.get('controls'):
             self._clean_controls()
 
@@ -1034,23 +1036,153 @@ class DALIDeviceConfigForm(ColonelComponentForm):
         )
     )
 
-    def save(self, commit=True):
+    def clean_interface(self):
+        if not self.instance.pk:
+            return self.cleaned_data['interface']
+        if 'interface' in self.changed_data:
+            raise forms.ValidationError(
+                "Changing interface after component is created "
+                "it is not allowed!"
+            )
+        return self.cleaned_data['interface']
+
+    def save(self, commit=True, update_colonel_config=True):
         if 'interface' in self.cleaned_data:
             self.instance.config['dali_interface'] = \
                 self.cleaned_data['interface'].no
-        return super().save(commit=commit)
 
+        # prevent immediate config update on colonel as dali devices are
+        # added via pairing process, which uses finalization procedure.
+        is_new = not self.instance.pk
+        obj = super(BaseComponentForm, self).save(commit=commit)
+        if commit:
+            self.cleaned_data['colonel'].components.add(obj)
+            if not is_new and update_colonel_config:
+                GatewayObjectCommand(
+                    obj.gateway, self.cleaned_data['colonel'], id=obj.id,
+                    command='call', method='update_config', args=[
+                        obj.controller._get_colonel_config()
+                    ]
+                ).publish()
+        return obj
 
-class DaliSwitchForm(DALIDeviceConfigForm, SwitchForm):
 
+class DaliLampForm(DALIDeviceConfigForm, BaseComponentForm):
+    boot_update = forms.BooleanField(
+        initial=False, required=False,
+        help_text="Update device config on colonel boot."
+    )
+    fade_time = forms.TypedChoiceField(
+        initial=3, choices=(
+            (1, "0.7 s"), (2, "1.0 s"), (3, "1.4 s"), (4, "2.0 s"), (5, "2.8 s"),
+            (6, "4.0 s"), (7, "5.7 s"), (8, "8.0 s")
+        )
+    )
+    gear_min = forms.IntegerField(
+        min_value=1, max_value=254, initial=90,
+        help_text="Minimum level at which device starts operating up (1 - 254), "
+                  "SIMO.io DALI interface detects this value automatically when "
+                  "pairing a new device. <br>"
+                  "Most LED drivers we tested starts at 86. <br>"
+                  "If you set this value to low, you might start seeing device "
+                  "beings dying out when you hit it with lower value than it "
+                  "is capable of supplying."
+    )
     auto_off = forms.FloatField(
         required=False, min_value=0.01, max_value=1000000000,
-        help_text="If provided, switch will be turned off after "
+        help_text="If provided, lamp will be turned off after "
                   "given amount of seconds after last turn on event."
     )
-    inverse = forms.BooleanField(
-        label=_("Inverse switch value"), required=False
-    )
 
 
+class DaliGearGroupForm(DALIDeviceConfigForm, BaseComponentForm):
+    auto_off = forms.FloatField(
+        required=False, min_value=0.01, max_value=1000000000,
+        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(
+            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'
+                ),
+            )
+        )
+    )
 
+    def clean(self):
+        if 'members' in self.cleaned_data:
+            if len(self.cleaned_data['members']) < 2:
+                raise forms.ValidationError("At least two members are required.")
+            for member in self.cleaned_data['members']:
+                if member.config['interface'] != self.cleaned_data['interface'].id:
+                    self.add_error(
+                        'members', f"{member} belongs to other DALI interface."
+                    )
+        self.group_addr = None
+        if not self.instance.pk:
+            from .controllers import DALIGearGroup
+            occupied_addresses = set([
+                int(c['config'].get('da', 0)) for c in Component.objects.filter(
+                controller_uid=DALIGearGroup.uid,
+                config__colonel=self.cleaned_data['colonel'].id,
+                config__interface=self.cleaned_data['interface'].id,
+            ).values('config')])
+            for addr in range(16):
+                if addr in occupied_addresses:
+                    continue
+                self.group_addr = addr
+                break
+            if self.group_addr is None:
+                self.add_error(
+                    'interface',
+                    "Already has 16 groups. No more groups are allowed on DALI line."
+                )
+        else:
+            self.group_addr = self.instance.config['da']
+        return self.cleaned_data
+
+    def save(self, commit=True, update_colonel_config=True):
+        old_members = self.instance.config.get('members', [])
+        self.instance.config['da'] = self.group_addr
+        is_new = not self.instance.pk
+        obj = super().save(commit, update_colonel_config=False)
+        if commit:
+            self.cleaned_data['colonel'].components.add(obj)
+            new_members = obj.config.get('members', [])
+            for removed_member in Component.objects.filter(
+                id__in=set(old_members) - set(new_members)
+            ):
+                self.controller._modify_member_group(
+                    removed_member, self.group_addr, remove=True
+                )
+            for member in Component.objects.filter(id__in=new_members):
+                self.controller._modify_member_group(member, self.group_addr)
+            if is_new:
+                GatewayObjectCommand(
+                    obj.gateway, self.cleaned_data['colonel'],
+                    command='finalize',
+                    data={
+                        'temp_id': 'none',
+                        'permanent_id': obj.id,
+                        'comp_config': {
+                            'type': obj.controller_uid.split('.')[-1],
+                            'family': self.controller.family,
+                            'config': obj.config
+                        }
+                    }
+                ).publish()
+            else:
+                GatewayObjectCommand(
+                    obj.gateway, self.cleaned_data['colonel'], id=obj.id,
+                    command='call', method='update_config', args=[
+                        obj.controller._get_colonel_config()
+                    ]
+                ).publish()
+        return obj

simo/fleet/migrations/0035_auto_20240514_0855.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.9 on 2024-05-14 08:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('fleet', '0034_auto_20240418_0735'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InterfaceAddress',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('address_type', models.CharField(choices=[('i2c', 'I2C'), ('dali-gear', 'DALI Gear'), ('dali-group', 'DALI Gear Group')], db_index=True, max_length=100)),
+                ('address', models.JSONField(db_index=True)),
+                ('occupied_by_id', models.PositiveIntegerField(null=True)),
+                ('interface', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='addresses', to='fleet.interface')),
+                ('occupied_by_content_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+            ],
+            options={
+                'unique_together': {('interface', 'address_type', 'address')},
+            },
+        ),
+        migrations.DeleteModel(
+            name='I2CInterface',
+        ),
+    ]

simo/fleet/models.py

@@ -181,13 +181,13 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 pin.occupied_by = component
                 pin.save()
 
-        for interface in self.i2c_interfaces.all():
-            if interface.sda_pin:
-                interface.sda_pin.occupied_by = interface
-                interface.sda_pin.save()
-            if interface.scl_pin:
-                interface.scl_pin.occupied_by = interface
-                interface.scl_pin.save()
+        for interface in self.interfaces.all():
+            if interface.pin_a:
+                interface.pin_a.occupied_by = interface
+                interface.pin_a.save()
+            if interface.pin_b:
+                interface.pin_b.occupied_by = interface
+                interface.pin_b.save()
 
 
     def move_to(self, other_colonel):
@@ -259,6 +259,10 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
                 capacitive=data.get('capacitive'), adc=data.get('adc'),
                 native=data.get('native'), note=data.get('note')
             )
+        fleet_gateway, new = Gateway.objects.get_or_create(
+            type='simo.fleet.gateways.FleetGatewayHandler'
+        )
+        fleet_gateway.run()
 
 
 @receiver(pre_delete, sender=Component)
@@ -266,81 +270,34 @@ def post_component_delete(sender, instance, *args, **kwargs):
     if not instance.controller_uid.startswith('simo.fleet'):
         return
 
-    affected_colonels = list(Colonel.objects.filter(components=instance))
-
-    def update_colonel():
-        for colonel in affected_colonels:
-            print("Rebuild occupied pins for :", colonel)
-            colonel.rebuild_occupied_pins()
-            colonel.update_config()
-
-    transaction.on_commit(update_colonel)
-
-
-i2c_interface_no_choices = (
-    (0, "0 - Main"), (1, "1 - Secondary"),
-    (2, "2 - Software"), (3, "3 - Software")
-)
-
-
-class I2CInterface(models.Model):
-    colonel = models.ForeignKey(
-        Colonel, on_delete=models.CASCADE, related_name='i2c_interfaces'
-    )
-    name = models.CharField(max_length=50)
-    no = models.IntegerField(
-        default=0, choices=i2c_interface_no_choices
-    )
-    scl_pin = models.ForeignKey(
-        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
-            'native': True, 'output': True,
-        },
-        null=True, related_name='i2c_scl'
-    )
-    sda_pin = models.ForeignKey(
-        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
-            'native': True, 'output': True,
-        },
-        null=True, related_name='i2c_sda'
-    )
-    freq = models.IntegerField(
-        default=100000, help_text="100000 - is a good middle point!"
-    )
-
-    objects = InterfacesManager()
+    from .controllers import DALIGearGroup
+    if instance.controller_uid == DALIGearGroup.uid:
+        for comp in Component.objects.filter(
+                id__in=instance.config.get('members', [])
+        ):
+            instance.controller._modify_member_group(
+                comp, instance.config.get('da', 0), remove=True
+            )
 
-    class Meta:
-        unique_together = 'colonel', 'no'
+    elif instance.controller.family == 'dali':
+        colonel = Colonel.objects.filter(id=instance.config['colonel']).first()
+        if colonel:
+            GatewayObjectCommand(
+                instance.gateway, colonel, id=instance.id,
+                command='call', method='destroy',
+            ).publish()
 
-    def __str__(self):
-        return self.name
+    else:
 
+        affected_colonels = list(Colonel.objects.filter(components=instance))
 
-@receiver(post_delete, sender=I2CInterface)
-def post_i2c_interface_delete(sender, instance, *args, **kwargs):
-    with transaction.atomic():
-        ct = ContentType.objects.get_for_model(instance)
-        for pin in ColonelPin.objects.filter(
-            occupied_by_content_type=ct,
-            occupied_by_id=instance.id
-        ):
-            pin.occupied_by_content_type = None
-            pin.occupied_by_content_id = None
-            pin.save()
+        def update_colonel():
+            for colonel in affected_colonels:
+                print("Rebuild occupied pins for :", colonel)
+                colonel.rebuild_occupied_pins()
+                colonel.update_config()
 
-        # In an event of colonel deletion these pin no longer exist
-        # at this point, therefore this trhows irrelevant exceptions
-        # that we want to fail silenty
-        try:
-            instance.scl_pin.occupied_by = instance
-            instance.scl_pin.save()
-        except ColonelPin.DoesNotExist:
-            pass
-        try:
-            instance.sda_pin.occupied_by = instance
-            instance.sda_pin.save()
-        except ColonelPin.DoesNotExist:
-            pass
+        transaction.on_commit(update_colonel)
 
 
 class Interface(models.Model):
@@ -384,6 +341,49 @@ class Interface(models.Model):
         return super().save(*args, **kwargs)
 
 
+    def broadcast_reset(self):
+        gw = Gateway.objects.filter(type=FleetGatewayHandler.uid).first()
+        if not gw:
+            return
+        GatewayObjectCommand(
+            gw, self.colonel, command='broadcast_reset',
+            data={'interface': self.no}
+        ).publish()
+
+
+class InterfaceAddress(models.Model):
+    interface = models.ForeignKey(
+        Interface, related_name='addresses', on_delete=models.CASCADE
+    )
+    address_type = models.CharField(
+        db_index=True, max_length=100, choices=(
+            ('i2c', "I2C"),
+            ('dali-gear', "DALI Gear"),
+            ('dali-group', "DALI Gear Group")
+        )
+    )
+    address = models.JSONField(db_index=True)
+    occupied_by_content_type = models.ForeignKey(
+        ContentType, on_delete=models.CASCADE, null=True
+    )
+    occupied_by_id = models.PositiveIntegerField(null=True)
+    occupied_by = GenericForeignKey(
+        "occupied_by_content_type", "occupied_by_id"
+    )
+
+    class Meta:
+        unique_together = 'interface', 'address_type', 'address'
+
+    def __str__(self):
+        addr = self.address
+        if self.address_type == 'i2c':
+            try:
+                addr = hex(int(self.address))
+            except:
+                pass
+        return f"{self.get_address_type_display()}: {addr}"
+
+
 @receiver(post_save, sender=Interface)
 def post_interface_save(sender, instance, created, *args, **kwargs):
     if created:
@@ -399,6 +399,24 @@ def post_interface_save(sender, instance, created, *args, **kwargs):
         instance.pin_b.save()
         instance.save()
 
+        if instance.type == 'i2c':
+            for addr in range(128):
+                InterfaceAddress.objects.create(
+                    interface=instance, address_type='i2c',
+                    address=addr,
+                )
+        elif instance.type == 'dali':
+            for addr in range(64):
+                InterfaceAddress.objects.create(
+                    interface=instance, address_type='dali-gear',
+                    address=addr,
+                )
+            for addr in range(16):
+                InterfaceAddress.objects.create(
+                    interface=instance, address_type='dali-group',
+                    address=addr,
+                )
+
 
 @receiver(post_delete, sender=Interface)
 def post_interface_delete(sender, instance, *args, **kwargs):
@@ -408,8 +426,4 @@ def post_interface_delete(sender, instance, *args, **kwargs):
             occupied_by_content_type=ct,
             occupied_by_id=instance.id
         ):
-            pin.occupied_by_content_type = None
-            pin.occupied_by_content_id = None
-            pin.save()
-
-
+            pin.occupied_by_content_type = None

simo/fleet/serializers.py

@@ -22,7 +22,14 @@ class ColonelPinSerializer(serializers.ModelSerializer):
         read_only_fields = fields
 
     def get_occupied(self, obj):
-        return bool(obj.occupied_by)
+        try:
+            return bool(obj.occupied_by)
+        except AttributeError:
+            # apparently the item type that this pin was occupied by
+            # was deleted from the codebase, so we quickly fix it here. :)
+            obj.occupied_by = None
+            obj.save()
+            return False
 
 
 class ColonelInterfaceSerializer(serializers.ModelSerializer):

simo/fleet/socket_consumers.py

@@ -378,7 +378,7 @@ class FleetConsumer(AsyncWebsocketConsumer):
                                     component.change_init_fingerprint = fingerprint
                                 component.controller._receive_from_device(
                                     data['val'], bool(data.get('alive')),
-                                    data.get('battery_level')
+                                    data.get('battery_level'), data.get('error_msg')
                                 )
                             await sync_to_async(
                                 receive_val, thread_sensitive=True
@@ -404,28 +404,16 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
                 elif 'discovery-result' in data:
                     def process_discovery_result():
-                        # check if component is already created
-                        if data['discovery-result'] == 'success':
-                            comp = Component.objects.filter(
-                                meta__finalization_data__temp_id=data['result']['id']
-                            ).first()
-                            if comp:
-                                return comp
-
                         self.gateway.refresh_from_db()
                         try:
                             self.gateway.process_discovery(data)
                         except Exception as e:
                             print(traceback.format_exc(), file=sys.stderr)
 
-                    finished_comp = await sync_to_async(
+                    await sync_to_async(
                         process_discovery_result, thread_sensitive=True
                     )()
-                    if finished_comp:
-                        await self.send_data({
-                            'command': 'finalize',
-                            'data': finished_comp.meta['finalization_data']
-                        })
+
 
             elif bytes_data:
                 if not self.colonel_logger:

simo/users/migrations/0003_create_roles_and_system_user.py

@@ -4,29 +4,30 @@ from django.db import migrations
 
 
 def create_objects(apps, schema_editor):
-
-    PermissionsRole = apps.get_model("users", "PermissionsRole")
-    User = apps.get_model("users", "User")
-
-    admin_role, new = PermissionsRole.objects.get_or_create(
-        is_superuser=True, name='Admin'
-    )
-    user_role, new = PermissionsRole.objects.get_or_create(
-        name='User', can_manage_users=False, is_default=True
-    )
-    PermissionsRole.objects.get_or_create(
-        name='Guest'
-    )
-    User.objects.get_or_create(
-        email='system@simo.io', defaults={
-            'role': admin_role, 'name': "System"
-        }
-    )
-    User.objects.get_or_create(
-        email='device@simo.io', defaults={
-            'role': user_role, 'name': "Device"
-        }
-    )
+    pass
+    # legacy
+    # PermissionsRole = apps.get_model("users", "PermissionsRole")
+    # User = apps.get_model("users", "User")
+    #
+    # admin_role, new = PermissionsRole.objects.get_or_create(
+    #     is_superuser=True, name='Admin'
+    # )
+    # user_role, new = PermissionsRole.objects.get_or_create(
+    #     name='User', can_manage_users=False, is_default=True
+    # )
+    # PermissionsRole.objects.get_or_create(
+    #     name='Guest'
+    # )
+    # User.objects.get_or_create(
+    #     email='system@simo.io', defaults={
+    #         'role': admin_role, 'name': "System"
+    #     }
+    # )
+    # User.objects.get_or_create(
+    #     email='device@simo.io', defaults={
+    #         'role': user_role, 'name': "Device"
+    #     }
+    #)
 
 def delete_objects(apps, schema_editor):
     pass

simo/users/migrations/0019_auto_20231221_1155.py

@@ -4,14 +4,15 @@ from django.db import migrations
 
 
 def forwards_func(apps, schema_editor):
-
-    PermissionsRole = apps.get_model("users", "PermissionsRole")
-
-    for role in PermissionsRole.objects.filter(instance=None):
-        for iu in role.instanceuser_set.all():
-            iu.user.is_god = True
-            iu.user.save()
-        role.delete()
+    pass
+    # legacy
+    # PermissionsRole = apps.get_model("users", "PermissionsRole")
+    #
+    # for role in PermissionsRole.objects.filter(instance=None):
+    #     for iu in role.instanceuser_set.all():
+    #         iu.user.is_god = True
+    #         iu.user.save()
+    #     role.delete()
 
 def reverse_func(apps, schema_editor):
     pass

simo/users/models.py

@@ -1,19 +1,15 @@
 import datetime
 import requests
 import subprocess
-import sys
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.db import models
-from django.db.models import Q
 from django.db import transaction
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.dispatch import receiver
-from model_utils import FieldTracker
 from dirtyfields import DirtyFieldsMixin
 from django.contrib.gis.geos import Point
 from geopy.distance import distance
-from django.core.exceptions import ValidationError
 from django.contrib.auth.models import (
     AbstractBaseUser, PermissionsMixin, UserManager as DefaultUserManager
 )
@@ -481,11 +477,12 @@ def rebuild_mqtt_acls_on_create(sender, instance, created, **kwargs):
 def create_component_permissions_comp(sender, instance, created, **kwargs):
     if created:
         for role in PermissionsRole.objects.filter(
-            Q(instance__isnull=True) | Q(instance=instance.zone.instance)
+            instance=instance.zone.instance
         ):
             ComponentPermission.objects.get_or_create(
                 component=instance, role=role, defaults={
-                    'read': role.is_superuser, 'write': role.is_superuser
+                    'read': role.is_superuser or role.is_owner,
+                    'write': role.is_superuser or role.is_owner
                 }
             )
         rebuild_mqtt_acls.delay()
@@ -575,4 +572,6 @@ class InstanceInvitation(models.Model):
         return response
 
     def get_absolute_url(self):
-        return reverse('accept_invitation', kwargs={'token': self.token})
+        return reverse('accept_invitation', kwargs={'token': self.token})
+
+

simo/users/utils.py

@@ -1,11 +1,7 @@
 import sys
-import os
-import pwd
-import grp
 import traceback
 import subprocess
 from django.template.loader import render_to_string
-from django.conf import settings
 
 
 def get_system_user():

{simo-2.0.32.dist-info → simo-2.0.33.dist-info}/METADATA

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