simo 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

simo/fleet/models.py

@@ -1,5 +1,6 @@
 import requests
 import time
+from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db import models
 from django.db.models.signals import post_save, pre_delete, post_delete
@@ -11,8 +12,8 @@ from simo.core.models import Instance, Gateway, Component
 from simo.core.utils.helpers import get_random_string
 from simo.core.events import GatewayObjectCommand
 from .gateways import FleetGatewayHandler
-from .managers import ColonelsManager, ColonelPinsManager, I2CInterfacesManager
-from .utils import GPIO_PINS
+from .managers import ColonelsManager, ColonelPinsManager, InterfacesManager
+from .utils import GPIO_PINS, INTERFACES_PINS_MAP
 
 
 
@@ -181,10 +182,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 pin.save()
 
         for interface in self.i2c_interfaces.all():
-            interface.sda_pin.occupied_by = interface
-            interface.sda_pin.save()
-            interface.scl_pin.occupied_by = interface
-            interface.scl_pin.save()
+            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()
 
 
     def move_to(self, other_colonel):
@@ -256,12 +259,6 @@ 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')
             )
-        if instance.type in ('ample-wall', 'game-changer'):
-            I2CInterface.objects.create(
-                colonel=instance, name='Main', no=0,
-                scl_pin=ColonelPin.objects.get(colonel=instance, no=4),
-                sda_pin=ColonelPin.objects.get(colonel=instance, no=15),
-            )
 
 
 @receiver(pre_delete, sender=Component)
@@ -310,7 +307,7 @@ class I2CInterface(models.Model):
         default=100000, help_text="100000 - is a good middle point!"
     )
 
-    objects = I2CInterfacesManager()
+    objects = InterfacesManager()
 
     class Meta:
         unique_together = 'colonel', 'no'
@@ -319,7 +316,7 @@ class I2CInterface(models.Model):
         return self.name
 
 
-@receiver(post_save, sender=I2CInterface)
+@receiver(post_delete, sender=I2CInterface)
 def post_i2c_interface_delete(sender, instance, *args, **kwargs):
     with transaction.atomic():
         ct = ContentType.objects.get_for_model(instance)
@@ -334,3 +331,74 @@ def post_i2c_interface_delete(sender, instance, *args, **kwargs):
         instance.scl_pin.save()
         instance.sda_pin.occupied_by = instance
         instance.sda_pin.save()
+
+
+class Interface(models.Model):
+    colonel = models.ForeignKey(
+        Colonel, on_delete=models.CASCADE, related_name='interfaces'
+    )
+    no = models.PositiveIntegerField(choices=((1, "1"), (2, "2")))
+    type = models.CharField(
+        max_length=20, choices=(('i2c', "I2C"), ('dali', "DALI"))
+    )
+    pin_a = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin A (scl)", null=True, related_name='interface_a',
+        editable=False
+    )
+    pin_b = models.ForeignKey(
+        ColonelPin, on_delete=models.CASCADE, limit_choices_to={
+            'native': True, 'output': True,
+        }, verbose_name="Pin B (sda)", null=True, related_name='interface_b',
+        editable=False
+    )
+
+    objects = InterfacesManager()
+
+    class Meta:
+        unique_together = 'colonel', 'no'
+
+    def __str__(self):
+        return f"{self.no} - {self.get_type_display()}"
+
+    def save(self, *args, **kwargs):
+        if not self.pk:
+            for pin_no in INTERFACES_PINS_MAP[self.no]:
+                cpin = ColonelPin.objects.get(colonel=self.colonel, no=pin_no)
+                if cpin.occupied_by:
+                    raise ValidationError(
+                        f"Interface can not be created, because "
+                        f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                    )
+        return super().save(*args, **kwargs)
+
+
+@receiver(post_save, sender=Interface)
+def post_interface_save(sender, instance, created, *args, **kwargs):
+    if created:
+        instance.pin_a = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][0]
+        )
+        instance.pin_a.occupied_by = instance
+        instance.pin_a.save()
+        instance.pin_b = ColonelPin.objects.get(
+            colonel=instance.colonel, no=INTERFACES_PINS_MAP[instance.no][1]
+        )
+        instance.pin_b.occupied_by = instance
+        instance.pin_b.save()
+
+
+@receiver(post_delete, sender=Interface)
+def post_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()
+
+

