simo 2.5.34__py3-none-any.whl → 2.5.36__py3-none-any.whl

simo/core/controllers.py

@@ -285,6 +285,8 @@ class ControllerBase(ABC):
         self.component.alive = is_alive
         if error_msg != None:
             self.component.error_msg = error_msg if error_msg.strip() else None
+        else:
+            self.component.error_msg = None
         if battery_level:
             self.component.battery_level = battery_level
         self.component.save(update_fields=['alive', 'battery_level', 'error_msg'])

simo/core/forms.py

@@ -298,7 +298,7 @@ class ComponentAdminForm(forms.ModelForm):
             'alarm_category', 'arm_status',
             'notes'
         )
-        base_fields = ['id', 'gateway', 'base_type', 'info', 'name']
+        base_fields = ['id', 'gateway', 'base_type', 'controller_uid', 'info', 'name']
         if cls.has_icon:
             base_fields.append('icon')
 

simo/core/serializers.py

@@ -87,7 +87,6 @@ class ObjectSerializerMethodField(serializers.SerializerMethodField):
 class FormsetPrimaryKeyRelatedField(PrimaryKeyRelatedField):
 
     def get_attribute(self, instance):
-        print("f{instance} SOURCE FORMSET ATTRIBUTES: ", self.source_attrs)
         return self.queryset.model.objects.filter(
             pk=instance.get(self.source_attrs[0], -1)
         ).first()

simo/fleet/socket_consumers.py

@@ -392,10 +392,18 @@ class FleetConsumer(AsyncWebsocketConsumer):
                                         value=f"ttlock-{component.id}-{data.get('actor')}",
                                     ).first()
                                     component.change_init_fingerprint = fingerprint
-                                component.controller._receive_from_device(
-                                    data['val'], bool(data.get('alive')),
-                                    data.get('battery_level'), data.get('error_msg')
-                                )
+                                try:
+                                    alive = bool(data.get('alive', True))
+                                    error_msg = None
+                                    if not alive:
+                                        error_msg = data.get('error_msg')
+                                    component.controller._receive_from_device(
+                                        data['val'], alive,
+                                        data.get('battery_level'), error_msg
+                                    )
+                                except Exception as e:
+                                    print(traceback.format_exc(),
+                                          file=sys.stderr)
                             await sync_to_async(
                                 receive_val, thread_sensitive=True
                             )(data)

{simo-2.5.34.dist-info → simo-2.5.36.dist-info}/METADATA

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

{simo-2.5.34.dist-info → simo-2.5.36.dist-info}/RECORD

@@ -42,12 +42,12 @@ simo/core/auto_urls.py,sha256=nNXEgLAAAQAhRWQDA9AbDtw-zcPKmu_pufJaSa8g818,1102
 simo/core/autocomplete_views.py,sha256=Nu9sgc0X5OspRkJnpomeO2XdHCOg9ii9v4ZkGecCNjQ,3860
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
-simo/core/controllers.py,sha256=Oy89sRh11eHlyPyrvmgxhK7kc7Aw9z0ndVMMyHhwRyM,35598
+simo/core/controllers.py,sha256=vAZwtwPb259Bw-3dPSXuDxIcErMnQ6YBpBaUh4HWghM,35656
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=wowWocYgxkKBr0WYzpKn4UvH4ScnImus56Tg2G8OPBc,2274
-simo/core/forms.py,sha256=cLsiyTIAlVni_ir0VplPs6hCdx8SHDkdNW4I9C-lhyw,21568
+simo/core/forms.py,sha256=CCKypzX32-Mp8LpyO0ffiPcwIitaw0F03e8A9ZL0Mhw,21586
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
@@ -55,7 +55,7 @@ simo/core/middleware.py,sha256=eUFf6iP-Snx_0TE3MoXsSwqrd5IjlukqZk2GQGStRCo,3385
 simo/core/models.py,sha256=1eJRIxOYtzx7JOGSAyo75QBoTEaigxjsRXIFghDSz9k,22837
 simo/core/permissions.py,sha256=INQPrUAIM3WXCvd7e6cmYytKaak8fMEn7VooX-fIds0,3002
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=WgksN1Ombv240nfQR_UtmKslTWM9vz9Y0yTdN5usiHU,21892
+simo/core/serializers.py,sha256=tY0pQWe_EtUHOOsYPqg89NH-0-Me76_mG1ppvxsMTHY,21816
 simo/core/signal_receivers.py,sha256=2WfF3FI5ZmJM1S-oT_1w3TdnBUX6fjbI4Rpg-DKsuYA,8696
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
@@ -10234,7 +10234,7 @@ simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
 simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=X2M0DFKVaxM6JFGDsdg3S2nJlLIcBvbujidZdfxD88w,2169
-simo/fleet/socket_consumers.py,sha256=0OU4lQHUBWB8VU2-Iqkjmj4eWqGkGDg0RFQhBIshRKE,18386
+simo/fleet/socket_consumers.py,sha256=4hVSvFNq9Hi44R7JmaujFoEtgmH5YBST2cFYtIiMDRA,18840
 simo/fleet/tasks.py,sha256=NX_opj-rbkK9eeQMeRNwHj_ZJ0LC4rYOZovMg9_r0kA,904
 simo/fleet/utils.py,sha256=wNJvURzLP3-aho3D3rfg07N9kWCaMIw5gOsmeeO9Nlg,4740
 simo/fleet/views.py,sha256=jT3GcGv_JEj3dqyfHH2whCnGqwT8YEAuFxRgIX4Dk9w,3237
@@ -10577,9 +10577,9 @@ 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.5.34.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.34.dist-info/METADATA,sha256=It5zSxA-pwB_V8rKlMy-sHyM3fLZgFds8V4Seg4XChc,1953
-simo-2.5.34.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.34.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.34.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.34.dist-info/RECORD,,
+simo-2.5.36.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.36.dist-info/METADATA,sha256=LHL9P0w6a2-u0ktXQc6PtLQbTfRhmMkGQfuY3NUMP2w,1953
+simo-2.5.36.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.36.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.36.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.36.dist-info/RECORD,,