simo 2.1.8__py3-none-any.whl → 2.1.10__py3-none-any.whl

simo/core/api.py

@@ -205,6 +205,9 @@ class ComponentViewSet(
         for method_name, param in json_data.items():
             if method_name in ('id', 'secret'):
                 continue
+
+            component.prepare_controller()
+
             if not hasattr(component, method_name):
                 raise APIValidationError(
                      _('"%s" method not found on controller') % method_name,
@@ -291,8 +294,6 @@ class ComponentViewSet(
         return RESTResponse(resp_data)
 
 
-
-
 class HistoryResultsSetPagination(PageNumberPagination):
     page_size = 50
     page_size_query_param = 'page_size'

simo/core/dynamic_settings.py

@@ -66,4 +66,11 @@ class AutoUpdate(BooleanPreference):
                 os.remove(os.path.join(settings.VAR_DIR, 'auto_update'))
             except:
                 pass
-        return
+        return
+
+
+@global_preferences_registry.register
+class NeedsMqttAclsRebuild(BooleanPreference):
+    section = core
+    name = 'needs_mqtt_acls_rebuild'
+    default = True

simo/core/models.py

@@ -530,17 +530,32 @@ def is_in_alarm(self):
         return obj
 
     def arm(self):
+        # supports this method override in controller class
+        if not self._controller_initiated:
+            self._controller_initiated = True
+            self.prepare_controller()
+            return self.arm()
         self.refresh_from_db()
         if self.alarm_category:
             self.arm_status = 'pending-arm'
             self.save()
 
     def disarm(self):
+        # supports this method override in controller class
+        if not self._controller_initiated:
+            self._controller_initiated = True
+            self.prepare_controller()
+            return self.disarm()
         self.refresh_from_db()
         self.arm_status = 'disarmed'
         self.save()
 
     def is_in_alarm(self):
+        # supports this method override in controller class
+        if not self._controller_initiated:
+            self._controller_initiated = True
+            self.prepare_controller()
+            return self.is_in_alarm()
         return bool(self.value)
 
     def can_read(self, user):

simo/core/tasks.py

@@ -255,19 +255,6 @@ def sync_with_remote():
         ).update(is_active=False)
 
 
-@celery_app.task
-def watch_timers():
-    for component in Component.objects.filter(
-        meta__timer_to__gt=0
-    ).filter(meta__timer_to__lt=time.time()):
-        component.meta['timer_to'] = 0
-        component.meta['timer_start'] = 0
-        component.save()
-        try:
-            component.controller._on_timer_end()
-        except Exception as e:
-            print(traceback.format_exc(), file=sys.stderr)
-
 
 @celery_app.task
 def clear_history():
@@ -411,7 +398,6 @@ def low_battery_notifications():
 
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
-    sender.add_periodic_task(1, watch_timers.s())
     sender.add_periodic_task(20, sync_with_remote.s())
     sender.add_periodic_task(60 * 60, clear_history.s())
     sender.add_periodic_task(60 * 60, update_latest_version_available.s())

simo/generic/controllers.py

@@ -717,7 +717,7 @@ class Blinds(ControllerBase, TimerMixin):
                         "Integer between 0 - 180 is required for blinds angle."
                     )
             else:
-                value['angle'] = self.component.value['angle']
+                value['angle'] = self.component.value.get('angle', 0)
 
         elif occasion == BEFORE_SET:
             if not isinstance(value, dict):

simo/generic/gateways.py

@@ -178,6 +178,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ('watch_scripts', 10),
         ('watch_watering', 60),
         ('watch_alarm_events', 1),
+        ('watch_timers', 1)
     )
 
     def watch_thermostats(self):
@@ -496,6 +497,18 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                     alarm.meta['events_triggered'].append(uid)
                 alarm.save(update_fields=['meta'])
 
+    def watch_timers(self):
+        for component in Component.objects.filter(
+            meta__timer_to__gt=0
+        ).filter(meta__timer_to__lt=time.time()):
+            component.meta['timer_to'] = 0
+            component.meta['timer_start'] = 0
+            component.save()
+            try:
+                component.controller._on_timer_end()
+            except Exception as e:
+                print(traceback.format_exc(), file=sys.stderr)
+
 
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"

simo/users/models.py

@@ -135,7 +135,7 @@ def post_instance_user_save(sender, instance, created, **kwargs):
             ).publish()
         transaction.on_commit(post_update)
     if 'role' or 'is_active' in instance.dirty_fields:
-        rebuild_mqtt_acls.delay()
+        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
 
 
 class User(AbstractBaseUser, SimoAdminMixin):
@@ -491,7 +491,7 @@ class ComponentPermission(models.Model):
 @receiver(post_save, sender=ComponentPermission)
 def rebuild_mqtt_acls_on_create(sender, instance, created, **kwargs):
     if not created:
-        rebuild_mqtt_acls.delay()
+        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
 
 
 
@@ -507,7 +507,7 @@ def create_component_permissions_comp(sender, instance, created, **kwargs):
                     'write': role.is_superuser or role.is_owner
                 }
             )
-        rebuild_mqtt_acls.delay()
+        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
 
 
 @receiver(post_save, sender=PermissionsRole)

simo/users/tasks.py

@@ -18,12 +18,14 @@ def clear_device_report_logs():
 
 @celery_app.task
 def rebuild_mqtt_acls():
