simo 2.5.39__py3-none-any.whl → 2.5.41__py3-none-any.whl

simo/core/api.py

@@ -12,6 +12,7 @@ from actstream.models import Action
 from rest_framework.pagination import PageNumberPagination
 from rest_framework import viewsets
 from django_filters.rest_framework import DjangoFilterBackend
+from django.core.cache import cache
 from rest_framework.decorators import action
 from rest_framework.response import Response as RESTResponse
 from rest_framework.exceptions import ValidationError as APIValidationError
@@ -143,43 +144,55 @@ class ZoneViewSet(InstanceMixin, viewsets.ModelViewSet):
         return RESTResponse({'status': 'success'})
 
 
-def get_components_queryset(instance, user):
-    qs = Component.objects.filter(zone__instance=instance)
-    if user.is_superuser:
-        return qs
-
-    c_ids = set()
+def get_main_components_ids(instance):
+    cache_key = f"main-components-{instance.id}"
+    ids = cache.get(cache_key)
+    if ids:
+        return ids
 
+    ids = []
     from simo.generic.controllers import Weather
 
     if instance.indoor_climate_sensor:
-        c_ids.add(instance.indoor_climate_sensor.id)
+        ids.append(instance.indoor_climate_sensor.id)
     wf_c = Component.objects.filter(
         zone__instance=instance,
         controller_uid=Weather.uid, config__is_main=True
     ).values('id').first()
     if wf_c:
-        c_ids.add(wf_c['id'])
+        ids.append(wf_c['id'])
     main_alarm_group = Component.objects.filter(
         zone__instance=instance,
         base_type='alarm-group', config__is_main=True
     ).values('id').first()
     if main_alarm_group:
-        c_ids.add(main_alarm_group['id'])
+        ids.append(main_alarm_group['id'])
     state = Component.objects.filter(
         zone__instance=instance,
         base_type='state-select', config__is_main=True
     ).values('id').first()
     if state:
-        c_ids.add(state['id'])
+        ids.append(state['id'])
 
-    user_role = user.get_role(instance)
-    if user_role:
-        for cp in user_role.component_permissions.all():
-            if cp.read:
-                c_ids.add(cp.component.id)
+    cache.set(cache_key, ids, 30)
+    return ids
 
-    return qs.filter(id__in=c_ids).select_related(
+
+def get_components_queryset(instance, user):
+    qs = Component.objects.filter(zone__instance=instance)
+    if user.is_master or user.is_superuser:
+        pass
+    else:
+        c_ids = get_main_components_ids(instance)
+
+        user_role = user.get_role(instance)
+        if user_role:
+            for cp in user_role.component_permissions.all():
+                if cp.read:
+                    c_ids.append(cp.component.id)
+        qs = qs.filter(id__in=c_ids)
+
+    return qs.select_related(
         'zone', 'category', 'icon'
     ).prefetch_related('slaves')
 
@@ -318,12 +331,11 @@ class ComponentHistoryViewSet(InstanceMixin, viewsets.ReadOnlyModelViewSet):
         )
         if self.request.user.is_superuser:
             return qs
-        c_ids = [
-            cp.component.id for cp in
-            self.request.user.get_role(self.instance).component_permissions.filter(
-                read=True
-            ).select_related('component')
-        ]
+        role = self.request.user.get_role(self.instance)
+        c_ids = []
+        for p in role.component_permissions.all():
+            if p.read:
+                c_ids.append(p.component.id)
         qs = qs.filter(component__id__in=c_ids)
         return qs
 

simo/core/models.py

@@ -580,22 +580,19 @@ def is_in_alarm(self):
         return bool(self.value)
 
     def can_read(self, user):
-        if user.is_superuser:
+        if user.is_master:
             return True
-        perm = user.component_permissions.filter(component=self).first()
-        if not perm:
+        from .middleware import get_current_instance
+        instance = get_current_instance()
+        if instance:
+            role = user.get_role(instance)
+            if not role:
+                return False
+            for perm in role.component_permissions.all():
+                if perm.component.id == self.id:
+                    return any([perm.write, perm.read])
             return False
-        if perm.write:
-            return True
-        return perm.read
-
-    def can_write(self, user):
-        if user.is_superuser:
-            return True
-        perm = user.component_permissions.filter(component=self).first()
-        if not perm:
-            return False
-        return perm.write
+        return False
 
     def get_controller_methods(self):
         c_methods = []

simo/core/permissions.py

@@ -80,7 +80,7 @@ class ComponentPermission(BasePermission):
             return True
         if request.user.is_master:
             return True
-        if obj.controller.masters_only:
+        if obj.controller and obj.controller.masters_only:
             return False
         user_role = request.user.get_role(view.instance)
         if user_role.is_superuser:
