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

simo/core/controllers.py

@@ -762,6 +762,12 @@ class Lock(Switch):
     app_widget = LockWidget
     admin_widget_template = 'admin/controller_widgets/lock.html'
 
+    UNLOCKED = 0
+    LOCKED = 1
+    LOCKING = 2
+    UNLOCKING = 3
+    FAULT = 4
+
     def lock(self):
         self.turn_on()
 
@@ -769,11 +775,20 @@ class Lock(Switch):
         self.turn_off()
 
     def _receive_from_device(self, value, is_alive=True):
-        if type(value) in (int, bool):
+        if type(value) == bool:
             if value:
                 value = 'locked'
             else:
                 value = 'unlocked'
+        if type(value) == int:
+            values_map = {
+                self.UNLOCKED: 'unlocked',
+                self.LOCKED: 'locked',
+                self.LOCKING: 'locking',
+                self.UNLOCKING: 'unlocking',
+                self.FAULT: 'fault'
+            }
+            value = values_map.get(value, 'fault')
         return super()._receive_from_device(value, is_alive=is_alive)
 
     def _validate_val(self, value, occasion=None):

simo/core/socket_consumers.py

@@ -7,6 +7,7 @@ from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from channels.generic.websocket import AsyncWebsocketConsumer, WebsocketConsumer
 from simo.core.events import ObjectChangeEvent, get_event_obj
+from simo.core.utils.logs import capture_socket_errors
 import paho.mqtt.client as mqtt
 from simo.users.middleware import introduce
 from simo.core.models import Component, Gateway
@@ -14,6 +15,7 @@ from simo.core.utils.model_helpers import get_log_file_path
 from simo.core.middleware import introduce_instance
 
 
+@capture_socket_errors
 class SIMOWebsocketConsumer(WebsocketConsumer):
     headers = {}
 
@@ -24,6 +26,7 @@ class SIMOWebsocketConsumer(WebsocketConsumer):
         }
 
 
+@capture_socket_errors
 class LogConsumer(AsyncWebsocketConsumer):
     log_file = None
     in_error = False
@@ -123,6 +126,7 @@ class LogConsumer(AsyncWebsocketConsumer):
             self.log_file = None
 
 
+@capture_socket_errors
 class GatewayController(SIMOWebsocketConsumer):
     gateway = None
     _mqtt_client = None
@@ -178,6 +182,7 @@ class GatewayController(SIMOWebsocketConsumer):
                 pass
 
 
+@capture_socket_errors
 class ComponentController(SIMOWebsocketConsumer):
     component = None
     send_value = False

simo/core/utils/logs.py

@@ -1,4 +1,10 @@
 import logging
+from functools import wraps
+from inspect import iscoroutinefunction
+from logging import getLogger
+from channels.exceptions import AcceptConnection, DenyConnection, StopConsumer
+
+logger = getLogger()
 
 
 class StreamToLogger(object):
@@ -28,3 +34,31 @@ class StreamToLogger(object):
         if self.linebuf != '':
             self.logger.log(self.log_level, self.linebuf.rstrip())
         self.linebuf = ''
+
+
+
+
+def propagate_exceptions(func):
+    async def wrapper(*args, **kwargs):  # we're wrapping an async function
+        try:
+            return await func(*args, **kwargs)
+        except (AcceptConnection, DenyConnection, StopConsumer):  # these are handled by channels
+            raise
+        except Exception as exception:  # any other exception
+            # avoid logging the same exception multiple times
+            if not getattr(exception, "caught", False):
+                setattr(exception, "caught", True)
+                logger.error(
+                    "Exception occurred in {}:".format(func.__qualname__),
+                    exc_info=exception,
+                )
+            raise  # propagate the exception
+    return wraps(func)(wrapper)
+
+
+def capture_socket_errors(consumer_class):
+    for method_name, method in list(consumer_class.__dict__.items()):
+        if iscoroutinefunction(method):  # an async method
+            # wrap the method with a decorator that propagate exceptions
+            setattr(consumer_class, method_name, propagate_exceptions(method))
+    return consumer_class

