simo 2.11.4__py3-none-any.whl → 3.0.4__py3-none-any.whl

simo/fleet/forms.py

@@ -7,7 +7,7 @@ from django.urls.base import get_script_prefix
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from dal import forward
-from simo.core.models import Component
+from simo.core.models import Component, Category
 from simo.core.forms import (
     BaseComponentForm, ValueLimitForm, NumericSensorForm
 )
@@ -25,7 +25,7 @@ from simo.core.form_fields import (
 )
 from simo.core.form_fields import PlainLocationField
 from simo.users.models import PermissionsRole
-from .models import Colonel, ColonelPin, Interface, CustomDaliDevice
+from .models import Colonel, ColonelPin, Interface
 from .utils import INTERFACES_PINS_MAP, get_all_control_input_choices
 
 
@@ -1792,81 +1792,55 @@ class DALIButtonConfigForm(DALIDeviceConfigForm, BaseComponentForm):
     pass
 
 
-class CustomDaliDeviceForm(BaseComponentForm):
-    device = forms.ChoiceField()
+class SentinelDeviceConfigForm(BaseComponentForm):
+    colonel = Select2ModelChoiceField(
+        label="Sentinel", queryset=Colonel.objects.filter(type='sentinel'),
+        url='autocomplete-colonels',
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        choices = []
+        # Limit colonels to current instance for convenience
         instance = get_current_instance()
-        for colonel in Colonel.objects.filter(
-            type='room-sensor', instance=instance
-        ):
-            choices.append((f"wifi-{colonel.id}", colonel.name))
-        for device in CustomDaliDevice.objects.filter(
-            instance=instance,
-            last_seen__gt=timezone.now() - datetime.timedelta(minutes=10)
-        ):
-            choices.append((f"dali-{device.id}", device.name))
-        self.fields['device'].choices = choices
-
-    def get_device(self, field_val):
-        if field_val.startswith('wifi'):
-            return Colonel.objects.filter(
-                id=self.cleaned_data['device'][5:]
-            ).first()
-        else:
-            return CustomDaliDevice.objects.filter(
-                id=self.cleaned_data['device'][5:]
+        if instance:
+            self.fields['colonel'].queryset = self.fields['colonel'].queryset.filter(
+                instance=instance
             )
 
-
-class RoomSensorDeviceConfigForm(CustomDaliDeviceForm):
-
-
     def save(self, commit=True):
         from simo.core.models import Icon
-        colonel = None
-        dali_device = None
-        device = self.get_device(self.cleaned_data['device'])
-        if not device:
+        colonel = self.cleaned_data.get('colonel')
+        if not colonel:
             return
-        if isinstance(device, CustomDaliDevice):
-            dali_device = device
-        else:
-            colonel = device
 
         from .controllers import (
             RoomSiren, AirQualitySensor, TempHumSensor, AmbientLightSensor,
-            RoomPresenceSensor
+            RoomPresenceSensor, VoiceAssistant, SmokeDetector
         )
 
         org_name = self.cleaned_data['name']
         org_icon = self.cleaned_data['icon']
-        for CtrlClass, icon, suffix in (
-            (RoomSiren, 'siren', 'siren'),
-            (AirQualitySensor, 'leaf', 'air quality'),
-            (TempHumSensor, 'temperature-half', 'temperature'),
-            (AmbientLightSensor, 'brightness-low', 'brightness'),
-            (RoomPresenceSensor, 'person', 'presence')
+        last_comp = None
+        for CtrlClass, icon, suffix, cat_slug in (
+            (RoomSiren, 'siren', 'siren', 'security'),
+            (AirQualitySensor, 'leaf', 'air quality', 'climate'),
+            (TempHumSensor, 'temperature-half', 'temperature', 'climate'),
+            (AmbientLightSensor, 'brightness-low', 'brightness', 'light'),
+            (RoomPresenceSensor, 'person', 'presence', 'security'),
+            (VoiceAssistant, 'microphone-lines', 'voice assistant', 'other'),
+            (SmokeDetector, 'fire-smoke', 'dust/pollution', 'security'),
         ):
             default_icon = Icon.objects.filter(slug=icon).first()
-            if default_icon:
-                self.cleaned_data['icon'] = default_icon.slug
-            else:
-                self.cleaned_data['icon'] = org_icon
+            self.cleaned_data['icon'] = default_icon.slug if default_icon else org_icon
             self.cleaned_data['name'] = f"{org_name} {suffix}"
+            self.cleaned_data['category'] = Category.objects.filter(
+                name__icontains=cat_slug
+            ).first()
 
-            if colonel:
-                comp = Component.objects.filter(
-                    config__colonel=colonel.id,
-                    controller_uid=CtrlClass.uid
-                ).first()
-            else:
-                comp = Component.objects.filter(
-                    config__dali_device=dali_device.id,
-                    controller_uid=CtrlClass.uid
-                ).first()
+            comp = Component.objects.filter(
+                config__colonel=colonel.id,
+                controller_uid=CtrlClass.uid
+            ).first()
 
             form = CtrlClass.config_form(
                 controller_uid=CtrlClass.uid, instance=comp,
@@ -1874,47 +1848,43 @@ class RoomSensorDeviceConfigForm(CustomDaliDeviceForm):
             )
             if form.is_valid():
                 comp = form.save()
-                if colonel:
-                    comp.config['colonel'] = colonel.id
-                else:
-                    comp.config['dali_device'] = dali_device.id
+                comp.value_units = CtrlClass.default_value_units
+                comp.config['colonel'] = colonel.id
                 comp.save()
+                last_comp = comp
             else:
                 raise Exception(form.errors)
 
-        if colonel:
+        if colonel and last_comp:
             GatewayObjectCommand(
-                comp.gateway, colonel, id=comp.id,
+                last_comp.gateway, colonel, id=last_comp.id,
                 command='call', method='update_config', args=[
-                    comp.controller._get_colonel_config()
+                    last_comp.controller._get_colonel_config()
                 ]
             ).publish()
 
-        return comp
+        return last_comp
 
 
-class RoomZonePresenceConfigForm(CustomDaliDeviceForm):
+class RoomZonePresenceConfigForm(BaseComponentForm):
+    colonel = Select2ModelChoiceField(
+        label="Sentinel", queryset=Colonel.objects.filter(type='sentinel'),
+        url='autocomplete-colonels',
+    )
 
-    def clean_device(self):
-        value = self.cleaned_data['device']
-        if value.startswith('wifi'):
-            return value
-        from .controllers import RoomZonePresenceSensor
-        dali_device = CustomDaliDevice.objects.filter(
-            id=value[5:]
-        ).first()
-        free_slots = {0, 1, 2, 3, 4, 5, 6, 7}
-        for comp in Component.objects.filter(
-            controller_uid=RoomZonePresenceSensor.uid,
-            config__dali_device=dali_device.id
-        ):
-            try:
-                free_slots.remove(int(comp.config['slot']))
-            except:
-                continue
-        if not free_slots:
-            raise forms.ValidationError(
-                "This device already has 8 zones defined. "
-                "Please first delete some to add a new one."
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        instance = get_current_instance()
+        if instance:
+            self.fields['colonel'].queryset = self.fields['colonel'].queryset.filter(
+                instance=instance
             )
-        return value
+
+
+class VoiceAssistantConfigForm(BaseComponentForm):
+    voice = forms.ChoiceField(
+        label="Voice",
+        required=True, choices=(
+            ('male', "Male"), ('female', "Female"),
+        ),
+    )

simo/fleet/gateways.py

@@ -127,24 +127,17 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
                 form_cleaned_data = deserialize_form_data(
                     gw.discovery['init_data']
                 )
-                if form_cleaned_data['device'].startswith('wifi'):
-                    colonel = Colonel.objects.filter(
-                        id=form_cleaned_data['device'][5:]
-                    ).first()
+                # Room-zone presence discovery now only supports network sentinels
+                colonel = Colonel.objects.filter(
+                    id=form_cleaned_data['colonel'].id
+                    if hasattr(form_cleaned_data.get('colonel'), 'id')
+                    else form_cleaned_data.get('colonel')
+                ).first()
+                if colonel:
                     GatewayObjectCommand(
                         gw, colonel,
                         command='discover', type=self.uid.split('.')[-1],
                     ).publish()
-                else:
-                    from .models import CustomDaliDevice
-                    from .custom_dali_operations import Frame
-                    dali_device = CustomDaliDevice.objects.filter(
-                        id=form_cleaned_data['device'][5:]
-                    ).first()
-                    frame = Frame(40, bytes(bytearray(5)))
-                    frame[8:11] = 15  # command to custom dali device
-                    frame[12:15] = 0  # action to perform: start room zone discovery
-                    dali_device.transmit(frame)
 
 
 
@@ -178,4 +171,4 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
                     f"| Btn type: {method}"
                 )
                 comp.controller._ctrl(j, btn.value, method)
-                break
+                break

simo/fleet/migrations/0055_colonel_is_vo_active_colonel_last_wake_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.10 on 2025-09-11 06:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0054_auto_20250507_1256'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='colonel',
+            name='is_vo_active',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='colonel',
+            name='last_wake',
+            field=models.DateTimeField(db_index=True, editable=False, null=True),
+        ),
+        migrations.AddField(
+            model_name='colonel',
+            name='wake_stats',
+            field=models.JSONField(db_index=True, default=dict, editable=False),
+        ),
+    ]

simo/fleet/migrations/0056_delete_customdalidevice.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.10 on 2025-09-26 06:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0055_colonel_is_vo_active_colonel_last_wake_and_more'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='CustomDaliDevice',
+        ),
+    ]

