simo 2.7.18__py3-none-any.whl → 2.7.20__py3-none-any.whl

simo/automation/gateways.py

@@ -350,8 +350,11 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         print("START SCRIPT %s" % str(component))
         if component.id in self.running_scripts:
             if component.value in ('finished', 'error', 'stopped'):
-                self.running_scripts[component.id].kill()
-                self.running_scripts.pop(component.id)
+                try:
+                    self.running_scripts[component.id].kill()
+                except:
+                    pass
+                self.running_scripts.pop(component.id, None)
             elif component.id not in self.terminating_scripts \
             and self.running_scripts[component.id].is_alive():
                 if component.value != 'running':
@@ -359,7 +362,10 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     component.save()
                 return
             else:
-                self.running_scripts[component.id].kill()
+                try:
+                    self.running_scripts[component.id].kill()
+                except:
+                    pass
 
         self.running_scripts[component.id] = ScriptRunHandler(
             component.id, multiprocessing.Event(),

simo/automation/models.py

@@ -15,8 +15,9 @@ def post_script_change(sender, instance, created, **kwargs):
         return
 
     def post_update():
-        instance.controller.stop()
-        if instance.config.get('keep_alive') or instance.config.get('autostart'):
+        if instance.value == 'running':
+            instance.controller.stop()
+        if instance.config.get('autostart'):
             time.sleep(2)
             instance.controller.start()
 

simo/core/controllers.py

@@ -509,6 +509,12 @@ class MultiSensor(ControllerBase):
         return vectors
 
 
+    def get_val(self, param):
+        for item in self.component.value:
+            if item[0] == param:
+                return item[1]
+
+
 class BinarySensor(ControllerBase):
     name = _("Binary sensor")
     base_type = 'binary-sensor'

simo/core/tasks.py

@@ -476,8 +476,13 @@ def maybe_update_to_latest():
     if resp.status_code != 200:
         print("Bad response from server")
         return
-    latest = list(resp.json()['releases'].keys())[-1]
-    dynamic_settings['core__latest_version_available'] = latest
+
+    versions = list(resp.json()['releases'].keys())
+    def version_no(v):
+        major, minor, patch = v.split('.')
+        return int(major) * 1000000 + int(minor) * 1000 + int(patch)
+    versions.sort(reverse=True, key=version_no)
+    dynamic_settings['core__latest_version_available'] = versions[0]
 
     try:
         version = pkg_resources.get_distribution('simo').version

simo/users/models.py

@@ -216,7 +216,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
     REQUIRED_FIELDS = ['name']
 
 
-
     class Meta:
         verbose_name = _('user')
         verbose_name_plural = _('users')
@@ -225,8 +224,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._is_active = None
-        self._instances = None
-        self._instance_roles = {}
 
     def __str__(self):
         return self.name
@@ -270,8 +267,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
         return self.is_active and self.is_master
 
     def get_role(self, instance):
-        if instance.id in self._instance_roles:
-            return self._instance_roles[instance.id]
         cache_key = f'user-{self.id}_instance-{instance.id}_role'
         role = cache.get(cache_key)
         if role is None:
@@ -282,8 +277,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
             ).first()
             if role:
                 cache.set(cache_key, role, 20)
-        self._instance_roles[instance.id] = role
-        return self._instance_roles[instance.id]
+        return role
 
     @property
     def role_id(self):
@@ -329,8 +323,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
         from simo.core.models import Instance
         if not self.is_active:
             return Instance.objects.none()
-        if self._instances != None:
-            return self._instances
 
         cache_key = f'user-{self.id}_instances'
         instances = cache.get(cache_key)
@@ -344,8 +336,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     )
                 ], is_active=True)
             cache.set(cache_key, instances, 10)
-        self._instances = instances
-        return self._instances
+
+        return instances
 
     @property
     def component_permissions(self):
@@ -356,8 +348,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def is_active(self):
-        if self._is_active != None:
-            return self._is_active
         cache_key = f'user-{self.id}_is_active'
         cached_value = cache.get(cache_key)
         if cached_value is None:
@@ -383,9 +373,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     self.instance_roles.filter(is_active=True).count()
                 )
             cache.set(cache_key, cached_value, 20)