simo/fleet/models.py

@@ -82,10 +82,12 @@ class Colonel(DirtyFieldsMixin, models.Model):
     occupied_pins = models.JSONField(default=dict, blank=True)
 
     logs_stream = models.BooleanField(
-        default=False, help_text="ATENTION! Causes serious overhead!!! "
-                                 "Leave this off. "
-                                 "It causes Colonel websocket to run out of memory "
-                                 "and reset if a lot of data is being transmitted."
+        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!"
     )
     pwm_frequency = models.IntegerField(default=1, choices=(
         (0, "3kHz"), (1, "22kHz")
@@ -196,9 +198,6 @@ class Colonel(DirtyFieldsMixin, models.Model):
             self.components.remove(component)
             other_colonel.components.add(component)
 
-        self.rebuild_occupied_pins()
-        other_colonel.rebuild_occupied_pins()
-
         other_colonel.i2c_interfaces.all().delete()
 
         for i2c_interface in self.i2c_interfaces.all():
@@ -214,6 +213,8 @@ class Colonel(DirtyFieldsMixin, models.Model):
                 ),
             )
 
+        self.rebuild_occupied_pins()
+        other_colonel.rebuild_occupied_pins()
         self.update_config()
         other_colonel.update_config()
 

simo/fleet/socket_consumers.py

@@ -13,15 +13,18 @@ import paho.mqtt.client as mqtt
 from channels.generic.websocket import AsyncWebsocketConsumer
 from asgiref.sync import sync_to_async
 from simo.core.utils.model_helpers import get_log_file_path
+from simo.core.utils.logs import capture_socket_errors
 from simo.core.events import GatewayObjectCommand, get_event_obj
 from simo.core.models import Gateway, Instance, Component
 from simo.conf import dynamic_settings
 from simo.users.models import Fingerprint
+
 from .gateways import FleetGatewayHandler
 from .models import Colonel
 from .controllers import TTLock
 
 
+@capture_socket_errors
 class FleetConsumer(AsyncWebsocketConsumer):
     colonel = None
     colonel_logger = None
@@ -345,106 +348,110 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
 
     async def receive(self, text_data=None, bytes_data=None):
-        if text_data:
-            print(f"{self.colonel}: {text_data}")
-            data = json.loads(text_data)
-            if 'get_config' in data:
-                config = await self.get_config_data()
-                print("Send config: ", config)
-                await self.send_data({
-                    'command': 'set_config', 'data': config
-                }, compress=True)
-            elif 'comp' in data:
-                try:
+        try:
+            if text_data:
+                print(f"{self.colonel}: {text_data}")
+                data = json.loads(text_data)
+                if 'get_config' in data:
+                    config = await self.get_config_data()
+                    print("Send config: ", config)
+                    await self.send_data({
+                        'command': 'set_config', 'data': config
+                    }, compress=True)
+                elif 'comp' in data:
                     try:
-                        id=int(data['comp'])
-                    except:
-                        return
-
-                    component = await sync_to_async(
-                        Component.objects.get, thread_sensitive=True
-                    )(id=id)
-
-                    if 'val' in data:
-                        def receive_val(val):
-                            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'))
-                            )
-                        await sync_to_async(
-                            receive_val, thread_sensitive=True
-                        )(data['val'])
-
-                    if 'options' in data:
-                        def receive_options(val):
-                            component.meta['options'] = val
-                            component.save()
-                        await sync_to_async(
-                            receive_options, thread_sensitive=True
-                        )(data['options'])
-
-                    if 'codes' in data and component.controller_uid == TTLock.uid:
-                        def save_codes(codes):
-                            component.meta['codes'] = codes
-                            for code in codes:
-                                Fingerprint.objects.get_or_create(
-                                    value=f"ttlock-{component.id}-code-{str(code)}",
-                                    defaults={'type': "TTLock code"}
-                                )
-                            component.save()
-                        await sync_to_async(
-                            save_codes, thread_sensitive=True
-                        )(data['codes'])
-                    if 'fingerprints' in data and component.controller_uid == TTLock.uid:
-                        def save_codes(codes):
-                            component.meta['fingerprints'] = codes
-                            for code in codes:
-                                Fingerprint.objects.get_or_create(
-                                    value=f"ttlock-{component.id}-finger-{str(code)}",
-                                    defaults={'type': "TTLock Fingerprint"}
+                        try:
+                            id=int(data['comp'])
+                        except:
+                            return
+
+                        component = await sync_to_async(
+                            Component.objects.get, thread_sensitive=True
+                        )(id=id)
+
+                        if 'val' in data:
+                            def receive_val(val):
+                                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'))
                                 )