simo/fleet/models.py

@@ -1,6 +1,5 @@
 import requests
 import time
-import random
 import datetime
 from actstream import action
 from django.core.exceptions import ValidationError
@@ -68,7 +67,7 @@ class Colonel(DirtyFieldsMixin, models.Model):
             ('ample-wall', "Ample Wall"),
             ('game-changer', "Game Changer"),
             ('game-changer-mini', "Game Changer Mini"),
-            ('room-sensor', "Room Sensor")
+            ('sentinel', "Sentinel")
         )
     )
     firmware_version = models.CharField(
@@ -105,6 +104,13 @@ class Colonel(DirtyFieldsMixin, models.Model):
         (0, "3kHz"), (1, "22kHz")
     ), help_text="Affects Ample Wall dimmer PWM output (dimmer) frequency")
 
+    # Sentinel voice assistant specific fields
+    wake_stats = models.JSONField(
+        default=dict, editable=False, db_index=True
+    )
+    last_wake = models.DateTimeField(null=True, editable=False, db_index=True)
+    is_vo_active = models.BooleanField(default=False, db_index=True)
+
     objects = ColonelsManager()
 
     def __str__(self):
@@ -121,6 +127,11 @@ class Colonel(DirtyFieldsMixin, models.Model):
         if self.major_upgrade_available and self.firmware_version == self.major_upgrade_available:
             self.major_upgrade_available = None
 
