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

simo/core/controllers.py

@@ -275,6 +275,10 @@ class ControllerBase(ABC):
                  'val': icon if any(values) else None}
             ]
 
+    def poke(self):
+        '''Use this when component is dead to try and wake it up'''
+        pass
+
     def _prepare_for_send(self, value):
         return value
 
@@ -435,7 +439,19 @@ class BinarySensor(ControllerBase):
         return value
 
 
-class Dimmer(ControllerBase, TimerMixin):
+class OnOffPokerMixin:
+    _poke_toggle = False
+
+    def poke(self):
+        if self._poke_toggle:
+            self._poke_toggle = False
+            self.turn_on()
+        else:
+            self._poke_toggle = True
+            self.turn_off()
+
+
+class Dimmer(ControllerBase, TimerMixin, OnOffPokerMixin):
     name = _("Dimmer")
     base_type = 'dimmer'
     app_widget = KnobWidget
@@ -444,6 +460,7 @@ class Dimmer(ControllerBase, TimerMixin):
     default_config = {'min': 0.0, 'max': 100.0, 'inverse': False}
     default_value = 0
 
+
     def _prepare_for_send(self, value):
         if isinstance(value, bool):
             if value:
@@ -484,7 +501,8 @@ class Dimmer(ControllerBase, TimerMixin):
             self.turn_on()
 
 
-class DimmerPlus(ControllerBase, TimerMixin):
+
+class DimmerPlus(ControllerBase, TimerMixin, OnOffPokerMixin):
     name = _("Dimmer Plus")
     base_type = 'dimmer-plus'
     app_widget = KnobPlusWidget
@@ -564,7 +582,7 @@ class DimmerPlus(ControllerBase, TimerMixin):
             self.turn_on()
 
 
-class RGBWLight(ControllerBase, TimerMixin):
+class RGBWLight(ControllerBase, TimerMixin, OnOffPokerMixin):
     name = _("RGB(W) Light")
     base_type = 'rgbw-light'
     app_widget = RGBWidget
@@ -648,7 +666,7 @@ class MultiSwitchBase(ControllerBase):
         return value
 
 
-class Switch(MultiSwitchBase, TimerMixin):
+class Switch(MultiSwitchBase, TimerMixin, OnOffPokerMixin):
     name = _("Switch")
     base_type = 'switch'
     app_widget = SingleSwitchWidget

simo/fleet/admin.py

@@ -81,11 +81,6 @@ class ColonelAdmin(admin.ModelAdmin):
     def has_add_permission(self, request):
         return False
 
-    def save_model(self, request, obj, form, change):
-        res = super().save_model(request, obj, form, change)
-        obj.update_config()
-        return res
-
     def update_firmware(self, request, queryset):
         count = 0
         for colonel in queryset:

simo/fleet/models.py

@@ -179,6 +179,7 @@ class Colonel(DirtyFieldsMixin, models.Model):
 
     @transaction.atomic()
     def move_to(self, other_colonel):
+        # TODO: Need to replace pins on components!
         other_colonel.refresh_from_db()
         assert list(other_colonel.components.all()) == [], \
                "Other colonel must be completely empty!"
@@ -261,22 +262,27 @@ class ColonelPin(models.Model):
 
 
 @receiver(post_save, sender=Colonel)
-def create_interfaces(sender, instance, created, *args, **kwargs):
+def after_colonel_save(sender, instance, created, *args, **kwargs):
     if not created:
         return
-    for no, data in GPIO_PINS.get(instance.type).items():
-        ColonelPin.objects.get_or_create(
-            colonel=instance, 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')
-        )
-    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),
-        )
+
+    def after_update():
+        for no, data in GPIO_PINS.get(instance.type).items():
+            ColonelPin.objects.get_or_create(
+                colonel=instance, 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')
+            )
+        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),
+            )
+        instance.update_config()
+
+    transaction.on_commit(after_update)
 
 
 @receiver(pre_delete, sender=Component)

simo/users/serializers.py

@@ -81,8 +81,8 @@ class FingerprintSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Fingerprint
-        fields = 'type', 'value', 'user'
-        read_only_fields = ('type', 'value')
+        fields = 'id', 'type', 'value', 'user'
+        read_only_fields = ('id', 'type', 'value')
 
     def get_type(self, obj):
         return obj.type

{simo-2.0.0.dist-info → simo-2.0.1.dist-info}/METADATA

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

