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

simo/core/utils/serialization.py

@@ -21,14 +21,14 @@ def serialize_form_data(data):
                 serialized_data[field_name] = {
                     'model': 'many',
                     'val': json.loads(model_serializers.serialize(
-                        'json', val
+                        'json', val, fields=['pk']
                     ))
                 }
             else:
                 serialized_data[field_name] = {
                     'model': 'single',
                     'val': json.loads(model_serializers.serialize(
-                        'json', [val]
+                        'json', [val], fields=['pk']
                     ))
                 }
         else:
@@ -46,11 +46,13 @@ def deserialize_form_data(data):
             if val['model'] == 'single':
                 for item in deserializer_generator:
                     deserialized_data[field_name] = item.object
+                    deserialized_data[field_name].refresh_from_db()
                     break
             else:
                 deserialized_data[field_name] = []
                 for item in deserializer_generator:
                     deserialized_data[field_name].append(item.object)
+                    deserialized_data[field_name][-1].refresh_from_db()
         else:
             deserialized_data[field_name] = val
     return deserialized_data

simo/core/utils/type_constants.py

@@ -19,20 +19,32 @@ def get_controller_types_map(gateway=None):
         except ModuleNotFoundError:
             continue
         for cls_name, cls in configs.__dict__.items():
-            if inspect.isclass(cls) and issubclass(cls, ControllerBase) \
-                and not inspect.isabstract(cls):
-                if gateway:
+            if not inspect.isclass(cls):
+                continue
+            if not issubclass(cls, ControllerBase):
+                continue
+            if inspect.isabstract(cls):
+                continue
+            if gateway:
+                if issubclass(gateway, BaseGatewayHandler) \
+                or isinstance(gateway, BaseGatewayHandler):
+                    if gateway.uid != cls.gateway_class.uid:
+                        continue
+                else:
                     try:
-                        same = gateway.type == cls.gateway_class.uid
+                        same = gateway.handler.uid == cls.gateway_class.uid
                     except:
                         continue
                     else:
                         if not same:
                             continue
-                controllers_map[cls.uid] = cls
+            controllers_map[cls.uid] = cls
     return controllers_map
 
 
+CONTROLLER_TYPES_MAP = get_controller_types_map()
+
+
 def get_controller_types_choices(gateway=None):
     choices = []
     for controller_cls in get_controller_types_map(gateway).values():
@@ -40,11 +52,8 @@ def get_controller_types_choices(gateway=None):
     return choices
 
 
-#ALL_CONTROLLER_TYPES = get_controller_types_map()
-# CONTROLLER_TYPE_CHOICES = [
-#     (slug, cls.name) for slug, cls in ALL_CONTROLLER_TYPES.items()
-# ]
-# CONTROLLER_TYPE_CHOICES.sort(key=lambda e: e[0])
+CONTROLLER_TYPES_CHOICES = get_controller_types_choices()
+
 
 def get_all_gateways():
     all_gateways = {}
@@ -65,13 +74,25 @@ def get_all_gateways():
     return all_gateways
 
 
+GATEWAYS_MAP = get_all_gateways()
+
+
 def get_gateway_choices():
     choices = [
-        (slug, cls.name) for slug, cls in get_all_gateways().items()
+        (slug, cls.name) for slug, cls in GATEWAYS_MAP.items()
     ]
     choices.sort(key=lambda e: e[1])
     return choices
 
+GATEWAYS_CHOICES = get_gateway_choices()
+
+
+CONTROLLERS_BY_GATEWAY = {}
+for gateway_slug, gateway_cls in GATEWAYS_MAP.items():
+    CONTROLLERS_BY_GATEWAY[gateway_slug] = {}
+    for ctrl_uid, ctrl_cls in get_controller_types_map(gateway_cls).items():
+        CONTROLLERS_BY_GATEWAY[gateway_slug][ctrl_uid] = ctrl_cls
+
 
 ALL_BASE_TYPES = {}
 for name, app in apps.app_configs.items():

simo/fleet/admin.py

@@ -5,14 +5,14 @@ from django.template.loader import render_to_string
 from django.templatetags.static import static
 from simo.core.models import Component
 from simo.core.utils.admin import FormAction