-                            component.save()
-                        await sync_to_async(
-                            save_codes, thread_sensitive=True
-                        )(data['fingerprints'])
-
-                except Exception as e:
-                    print(traceback.format_exc(), file=sys.stderr)
-
-            elif 'discover-ttlock' in data:
-                def process_discovery_result():
-                    self.gateway.refresh_from_db()
-                    if self.gateway.discovery.get('finished'):
-                        return Component.objects.filter(
-                            meta__finalization_data__temp_id=data['result']['id']
-                        ).first()
-                    try:
-                        self.gateway.process_discovery(data)
+                            await sync_to_async(
+                                receive_val, thread_sensitive=True
+                            )(data['val'])
+
+                        if 'options' in data:
+                            def receive_options(val):
+                                component.meta['options'] = val
+                                component.save()
+                            await sync_to_async(
+                                receive_options, thread_sensitive=True
+                            )(data['options'])
+
+                        if 'codes' in data and component.controller_uid == TTLock.uid:
+                            def save_codes(codes):
+                                component.meta['codes'] = codes
+                                for code in codes:
+                                    Fingerprint.objects.get_or_create(
+                                        value=f"ttlock-{component.id}-code-{str(code)}",
+                                        defaults={'type': "TTLock code"}
+                                    )
+                                component.save()
+                            await sync_to_async(
+                                save_codes, thread_sensitive=True
+                            )(data['codes'])
+                        if 'fingerprints' in data and component.controller_uid == TTLock.uid:
+                            def save_codes(codes):
+                                component.meta['fingerprints'] = codes
+                                for code in codes:
+                                    Fingerprint.objects.get_or_create(
+                                        value=f"ttlock-{component.id}-finger-{str(code)}",
+                                        defaults={'type': "TTLock Fingerprint"}
+                                    )
+                                component.save()
+                            await sync_to_async(
+                                save_codes, thread_sensitive=True
+                            )(data['fingerprints'])
+
                     except Exception as e:
                         print(traceback.format_exc(), file=sys.stderr)
-                    self.gateway.finish_discovery()
 
-                finished_comp = await sync_to_async(
-                    process_discovery_result, thread_sensitive=True
-                )()
-                if finished_comp:
-                    await self.send_data({
-                        'command': 'finalize',
-                        'data': finished_comp.meta['finalization_data']
-                    })
+                elif 'discover-ttlock' in data:
+                    def process_discovery_result():
+                        self.gateway.refresh_from_db()
+                        if self.gateway.discovery.get('finished'):
+                            return Component.objects.filter(
+                                meta__finalization_data__temp_id=data['result']['id']
+                            ).first()
+                        try:
+                            self.gateway.process_discovery(data)
+                        except Exception as e:
+                            print(traceback.format_exc(), file=sys.stderr)
+                        self.gateway.finish_discovery()
+
+                    finished_comp = await sync_to_async(
+                        process_discovery_result, thread_sensitive=True
+                    )()
+                    if finished_comp:
+                        await self.send_data({
+                            'command': 'finalize',
+                            'data': finished_comp.meta['finalization_data']
+                        })
 
