simo 2.8.2__py3-none-any.whl → 2.8.3__py3-none-any.whl

simo/users/models.py

@@ -117,6 +117,7 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
     class Meta:
         unique_together = 'user', 'instance'
 
+
     def __str__(self):
         if self.role.instance:
             return f"{self.user} is {self.role.name} on {self.instance}"
@@ -223,6 +224,8 @@ 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
@@ -266,6 +269,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:
@@ -276,7 +281,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):
@@ -323,6 +329,9 @@ class User(AbstractBaseUser, SimoAdminMixin):
         if not self.is_active:
             return Instance.objects.none()
 
+        if self._instances is not None:
+            return self._instances
+
         cache_key = f'user-{self.id}_instances'
         instances = cache.get(cache_key)
         if instances is None:
@@ -336,7 +345,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):
@@ -347,6 +357,8 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def is_active(self):
+        if self._is_active is not None:
+            return self._is_active
         cache_key = f'user-{self.id}_is_active'
         cached_value = cache.get(cache_key)
         if cached_value is None:
@@ -372,7 +384,8 @@ 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

{simo-2.8.2.dist-info → simo-2.8.3.dist-info}/METADATA

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

{simo-2.8.2.dist-info → simo-2.8.3.dist-info}/RECORD

@@ -30,7 +30,7 @@ simo/automation/__pycache__/__init__.cpython-312.pyc,sha256=rIs1rkBbUhjXjbUffmq2
 simo/automation/__pycache__/__init__.cpython-38.pyc,sha256=YmP0xAD-mxpQHgdTZeC64sXChA8TriMZD1jckNYi3xg,164
 simo/automation/__pycache__/app_widgets.cpython-312.pyc,sha256=6u8LsTpf32yn0L49eI4A0sVHlSwl6gOyPlReUwQKoOM,577
 simo/automation/__pycache__/app_widgets.cpython-38.pyc,sha256=7DfUA9V_1MiwrOe_ta-ts8dYY8xXb9UMg2_9A3XoRcs,523
-simo/automation/__pycache__/controllers.cpython-312.pyc,sha256=VvHAmaxfOKpyr9Dd256KXd_qxPCj_-hJYpRnpjXIAzk,14965
+simo/automation/__pycache__/controllers.cpython-312.pyc,sha256=QV63g3UlpMAA-yCaZxoe1B2hVeDGobfOtBA0K1h66Os,15052
 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
@@ -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=tNPmnzo0eTrJ25SLHP7NotqYKI2cKnmv8hf6v5DLOWo,427
-simo/users/models.py,sha256=6Y05Z5IiARr-Dti_xRjQTxi2ji62M387mN-VVzxMGSY,20069
+simo/users/models.py,sha256=EUsYX8PtPgRkpmCZXg0mRkYHV6e69TqGB-UkbZGe5Cw,20549
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=REgXD9Af6nTRu_wUm1dt5YoCB6C_KNDaPqHZj726zZ0,2497
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10753,7 +10753,7 @@ simo/users/__pycache__/__init__.cpython-312.pyc,sha256=n0GE5zxjujBUkv1t1CswZ9Gby
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-312.pyc,sha256=lTVuZQwkuw1bzSn0A0kt-8H6ruKas_YPb_61AxSYSoo,11465
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=uL8TwAipkatZxanvQtBKKcOv8Fm3UvinBxsP0okrOZg,8443
-simo/users/__pycache__/api.cpython-312.pyc,sha256=dk3jAqiRRkTJdzBc7E1Bgfnu74t_aJ6TuDLHJmQ8znU,18739
+simo/users/__pycache__/api.cpython-312.pyc,sha256=p8nEOe95slqWK0QxhAkmXXbyPiZd-0VcA-ejvFcS6Mo,18333
 simo/users/__pycache__/api.cpython-38.pyc,sha256=zZ4DfNktgeVvLAtMpaPUv7AoAgbKr7SCt-4ghJk1zp4,10386
 simo/users/__pycache__/apps.cpython-312.pyc,sha256=yLvyvcBuRr6jfIxwiA9sjQOE4VyHVUKl5FUVDPXuAkM,707
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
@@ -10767,7 +10767,7 @@ simo/users/__pycache__/managers.cpython-312.pyc,sha256=A9-yF1dilDc1H_-BtrIw9USpH
 simo/users/__pycache__/managers.cpython-38.pyc,sha256=O0Y8ABp42RAosrbODmYsPMaj9AyOPyJ-aqzuO0Qpi2s,679
 simo/users/__pycache__/middleware.cpython-312.pyc,sha256=9pkiIkMriu0ExLK479hyPfaN-DOfp6WErqQlrZY1Mvk,927
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-312.pyc,sha256=j4-HII44-P4ExB7UVZGtOT8IYz6jbRa4hnDsCRglbUU,29020
+simo/users/__pycache__/models.cpython-312.pyc,sha256=DownCK4FLYKjE-QMM1-ciZ0koLzwsnc_RFgyq5sIi8k,29596
 simo/users/__pycache__/models.cpython-38.pyc,sha256=qNtAn_eWVmRTWhTxN8GtCc549dcJsTdaF7Uk19yNMgg,18330
 simo/users/__pycache__/permissions.cpython-312.pyc,sha256=NCaxeIz4qmG_mF18lKTYXqOSUvJkFLnUZjfYIQFUCkU,718
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
@@ -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.8.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.8.2.dist-info/METADATA,sha256=AhDqWH1SoeS6j6V0KlUk-QMeuzbVjZouP_a_fJRr_ZI,2008
-simo-2.8.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simo-2.8.2.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.8.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.8.2.dist-info/RECORD,,
+simo-2.8.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.8.3.dist-info/METADATA,sha256=e73yT_ZPrUBSQ9WeaC3C_Ha7RqPRz8oRME8ayRXL1X4,2008
+simo-2.8.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+simo-2.8.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.8.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.8.3.dist-info/RECORD,,