simo 2.7.19__py3-none-any.whl → 2.7.21__py3-none-any.whl

simo/core/permissions.py

@@ -80,8 +80,6 @@ class ComponentPermission(BasePermission):
             return True
         if request.user.is_master:
             return True
-        if obj.controller and obj.controller.masters_only:
-            return False
         user_role = request.user.get_role(view.instance)
         if user_role.is_superuser:
             return True

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.19.dist-info → simo-2.7.21.dist-info}/METADATA

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

{simo-2.7.19.dist-info → simo-2.7.21.dist-info}/RECORD

@@ -108,13 +108,13 @@ simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
 simo/core/middleware.py,sha256=eUFf6iP-Snx_0TE3MoXsSwqrd5IjlukqZk2GQGStRCo,3385
 simo/core/models.py,sha256=f4f_ows94pAGfAZmFuAeYsv_1IzV60xn7jNqR9QZndk,23701
-simo/core/permissions.py,sha256=2YNRot2qoHjHKWPGOpO4PBseecctPbTlUQpepnFkCRs,3027
+simo/core/permissions.py,sha256=Ef4NO7QwwDd3Z-v61R0BeCBXxTOJz9qBvzRTIB5tHwI,2943
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=jimqPhL2mq5_dJWtv6P1qErFMaNMizsAS2E_aYkAiQU,23208
 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
@@ -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.19.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.7.19.dist-info/METADATA,sha256=WpsPW7Q5XwQTjshoHvQuwLUip5VdvIa4JBLhqUXXVBE,2009
-simo-2.7.19.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-simo-2.7.19.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.7.19.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.7.19.dist-info/RECORD,,
+simo-2.7.21.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.7.21.dist-info/METADATA,sha256=UKr6l5SamIZIGzDDFDNEOEr4zVM3iVWZJhNg97dJitA,2009
+simo-2.7.21.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+simo-2.7.21.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.7.21.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.7.21.dist-info/RECORD,,