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

utg_base/celery/serializers/periodic_task.py

@@ -7,7 +7,7 @@ from utg_base.celery.serializers import TaskResultSerializer
 
 
 class CrontabScheduleSerializer(serializers.ModelSerializer):
-    timezone = serializers.SerializerMethodField()
+    timezone = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = CrontabSchedule
@@ -18,7 +18,7 @@ class CrontabScheduleSerializer(serializers.ModelSerializer):
 
 
 class PeriodicTaskSerializer(serializers.ModelSerializer):
-    crontab = CrontabScheduleSerializer(read_only=True)
+    crontab = CrontabScheduleSerializer()
     task_result = serializers.SerializerMethodField(read_only=True)
 
     class Meta:

utg_base/celery/views/periodic_task.py

@@ -1,7 +1,7 @@
 import json
 
 from celery import current_app
-from django_celery_beat.models import PeriodicTask
+from django_celery_beat.models import PeriodicTask, CrontabSchedule
 from drf_spectacular.utils import extend_schema
 from rest_framework import viewsets, filters
 from rest_framework.exceptions import NotFound, ValidationError
@@ -23,6 +23,20 @@ class PeriodicTaskViewSet(viewsets.ModelViewSet):
     filter_backends = [filters.SearchFilter]
     search_fields = ['name']
 
+    @extend_schema(request={'application/json': PeriodicTaskSerializer()})
+    def partial_update(self, request, *args, **kwargs):
+        crontab = request.data.pop('crontab')
+        response = super().partial_update(request, *args, **kwargs)
+
+        if crontab:
+            instance = self.get_object()
+            crontab, _ = CrontabSchedule.objects.get_or_create(**crontab)
+
+            instance.crontab = crontab
+            instance.save()
+
+        return Response(self.serializer_class(instance).data)
+
 
 @extend_schema(tags=['admin/periodic-tasks'])
 class PeriodicTaskRunNowView(APIView):

utg_base/permissions/decorators.py

@@ -1,8 +1,6 @@
 from functools import wraps
 from typing import Literal, Dict, Union, List
 
-from rest_framework.exceptions import PermissionDenied
-
 from .utils import has_perms as has_permissions
 
 
@@ -13,15 +11,20 @@ def has_perm(*permission: str, operator: Literal["OR", "AND"] = "OR"):
         has_perm('PERM1', 'PERM2')
 
     :param permission: One or many permissions.
+    :param operator: Any of (OR, AND)
     """
+
     def decorator(view_func):
         view_func._perms = permission
+
         @wraps(view_func)
         def _wrapped_view(self, request, *args, **kwargs):
             if not has_permissions(user_id=request.user.id, perms=list(permission), operator=operator, request=request):
                 self.permission_denied(request)
             return view_func(self, request, *args, **kwargs)
+
         return _wrapped_view
+
     return decorator
 
 
@@ -34,6 +37,7 @@ def has_class_perm(permissions_map: Dict[str, Union[str, List[str]]], operator:
             'update': ['perm4']
         })
     """
+
     def decorator(cls):
         for action, perms in permissions_map.items():
             if isinstance(perms, str):

utg_base/utils/data.py

@@ -1,8 +1,12 @@
+import datetime
+from collections import defaultdict
 from collections.abc import Iterable
 from copy import deepcopy
 
 from django.db.models import QuerySet
 
+from utg_base.utils.date import UDate, UDateTime
+
 
 def deep_map(data: dict | list, func_cond, func_map, in_place=True):
     if not in_place:
@@ -153,3 +157,35 @@ 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)
+
+
+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}
+
+
+def generate_series(start: UDate | UDateTime, end: UDate | UDateTime, step: datetime.timedelta):
+    current = start
+    if step.total_seconds() == 0:
+        raise ValueError("step cannot be zero")
+
+    series = []
+    while current <= end:
+        series.append(current)
+        current += step
+
+    return series
+
+
+def fill_series(series: Iterable, data: dict, keys: str | list[str]):
+    result = defaultdict(list)
+
+    for term in series:
+        for key in keys:
+            result[key].append(data.get(term, {}).get(key, None))
+
+    data = []
+    for key in keys:
+        data.append(result[key])
+    return data

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

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

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

@@ -17,11 +17,11 @@ utg_base/celery/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 utg_base/celery/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/celery/management/commands/migrate_tasks.py,sha256=TAvPmYAmMkODdPAucbQDya2dd-BkVFCvWJrolqFdz6w,1667
 utg_base/celery/serializers/__init__.py,sha256=NjQ4dcnyoX9p5ljUBCjDegTKt7icia48GkVSmFCK9Ao,96
-utg_base/celery/serializers/periodic_task.py,sha256=lQShBqUQUOvk6-VQocyGfATZHAAVrng-w6_VjD3_WH4,1298
+utg_base/celery/serializers/periodic_task.py,sha256=XrBSwmb15HqrfQgRHn1_rOHTvQZXPoR_Mo0wmj5gMeU,1298
 utg_base/celery/serializers/task_result.py,sha256=pt6BRjjvqU1Ah8IUSyL67AZJ1Z5iXAelYe6z-Pv1Nco,220
 utg_base/celery/urls.py,sha256=ww-ZwAzK0CnOZxqh4gaEYGuRoCgkrolB3jvKsLZEknI,524
 utg_base/celery/views/__init__.py,sha256=WPNtK_40JCSYGWkDgtpTdOWJ_GOp_dBKs9eK4VNq5Xs,114
-utg_base/celery/views/periodic_task.py,sha256=OyRJh_-KCicUZD84hksRoOXLHGk7mLF7QlsjncqvQac,1945
+utg_base/celery/views/periodic_task.py,sha256=UWYew868jmw937uBCaaqarwsfSYhxbCZ9BnjPf-6CtA,2475
 utg_base/celery/views/task_result.py,sha256=c9HIcohrToRfz1jfZRRZ1ri15FOasjKgMYnzKcA2X8M,726
 utg_base/constants/__init__.py,sha256=Bpyeki5V2djF1p6XnhybBnmDiiYpNQwIBvCYI0tlQ68,102
 utg_base/constants/accessibility_type.py,sha256=dJBoA1E7NAGpHzifD_NDL_GPhRY3c6Fabez-34ghLl0,265
@@ -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=g-ozzjkjJ-O69_wHWzZnZ9jitFR6MxqGLz2skFjzht4,2118
+utg_base/permissions/decorators.py,sha256=db26UrbOk66AuQBRFyxcNoQDSC3EWkencptRHk0ikUM,2105
 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=0_upHGaiafuZOCHaL7IT84b0E0qknCA4pHPQMFH8cdY,4135
+utg_base/utils/data.py,sha256=8w0Lr8gj4Klu8903XWZlZeMzz9HxNX9_W08KVeIQMuw,5039
 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.21.1.dist-info/METADATA,sha256=zunw_Sp5QKKQa8ysvtB0XFie011Bndjd90kxjXsRZMk,960
-utg_base-1.21.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-utg_base-1.21.1.dist-info/RECORD,,
+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,,