-from .models import Colonel, I2CInterface, ColonelPin
-from .forms import ColonelAdminForm, MoveColonelForm, I2CInterfaceAdminForm
+from .models import Colonel, Interface, ColonelPin
+from .forms import ColonelAdminForm, MoveColonelForm, InterfaceAdminForm
 
 
-class I2CInterfaceInline(admin.TabularInline):
-    model = I2CInterface
+class InterfaceInline(admin.TabularInline):
+    model = Interface
     extra = 0
-    form = I2CInterfaceAdminForm
+    form = InterfaceAdminForm
 
 
 class ColonelPinsInline(admin.TabularInline):
@@ -71,7 +71,7 @@ class ColonelAdmin(admin.ModelAdmin):
         'rebuild_occupied_pins'
     )
 
-    inlines = I2CInterfaceInline, ColonelPinsInline
+    inlines = InterfaceInline, ColonelPinsInline
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)

simo/fleet/auto_urls.py

@@ -1,9 +1,8 @@
 from django.urls import path, re_path
-from django.views.generic import TemplateView
 from .views import (
     colonels_ping,
     PinsSelectAutocomplete,
-    I2CInterfaceSelectAutocomplete
+    InterfaceSelectAutocomplete
 )
 
 urlpatterns = [
@@ -15,7 +14,8 @@ urlpatterns = [
         PinsSelectAutocomplete.as_view(), name='autocomplete-colonel-pins'
     ),
     path(
-        'autocomplete-colonel-i2c_interfaces',
-        I2CInterfaceSelectAutocomplete.as_view(), name='autocomplete-colonel-i2c_interfaces'
+        'autocomplete-colonel-interfaces',
+        InterfaceSelectAutocomplete.as_view(),
+        name='autocomplete-interfaces'
     )
 ]

simo/fleet/controllers.py

@@ -24,7 +24,7 @@ from .forms import (
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MPC9808SensorConfigForm,
     DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
-    TTLockConfigForm
+    TTLockConfigForm, DALIDeviceConfigForm
 )
 
 
@@ -294,6 +294,7 @@ class TTLock(FleeDeviceMixin, Lock):
     @classmethod
     def init_discovery(self, form_cleaned_data):
         from simo.core.models import Gateway
+        print("INIT discovery form cleaned data: ", form_cleaned_data)
         print("Serialized form: ", serialize_form_data(form_cleaned_data))
         gateway = Gateway.objects.filter(type=self.gateway_class.uid).first()
         gateway.start_discovery(
@@ -307,7 +308,7 @@ class TTLock(FleeDeviceMixin, Lock):
 
     @classmethod
     def _process_discovery(cls, started_with, data):
-        if data['discover-ttlock'] == 'fail':
+        if data['discovery-result'] == 'fail':
             if data['result'] == 0:
                 return {'error': 'Internal Colonel error. See Colonel logs.'}
             if data['result'] == 1:
@@ -348,6 +349,7 @@ class TTLock(FleeDeviceMixin, Lock):
                 },
             }
             new_component.save()
+            new_component.gateway.finish_discovery()
             GatewayObjectCommand(
                 new_component.gateway, Colonel(
                     id=new_component.config['colonel']
@@ -417,4 +419,75 @@ class TTLock(FleeDeviceMixin, Lock):
         ).publish()
 
 
+class DALIDevice(FleeDeviceMixin):
+    gateway_class = FleetGatewayHandler
+    config_form = DALIDeviceConfigForm
+    discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
+
+    @classmethod
+    def init_discovery(self, form_cleaned_data):
+        from simo.core.models import Gateway
+        gateway = Gateway.objects.filter(type=self.gateway_class.uid).first()
+        gateway.start_discovery(
+            self.uid, serialize_form_data(form_cleaned_data),
+            timeout=60
+        )
+        GatewayObjectCommand(
+            gateway, form_cleaned_data['colonel'],
+            command=f'discover-dali',
+            interface=form_cleaned_data['interface'].no
+        ).publish()
+
+    @classmethod
+    def _process_discovery(cls, started_with, data):
+        started_with = deserialize_form_data(started_with)
+        form = TTLockConfigForm(controller_uid=cls.uid, data=started_with)
+
+        if form.is_valid():
+            new_component = form.save()
+            new_component.config.update(data.get('result', {}).get('config'))
+            new_component.meta['finalization_data'] = {
+                'temp_id': data['result']['id'],
+                'permanent_id': new_component.id,
+                'config': {
+                    'type': cls.uid.split('.')[-1],
+                    'config': new_component.config,
+                    'val': False,
+                },
+            }
+            new_component.save()
+            new_component.gateway.finish_discovery()
+            GatewayObjectCommand(
+                new_component.gateway, Colonel(
+                    id=new_component.config['colonel']
+                ), command='finalize',
+                data=new_component.meta['finalization_data'],
+            ).publish()
+            return [new_component]
+
+        # Literally impossible, but just in case...
+        return {'error': 'INVALID INITIAL DISCOVERY FORM!'}
+
+
+class DALIGear(DALIDevice):
+
+    def _send_to_device(self, value):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            set_val=value,
+            component_id=self.component.id,
+        ).publish()
+
+
+class DALILamp(DALIGear, BaseSwitch):
+    manual_add = False
+    name = 'DALI Lamp'
+    discovery_msg = _("Please hook up your new DALI device to your DALI bus.")
+
+
+class DALIDimmableLamp(DALIGear, BaseDimmer):
+    manual_add = False
+    name = 'DALI Dimmable Lamp'
+    discovery_msg = _("Please hook up your new DALI lamp to your DALI bus.")
 

