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

simo/_hub_template/hub/nginx.conf

@@ -1,6 +1,6 @@
 server{
-    listen [::]:80 default_server ssl;
-    listen      80 default_server ssl;
+    listen [::]:80 default_server;
+    listen      80 default_server;
 
     charset     utf-8;
 

simo/core/api.py

@@ -14,6 +14,7 @@ from rest_framework.decorators import action
 from rest_framework.response import Response as RESTResponse
 from rest_framework.exceptions import ValidationError as APIValidationError
 from simo.core.utils.config_values import ConfigException
+from simo.users.middleware import introduce as introduce_user
 from .models import (
     Instance, Category, Zone, Component, Icon, ComponentHistory,
     HistoryAggregate, Gateway

simo/core/api_auth.py

@@ -1,7 +1,7 @@
-import json
 from rest_framework.authentication import SessionAuthentication, BasicAuthentication
 from rest_framework import HTTP_HEADER_ENCODING, exceptions
 from simo.users.models import User
+from simo.users.middleware import introduce as introduce_user
 
 
 class SecretKeyAuth(BasicAuthentication):
@@ -15,7 +15,7 @@ class SecretKeyAuth(BasicAuthentication):
 
             if not user or not user.is_active:
                 return
-
+            introduce_user(user)
             return (user, None)
 
     def authenticate_header(self, request):
@@ -35,6 +35,8 @@ class IsAuthenticated(SessionAuthentication):
         if not user.is_authenticated:
             raise exceptions.NotAuthenticated()
 
+        introduce_user(user)
+
         return (user, None)
 
     def authenticate_header(self, request):

simo/core/controllers.py

@@ -222,13 +222,14 @@ class ControllerBase(ABC):
         if value != self.component.value:
             self.component.value_previous = self.component.value
         self.component.value = value
+
         self.component.change_init_by = None
         self.component.change_init_date = None
         self.component.change_init_to = None
         self.component.change_init_fingerprint = None
         self.component.save()
 
-    def _receive_from_device(self, value, is_alive=True):
+    def _receive_from_device(self, value, is_alive=True, battery_level=None):
         value = self._prepare_for_set(value)
         actor = self._get_actor(value)
 
@@ -241,7 +242,9 @@ class ControllerBase(ABC):
         # in relation to the change of this component
         introduce(actor)
         self.component.alive = is_alive
-        self.component.save(update_fields=['alive'])
+        if battery_level:
+            self.battery_level = battery_level
+        self.component.save(update_fields=['alive', 'battery_level'])
         self.set(value, actor)
 
         if init_by_device and self.component.slaves.count():
@@ -774,7 +777,7 @@ class Lock(Switch):
     def unlock(self):
         self.turn_off()
 
-    def _receive_from_device(self, value, is_alive=True):
+    def _receive_from_device(self, value, is_alive=True, battery_level=None):
         if type(value) == bool:
             if value:
                 value = 'locked'
@@ -789,7 +792,9 @@ class Lock(Switch):
                 self.FAULT: 'fault'
             }
             value = values_map.get(value, 'fault')
-        return super()._receive_from_device(value, is_alive=is_alive)
+        return super()._receive_from_device(
+            value, is_alive=is_alive, battery_level=battery_level
+        )
 
     def _validate_val(self, value, occasion=None):
         if occasion == BEFORE_SEND:

simo/fleet/forms.py

@@ -106,6 +106,8 @@ class ColonelComponentForm(BaseComponentForm):
     )
 
     def clean_colonel(self):