+        if self.is_vo_active:
+            Colonel.objects.filter(
+                instance=self.instance
+            ).exclude(id=self.id).update(is_vo_active=False)
+
         return super().save(*args, **kwargs)
 
     @property
@@ -558,73 +569,3 @@ def post_interface_delete(sender, instance, *args, **kwargs):
             ColonelPin.objects.bulk_update(
                 pins, ["occupied_by_content_type", "occupied_by_id"]
             )
-
-
-class CustomDaliDevice(models.Model):
-    '''
-    Our own custom dali line device, 
-    not compatible with anything else of DALI!
-    '''
-    instance = models.ForeignKey(Instance, on_delete=models.CASCADE)
-    uid = models.CharField(max_length=100, db_index=True)
-    random_address = models.PositiveIntegerField(db_index=True, editable=False)
-    name = models.CharField(
-        max_length=200, help_text="User given name on initial pairing"
-    )
-    interface = models.ForeignKey(
-        Interface, null=True, blank=True, editable=False,
-        on_delete=models.SET_NULL, related_name='custom_devices',
-        help_text="Colonel interface on which it operates."
-    )
-    last_seen = models.DateTimeField(null=True, editable=False)
-    components = models.ManyToManyField(Component)
-
-    class Meta:
-        unique_together = 'instance', 'random_address'
-
-    def save(self, *args, **kwargs):
-        if not self.random_address:
-            while True:
-                self.random_address = random.randint(0, 255)
-                if CustomDaliDevice.objects.filter(
-                    random_address=self.random_address,
-                    instance=self.instance
-                ).first():
-                    continue
-                break
-        return super().save(*args, **kwargs)
-
-    def transmit(self, frame):
-        from .gateways import FleetGatewayHandler
-        frame[0:7] = self.random_address
-        gateway = Gateway.objects.filter(type=FleetGatewayHandler.uid).first()
-        GatewayObjectCommand(
-            gateway, self.interface.colonel,
-            command='da-tx', interface=self.interface.no,
-            msg=frame.pack.hex()
-        ).publish()
-
-    @property
-    def is_alive(self):
-        if not self.last_seen:
-            return False
-        return self.last_seen + datetime.timedelta(seconds=60) > timezone.now()
-
-
-@receiver(post_save, sender=Component)
-def attatch_components_to_dali_device(sender, instance, created, *args, **kwargs):
-    if not instance.controller_uid.startswith('simo.fleet'):
-        return
-    if 'config' not in instance.get_dirty_fields():
-        return
-    dali_device = CustomDaliDevice.objects.filter(
-        id=instance.config.get('dali_device', 0)
-    ).first()
-    if not dali_device:
-        return
-    dali_device.components.add(instance)
-
-
-@receiver(pre_delete, sender=CustomDaliDevice)
-def delete_dali_device_components(sender, instance, *args, **kwargs):
-    instance.components.all().delete()