@@ -89,6 +89,6 @@ class ComponentPermission(BasePermission):
             return True
         if request.method == 'POST':
             for perm in user_role.component_permissions.all():
-                if perm.component == obj:
+                if perm.component.id == obj.id:
                     return perm.write
         return False

simo/core/serializers.py

@@ -544,7 +544,7 @@ class ComponentSerializer(FormSerializer):
         return {'type': app_widget.uid, 'size': app_widget.size}
 
     def get_slaves(self, obj):
-        return [c['id'] for c in obj.slaves.all().values('id')]
+        return [s.id for s in obj.slaves.all()]
 
     def get_masters_only(self, obj):
         if not obj.controller:
@@ -565,12 +565,11 @@ class ZoneSerializer(serializers.ModelSerializer):
             return qs
         user = self.context.get('request').user
         instance = self.context.get('instance')
-        c_ids = [
-            cp.component.id for cp in
-            user.get_role(instance).component_permissions.filter(
-                read=True
-            ).select_related('component')
-        ]
+        role = user.get_role(instance)
+        c_ids = []
+        for p in role.component_permissions.all():
+            if p.read:
+                c_ids.append(p.component.id)
         qs = qs.filter(id__in=c_ids)
         return qs
 

simo/users/models.py

@@ -193,11 +193,19 @@ class User(AbstractBaseUser, SimoAdminMixin):
     USERNAME_FIELD = 'email'
     REQUIRED_FIELDS = ['name']
 
+
+
     class Meta:
         verbose_name = _('user')
         verbose_name_plural = _('users')
         abstract = False
 
+    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
 
@@ -240,6 +248,8 @@ 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:
@@ -250,7 +260,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
             ).first()
             if role:
                 cache.set(cache_key, role, 20)
-        return role
+        self._instance_roles[instance.id] = role
+        return self._instance_roles[instance.id]
 
     @property
     def role_id(self):
@@ -285,12 +296,20 @@ class User(AbstractBaseUser, SimoAdminMixin):
                 'role': role
             }
         )
+        self._role_id = None
+        try:
+            cache.delete(f'user-{self.id}_instance-{instance.id}-role-id')
+        except:
+            pass
 
     @property
     def instances(self):
         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)
         if instances is None:
@@ -303,7 +322,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     )
                 ], is_active=True)
             cache.set(cache_key, instances, 10)
-        return instances
+        self._instances = instances
+        return self._instances
 
     @property
     def component_permissions(self):
@@ -314,6 +334,8 @@ 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:
@@ -339,7 +361,9 @@ class User(AbstractBaseUser, SimoAdminMixin):
                     self.instance_roles.filter(is_active=True).count()
                 )
             cache.set(cache_key, cached_value, 20)
-        return cached_value
+
+        self._is_active = cached_value
+        return self._is_active
 
 
     @is_active.setter
@@ -359,6 +383,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
         rebuild_authorized_keys()
 
+        self._is_active = None
+
 
     @property
     def is_superuser(self):
@@ -391,23 +417,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
     def has_perms(self, perm_list, obj=None):
         return True
 
-    def get_component_permissions(self):
-        if not self.instances:
-            return []
-        components = []
-        for instance in self.instances:
-            for comp in instance.components.all():
-                can_read = comp.can_read(self)
-                can_write = comp.can_write(self)
-                if not any([can_read, can_write]):
-                    continue
-                components.append({
-                    'component': comp,
-                    'can_read': can_read,
-                    'can_write': can_write
-                })
-        return components
-
 
 class Fingerprint(models.Model):
     value = models.CharField(max_length=200, db_index=True, unique=True)

{simo-2.5.39.dist-info → simo-2.5.41.dist-info}/METADATA

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

{simo-2.5.39.dist-info → simo-2.5.41.dist-info}/RECORD

@@ -33,7 +33,7 @@ simo/backups/migrations/__pycache__/0004_alter_backup_options_alter_backuplog_op
 simo/backups/migrations/__pycache__/__init__.cpython-38.pyc,sha256=Lz1fs6V05h2AoxTOLNye0do9bEMnyuaXB_hHOjG5-HU,172
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=T-NjMq1OxtCt-LjWL-YuuGtAi4JcvtjWhcGrLb8G5D4,18434
-simo/core/api.py,sha256=jFSuknrIiFhuf_Hx07GeTQ_prOG0cBJhtbcTImPVmqI,28502
+simo/core/api.py,sha256=9e9q0a_Knrddx2Yt_R3r7_mYRphyUUCgxbHr8XP5m9o,28827
 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=VxZzapuc-a29wBH7JzpvNF2SK1ECrgNUySId5ke1ffc,2509
