simo 1.7.19__py3-none-any.whl → 2.0.0__py3-none-any.whl

simo/fleet/gateways.py

@@ -1,7 +1,49 @@
-from simo.core.gateways import BaseGatewayHandler
+import datetime
+from django.utils import timezone
+from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
+from simo.core.models import Gateway
+from simo.core.events import GatewayObjectCommand
 
 
-class FleetGatewayHandler(BaseGatewayHandler):
+
+class FleetGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "SIMO.io Fleet"
     config_form = BaseGatewayForm
+
+    periodic_tasks = (
+        ('look_for_updates', 600),
+        ('watch_colonels_connection', 30),
+        ('push_discoveries', 3),
+    )
+
+    def _on_mqtt_message(self, client, userdata, msg):
+        pass
+
+    def look_for_updates(self):
+        from .models import Colonel
+        for colonel in Colonel.objects.all():
+            colonel.check_for_upgrade()
+
+    def watch_colonels_connection(self):
+        from .models import Colonel
+        for colonel in Colonel.objects.filter(
+            socket_connected=True,
+            last_seen__lt=timezone.now() - datetime.timedelta(minutes=2)
+        ):
+            colonel.socket_connected = False
+            colonel.save()
+
+    def push_discoveries(self):
+        from .models import Colonel
+        for gw in Gateway.objects.filter(
+            type=self.uid,
+            discovery__has_key='start',
+        ).exclude(discovery__has_key='finished'):
+            colonel = Colonel.objects.get(
+                id=gw.discovery['init_data']['colonel']['val'][0]['pk']
+            )
+            print("Publish discover-ttlock command!")
+            GatewayObjectCommand(
+                gw, colonel, command='discover-ttlock',
+            ).publish()

simo/fleet/managers.py

@@ -0,0 +1,32 @@
+from django.db import models
+from simo.core.middleware import get_current_instance
+
+
+class ColonelsManager(models.Manager):
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        instance = get_current_instance()
+        if instance:
+            qs = qs.filter(instance=instance)
+        return qs
+
+
+class ColonelPinsManager(models.Manager):
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        instance = get_current_instance()
+        if instance:
+            qs = qs.filter(colonel__instance=instance)
+        return qs
+
+
+class I2CInterfacesManager(models.Manager):
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        instance = get_current_instance()
+        if instance:
+            qs = qs.filter(colonel__instance=instance)
+        return qs

simo/fleet/migrations/0025_auto_20240130_1334.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.9 on 2024-01-30 13:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0024_colonel_pwm_frequency'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='colonel',
+            name='is_authorized',
+        ),
+        migrations.AlterField(
+            model_name='colonel',
+            name='pwm_frequency',
+            field=models.IntegerField(choices=[(0, '3kHz'), (1, '22kHz')], default=1, help_text='Affects Ample Wall dimmer PWM output (dimmer) frequency'),
+        ),
+        migrations.AlterField(
+            model_name='colonel',
+            name='type',
+            field=models.CharField(choices=[('ample-wall', 'Ample Wall')], default='ample-wall', max_length=20),
+        ),
+    ]

simo/fleet/migrations/0026_rename_i2cinterface_scl_pin_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.2.10 on 2024-03-06 08:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('fleet', '0025_auto_20240130_1334'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='i2cinterface',
+            old_name='scl_pin',
+            new_name='scl_pin_no',
+        ),
+        migrations.RenameField(
+            model_name='i2cinterface',
+            old_name='sda_pin',
+            new_name='sda_pin_no',
+        ),
+        migrations.CreateModel(
+            name='ColonelPin',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('no', models.PositiveIntegerField()),
+                ('input', models.BooleanField(db_index=True, default=False)),
+                ('output', models.BooleanField(db_index=True, default=False)),
+                ('capacitive', models.BooleanField(db_index=True, default=False)),
+                ('adc', models.BooleanField(default=False)),
+                ('native', models.BooleanField(db_index=True, default=True)),
+                ('default_pull', models.CharField(blank=True, choices=[('LOW', 'LOW'), ('HIGH', 'HIGH')], db_index=True, max_length=50, null=True)),
+                ('note', models.CharField(max_length=100)),
+                ('occupied_by_id', models.PositiveIntegerField(null=True)),
+                ('colonel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pins', to='fleet.colonel')),
+                ('occupied_by_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, null=True, to='contenttypes.contenttype')),
+            ],
+            options={
+                'indexes': [models.Index(fields=['occupied_by_content_type', 'occupied_by_id'], name='fleet_colon_occupie_f2bfd0_idx')],
+                'unique_together': {('colonel', 'no')},
+            },
+        ),
+        migrations.AddField(
+            model_name='i2cinterface',
+            name='scl_pin',
+            field=models.ForeignKey(
+                to='fleet.ColonelPin', on_delete=django.db.models.CASCADE,
+                limit_choices_to={'native': True},
+                null=True, related_name='i2c_scl'
+            ),
+        ),
+        migrations.AddField(
+            model_name='i2cinterface',
+            name='sda_pin',
+            field=models.ForeignKey(
+                to='fleet.ColonelPin', on_delete=django.db.models.CASCADE,
+                limit_choices_to={'native': True},
+                null=True, related_name='i2c_sda'
+            ),
+        ),
+    ]

simo/fleet/migrations/0027_auto_20240306_0802.py