-
-        self._is_active = cached_value
-        return self._is_active
+        return cached_value
 
 
     @is_active.setter

{simo-2.7.18.dist-info → simo-2.7.20.dist-info}/METADATA

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

{simo-2.7.18.dist-info → simo-2.7.20.dist-info}/RECORD

@@ -21,9 +21,9 @@ simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
 simo/automation/controllers.py,sha256=Ow8xG9hkdyMRZbrNPX5uZloYM9jZqa9mgCh4k6FeoJw,11492
 simo/automation/forms.py,sha256=UWnkxw8pILPK0smRPTo4SLgsZl78zOySx7JIc30Bgtk,10228
-simo/automation/gateways.py,sha256=iWHDACq98Xzwe1kQIa1d6uDRV9wEBmZLd8ouHlGkw5I,15694
+simo/automation/gateways.py,sha256=MAzv-i8BemhqfNY2NTYYlyCGPfctyNh4_dXyIZYJRSE,15848
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
-simo/automation/models.py,sha256=l45FHgeKGsfpLtd1X1PVFpIjB5JI4BlvKkodpcxm6aE,927
+simo/automation/models.py,sha256=zt-jkzyq5ddqGT864OkJzCsvov2vZ0nO4ez3hAeZkXg,934
 simo/automation/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN4,1996
 simo/automation/state.py,sha256=aZZvNBae7unnux_zGHCIWCV2z47hVJc-DIL72Hqfkeo,600
 simo/automation/__pycache__/__init__.cpython-312.pyc,sha256=rIs1rkBbUhjXjbUffmq2-tb7XbAY0JkA83xXPoByTwU,170
@@ -34,11 +34,11 @@ simo/automation/__pycache__/controllers.cpython-312.pyc,sha256=w2yAFvk-Fh1MZha7J
 simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=CL-0Tq9B4-E36fYfWT1XEBTq1dkq1W8003f6MrBnQU0,8391
 simo/automation/__pycache__/forms.cpython-312.pyc,sha256=63rU0rWZk-Rz5qoMZiXl743WPc9NVm5d8bSd8w52T4E,12347
 simo/automation/__pycache__/forms.cpython-38.pyc,sha256=cpA5hA2Iz3JsPC0Dq01ki1I7S9c5DKRcXveHApI1dJo,7772
-simo/automation/__pycache__/gateways.cpython-312.pyc,sha256=yOA6ec8FeZQLYdM4zdrx7cklKY9MJRFYm5xv7SkDag0,22129
+simo/automation/__pycache__/gateways.cpython-312.pyc,sha256=j4bG9KqBcCB8JD59frTl9VtP8n04mUPF_bd0vInDZfs,22223
 simo/automation/__pycache__/gateways.cpython-38.pyc,sha256=nHujqChMCqqxHbZezP3MisavjKDhczqzFGurO10h-lc,11113
 simo/automation/__pycache__/helpers.cpython-312.pyc,sha256=aDFtzBE72szi4gzVxK_NiAEC__wCmdztw0UKu2lVU58,5853
 simo/automation/__pycache__/helpers.cpython-38.pyc,sha256=fNjSyn4Mfq7-JQx-bdsnj-rSxgu20dVJ9-5ZEMT6yiM,3627
-simo/automation/__pycache__/models.cpython-312.pyc,sha256=udvF6nfTRYISXJJyudJCEieTEdoZ3MthhtLfLu9zbx4,1815
+simo/automation/__pycache__/models.cpython-312.pyc,sha256=yGnRFAG5Py3-OsPxEjACM0WNWt6Eo9wsHeUGL3uUF8M,1789
 simo/automation/__pycache__/models.cpython-38.pyc,sha256=VeQNAygVr0AXPlF5LEYk90Tq8zuCVPfsA2r1NBjrkxU,1230
 simo/automation/__pycache__/serializers.cpython-312.pyc,sha256=Y68epVxWVtIRtED--24LOf5PIDHXthpVweAYpqE4X6U,4314
 simo/automation/__pycache__/serializers.cpython-38.pyc,sha256=9Te21FW5-Tki1a-tq3gt0rme0afBA8o-7V249b4muFk,3405