-        elif bytes_data:
-            if not self.colonel_logger:
-                await self.start_logger()
+            elif bytes_data:
+                if not self.colonel_logger:
+                    await self.start_logger()
 
-            for logline in bytes_data.decode(errors='replace').split('\n'):
-                self.colonel_logger.log(logging.INFO, logline)
+                for logline in bytes_data.decode(errors='replace').split('\n'):
+                    self.colonel_logger.log(logging.INFO, logline)
+
+            await self.log_colonel_connected()
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
 
-        await self.log_colonel_connected()
 
 
     async def log_colonel_connected(self):

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

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

{simo-2.0.2.dist-info → simo-2.0.3.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=bxJRpmREw8CsgDAiuVvpOl8HxHhZqrRM1qXTF_8afV4,26617
+simo/core/controllers.py,sha256=7M28j0I2Eh-Q7jIXZ7FMkNQoA7xluu67NSXhJXaW4gs,27018
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -48,7 +48,7 @@ simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=bkfXZgUzbXZOrJY69VIevBHNLWRd7DmgyFRh4arr-gs,15810
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
-simo/core/socket_consumers.py,sha256=R8zOkbZvsNf19NU9gz-2HzbTzpocb-j-jTGoC2KZxak,9488
+simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
 simo/core/tasks.py,sha256=se27V-noW02v4ZY2PMv0AJkXNsY3NtJ4G43__KLW7Kg,11005
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
@@ -10110,7 +10110,7 @@ simo/core/utils/form_fields.py,sha256=UOzYdPd71qgCw1H3qH01u85YjrOlETPJAHOJrZKhyD
 simo/core/utils/form_widgets.py,sha256=Zxn9jJqPle9Q_BKNJnyTDn7MosYwNp1TFu5LoKs0bfc,408
 simo/core/utils/formsets.py,sha256=1u34QGZ2P67cxZD2uUJS3lAf--E8XsiiqFmZ4P41Vw4,6463
 simo/core/utils/helpers.py,sha256=TOWy3slspaEYEhe9zDcb0RgzHUYslF6LZDlrWPGSqUI,3791
-simo/core/utils/logs.py,sha256=JBUHhnm9Cn81csrQ4xHbujBFRL9YWulMwUj_zJPNvyw,1057
+simo/core/utils/logs.py,sha256=Zn9JQxqCH9Odx2J1BWT84nFCfkJ4Z4p5X8psdll7hNc,2366
 simo/core/utils/mixins.py,sha256=X6kUPKAi_F-uw7tgm8LEaYalBXpvDA-yrLNFCGr2rks,259
 simo/core/utils/model_helpers.py,sha256=3IzJeOvBoYdUJVXCJkY20npOZXPjNPAiEFvuT0OPhwA,884
 simo/core/utils/relay.py,sha256=i1xy_nPTgY5Xn0l2W4lNI3xeVUpDQTUUfV3M8h2DeBg,457
@@ -10128,10 +10128,10 @@ simo/fleet/controllers.py,sha256=N8Qzdp2RPFrpZ_l9O4u8VjHWoY_WTWGg76s3V3oJqEs,139
 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=6IzGv4jvLaRInzKX8cetHcD08f59HCLWRClYDQJJyKc,12588
+simo/fleet/models.py,sha256=Ro0ZkYB3a7ZhczVQOxjAobCRECIdN0Nj0yb5EBybvW0,12809
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
-simo/fleet/socket_consumers.py,sha256=HbkrV0i1TwBC38otu_2lzN6IlBdyZHVdXIVhU4y-YCM,18872
+simo/fleet/socket_consumers.py,sha256=o8yr27AYxKFStQGyXZrk7PP1P2fUgSjsWp76DojWqbM,19415
 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
@@ -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.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.2.dist-info/METADATA,sha256=svTddp9-mP3qTEeGmU9RQ__HdbwqgbY6ivmcGiRa4xg,1669
-simo-2.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.2.dist-info/RECORD,,
+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,,