utg-base 1.12.0__tar.gz → 1.13.1__tar.gz

{utg_base-1.12.0 → utg_base-1.13.1}/PKG-INFO

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

{utg_base-1.12.0 → utg_base-1.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.12.0"
+version = "1.13.1"
 description = "UTG Base Package"
 authors = ["Olimboy <shavkatov.olimboy@mail.ru>", "Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"

{utg_base-1.12.0 → utg_base-1.13.1}/src/utg_base/permissions/utils.py

@@ -19,13 +19,13 @@ def generate_perm_cache_key(user_id: str):
 
 def has_perm(user_id, perm):
     redis_conn: Redis = get_redis_connection("shared")
-    perm = f"{to_snake_case(env('APP_NAME')):{perm}}"
+    perm = f"{to_snake_case(env('APP_NAME'))}:{perm}"
     return bool(redis_conn.sismember(f'user:{user_id}:permissions', perm))
 
 
 def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "OR"):
     redis_conn: Redis = get_redis_connection("shared")
-    perms = [f"{to_snake_case(env('APP_NAME')):{perm}}" for perm in perms]
+    perms = [f"{to_snake_case(env('APP_NAME'))}:{perm}" for perm in perms]
     result = redis_conn.smismember(f'user:{user_id}:permissions', perms)
 
     if operator == "OR":
@@ -68,9 +68,10 @@ def sync_permissions():
 
     request = Request(HttpRequest())
     try:
-        u_requests.post(request, UServices.USER_MANAGEMENT, '/api/permissions/', data={
+        response = u_requests.post(request, UServices.USER_MANAGEMENT, '/api/permissions/', data={
             "service": to_snake_case(env('APP_NAME')),
             "codes": perm_codes
         })
+        print(response.json())
     except Exception as e:
         print(e)

utg_base-1.13.1/src/utg_base/signals/__init__.py

@@ -0,0 +1 @@
+from .sync_perms import sync_perms

utg_base-1.13.1/src/utg_base/signals/sync_perms.py

@@ -0,0 +1,19 @@
+import time
+
+from django.apps import apps
+from django.core.cache import cache
+from django.dispatch import receiver
+from utg_base.permissions.utils import sync_permissions
+from utg_base.utils.signals import app_ready
+
+
+@receiver(app_ready)
+def sync_perms(sender, **kwargs):
+    # wait all apps ready
+    while not apps.ready:
+        time.sleep(0.1)
+
+    # only run 1 time (not all gunicorn workers)
+    if not cache.add("sync_perms", True, timeout=10):
+        return
+    sync_permissions()