+        if not self.instance.pk:
+            return self.cleaned_data['colonel']
         org = self.instance.config.get('colonel')
         if org and org != self.cleaned_data['colonel'].id:
             raise forms.ValidationError(
@@ -618,7 +620,7 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         help_text="easeOutSine - offers most naturally looking effect."
     )
     inverse = forms.BooleanField(
-        label=_("Inverse dimmer signal"), required=False
+        label=_("Inverse dimmer signal"), required=False, initial=True
     )
     on_value = forms.FloatField(
         required=True, initial=100,

simo/fleet/models.py

@@ -1,4 +1,5 @@
 import requests
+import time
 from django.db import transaction
 from django.db import models
 from django.db.models.signals import post_save, pre_delete, post_delete
@@ -165,7 +166,8 @@ class Colonel(DirtyFieldsMixin, models.Model):
     @transaction.atomic
     def rebuild_occupied_pins(self):
         for pin in ColonelPin.objects.filter(colonel=self):
-            pin.occupied_by = None
+            pin.occupied_by_id = None
+            pin.occupied_by_content_type = None
             pin.save()
 
         for component in self.components.all():
@@ -185,38 +187,13 @@ class Colonel(DirtyFieldsMixin, models.Model):
             interface.scl_pin.save()
 
 
-    @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!"
-
-        for component in self.components.all():
-            component.config['colonel'] = other_colonel.id
-            component.save()
-            self.components.remove(component)
-            other_colonel.components.add(component)
-
-        other_colonel.i2c_interfaces.all().delete()
-
-        for i2c_interface in self.i2c_interfaces.all():
-            I2CInterface.objects.create(
-                no=i2c_interface.no,
-                colonel=other_colonel, name=i2c_interface.name,
-                freq=i2c_interface.freq,
-                scl_pin=ColonelPin.objects.get(
-                    colonel=other_colonel, no=i2c_interface.scl_pin.no,
-                ),
-                sda_pin=ColonelPin.objects.get(
-                    colonel=other_colonel, no=i2c_interface.sda_pin.no,
-                ),
-            )
-
-        self.rebuild_occupied_pins()
-        other_colonel.rebuild_occupied_pins()
-        self.update_config()
-        other_colonel.update_config()
+        self.restart()
+        other_colonel.restart()
+        time.sleep(1)
+        self.uid = other_colonel.uid
+        other_colonel.delete()
+        self.save()
 
 
 class ColonelPin(models.Model):

simo/fleet/socket_consumers.py

@@ -46,6 +46,8 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
 
     async def connect(self):
+        print("Fleet Socket Connect with headers:", self.scope.get('headers'))
+        await self.accept()
 
         headers = {
             item[0].decode().lower(): item[1].decode() for item in self.scope['headers']
@@ -91,7 +93,8 @@ class FleetConsumer(AsyncWebsocketConsumer):
                 'name': headers.get('colonel-name'),
                 'type': headers['colonel-type'],
                 'firmware_version': headers['firmware-version'],
-                'last_seen': timezone.now()
+                'last_seen': timezone.now(),
+                'enabled': True
             }
             with transaction.atomic():
                 colonel, new = Colonel.objects.get_or_create(
@@ -99,10 +102,10 @@ class FleetConsumer(AsyncWebsocketConsumer):
                 )
                 if not new:
                     for key, val in defaults.items():
+                        if key in ('new', ):
+                            continue
                         setattr(colonel, key, val)
-                if new:
-                    colonel.enabled = True
-                colonel.save()
+                    colonel.save()
 
             return colonel, new
 
@@ -113,7 +116,6 @@ class FleetConsumer(AsyncWebsocketConsumer):
         print(f"Colonel {self.colonel} connected!")
         if not self.colonel.enabled:
             print("Colonel %s drop, it's not enabled!" % str(self.colonel))
-            await self.accept()
             return await self.close()
 
         if headers.get('instance-uid') != self.colonel.instance.uid \
@@ -123,8 +125,6 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
         self.connected = True
 
-        await self.accept()
-
         await self.log_colonel_connected()
 
 
@@ -370,18 +370,19 @@ class FleetConsumer(AsyncWebsocketConsumer):
                         )(id=id)
 
                         if 'val' in data:
-                            def receive_val(val):
+                            def receive_val(data):
                                 if data.get('actor'):
                                     fingerprint = Fingerprint.objects.filter(
                                         value=f"ttlock-{component.id}-{data.get('actor')}",
                                     ).first()
                                     component.change_init_fingerprint = fingerprint
                                 component.controller._receive_from_device(
-                                    val, bool(data.get('alive'))
+                                    data['val'], bool(data.get('alive')),
+                                    data.get('battery_level')
                                 )
                             await sync_to_async(
                                 receive_val, thread_sensitive=True
-                            )(data['val'])
+                            )(data)
 
                         if 'options' in data:
                             def receive_options(val):

simo/users/middleware.py

@@ -11,9 +11,8 @@ import threading
 
 # We use daphne for asgi, which seems to be working fine for what we have already
 # observed. However, this is a good candidate for reworking it in to something
-# more rboust.
+# more robust.
 
-# TODO: rework this in to something more roboust
 
 _thread_locals = threading.local()
 
@@ -39,7 +38,6 @@ class IntroduceUser:
         self.get_response = get_response
 
     def __call__(self, request):
-        response = self.get_response(request)
         if request.user.is_authenticated:
             introduce(request.user)
-        return response
+        return self.get_response(request)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.0.3
+Version: 2.0.5
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -43,4 +43,5 @@ Requires-Dist: ansi2html ==1.7.0
 Requires-Dist: slugify ==0.0.1
 Requires-Dist: django-countries ==7.5.1
 Requires-Dist: librosa ==0.10.1
+Requires-Dist: daphne ==4.1.0
 

