utg-base 1.19.0__py3-none-any.whl → 1.20.0__py3-none-any.whl

utg_base/permissions/utils.py

@@ -7,6 +7,7 @@ from django_redis import get_redis_connection
 from redis.client import Redis
 from rest_framework.request import Request
 
+from utg_base.constants import AccessibilityType
 from utg_base.env import env
 from utg_base.u_services import u_requests
 from utg_base.u_services.constants import UServices
@@ -19,7 +20,8 @@ def generate_perm_cache_key(user_id: str):
 
 
 def has_perm(user_id, perm, request=None):
-    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+    if (request is not None and isinstance(request, Request)
+            and (request.user.is_superuser or request.user.accessibility == AccessibilityType.ADMIN)):
         return True
     redis_conn: Redis = get_redis_connection("shared")
     perm = f"{to_snake_case(env('APP_NAME'))}:{perm}"
@@ -27,7 +29,8 @@ def has_perm(user_id, perm, request=None):
 
 
 def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "OR", request=None):
-    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+    if (request is not None and isinstance(request, Request)
+            and (request.user.is_superuser or request.user.accessibility == AccessibilityType.ADMIN)):
         return True
     redis_conn: Redis = get_redis_connection("shared")
     perms = [f"{to_snake_case(env('APP_NAME'))}:{perm}" for perm in perms]

utg_base/utils/__init__.py

@@ -1,3 +1,3 @@
-from .data import deep_map, deep_round, safe_sum, safe_subtract
+from .data import deep_map, deep_round, safe_sum, safe_subtract, compute_change_percent
 from .dict_util import get_by_dotted
 from .string import to_snake_case

utg_base/utils/data.py

@@ -147,3 +147,9 @@ def safe_get(obj, dotted_path: str, default=None):
                 return default
 
     return obj
+
+
+def compute_change_percent(current, previous, ndigits=2):
+    if not current or previous in (None, 0):
+        return None
+    return round(((current - previous) / previous) * 100, ndigits)

{utg_base-1.19.0.dist-info → utg_base-1.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.19.0
+Version: 1.20.0
 Summary: UTG Base Package
 Author: Olimboy
 Author-email: shavkatov.olimboy@mail.ru

{utg_base-1.19.0.dist-info → utg_base-1.20.0.dist-info}/RECORD

@@ -42,7 +42,7 @@ utg_base/models/timestamp.py,sha256=AkCliNXnvs8Z17b1mcS7gOK7v6h3Jul6WCyGyVAkb-w,
 utg_base/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/permissions/decorators.py,sha256=g-ozzjkjJ-O69_wHWzZnZ9jitFR6MxqGLz2skFjzht4,2118
 utg_base/permissions/folder.py,sha256=uJv40FVb7R379qss66a5oUcLK7KCUIL6DPbzEcGOw38,694
-utg_base/permissions/utils.py,sha256=j1eaObNOKRgcpgvB3J8AAdXnXboGCMxKYu2l16itPp4,3043
+utg_base/permissions/utils.py,sha256=ZoPlqVRmAQv8IS7AYWN1uEWj0CjTt_y5gy7A5hz2His,3238
 utg_base/references_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/references_api/apps.py,sha256=thAGmO-ZT-OD9dHHBSQRL_RRt-Es_jt-mEmHgVTpERs,168
 utg_base/references_api/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,8 +59,8 @@ utg_base/u_services/migrations/0001_initial.py,sha256=UtUtk2r2uEuQiYIRZb0Of6sbsT
 utg_base/u_services/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/u_services/models.py,sha256=seaxBj9vNWrPu1Y8r7NzHEuXemtSvqLkaw4S1Xgr58I,1310
 utg_base/u_services/u_requests.py,sha256=fGNWWQ3RJOOARgNHkScsqlGXwP6sI-HnS3Y-HnSoVS4,1709
-utg_base/utils/__init__.py,sha256=QUW8ezT_OxpNqmCCCnxeTVn47hxN2CdY8QlYCCDFGs4,135
-utg_base/utils/data.py,sha256=cJmZ03rS1AfIz02htZ1REBIfkKfig5fxhJi5jgKUzN4,3943
+utg_base/utils/__init__.py,sha256=zRTdSLGpukInlb7oRD6vcI1jKQkkBR3jTCiOiwOmRyA,159
+utg_base/utils/data.py,sha256=0_upHGaiafuZOCHaL7IT84b0E0qknCA4pHPQMFH8cdY,4135
 utg_base/utils/date.py,sha256=thcbK6RgTUYZfs4_vW5ucuu2e8H0rei6tv7SEC72iwM,3612
 utg_base/utils/dict_util.py,sha256=ipdCZO8aTukGQ319OWHb2Ij5MNtV-FioJQ4qCX3Th48,758
 utg_base/utils/response_processors.py,sha256=WdZQL49wOJqCIY2MucAI6sez_llCqih0v_ltQa-mv7k,687
@@ -69,6 +69,6 @@ utg_base/utils/sql.py,sha256=rqIWcSjdjIMszdRnsnhV5TTYB8W17RPOujIQA9rKC_Y,762
 utg_base/utils/string.py,sha256=ATwIo9uLa00p85h_NjRYLcjRs8o3KSGF7s2yhTg5GiA,1073
 utg_base/utils/thread.py,sha256=4RqRnwtyHymY-dNcuPrMSTamE2V7wCMVfzzyIb0P4TI,2191
 utg_base/utils/translation.py,sha256=GxJHUt0iar_0E7RWBPbeLFQ4DhgXBjffHCmxfKyjFtk,463
-utg_base-1.19.0.dist-info/METADATA,sha256=6hNYr7nWeg335qTydKh6Hno89MFH2jMZFNwCmqa71Pw,960
-utg_base-1.19.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-utg_base-1.19.0.dist-info/RECORD,,
+utg_base-1.20.0.dist-info/METADATA,sha256=hEV7vSsLKxTXrNiUqiPqS2orAqIEUpxFONpkbVxcZlc,960
+utg_base-1.20.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+utg_base-1.20.0.dist-info/RECORD,,