{simo-2.0.0.dist-info → simo-2.0.1.dist-info}/RECORD

@@ -34,7 +34,7 @@ simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=yqbIZqBksrAkEuHRbt6iExwPDDy0K5II2NzRCkmOvMU,589
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=vJ4PXlmo8gZ7_Cm16IV9fvgObolkC-0P7dgujavvXnE,26200
+simo/core/controllers.py,sha256=bxJRpmREw8CsgDAiuVvpOl8HxHhZqrRM1qXTF_8afV4,26617
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -10120,7 +10120,7 @@ simo/core/utils/validators.py,sha256=FRO6_K5HAO1OaC-LosApZjh-W3EA-IJZ53HnwEJgqiI
 simo/core/utils/__pycache__/api.cpython-38.pyc,sha256=CuJq9GKQC8gbeCxmH2wQHZUmkIihVILSEIAoVYCFwH0,1575
 simo/core/utils/__pycache__/serialization.cpython-38.pyc,sha256=zOo2M97bAC0Ed-iiNoVtcHvgdAYR8RwrF2bUwuf8Pus,1145
 simo/fleet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/fleet/admin.py,sha256=9dEA3XcynAhcyeJrGzuPOXSGGPtawVyHUOyrVty5CEc,5480
+simo/fleet/admin.py,sha256=sN16en2sKYbApCHkitjOq6Fc5xagBTRSQ8tNCiVa1r0,5317
 simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 simo/fleet/auto_urls.py,sha256=gAXTWUvsWkQHRdZGM_W_5iJBEsM4lY063kIx3f5LUqs,578
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
@@ -10128,7 +10128,7 @@ simo/fleet/controllers.py,sha256=ELYfj2o1xrceg2tcprv6ofHA4WtYaWrFmgiIAthnCSw,138
 simo/fleet/forms.py,sha256=UGj1mK2Zbl2LRlvLtEDObeGfC2wcuHleRbePo1_Vx6I,34972
 simo/fleet/gateways.py,sha256=xFsmF_SXYXK_kMJOCHkiInPJ_0VcPWz-kJDoMup2lT8,1576
 simo/fleet/managers.py,sha256=kpfvvfdH4LDxddIBDpdAb5gsVk8Gb0-L9biFcj9OFPs,807
-simo/fleet/models.py,sha256=ly_1nU0rzLcplkQe7pBL-7BweRiaKOj0XunyvQSQIno,12216
+simo/fleet/models.py,sha256=iLIdmcWTr_j8R7wTHph3fAExek8UH4S1HJyJ-asTNgw,12420
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=lVxqb4ldmJ5bUIklqeet5AIQak2Fbp_Tx5uKcP0eqmQ,1339
 simo/fleet/socket_consumers.py,sha256=HbkrV0i1TwBC38otu_2lzN6IlBdyZHVdXIVhU4y-YCM,18872
@@ -10279,7 +10279,7 @@ simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCa
 simo/users/middleware.py,sha256=9epN8xDcnYAMoEjAeJGg4W9e54szTgh48LKz3rlywFI,1287
 simo/users/models.py,sha256=f59mkQBpq_fFLDUa-44b1qWleB-TvGdC1M0G67huJMg,18498
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
-simo/users/serializers.py,sha256=9fDT23WBsOSPnNlmtOp6095IF8wng2eg_iboUCzYIDA,2474
+simo/users/serializers.py,sha256=yrWghK7ONxfzkjO3LbDLK1WPxsPBMYUegdm29qovjjo,2486
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
 simo/users/sso_views.py,sha256=-XI67TvQ7SN3goU4OuAHyn84u_1vtusvpn7Pu0K97zo,4648
 simo/users/tasks.py,sha256=v9J7t4diB0VnqUDVZAQ8H-rlr4ZR14bgEUuEGpODyOI,854
@@ -10343,8 +10343,8 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.0.0.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.0.dist-info/METADATA,sha256=a3T7zOscRzMDFgziDrgeASopaHXZ8XnLBEwdS4OTl08,1669
-simo-2.0.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.0.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.0.dist-info/RECORD,,
+simo-2.0.1.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.1.dist-info/METADATA,sha256=UNG_zOqdwai9Z5jFbVFDrXcVozRzzHrASc4hdMZgKQM,1669
+simo-2.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.1.dist-info/RECORD,,