utg-base 1.22.0__py3-none-any.whl → 1.23.0__py3-none-any.whl

utg_base/permissions/decorators.py

@@ -1,9 +1,17 @@
 from functools import wraps
 from typing import Literal, Dict, Union, List
 
+from drf_spectacular.utils import extend_schema
+
 from .utils import has_perms as has_permissions
 
 
+def _get_perms_desc(perms, operator):
+    perms_text = ", ".join(perms)
+    desc = f"**Perms(operator={operator}):** `[{perms_text}]`"
+    return desc
+
+
 def has_perm(*permission: str, operator: Literal["OR", "AND"] = "OR"):
     """
     Usage:
@@ -16,6 +24,9 @@ def has_perm(*permission: str, operator: Literal["OR", "AND"] = "OR"):
 
     def decorator(view_func):
         view_func._perms = permission
+        description = _get_perms_desc(permission, operator)
+
+        view_func = extend_schema(description=description)(view_func)
 
         @wraps(view_func)
         def _wrapped_view(self, request, *args, **kwargs):
@@ -45,7 +56,13 @@ def has_class_perm(permissions_map: Dict[str, Union[str, List[str]]], operator:
 
             if hasattr(cls, action):
                 method = getattr(cls, action)
-                setattr(method, "_perms", perms)
+
+                description = _get_perms_desc(perms, operator)
+                decorated_method = extend_schema(description=description)(method)
+
+                setattr(decorated_method, "_perms", perms)
+                setattr(cls, action, decorated_method)
+
         original_initial = cls.initial
 
         @wraps(original_initial)
@@ -58,7 +75,8 @@ def has_class_perm(permissions_map: Dict[str, Union[str, List[str]]], operator:
                 if isinstance(required_perms, str):
                     required_perms = [required_perms]
 
-                if not has_permissions(user_id=request.user.id, perms=required_perms, operator=operator, request=request):
+                if not has_permissions(user_id=request.user.id, perms=required_perms, operator=operator,
+                                       request=request):
                     self.permission_denied(request)
 
             return original_initial(self, request, *args, **kwargs)

utg_base/utils/data.py

@@ -1,8 +1,8 @@
-import datetime
 from collections import defaultdict
 from collections.abc import Iterable
 from copy import deepcopy
 
+from dateutil.relativedelta import relativedelta
 from django.db.models import QuerySet
 
 from utg_base.utils.date import UDate, UDateTime
@@ -162,12 +162,12 @@ def compute_change_percent(current, previous, ndigits=2):
 def list_to_dict(rows: Iterable[dict], key: str, key_func=None) -> dict:
     if not key_func:
         key_func = lambda x: x
-    return {row[key_func(key)]: row for row in rows}
+    return {key_func(row[key]): row for row in rows}
 
 
-def generate_series(start: UDate | UDateTime, end: UDate | UDateTime, step: datetime.timedelta):
+def generate_series(start: UDate | UDateTime, end: UDate | UDateTime, step: relativedelta):
     current = start
-    if step.total_seconds() == 0:
+    if step == relativedelta():
         raise ValueError("step cannot be zero")
 
     series = []

{utg_base-1.22.0.dist-info → utg_base-1.23.0.dist-info}/METADATA

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

{utg_base-1.22.0.dist-info → utg_base-1.23.0.dist-info}/RECORD

@@ -40,7 +40,7 @@ utg_base/models/__init__.py,sha256=1zXygGICiR3iUCKdkNal9d3i3kNp654gFgBf_VlR2gI,6
 utg_base/models/jwt_user.py,sha256=6TQ5wB_OZBtGhRL-2MonBGZm0n0Y86s4BRTxiRlUJOk,375
 utg_base/models/timestamp.py,sha256=AkCliNXnvs8Z17b1mcS7gOK7v6h3Jul6WCyGyVAkb-w,217
 utg_base/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utg_base/permissions/decorators.py,sha256=db26UrbOk66AuQBRFyxcNoQDSC3EWkencptRHk0ikUM,2105
+utg_base/permissions/decorators.py,sha256=EsJGnb8hV-l1jeHUT6WEepQn5wwhxE0-K-v_2QBS74c,2690
 utg_base/permissions/folder.py,sha256=uJv40FVb7R379qss66a5oUcLK7KCUIL6DPbzEcGOw38,694
 utg_base/permissions/utils.py,sha256=Rp8_ZuU5SdXri4amfFlMmrBoJUjwwQ4GYxDujRpt8YU,3264
 utg_base/references_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,7 +60,7 @@ utg_base/u_services/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 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=zRTdSLGpukInlb7oRD6vcI1jKQkkBR3jTCiOiwOmRyA,159
-utg_base/utils/data.py,sha256=8w0Lr8gj4Klu8903XWZlZeMzz9HxNX9_W08KVeIQMuw,5039
+utg_base/utils/data.py,sha256=gkPPA3TCQKZUyFYr_FYiOs6WWOXz2R5eMpaLNUg-zCo,5065
 utg_base/utils/date.py,sha256=fS4o5Nd4HyNyHBJTSsasTlqSMNjnNHwocSYdinkKyeY,4371
 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.22.0.dist-info/METADATA,sha256=3mO-4yLX73EtPVU5-gCl8NMCF8wmdw8Z5xzYYs9gZsY,960
-utg_base-1.22.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-utg_base-1.22.0.dist-info/RECORD,,
+utg_base-1.23.0.dist-info/METADATA,sha256=N8dneTBQ9rDaUdoCNnYBqeAw62pzJwnDwfExaMw54Lg,960
+utg_base-1.23.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+utg_base-1.23.0.dist-info/RECORD,,