utg-base 1.22.0__tar.gz → 1.23.0__tar.gz

{utg_base-1.22.0 → utg_base-1.23.0}/PKG-INFO

@@ -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 → utg_base-1.23.0}/pyproject.toml

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

{utg_base-1.22.0 → utg_base-1.23.0}/src/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-1.22.0 → utg_base-1.23.0}/src/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 = []