simo 2.10.6__py3-none-any.whl → 2.10.9__py3-none-any.whl

simo/fleet/migrations/0053_auto_20250507_0713.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.10 on 2025-05-07 07:13
+
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    ColonelPin = apps.get_model("fleet", "ColonelPin")
+    ColonelPin.objects.filter(no=101).update(interface=1)
+    ColonelPin.objects.filter(no=102).update(interface=2)
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0052_colonelpin_interface'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/fleet/models.py

@@ -1,6 +1,7 @@
 import requests
 import time
 import random
+import datetime
 from actstream import action
 from django.core.exceptions import ValidationError
 from django.db import transaction
@@ -9,12 +10,17 @@ from django.db.models.signals import post_save, pre_delete, post_delete
 from django.dispatch import receiver
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
+from django.utils import timezone
 from dirtyfields import DirtyFieldsMixin
 from simo.core.models import Instance, Gateway, Component
 from simo.core.utils.helpers import get_random_string
 from simo.core.events import GatewayObjectCommand
 from .managers import ColonelsManager, ColonelPinsManager, InterfacesManager
-from .utils import GPIO_PINS, INTERFACES_PINS_MAP
+# Now imported from utils
+from .utils import GPIO_PINS, INTERFACES_PINS_MAP, \
+    _sync_interface_address_occupancy, _release_interface_addresses
+
+# -------------------------------------------------------------------------
 
 
 
@@ -217,6 +223,7 @@ class ColonelPin(models.Model):
     capacitive = models.BooleanField(default=False, db_index=True)
     adc = models.BooleanField(default=False)
     native = models.BooleanField(default=True, db_index=True)
+    interface = models.PositiveIntegerField(null=True, blank=True)
     default_pull = models.CharField(
         max_length=50, db_index=True, null=True, blank=True,
         choices=(('LOW', "LOW"), ("HIGH", "HIGH"))
@@ -244,6 +251,12 @@ class ColonelPin(models.Model):
         if not self.label:
             # Might be created via migration...
             self.save()
+        if self.interface:
+            interface = Interface.objects.filter(
+                colonel=self.colonel, no=self.interface
+            ).first()
+            if interface:
+                return f"{self.label} - {interface.get_type_display()}"
         return self.label
 
     def save(self, *args, **kwargs):
@@ -266,7 +279,8 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
                 defaults={
                     'input': data.get('input'), 'output': data.get('output'),
                     'capacitive': data.get('capacitive'), 'adc': data.get('adc'),
-                    'native': data.get('native'), 'note': data.get('note')
+                    'native': data.get('native'), 'note': data.get('note'),
+                    'interface': data.get('interface')
                 }
             )
         fleet_gateway, new = Gateway.objects.get_or_create(
@@ -274,15 +288,6 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
         )
         if fleet_gateway.status != 'running':
             fleet_gateway.start()
-        # create i2c and dali interfaces automatically for game-changer boards
-        if instance.type == 'game-changer':
-            # occupy ports immediately
-            Interface.objects.create(colonel=instance, no=1, type='i2c')
-            Interface.objects.create(colonel=instance, no=2, type='dali')
-        elif instance.type == 'game-changer-mini':
-            # only create interfaces, but do not occupy ports
-            Interface.objects.create(colonel=instance, no=1)
-            Interface.objects.create(colonel=instance, no=2)
 
     if 'socket_connected' in instance.get_dirty_fields():
         if instance.socket_connected:
@@ -306,15 +311,26 @@ def post_component_save(sender, instance, created, *args, **kwargs):
     if not colonel:
         return
     colonel.components.add(instance)
+
+    # ------------------------------------------------------------------
+    # InterfaceAddress occupancy sync (always run for fleet components)
+    # ------------------------------------------------------------------
+    try:
+        _sync_interface_address_occupancy(instance)
+    except ValidationError:
+        raise
+
     from .controllers import (
         TTLock, DALILamp, DALIGearGroup, DALIRelay, DALIOccupancySensor,
         DALILightSensor, DALIButton,
-        AirQualitySensor, TempHumSensor, AmbientLightSensor, RoomPresenceSensor
+        AirQualitySensor, TempHumSensor, AmbientLightSensor,
+        RoomPresenceSensor, RoomZonePresenceSensor
     )
     if instance.controller and instance.controller_cls in (
         TTLock, DALILamp, DALIGearGroup, DALIRelay, DALIOccupancySensor,
         DALILightSensor, DALIButton,
-        AirQualitySensor, TempHumSensor, AmbientLightSensor, RoomPresenceSensor
+        AirQualitySensor, TempHumSensor, AmbientLightSensor,
+        RoomPresenceSensor, RoomZonePresenceSensor
     ):
         return
     colonel.rebuild_occupied_pins()
@@ -326,6 +342,9 @@ def post_component_save(sender, instance, created, *args, **kwargs):
 @receiver(pre_delete, sender=Component)
 def post_component_delete(sender, instance, *args, **kwargs):
     if not instance.controller_uid.startswith('simo.fleet'):
+        # Still ensure we release any InterfaceAddress occupied by this
+        # component to avoid dangling references.
+        _release_interface_addresses(instance)
         return
 
     from .controllers import DALIGearGroup
@@ -357,6 +376,9 @@ def post_component_delete(sender, instance, *args, **kwargs):
 
         transaction.on_commit(update_colonel)
 
