simo 2.0.14__py3-none-any.whl → 2.0.16__py3-none-any.whl

simo/core/controllers.py

@@ -697,16 +697,6 @@ class Switch(MultiSwitchBase, TimerMixin, OnOffPokerMixin):
             self.turn_off()
         threading.Thread(target=toggle_back).start()
 
-    def _prepare_for_send(self, value):
-        if self.component.config.get('inverse'):
-            return not value
-        return value
-
-    def _prepare_for_set(self, value):
-        if self.component.config.get('inverse'):
-            return not value
-        return value
-
 
 class DoubleSwitch(MultiSwitchBase):
     name = _("Double Switch")

simo/core/forms.py

@@ -507,11 +507,22 @@ class SwitchForm(BaseComponentForm):
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields['slaves'].initial = self.instance.slaves.all()
+
     def clean_slaves(self):
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
         return validate_slaves(self.cleaned_data['slaves'], self.instance)
 
+    def save(self, commit=True):
+        obj = super().save(commit=commit)
+        if commit:
+            obj.slaves.set(self.cleaned_data['slaves'])
+        return obj
+
 
 class DoubleSwitchConfigForm(BaseComponentForm):
     icon_1 = forms.ModelChoiceField(
@@ -634,11 +645,23 @@ class DimmerConfigForm(BaseComponentForm):
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields['slaves'].initial = self.instance.slaves.all()
+
     def clean_slaves(self):
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
         return validate_slaves(self.cleaned_data['slaves'], self.instance)
 
+    def save(self, commit=True):
+        self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+        obj = super().save(commit=commit)
+        if commit:
+            obj.slaves.set(self.cleaned_data['slaves'])
+        return obj
+
 
 class DimmerPlusConfigForm(BaseComponentForm):
     main_min = forms.FloatField(

simo/fleet/forms.py

@@ -526,12 +526,16 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields['slaves'].initial = self.instance.slaves.all()
+
     def clean_slaves(self):
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
         return validate_slaves(self.cleaned_data['slaves'], self.instance)
 
-
     def clean(self):
         super().clean()
         if not self.cleaned_data.get('colonel'):
@@ -551,7 +555,10 @@ class ColonelSwitchConfigForm(ColonelComponentForm):
 
     def save(self, commit=True):
         self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
-        return super().save(commit=commit)
+        obj = super().save(commit=commit)
+        if commit:
+            obj.slaves.set(self.cleaned_data['slaves'])
+        return obj
 
 
 class ColonelPWMOutputConfigForm(ColonelComponentForm):
@@ -625,6 +632,11 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.instance.pk:
+            self.fields['slaves'].initial = self.instance.slaves.all()
+
     def clean_slaves(self):
         if not self.cleaned_data['slaves'] or not self.instance:
             return self.cleaned_data['slaves']
@@ -649,7 +661,10 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
 
     def save(self, commit=True):
         self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
-        return super().save(commit=commit)
+        obj = super().save(commit=commit)
+        if commit:
+            obj.slaves.set(self.cleaned_data['slaves'])
+        return obj
 
 
 class ColonelRGBLightConfigForm(ColonelComponentForm):

simo/fleet/models.py

@@ -101,9 +101,9 @@ class Colonel(DirtyFieldsMixin, models.Model):
         return self.name if self.name else self.uid
 
     def save(self, *args, **kwargs):
-        if 'socket_connected' in self.get_dirty_fields() and self.pk:
+        if 'socket_connected' in self.get_dirty_fields() and self.socket_connected:
             for comp in self.components.all():
-                comp.alive = self.is_connected
+                comp.alive = True
                 comp.save()
 
         if self.minor_upgrade_available and self.firmware_version == self.minor_upgrade_available:

simo/fleet/tasks.py

@@ -0,0 +1,25 @@
+import datetime
+from django.db.models import Prefetch
+from django.utils import timezone
+from celeryc import celery_app
+
+
+@celery_app.task
+def check_colonel_components_alive():
+    from simo.core.models import Component
+    from .models import Colonel
+    for lost_colonel in Colonel.objects.filter(
+        last_seen__lt=timezone.now() - datetime.timedelta(seconds=60)
+    ).prefetch_related(Prefetch(
+        'components', queryset=Component.objects.filter(alive=True),
+        to_attr='alive_components'
+    )):
+        for comp in lost_colonel.alive_components:
+            print(f"{comp} is no longer alive!")
+            comp.alive = False
+            comp.save()
+
+
+@celery_app.on_after_finalize.connect
+def setup_periodic_tasks(sender, **kwargs):
+    sender.add_periodic_task(20, check_colonel_components_alive.s())

simo/users/models.py

@@ -113,7 +113,7 @@ def post_instance_user_save(sender, instance, created, **kwargs):
     if 'at_home' in dirty_fields:
         def post_update():
             ObjectChangeEvent(
-                instance, dirty_fields=dirty_fields
+                instance.instance, instance,  dirty_fields=dirty_fields
             ).publish()
         transaction.on_commit(post_update)
     if 'role' or 'is_active' in instance.dirty_fields:

{simo-2.0.14.dist-info → simo-2.0.16.dist-info}/METADATA

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

{simo-2.0.14.dist-info → simo-2.0.16.dist-info}/RECORD

@@ -34,11 +34,11 @@ 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=2D7YCLktx7a-4tn80DenQP2CdY0dc2bWg6IRU69YTZ8,27246
+simo/core/controllers.py,sha256=2NH1xZFA4_YWNjJWjHqEvCB6SerebiQ5eHZix_xYvx8,26967
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/forms.py,sha256=H66FJCX_OJ8ADTfFHRLLl6xEg5AsaFH59rbd2rCE2c8,21711
+simo/core/forms.py,sha256=iI3tiHMbjSrjldH8W8OYh8qJyT8QTVtfYczTPINY1ds,22502
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=WoQ4OX3akIvoroSYji-nLVqXBSJzCiC1u_IiWkKbKmA,2413
@@ -65,11 +65,11 @@ simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=SVl4fF0-yiq7e9gt08jIM6_rL4
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CasZJN42cK_ymoQgn5E4s8oOkuZJ18fVHCgN4GPuT7c,735
 simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnVjdUnFCTlH0awAJxZt2Y,24110
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=WmItOZU7CPqyYhxxB1F9I7QAhCqwUn0DSbLii_pqXwI,23818
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=ikU7wTC6vxzsCJJul0VD5qFJlpXHvvksSkwGun8tYVM,18187
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=iuxu0J6KHGL2TJl2nPIrVEkSFurM9N95kHFI-OAfT34,19047
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
@@ -10169,13 +10169,14 @@ simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=rTxRFf-LKWAZxzixrsLZHHm51BmMx9a1PLdgf6inlNM,20533
-simo/fleet/forms.py,sha256=Ree_e3V0rBkVk1bVPr4aV8bsdo0pfCS8i5UV2OBtMJQ,37684
+simo/fleet/forms.py,sha256=ucH9mkwHDA8iUaxVP5W9O8tyoKUb7N2V0KCVSD-oCWI,38237
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
-simo/fleet/models.py,sha256=J-rnn7Ew-7s3646NNRVY947Sbz21mUD_nBHtuHAKXds,14160
+simo/fleet/models.py,sha256=1Wb9xPc61OtoiYu9aS4KezchPGZTC4CDxa2dqVhltqM,14161
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
 simo/fleet/socket_consumers.py,sha256=Z-MooNN2HQccdhkynADJks5slbK9mGsnEpMLuA51H3I,18534
+simo/fleet/tasks.py,sha256=AGq9BXFNAqkhOANsPvId8yjEbDtVCB3MRsi_AKDpgIM,821
 simo/fleet/utils.py,sha256=2gcjbwQawsGw2edr_wm9q6XacGpYqO-gd4BF1t0Hg6U,3511
 simo/fleet/views.py,sha256=YKkcf8KcLgiPjr-brIHvu5yr1zZUIs8aytAgwdo49Pg,1694
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
@@ -10185,13 +10186,14 @@ simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEE
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
 simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=l9bz18Qp33C12TJOKPSn9vIXnlBKnBusODNk7Fg64qA,18103
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=IvK-njOrKBAlvzSGsvPrKnsHwB1gcRrmWL8Nlkg_fF0,27050
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=vFMihKqwLKQRO9GoErkNZwGmDPQd6OYywh9iiZ8rf84,27566
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfrwAHkObVmErYzfRvjk,3569
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
-simo/fleet/__pycache__/models.cpython-38.pyc,sha256=S9pPqRjIxASXahoIOkkjQX7cBwjkdu4d2nXMju0-Cf8,12283
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=DQtRR6kI9bt3atgJ0pArCVfSyuutqb6SpxYrsBg10cM,12277
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=yuY2H7jcboQGZdjb5WIsgNHXFhI9IPMUrEu9NgSiXNo,2452
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=RjzPD580096fby0HYLzZorm61zdZNOq5AHXmNAC4Yd8,13764
+simo/fleet/__pycache__/tasks.cpython-38.pyc,sha256=RoNxL2WUiW67s9O9DjaYVVjCBSZu2nje0Qn9FJkWVS0,1116
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=dTuvW9MnhUycwdCc6eHYfHsMlvZw-CmEWXWYu18X8Uw,1955
 simo/fleet/__pycache__/views.cpython-38.pyc,sha256=7hhRBlf6Vczg0TTdwTE5Hc5B-F7VcvFg1iS6mfs-fgo,1790
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
@@ -10359,7 +10361,7 @@ simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=e4Abz8Px4f9QUGmiqhNKduBeUjJMPlnf0tDdqRCSM1A,18565
+simo/users/models.py,sha256=Sr2T0GaN8l4iXIRR_ZXdaJO088nn5REyhwQju1S3X2g,18585
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=Gay16bdHinjhbn1Ly2KBwnomwK2d4jclO-OqAVeWbZI,2491
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10374,7 +10376,7 @@ simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=MuOieBIXt6lrDx83-UQtd
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=qSDZPjbMd5t7qDWGQSX6zE1IwrSsqzzNFYGanlAMMDw,17515
+simo/users/__pycache__/models.cpython-38.pyc,sha256=xgieyXEO74tyeN2rTUaPb0ciRgqx6XNGerGre4BYj9E,17526
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=RfyHFuPrIhPJ62h5RHy3h17S-5DX41hL5cLhmcDIaXo,3435
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10444,8 +10446,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.14.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.14.dist-info/METADATA,sha256=OG2N3Ch_c8-PXckNAykpPaxULK-HirD-InkoYjVk1ac,1700
-simo-2.0.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.14.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.14.dist-info/RECORD,,
+simo-2.0.16.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.16.dist-info/METADATA,sha256=toSBqhmwLzLJ7BNGd9_e0-YJpXhry91efsl9xGJn01M,1700
+simo-2.0.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.16.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.16.dist-info/RECORD,,