simo/fleet/forms.py

@@ -12,7 +12,8 @@ from simo.core.widgets import LogOutputWidget
 from simo.core.utils.easing import EASING_CHOICES
 from simo.core.utils.validators import validate_slaves
 from simo.core.utils.admin import AdminFormActionForm
-from .models import Colonel, ColonelPin, I2CInterface, i2c_interface_no_choices
+from .models import Colonel, ColonelPin, Interface
+from .utils import INTERFACES_PINS_MAP
 
 
 class ColonelPinChoiceField(forms.ModelChoiceField):
@@ -23,6 +24,11 @@ class ColonelPinChoiceField(forms.ModelChoiceField):
     filter_by = 'colonel'
 
 
+class ColonelInterfacesChoiceField(forms.ModelChoiceField):
+    filter_by = 'colonel'
+
+
+
 class ColonelAdminForm(forms.ModelForm):
     log = forms.CharField(
         widget=forms.HiddenInput, required=False
@@ -52,34 +58,29 @@ class MoveColonelForm(AdminFormActionForm):
     )
 
 
-class I2CInterfaceAdminForm(forms.ModelForm):
-    scl_pin = ColonelPinChoiceField(
-        queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
-    )
-    sda_pin = ColonelPinChoiceField(
-        queryset=ColonelPin.objects.filter(output=True, native=True),
-        widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-pins',
-            forward=[
-                forward.Self(),
-                forward.Field('colonel'),
-                forward.Const({'output': True, 'native': True}, 'filters')
-            ]
-        )
-    )
+class InterfaceAdminForm(forms.ModelForm):
 
     class Meta:
-        model = I2CInterface
+        model = Interface
         fields = '__all__'
 
+
+    def clean(self):
+        if self.instance.pk:
+            return self.cleaned_data
+
+        for pin_no in INTERFACES_PINS_MAP[self.cleaned_data['no']]:
+            cpin = ColonelPin.objects.get(
+                colonel=self.instance.colonel, no=pin_no
+            )
+            if cpin.occupied_by:
+                raise forms.ValidationError(
+                    f"Interface can not be created, because "
+                    f"GPIO{cpin} is already occupied by {cpin.occupied_by}."
+                )
+
+
+
     def clean_scl_pin(self):
         if self.cleaned_data['scl_pin'].occupied_by \
         and self.cleaned_data['scl_pin'].occupied_by  != self.instance:
@@ -416,13 +417,16 @@ class ColonelDHTSensorConfigForm(ColonelComponentForm):
 
 
 class BME680SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -437,15 +441,22 @@ class BME680SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class MPC9808SensorConfigForm(ColonelComponentForm):
-    i2c_interface = forms.TypedChoiceField(
-        coerce=int, choices=i2c_interface_no_choices,
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='i2c'),
         widget=autocomplete.ListSelect2(
-            url='autocomplete-colonel-i2c_interfaces',
+            url='autocomplete-interfaces',
             forward=[
                 forward.Self(),
                 forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'i2c'}, 'filters'
+                )
             ]
         )
     )
@@ -460,6 +471,10 @@ class MPC9808SensorConfigForm(ColonelComponentForm):
 
     )
 