+    # Finally release any InterfaceAddress rows occupied by this component
+    _release_interface_addresses(instance)
+
 
 class Interface(models.Model):
     colonel = models.ForeignKey(
@@ -391,27 +413,48 @@ class Interface(models.Model):
     def save(self, *args, **kwargs):
         if not self.pin_a:
             self.pin_a = ColonelPin.objects.get(
-                colonel=self.colonel, no=INTERFACES_PINS_MAP[self.no][0]
+                colonel=self.colonel,
+                no=INTERFACES_PINS_MAP[self.no][0],
             )
         if not self.pin_b:
             self.pin_b = ColonelPin.objects.get(
-                colonel=self.colonel, no=INTERFACES_PINS_MAP[self.no][1]
+                colonel=self.colonel,
+                no=INTERFACES_PINS_MAP[self.no][1],
             )
-        if self.type:
-            for pin_no in INTERFACES_PINS_MAP[self.no]:
-                cpin = ColonelPin.objects.get(colonel=self.colonel, no=pin_no)
-                if cpin.occupied_by and cpin.occupied_by != self:
-                    raise ValidationError(
-                        f"Interface can not be created, because "
-                        f"{cpin} is already occupied by {cpin.occupied_by}."
-                    )
-            self.pin_a.occupied_by = self
-            self.pin_b.occupied_by = self
-        else:
-            self.pin_a.occupied_by = None
-            self.pin_b.occupied_by = None
 
-        return super().save(*args, **kwargs)
+        with transaction.atomic():
+            created = self.pk is None
+            super_save = super().save  # keep lint happy
+            retval = super_save(*args, **kwargs)
+
+            pins = list(
+                ColonelPin.objects.select_for_update().filter(
+                    colonel=self.colonel,
+                    no__in=INTERFACES_PINS_MAP[self.no],
+                )
+            )
+
+            if self.type:  # claim the pins
+                for pin in pins:
+                    # If already occupied by another object – abort.
+                    if pin.occupied_by and pin.occupied_by != self:
+                        raise ValidationError(
+                            f"Interface cannot claim {pin}. Currently "
+                            f"occupied by {pin.occupied_by}.",
+                        )
+                    pin.occupied_by = self
+                ColonelPin.objects.bulk_update(
+                    pins, ["occupied_by_content_type", "occupied_by_id"]
+                )
+            else:  # release them if *we* were occupying
+                for pin in pins:
+                    if pin.occupied_by == self:
+                        pin.occupied_by = None
+                ColonelPin.objects.bulk_update(
+                    pins, ["occupied_by_content_type", "occupied_by_id"]
+                )
+
+        return retval
 
     def broadcast_reset(self):
         from .gateways import FleetGatewayHandler
@@ -470,6 +513,11 @@ def post_interface_save(sender, instance, created, *args, **kwargs):
                 address=addr,
             )
     elif instance.type == 'dali':
+        InterfaceAddress.objects.filter(
+            interface=instance
+        ).exclude(
+            address_type__in=('dali-gear', 'dali-group', 'dali-device')
+        ).delete()
         for addr in range(64):
             InterfaceAddress.objects.get_or_create(
                 interface=instance, address_type='dali-gear',
@@ -483,17 +531,33 @@ def post_interface_save(sender, instance, created, *args, **kwargs):
     else:
         InterfaceAddress.objects.filter(interface=instance).delete()
 
+    try:
+        instance.colonel.update_config()
+    except Exception:
+        # Fail silently – configuration push should not prevent saving.
+        pass
+
 
 
 @receiver(post_delete, sender=Interface)
 def post_interface_delete(sender, instance, *args, **kwargs):
+    """Release GPIO pins that were occupied by the removed Interface."""
     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
+        pins = list(
+            ColonelPin.objects.select_for_update().filter(
+                occupied_by_content_type=ct,
+                occupied_by_id=instance.id,
+            )
+        )
+
+        for pin in pins:
+            pin.occupied_by = None
+
+        if pins:
+            ColonelPin.objects.bulk_update(
+                pins, ["occupied_by_content_type", "occupied_by_id"]
+            )
 
 
 class CustomDaliDevice(models.Model):
@@ -502,6 +566,7 @@ class CustomDaliDevice(models.Model):
     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"
@@ -512,6 +577,7 @@ class CustomDaliDevice(models.Model):
         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'
@@ -538,3 +604,27 @@ class CustomDaliDevice(models.Model):
             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

@@ -46,7 +46,7 @@ class ColonelSerializer(serializers.ModelSerializer):
     pins = serializers.SerializerMethodField()
     interfaces = serializers.SerializerMethodField()
     newer_firmware_available = serializers.SerializerMethodField()
-    last_seen = TimestampField()
+    last_seen = TimestampField(read_only=True)
     is_empty = serializers.SerializerMethodField()
 
     class Meta:
@@ -89,12 +89,48 @@ class ColonelSerializer(serializers.ModelSerializer):
 
 
 class CustomDaliDeviceSerializer(serializers.ModelSerializer):
+    is_empty = serializers.SerializerMethodField()
+    is_alive = serializers.SerializerMethodField()
+    last_seen = TimestampField(read_only=True)
 
     class Meta:
         model = CustomDaliDevice
-        fields = 'id', 'random_address', 'name'
-        read_only_fields = 'random_address',
+        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)
+        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
+