{simo-2.0.3.dist-info → simo-2.0.5.dist-info}/RECORD

@@ -20,21 +20,21 @@ simo/__pycache__/wsgi.cpython-38.pyc,sha256=Wt9kKkH2Sg5LRL4NrVQQDYPIoDyTvnXwm6jZ
 simo/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
 simo/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
-simo/_hub_template/hub/nginx.conf,sha256=k7wH2Z57q6kZCRWqYMxMO6_Dm7ThhqkO7Qz-rdvfz3E,2008
+simo/_hub_template/hub/nginx.conf,sha256=MOJljsz_symwQF_L7ubp2ZnhkE7BrvkzIxZPtd1sWw0,2000
 simo/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
 simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR96-Adda5Z8,1353
 simo/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/admin.py,sha256=SXZlKI2aiEscDS12qXdkxDa30GNkFsgnJMT711S1wuw,17525
-simo/core/api.py,sha256=3uUaWOPD-wKrLktJqEg5J3eSeDLNQkZRRQAqQnMvlI4,23633
-simo/core/api_auth.py,sha256=2MRmCid_Fy67chKiJEt6_UaJZmb1PDF8KdbBlkA7YgU,1139
+simo/core/api.py,sha256=D2uX25Do7UkKaYNNY5ZIMtuet8r-_XgoEzK9324smkw,23695
+simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=li4KLFl6xTYOoD8pgS8PYcjqTZlzhXI0reAkt06PZFA,3404
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
 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=7M28j0I2Eh-Q7jIXZ7FMkNQoA7xluu67NSXhJXaW4gs,27018
+simo/core/controllers.py,sha256=paeZU6Ky2LgRTwj9nFqrgfeJ4kxWPcl95WDTf6P7jOo,27200
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -10125,13 +10125,13 @@ 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
 simo/fleet/controllers.py,sha256=N8Qzdp2RPFrpZ_l9O4u8VjHWoY_WTWGg76s3V3oJqEs,13999
-simo/fleet/forms.py,sha256=UGj1mK2Zbl2LRlvLtEDObeGfC2wcuHleRbePo1_Vx6I,34972
+simo/fleet/forms.py,sha256=HpvcdFyMl9dLNx1sEOkAkXOkYht6ku2HwWWga-PJzZQ,35067
 simo/fleet/gateways.py,sha256=xFsmF_SXYXK_kMJOCHkiInPJ_0VcPWz-kJDoMup2lT8,1576
 simo/fleet/managers.py,sha256=kpfvvfdH4LDxddIBDpdAb5gsVk8Gb0-L9biFcj9OFPs,807
-simo/fleet/models.py,sha256=Ro0ZkYB3a7ZhczVQOxjAobCRECIdN0Nj0yb5EBybvW0,12809
+simo/fleet/models.py,sha256=O0lsXRmTgPyOhpcwWeJ-2GHTNe2uFhiJy4FTW9Ljz-c,11830
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
-simo/fleet/socket_consumers.py,sha256=o8yr27AYxKFStQGyXZrk7PP1P2fUgSjsWp76DojWqbM,19415
+simo/fleet/socket_consumers.py,sha256=xNeR1IuaBTiHO2GEXwB1_4CJ29uMlqBycIUdxGT96E8,19578
 simo/fleet/utils.py,sha256=D0EGFbDmW8zyhyxf5ozGtRpo4Sy5Ov6ZixukBK_e2Do,3462
 simo/fleet/views.py,sha256=PbdZpsM_7-oyKzuDX1A5WULNABA1_B7ISF70UJX97FE,1662
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
@@ -10276,7 +10276,7 @@ simo/users/api.py,sha256=xJCCj75eQXdaYfiCxxG_rMDKzEZuYuCadOhOutqX2YY,9053
 simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3992
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
-simo/users/middleware.py,sha256=9epN8xDcnYAMoEjAeJGg4W9e54szTgh48LKz3rlywFI,1287
+simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
 simo/users/models.py,sha256=f59mkQBpq_fFLDUa-44b1qWleB-TvGdC1M0G67huJMg,18498
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=yrWghK7ONxfzkjO3LbDLK1WPxsPBMYUegdm29qovjjo,2486
@@ -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.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.3.dist-info/METADATA,sha256=kIgoVnqVIeZ9Paw4f7G6PA41Nwe3dafpPmpEbRV5JU4,1669
-simo-2.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.3.dist-info/RECORD,,
+simo-2.0.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.5.dist-info/METADATA,sha256=aQw7niHw3pcQrYlEkzWz-SoLhr68a4It838k65sh08Q,1699
+simo-2.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.5.dist-info/RECORD,,