@@ -97,7 +97,7 @@ simo/core/auto_urls.py,sha256=FqKhH0fF7cGO6P2YrjblwG4JA2UkVXj3lreJUOB2Jq4,1194
 simo/core/autocomplete_views.py,sha256=x3MKOZvXYS3xVQ-V1S7Liv_U5bxr-uc0gePa85wv5nA,4561
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
-simo/core/controllers.py,sha256=gVwQHYkJ6GNTHaKTSjf4H2VVykQbvKh4_fSe_MdAVi4,37412
+simo/core/controllers.py,sha256=nJZNjltis0DIlwb0Yn84MllXsPxo2CMhcAmtGPKnhBg,37550
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
@@ -114,7 +114,7 @@ simo/core/serializers.py,sha256=jimqPhL2mq5_dJWtv6P1qErFMaNMizsAS2E_aYkAiQU,2320
 simo/core/signal_receivers.py,sha256=5qp607PdNlRHyw88YOXu7rSznHm3upEpWLxB0lmEa0s,6527
 simo/core/socket_consumers.py,sha256=Es_NmacQGZjsncBXDTEXR2yZbRs7mf2FKOBJjbZRGac,9607
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=LMTkZQDGFus5L2Q8AGzYegjpnZKf9Klgo3V9BT5L2ng,16904
+simo/core/tasks.py,sha256=-yBjOPILEnKRga-6MK-hBpEINQcY5mpwZwUWiDpqISs,17091
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=08H4Bm7KrHxB3p3ZKx1vrFR4d0DjCqMbqQosEsRWpkY,2841
@@ -141,7 +141,7 @@ simo/core/__pycache__/base_types.cpython-312.pyc,sha256=Lnq2NL9B5hfwJARJYC447Rdv
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CX-qlF7CefRi_mCE954wYa9rUFR88mOl6g7fybDRu7g,803
 simo/core/__pycache__/context.cpython-312.pyc,sha256=8rsN2Er-Sx3rrVmO0Gk4cem3euGh0kTELXj667GGZ5E,2193
 simo/core/__pycache__/context.cpython-38.pyc,sha256=NlTHt2GvXxA21AhBkeyOLfRFUuXw7wmwqyNhhcDl2cw,1373
-simo/core/__pycache__/controllers.cpython-312.pyc,sha256=qB4nqIK85sHv6SksPmbOSlIdXXCxfJukk-oQnX_hvls,52648
+simo/core/__pycache__/controllers.cpython-312.pyc,sha256=z7zxtaI-nD3F94qct1_j7PiIJZEs1gGdv_nRn3D8iRM,52921
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=LtrQQ8egOIOuQbAckeM-z8OfbzS4W8VQ3vBnryAm3iU,32086
 simo/core/__pycache__/dynamic_settings.cpython-312.pyc,sha256=WUZ6XF4kZb6zPf541PkKmiQaBIw-r5C6F3EUUZiTEnE,3331
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
@@ -10741,7 +10741,7 @@ simo/users/auto_urls.py,sha256=RSUW3ai5LbMTknS8M7M5aOnG_YlFOVQrnNVNH-fkwlg,357
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=qTlhML4zRfL_Gcomblc09GU1xWDa4DOwbFaxCgd_rsE,20563
+simo/users/models.py,sha256=GFTMfs7dC6XXmvot7WLcjyH0WqowNU9zbLD9oE0_3Yg,20092
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10924,9 +10924,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.7.18.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.7.18.dist-info/METADATA,sha256=j6TvPFZp0bUFmMqq9nbWJnZCiqLB0MxSUCBOqoAK3j0,2009
-simo-2.7.18.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-simo-2.7.18.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.7.18.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.7.18.dist-info/RECORD,,
+simo-2.7.20.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.7.20.dist-info/METADATA,sha256=aVspt7f-xasumTf7jkxZRQi1qERai_kgs1wGTM6MKtI,2009
+simo-2.7.20.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+simo-2.7.20.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.7.20.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.7.20.dist-info/RECORD,,

{simo-2.7.18.dist-info → simo-2.7.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any