@@ -0,0 +1,170 @@
+# Generated by Django 4.2.10 on 2024-03-06 08:02
+import traceback
+import json
+import sys
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    from simo.fleet.utils import GPIO_PINS
+    from django.contrib.contenttypes.models import ContentType
+
+    Colonel = apps.get_model('fleet', "Colonel")
+    ColonelPin = apps.get_model("fleet", "ColonelPin")
+    Component = apps.get_model('core', "Component")
+
+    new_pins = {}
+
+    for colonel in Colonel.objects.all():
+        new_pins[colonel.id] = {}
+        for no, data in GPIO_PINS.get(colonel.type).items():
+            new_pins[colonel.id][no] = ColonelPin.objects.create(
+                colonel=colonel, no=no,
+                input=data.get('input'), output=data.get('output'),
+                capacitive=data.get('capacitive'), adc=data.get('adc'),
+                native=data.get('native'), note=data.get('note')
+            )
+
+        for i2c in colonel.i2c_interfaces.all():
+            ct = ContentType.objects.get_for_model(i2c)
+
+            scl_pin = new_pins[colonel.id][i2c.scl_pin_no]
+            scl_pin.occupied_by_content_type = ct
+            scl_pin.occupied_by_id = i2c.id
+            scl_pin.save()
+            i2c.scl_pin = scl_pin
+            i2c.scl_pin.save()
+
+            sda_pin = new_pins[colonel.id][i2c.sda_pin_no]
+            sda_pin.occupied_by_content_type = ct
+            sda_pin.occupied_by_id = i2c.id
+            sda_pin.save()
+
+            i2c.sda_pin = sda_pin
+            i2c.sda_pin.save()
+
+    print("NEW pins: ", new_pins)
+
+    for comp in Component.objects.filter(
+        controller_uid__startswith='simo.fleet.'
+    ):
+        ct = ContentType.objects.get_for_model(comp)
+        try:
+            colonel = Colonel.objects.get(id=comp.config['colonel'])
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
+            continue
+        if 'pin' in comp.config:
+            comp.config['pin_no'] = comp.config.pop('pin')
+
+            if comp.config['pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['pin_no']]
+            comp.config['pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+        if 'power_pin' in comp.config:
+            comp.config['power_pin_no'] = comp.config.pop('power_pin')
+
+            if comp.config['power_pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['power_pin_no']]
+            comp.config['power_pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+        if 'sensor_pin' in comp.config:
+            comp.config['sensor_pin_no'] = comp.config.pop('sensor_pin')
+
+            if comp.config['sensor_pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['sensor_pin_no']]
+            comp.config['sensor_pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+        if 'output_pin' in comp.config:
+            comp.config['output_pin_no'] = comp.config.pop('output_pin')
+
+            if comp.config['output_pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['output_pin_no']]
+            comp.config['output_pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+        if 'open_pin' in comp.config:
+            comp.config['open_pin_no'] = comp.config.pop('open_pin')
+
+            if comp.config['open_pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['open_pin_no']]
+            comp.config['open_pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+        if 'close_pin' in comp.config:
+            comp.config['close_pin_no'] = comp.config.pop('close_pin')
+
+            if comp.config['close_pin_no'] not in new_pins[colonel.id]:
+                print("BAD COMPONENT CONFIG!")
+                comp.delete()
+                continue
+
+            pin = new_pins[colonel.id][comp.config['close_pin_no']]
+            comp.config['close_pin'] = pin.pk
+            pin.occupied_by_content_type = ct
+            pin.occupied_by_id = comp.id
+            pin.save()
+
+        if 'controls' in comp.config:
+            for i, control in enumerate(comp.config['controls']):
+                updated_controls = json.loads(json.dumps(control))
+                updated_controls['pin_no'] = control['pin']
+
+                if updated_controls['pin_no'] not in new_pins[colonel.id]:
+                    print("BAD COMPONENT CONFIG!")
+                    comp.delete()
+                    continue
+
+                pin = new_pins[colonel.id][updated_controls['pin_no']]
+                updated_controls['pin'] = pin.pk
+
+                pin.occupied_by_content_type = ct
+                pin.occupied_by_id = comp.id
+                pin.save()
+
+                comp.config['controls'][i] = updated_controls
+
+        comp.save()
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0026_rename_i2cinterface_scl_pin_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/fleet/migrations/0028_remove_i2cinterface_scl_pin_no_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.10 on 2024-03-06 08:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0027_auto_20240306_0802'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='i2cinterface',
+            name='scl_pin_no',
+        ),
+        migrations.RemoveField(
+            model_name='i2cinterface',
+            name='sda_pin_no',
+        ),
+    ]

simo/fleet/migrations/0029_alter_i2cinterface_scl_pin_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.10 on 2024-03-06 10:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0028_remove_i2cinterface_scl_pin_no_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='i2cinterface',
+            name='scl_pin',
+            field=models.ForeignKey(limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='i2c_scl', to='fleet.colonelpin'),
+        ),
+        migrations.AlterField(
+            model_name='i2cinterface',
+            name='sda_pin',
+            field=models.ForeignKey(limit_choices_to={'native': True, 'output': True}, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='i2c_sda', to='fleet.colonelpin'),
+        ),
+    ]

simo/fleet/migrations/0030_colonelpin_label_alter_colonel_type.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.10 on 2024-03-06 11:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0029_alter_i2cinterface_scl_pin_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='colonelpin',
+            name='label',
+            field=models.CharField(db_index=True, default='', max_length=200),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='colonel',
+            name='type',
+            field=models.CharField(choices=[('4-relays', '4 Relay'), ('ample-wall', 'Ample Wall')], default='ample-wall', max_length=20),
+        ),
+    ]

simo/fleet/migrations/0031_alter_colonel_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-03-22 11:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0030_colonelpin_label_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='type',
+            field=models.CharField(choices=[('4-relays', '4 Relay'), ('ample-wall', 'Ample Wall'), ('game-changer', 'Game Changer')], default='ample-wall', max_length=20),
+        ),
+    ]