simo/fleet/serializers.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 from simo.core.serializers import TimestampField
 from .models import (
-    InstanceOptions, Colonel, ColonelPin, Interface, CustomDaliDevice
+    InstanceOptions, Colonel, ColonelPin, Interface
 )
 
 
@@ -87,50 +87,3 @@ class ColonelSerializer(serializers.ModelSerializer):
         instance.update_config()
         return instance
 
-
-class CustomDaliDeviceSerializer(serializers.ModelSerializer):
-    is_empty = serializers.SerializerMethodField()
-    is_alive = serializers.SerializerMethodField()
-    last_seen = TimestampField(read_only=True)
-
-    class Meta:
-        model = CustomDaliDevice
-        fields = (
-            'id', 'uid', 'random_address', 'name', 'is_empty',
-            'is_alive', 'last_seen'
-        )
-        read_only_fields = (
-            'random_address', 'is_empty', 'is_alive', 'last_seen'
-        )
-
-    def validate(self, data):
-        instance = self.context.get('instance')
-        uid = data.get('uid')
-        if instance and uid:
-            if CustomDaliDevice.objects.filter(
-                uid=uid, instance=instance
-            ).exists():
-                raise serializers.ValidationError(
-                    f"A device with uid '{uid}' already exists for this instance."
-                )
-        return data
-
-    def validate_uid(self, value):
-        """
-        Prevent changing the uid on update.
-        """
-        # self.instance will be None for creation, but set for updates.
-        if self.instance and self.instance.uid != value:
-            raise serializers.ValidationError("Changing uid is not allowed.")
-        return value
-
-    def create(self, validated_data):
-        validated_data['instance'] = self.context['instance']
-        return super().create(validated_data)
-
-    def get_is_empty(self, obj):
-        return not bool(obj.components.all().count())
-
-    def get_is_alive(self, obj):
-        return obj.is_alive
-