-    from .utils import update_mqtt_acls
-    update_mqtt_acls()
+    from simo.conf import dynamic_settings
+    if dynamic_settings['core__needs_mqtt_acls_rebuild']:
+        dynamic_settings['core__needs_mqtt_acls_rebuild'] = False
+        from .utils import update_mqtt_acls
+        update_mqtt_acls()
 
 
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60 * 60, clear_device_report_logs.s())
-    # Just in case we miss on something
-    sender.add_periodic_task(60 * 60 * 24, rebuild_mqtt_acls.s())
+    sender.add_periodic_task(30, rebuild_mqtt_acls.s())

{simo-2.1.8.dist-info → simo-2.1.10.dist-info}/METADATA

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

{simo-2.1.8.dist-info → simo-2.1.10.dist-info}/RECORD

@@ -14,7 +14,7 @@ simo/__pycache__/urls.cpython-38.pyc,sha256=sqfstQthcjXtv31Tad0RAlWWI2A0HH6HN0fW
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=Gb1lSyvFtYj2oC5lA7j3VqU6zlqlncx5R-_XJbb8Wdk,17927
-simo/core/api.py,sha256=_f0J9wmuB1ydN5qxZ487u-pKz4XiuENlTIhHfzBXvUY,27856
+simo/core/api.py,sha256=SNBhrN60ig64VNZS-gOhHr7bT9uq9dba3ozKrgsbaEs,27899
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=EaiY-dCADP__9MvLpoHvhjytFT92IrxPZDv95xgqasU,4955
 simo/core/app_widgets.py,sha256=4Lh9FDzdkfh_mccJMe09dyRTT3Uqf9VXwbkurJ9E9oQ,2115
@@ -24,7 +24,7 @@ simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2z
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
 simo/core/controllers.py,sha256=2XqqnpZy1nYwowflIKI4lcNMbotERf_YkbY0ztExfbY,29529
-simo/core/dynamic_settings.py,sha256=h8iy7dbMLHIfuaH704pM2Qrha0eHs6mp9Hxr66SCcTA,1709
+simo/core/dynamic_settings.py,sha256=U9pY7p_hoeD1LxobIvxZqQ7Zn_4MhYMqZvsr4O0PAYs,1871
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=9tIjiEN3IE55GPyB4tOlfkd51JDne3-h8pKhpL3tLFE,2220
@@ -33,14 +33,14 @@ simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=sCo9R7ctGepYK-uspl7cR-KFBrJxSy3TZkbWbOP0YHs,2914
 simo/core/middleware.py,sha256=pO52hQOJV_JRmNyUe7zfufSnJFlRITOWX6jwkoPWJhk,2052
-simo/core/models.py,sha256=y5IG6hcVen6tDjzPJM8GxVeuop3XsVZElLqgoAiLVDE,20908
+simo/core/models.py,sha256=Mg6UjGQjA5WtxO2kq9fO-iW2f9UzDh58etcZ9-X5RSU,21570
 simo/core/permissions.py,sha256=D8JA3gdsbSfA1Lz6-AIP5ILsYYZ59_Rw4csLqVpuKuE,2928
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=K13SDW-FIcNiRYmJufSDS2EkRAW3cuoiHRByof2DYXQ,20629
 simo/core/signal_receivers.py,sha256=9-qFCCeSLcMFEMg6QUtKOVgUsoNoqhzGoI98nuNSTEo,6228
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
-simo/core/tasks.py,sha256=kTqetlu8oqzTsxqgMKI3nmWhdERag3vjLCCbZuXDfEA,14517
+simo/core/tasks.py,sha256=BAnCnNPuHtZQL9CG4n_e6G_aKL0aZBZFjp-HOWQg4O0,14049
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=ze8yX0PBLN-DH8B8jol6NKj0hLOAE4WA1rTXf07G-MU,2129
@@ -10299,9 +10299,9 @@ simo/fleet/templates/fleet/controllers_info/button.md,sha256=GIuxqG617174NEtpPeC
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
-simo/generic/controllers.py,sha256=fgjsEtc4tJx3VaZ4R6HcrYQ0JosarR7JKKEar7ip5HI,58245
+simo/generic/controllers.py,sha256=YLkekwDFDJPAJKTC0w8As2B5ctzfvlLuRf0YLSi_vv4,58252
 simo/generic/forms.py,sha256=IAfDtmEk1-CP0JBoetOD_ahLm64nK41GOUXjmbUzNtY,29550
-simo/generic/gateways.py,sha256=FAGShbPuO88Ww8f5KxUwsMvvowK2d6BWsC4o3706y7Y,18354
+simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
 simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
@@ -10408,12 +10408,12 @@ 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=SnYBP-d7Z6eXCqb-aBayocpdbJSQfKw5qUaPgsxzqfY,19731
+simo/users/models.py,sha256=Y3dkwIvkSbTGWQmAUeK-7ADMsTUU3IqQKOXwtWWzxqY,19824
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=DwbFGi4WeTYXOSnfrBfd5rC5OGtevYurn27EaTVa1EU,2553
 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
+simo/users/tasks.py,sha256=HJAqiyWGsaN3wSfquU0UyQ20jL-njXeaaTOdDT3TQ3s,979
 simo/users/utils.py,sha256=7gU_TDnAOsDYqJM0CFo8efPah2bTXfGpXxRqzD5RiSs,1270
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
@@ -10502,9 +10502,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.1.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.8.dist-info/METADATA,sha256=nWipQhTgzmOkBqv6OOGUYMoptAirTzYtomh-xD-4x_c,1847
-simo-2.1.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-simo-2.1.8.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.8.dist-info/RECORD,,
+simo-2.1.10.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.10.dist-info/METADATA,sha256=cEdSVJo82lzIaZ7seRKzsmZTw3AO9mqBzT8qHcIy55o,1848
+simo-2.1.10.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+simo-2.1.10.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.10.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.10.dist-info/RECORD,,