simo 2.10.7__py3-none-any.whl → 2.10.11__py3-none-any.whl

simo/fleet/models.py

@@ -16,7 +16,11 @@ 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
+
+# -------------------------------------------------------------------------
 
 
 
@@ -219,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"))
@@ -246,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 and interface.type:
+                return f"{self.label} - {interface.get_type_display()}"
         return self.label
 
     def save(self, *args, **kwargs):
@@ -268,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(
@@ -276,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:
@@ -308,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()
@@ -328,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
@@ -359,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(
@@ -393,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
@@ -472,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',
@@ -485,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):

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:
@@ -91,7 +91,7 @@ class ColonelSerializer(serializers.ModelSerializer):
 class CustomDaliDeviceSerializer(serializers.ModelSerializer):
     is_empty = serializers.SerializerMethodField()
     is_alive = serializers.SerializerMethodField()
-    last_seen = TimestampField()
+    last_seen = TimestampField(read_only=True)
 
     class Meta:
         model = CustomDaliDevice

simo/fleet/utils.py

@@ -1,6 +1,10 @@
+from django.db import transaction, models
+from django.core.exceptions import ValidationError
+from django.contrib.contenttypes.models import ContentType
 from simo.core.utils.cache import get_cached_data
 from simo.core.middleware import get_current_instance
 
+
 GPIO_PIN_DEFAULTS = {
     'output': True, 'input': True, 'default_pull': 'FLOATING',
     'native': True, 'adc': False,
@@ -71,6 +75,10 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
         GPIO_PINS['game-changer'][no] = GPIO_PIN_DEFAULTS.copy()
         GPIO_PINS['game-changer'][no].update(data)
 
+        if no in (13, 23, 32, 33):
+            GPIO_PINS['game-changer-mini'][no] = GPIO_PIN_DEFAULTS.copy()
+            GPIO_PINS['game-changer-mini'][no].update(data)
+
 
 for no in range(101, 126):
     GPIO_PINS['ample-wall'][no] = {
@@ -78,6 +86,9 @@ for no in range(101, 126):
         'native': False, 'adc': False,
         'capacitive': False, 'note': ''
     }
+    if no in (101, 102):
+        GPIO_PINS['ample-wall'][no]['interface'] = no - 100
+
 for no in range(126, 133):
     GPIO_PINS['ample-wall'][no] = {
         'output': True, 'input': True, 'default_pull': 'HIGH',
@@ -92,6 +103,8 @@ for no in range(101, 139):
         'native': False, 'adc': False,
         'capacitive': False, 'note': ''
     }
+    if no in (101, 102):
+        GPIO_PINS['game-changer'][no]['interface'] = no - 100
 
 for no in range(101, 105):
     GPIO_PINS['game-changer-mini'][no] = {
@@ -99,6 +112,8 @@ for no in range(101, 105):
         'native': False, 'adc': False,
         'capacitive': False, 'note': ''
     }
+    if no in (101, 102):
+        GPIO_PINS['game-changer-mini'][no]['interface'] = no - 100
 
 
 #4-relays
@@ -134,6 +149,117 @@ INTERFACES_PINS_MAP = {
 }
 
 
+def _get_component_interface_addresses(component):
+    """Return list[(interface_id, address_type, address)] component needs.
+
+    Supports I²C and DALI controllers. Extend when new bus types land.
+    """
+    from .models import Interface  # local import to avoid circular deps
+
+    cfg = component.config or {}
+    desired = []
+
+    # I²C ----------------------------------------------------------------
+    if 'i2c_interface' in cfg and 'i2c_address' in cfg:
+        desired.append((cfg['i2c_interface'], 'i2c', cfg['i2c_address']))
+
+    # DALI ---------------------------------------------------------------
+    interface_no = None
+    if 'dali_interface' in cfg:
+        interface_no = cfg['dali_interface']
+    elif 'interface' in cfg:
+        interface_no = cfg['interface']
+
+    if interface_no is not None and 'colonel' in cfg and 'da' in cfg:
+        interface_obj = Interface.objects.filter(
+            colonel_id=cfg['colonel'], no=interface_no
+        ).first()
+        if interface_obj:
+            uid = component.controller_uid or ''
+            if uid.endswith('DALIGearGroup'):
+                addr_type = 'dali-group'
+            elif uid.endswith(('DALILamp', 'DALIRelay')):
+                addr_type = 'dali-gear'
+            else:
+                addr_type = 'dali-device'
+            desired.append((interface_obj.id, addr_type, cfg['da']))
+
+    return desired
+
+
+def _sync_interface_address_occupancy(component):
+    """Synchronise InterfaceAddress rows for *component* (claim/release)."""
+    from .models import InterfaceAddress  # local import, avoids circulars
+
+    desired = set(_get_component_interface_addresses(component))
+
+    # Short-circuit if nothing desired and nothing currently occupied.
+    if not desired and not InterfaceAddress.objects.filter(
+        occupied_by_id=component.id,
+        occupied_by_content_type=ContentType.objects.get_for_model(component),
+    ).exists():
+        return
+
+    with transaction.atomic():
+        ct = ContentType.objects.get_for_model(component)
+
+        iface_ids = [d[0] for d in desired]
+        lock_qs = InterfaceAddress.objects.select_for_update().filter(
+            models.Q(occupied_by_content_type=ct, occupied_by_id=component.id)
+            | models.Q(interface_id__in=iface_ids)
+        )
+
+        addr_map = {(
+            ia.interface_id, ia.address_type, ia.address): ia for ia in lock_qs}
+
+        # Release obsolete ------------------------------------------------
+        for ia in lock_qs:
+            key = (ia.interface_id, ia.address_type, ia.address)
+            if ia.occupied_by_id == component.id and key not in desired:
+                ia.occupied_by = None
+
+        # Claim desired ---------------------------------------------------
+        for iface_id, addr_type, addr_val in desired:
+            key = (iface_id, addr_type, addr_val)
+            ia = addr_map.get(key)
+            if not ia:
+                ia = InterfaceAddress.objects.select_for_update().create(
+                    interface_id=iface_id, address_type=addr_type,
+                    address=addr_val,
+                )
+                addr_map[key] = ia
+            if ia.occupied_by and ia.occupied_by != component:
+                raise ValidationError(
+                    f"Interface address {ia} already occupied by "
+                    f"{ia.occupied_by}."
+                )
+            ia.occupied_by = component
+
+        # Bulk save all modified objects
+        InterfaceAddress.objects.bulk_update(
+            addr_map.values(),
+            ["occupied_by_content_type", "occupied_by_id"],
+        )
+
+
+def _release_interface_addresses(component):
+    """Clear all InterfaceAddress rows owned by component."""
+    from .models import InterfaceAddress  # delayed import
+
+    ct = ContentType.objects.get_for_model(component)
+    with transaction.atomic():
+        addresses = InterfaceAddress.objects.select_for_update().filter(
+            occupied_by_content_type=ct, occupied_by_id=component.id,
+        )
+        if not addresses:
+            return
+        for ia in addresses:
+            ia.occupied_by = None
+        InterfaceAddress.objects.bulk_update(
+            addresses, ["occupied_by_content_type", "occupied_by_id"]
+        )
+
+
 def get_all_control_input_choices():
     '''
     This is called multiple times by component form,

simo/notifications/serializers.py

@@ -4,7 +4,7 @@ from .models import Notification
 
 
 class NotificationSerializer(serializers.ModelSerializer):
-    datetime = TimestampField()
+    datetime = TimestampField(read_only=True)
 
     class Meta:
         model = Notification