+    def save(self, commit=True):
+        self.instance.config['i2c_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
 
 class ColonelTouchSensorConfigForm(ColonelComponentForm):
     pin = ColonelPinChoiceField(
@@ -987,7 +1002,6 @@ class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
 
 
 class TTLockConfigForm(ColonelComponentForm):
-    pass
 
     def clean(self):
         if not self.instance or not self.instance.pk:
@@ -1002,7 +1016,6 @@ class TTLockConfigForm(ColonelComponentForm):
                 )
         return self.cleaned_data
 
-
     def save(self, commit=True):
         obj = super(ColonelComponentForm, self).save(commit)
         if commit:
@@ -1010,3 +1023,25 @@ class TTLockConfigForm(ColonelComponentForm):
             self.cleaned_data['colonel'].save()
         return obj
 
+
+
+class DALIDeviceConfigForm(ColonelComponentForm):
+    interface = ColonelInterfacesChoiceField(
+        queryset=Interface.objects.filter(type='dali'),
+        widget=autocomplete.ListSelect2(
+            url='autocomplete-interfaces',
+            forward=[
+                forward.Self(),
+                forward.Field('colonel'),
+                forward.Const(
+                    {'type': 'dali'}, 'filters'
+                )
+            ]
+        )
+    )
+
+    def save(self, commit=True):
+        self.instance.config['dali_interface'] = self.cleaned_data['interface'].no
+        return super().save(commit=commit)
+
+

simo/fleet/gateways.py

@@ -1,4 +1,5 @@
 import datetime
+import time
 from django.utils import timezone
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
@@ -14,7 +15,7 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     periodic_tasks = (
         ('look_for_updates', 600),
         ('watch_colonels_connection', 30),
-        ('push_discoveries', 3),
+        ('push_discoveries', 10),
     )
 
     def _on_mqtt_message(self, client, userdata, msg):
@@ -37,9 +38,12 @@ class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     def push_discoveries(self):
         from .models import Colonel
         for gw in Gateway.objects.filter(
-            type=self.uid,
-            discovery__has_key='start',
+            type=self.uid, discovery__has_key='start',
         ).exclude(discovery__has_key='finished'):
+            if time.time() - gw.discovery.get('last_check') > 10:
+                gw.finish_discovery()
+                continue
+
             colonel = Colonel.objects.get(
                 id=gw.discovery['init_data']['colonel']['val'][0]['pk']
             )

simo/fleet/managers.py

@@ -22,11 +22,13 @@ class ColonelPinsManager(models.Manager):
         return qs
 
 
-class I2CInterfacesManager(models.Manager):
+class InterfacesManager(models.Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
         instance = get_current_instance()
         if instance:
             qs = qs.filter(colonel__instance=instance)
-        return qs
+        return qs
+
+

simo/fleet/migrations/0032_auto_20240415_0736.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0031_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='logs_stream',
+            field=models.BooleanField(default=False, help_text='ATENTION! Causes serious overhead and significantly degrades the lifespan of a chip due to a lot of writes to the memory. It also causes Colonel websocket to run out of memory and reset if a lot of data is being transmitted. Leave this off, unleess you know what you are doing!'),
+        ),
+        migrations.CreateModel(
+            name='Interface',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('no', models.PositiveIntegerField(choices=[(1, '1'), (2, '2')])),
+                ('type', models.CharField(choices=[('i2c', 'I2C'), ('dali', 'DALI')], max_length=20)),
+                ('pin_a', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_a', to='fleet.colonelpin')),
+                ('pin_b', models.ForeignKey(editable=False, limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='interface_b', to='fleet.colonelpin')),
+                ('colonel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='fleet.colonel')),
+            ],
+            options={
+                'unique_together': {('colonel', 'no')},
+            },
+        ),
+    ]

simo/fleet/migrations/0033_auto_20240415_0736.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.9 on 2024-04-15 07:36
+
+from django.db import migrations
+
+def create_objects(apps, schema_editor):
+    I2CInterface = apps.get_model("fleet", "I2CInterface")
+    Interface = apps.get_model("fleet", "Interface")
+    for i2c_i in I2CInterface.objects.filter(no__gt=0):
+        Interface.objects.create(
+            colonel=i2c_i.colonel, type='i2c',
+            pin_a=i2c_i.scl_pin, pin_b=i2c_i.sda_pin
+        )
+
+
+def delete_objects(apps, schema_editor):
+    Interface = apps.get_model("fleet", "Interface")
+    Interface.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0032_auto_20240415_0736'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_objects, delete_objects),
+    ]