simo/fleet/socket_consumers.py

@@ -218,15 +218,14 @@ class FleetConsumer(AsyncWebsocketConsumer):
             }
         }
         config_data['settings'].update(instance_options)
-        i2c_interfaces = await sync_to_async(list, thread_sensitive=True)(
-            self.colonel.i2c_interfaces.all().select_related(
-                'scl_pin', 'sda_pin'
+        interfaces = await sync_to_async(list, thread_sensitive=True)(
+            self.colonel.interfaces.all().select_related(
+                'pin_a', 'pin_b'
             )
         )
-        for i2c_interface in i2c_interfaces:
-            config_data['interfaces']['i2c-%d' % i2c_interface.no] = {
-                'scl': i2c_interface.scl_pin.no, 'sda': i2c_interface.sda_pin.no,
-                'freq': i2c_interface.freq
+        for interface in interfaces:
+            config_data['interfaces'][f'{interface.type}-{interface.no}'] = {
+                'pin_a': interface.pin_a.no, 'pin_b': interface.pin_b.no,
             }
         components = await sync_to_async(
             list, thread_sensitive=True
@@ -319,6 +318,11 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     asyncio.run(self.send_data({
                         'command': 'discover-ttlock'
                     }))
+                elif payload.get('command') == 'discover-dali':
+                    print("SEND discover-dali command!")
+                    asyncio.run(self.send_data({
+                        'command': 'discover-dali', 'i': payload['interface']
+                    }))
                 elif payload.get('command') == 'finalize':
                     asyncio.run(self.send_data({
                         'command': 'finalize',
@@ -420,18 +424,21 @@ class FleetConsumer(AsyncWebsocketConsumer):
                     except Exception as e:
                         print(traceback.format_exc(), file=sys.stderr)
 
-                elif 'discover-ttlock' in data:
+                elif 'discovery-result' in data:
                     def process_discovery_result():
-                        self.gateway.refresh_from_db()
-                        if self.gateway.discovery.get('finished'):
-                            return Component.objects.filter(
+                        # 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)
-                        self.gateway.finish_discovery()
 
                     finished_comp = await sync_to_async(
                         process_discovery_result, thread_sensitive=True

simo/fleet/utils.py

@@ -58,7 +58,7 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
 
 # ample-wall
 for no, data in BASE_ESP32_GPIO_PINS.items():
-    if no in (4, 12, 13, 14, 15, 23, 32, 33, 34, 36, 39):
+    if no in (12, 13, 14, 23, 32, 33, 34, 36, 39):
         GPIO_PINS['ample-wall'][no] = GPIO_PIN_DEFAULTS.copy()
         GPIO_PINS['ample-wall'][no].update(data)
 
@@ -114,3 +114,8 @@ for no, data in BASE_ESP32_GPIO_PINS.items():
         GPIO_PINS['4-relays'][no]['note'] = 'Relay4'
     else:
         GPIO_PINS['4-relays'][no].update(data)
+
+
+INTERFACES_PINS_MAP = {
+    1: [13, 23], 2: [32, 33]
+}

simo/fleet/views.py

@@ -1,9 +1,8 @@
-from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponse, Http404
 from django.db.models import Q
 from dal import autocomplete
 from simo.core.utils.helpers import search_queryset
-from .models import Colonel, ColonelPin, I2CInterface
+from .models import Colonel, ColonelPin, Interface
 
 
 def colonels_ping(request):
@@ -43,20 +42,22 @@ class PinsSelectAutocomplete(autocomplete.Select2QuerySetView):
         return qs
 
 
-class I2CInterfaceSelectAutocomplete(autocomplete.Select2ListView):
+class InterfaceSelectAutocomplete(autocomplete.Select2ListView):
 
     def get_list(self):
         if not self.request.user.is_staff:
-            return []
+            return Interface.objects.none()
 
         try:
             colonel = Colonel.objects.get(
                 pk=self.forwarded.get("colonel")
             )
         except:
-            return []
+            return Interface.objects.none()
 
-        return [
-            (i.no, i.get_no_display()) for i in
-            I2CInterface.objects.filter(colonel=colonel)
-        ]
+        qs = Interface.objects.filter(colonel=colonel)
+
+        if self.forwarded.get('filters'):
+            qs = qs.filter(**self.forwarded.get('filters'))
+
+        return qs

simo/generic/controllers.py

@@ -208,13 +208,9 @@ class Thermostat(ControllerBase):
         heater = Component.objects.filter(
             pk=self.component.config.get('heater')
         ).first()
-        if heater:
-            heater.prepare_controller()
         cooler = Component.objects.filter(
             pk=self.component.config.get('cooler')
         ).first()
-        if cooler:
-            cooler.prepare_controller()
 
         if not temperature_sensor or not temperature_sensor.alive:
             print(f"No temperature sensor on {self.component}!")
@@ -720,7 +716,6 @@ class Watering(ControllerBase):
                 switch = Component.objects.get(pk=contour_data['switch'])
             except Component.DoesNotExist:
                 continue
-            switch.prepare_controller()
             if run:
                 if switch.timer_engaged():
                     switch.stop_timer()
@@ -845,7 +840,6 @@ class Watering(ControllerBase):
                 switch = Component.objects.get(pk=contour_data['switch'])
             except Component.DoesNotExist:
                 continue
-            switch.prepare_controller()
             if switch.timer_engaged():
                 switch.stop_timer()
             switch.turn_off()
@@ -1077,7 +1071,6 @@ class AlarmClock(ControllerBase):
             print(f"Reverse event {event['uid']}!")
         comp = Component.objects.filter(id=event['component']).first()
         if comp:
-            comp.prepare_controller()
             if forward:
                 action_name = 'play_action'
             else:

simo/generic/forms.py

@@ -202,7 +202,6 @@ class AlarmGroupConfigForm(BaseComponentForm):
                     "Can not cover self. Please remove - [%s]" % str(check_cmp)
                 )
             if comp.base_type == 'alarm-group':
-                comp.prepare_controller()
                 self.recurse_check_alarm_groups(
                     comp.get_children(), check_cmp
                 )
@@ -227,7 +226,6 @@ class AlarmGroupConfigForm(BaseComponentForm):
                 c.save(update_fields=('config',))
         if obj.id:
             comp = Component.objects.get(id=obj.id)
-            comp.prepare_controller()
             comp.refresh_status()
         return obj
 
@@ -512,7 +510,6 @@ class AlarmClockEventForm(forms.Form):
         if not self.cleaned_data.get('play_action'):
             return self.cleaned_data
         component = self.cleaned_data.get('component')
-        component.prepare_controller()
         if not hasattr(component, self.cleaned_data['play_action']):
             self.add_error(
                 'play_action',

simo/generic/gateways.py

@@ -175,7 +175,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ):
             tz = pytz.timezone(thermostat.zone.instance.timezone)
             timezone.activate(tz)
-            thermostat.prepare_controller()
             thermostat.evaluate()
 
     def watch_alarm_clocks(self):
@@ -185,7 +184,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ):
             tz = pytz.timezone(alarm_clock.zone.instance.timezone)
             timezone.activate(tz)
-            alarm_clock.prepare_controller()
             alarm_clock.tick()
 
     def watch_scripts(self):
@@ -194,7 +192,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             controller_uid=Script.uid,
             config__autostart=True
         ).exclude(value='running'):
-            script.prepare_controller()
             self.start_script(script)
 
     def watch_watering(self):
@@ -202,7 +199,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         for watering in Component.objects.filter(controller_uid=Watering.uid):
             tz = pytz.timezone(watering.zone.instance.timezone)
             timezone.activate(tz)
-            watering.prepare_controller()
             if watering.value['status'] == 'running_program':
                 watering.set_program_progress(
                     watering.value['program_progress'] + 1
@@ -333,11 +329,9 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             open_switch = Component.objects.get(
                 pk=blinds.config['open_switch']
             )
-            open_switch.prepare_controller()
             close_switch = Component.objects.get(
                 pk=blinds.config['close_switch']
             )
-            close_switch.prepare_controller()
         except:
             return
 
@@ -406,7 +400,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         alarm_group.save()
 
         for pk, other_group in other_alarm_groups.items():
-            other_group.prepare_controller()
             other_group.refresh_status()
 
 
@@ -416,7 +409,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ).first()
         if not switch:
             return
-        switch.prepare_controller()
 
         if gate.config.get('action_method') == 'click':
             switch.click()

{simo-2.0.5.dist-info → simo-2.0.7.dist-info}/METADATA

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