@@ -52,10 +52,10 @@ simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 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=1eJRIxOYtzx7JOGSAyo75QBoTEaigxjsRXIFghDSz9k,22837
-simo/core/permissions.py,sha256=INQPrUAIM3WXCvd7e6cmYytKaak8fMEn7VooX-fIds0,3002
+simo/core/models.py,sha256=QNVTnWeHAW6LVrs3eaR7WNMhwjICuQpXZ8vyH_2qCBo,22834
+simo/core/permissions.py,sha256=2YNRot2qoHjHKWPGOpO4PBseecctPbTlUQpepnFkCRs,3027
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=UIIKinmCICMbJZRkI6xInZau3VfkesRe_LX-GMrJYHg,21849
+simo/core/serializers.py,sha256=NgqZhBjY0or6dfN-N_EaaygR_EUoUBryuK1DbD4R3Fg,21810
 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
@@ -66,7 +66,7 @@ simo/core/views.py,sha256=yx9I0byeVUa-LAOnklpWIYwpNNOf5m9fyjKBvj4YCh4,2475
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=ZJFM_XN0RmJMULQulgA_wFiOnEtsMoedcOWnXjH-Y8o,208
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=mXU-u9Bl5RCa0K4Y9wJAkYns33XCByME3sb_FsMC2DI,14090
-simo/core/__pycache__/api.cpython-38.pyc,sha256=u4qCGX0I_IEvdVf4vzQWnGkUsNRBa7Bx2PqWCyX7aHs,21980
+simo/core/__pycache__/api.cpython-38.pyc,sha256=sAVNBbjo787IfRZTWp7YMUnGmaIFPjZw0bmoWSFSkPU,22162
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=mi3mu5qEKio_PvfQEvr3Q6AhdPLAHxzxAxrMbAz_pKU,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=VYx5ZeDyNBI4B_CBEIhV5B3GnLsMOx9s3rNZTSMODco,3703
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=oN657XMMZ6GYN9nblv7fX3kdnTEzSP9XV6PXM6Z0wl4,4358
@@ -85,10 +85,10 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=g3d4L2PwxFyRKIPMP9Hkdjk1PL9NarQd4hSHS55I8n8,2649
-simo/core/__pycache__/models.cpython-38.pyc,sha256=m2KdO5zWXwHT3pIDyGW9SQgnesSAGPPcttOXoKCArzM,18610
-simo/core/__pycache__/permissions.cpython-38.pyc,sha256=LXfbPrLm81oquflywAdK-a53-g7N1tkUuiePIdvk0ek,2974
+simo/core/__pycache__/models.cpython-38.pyc,sha256=jLZXRDsR1_GJBvuDZ32KpuFz3B5qRoQmgpY6kLxxFI0,18554
+simo/core/__pycache__/permissions.cpython-38.pyc,sha256=UdtxCTXPEbe99vgZOfRz9wfKSYvUn9hSRbpIV9CJSyI,2988
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=yBOmGPbCvfwk6j0dWN3sBuuf75ZG2FpSNWi84xLoX6Q,19577
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=QvlVp7m13i3Vn1FOmjV-y_IpLfmcSIy74jhb66ecJbo,19403
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=Od1ejof2nHAFzTAG5vGGVjMA8WUJNVJ9o_KWGqRSR34,6669
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
@@ -10456,7 +10456,7 @@ simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 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=cmoPzz5e4Mymqf7Dwh8KBoR5D-wumHSj18rvb3LU9E4,19735
+simo/users/models.py,sha256=2c9unF8xd9kjwzwQEUEsxw79NrO1_YSJZl6h4wpNsI8,19915
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10473,7 +10473,7 @@ simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/managers.cpython-38.pyc,sha256=O0Y8ABp42RAosrbODmYsPMaj9AyOPyJ-aqzuO0Qpi2s,679
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=XemTxwgZMpnoAXYryfY_H-g_xhVepqOU-ddCKJyPNCE,17710
+simo/users/__pycache__/models.cpython-38.pyc,sha256=UH-lceJI5fYxYn85dIUJ8HYESwb9irIPkvu_d-vGSkA,17777
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=Dy8RAcwNkNSXoJHvLp8fozURyHCtucqpSPyqZtbnMZc,3732
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10579,9 +10579,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.39.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.39.dist-info/METADATA,sha256=eJDjovPyXN783fHsdMkLjCh0MweABo21kJdAHUSvhE4,1953
-simo-2.5.39.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.39.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.39.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.39.dist-info/RECORD,,
+simo-2.5.41.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.41.dist-info/METADATA,sha256=Zv_ztSmF--6O5h2ftMUNFjKt-hjOdiBCJp3ZLBN28M0,1953
+simo-2.5.41.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.41.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.41.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.41.dist-info/RECORD,,