utg-base 1.4.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

utg_base/celery/views/__init__.py

@@ -1,4 +1,2 @@
 from .periodic_task import PeriodicTaskViewSet, PeriodicTaskRunNowView
 from .task_result import TaskResultViewSet
-
-

utg_base/env.py

@@ -0,0 +1,27 @@
+import os
+
+import dotenv
+import hvac
+from django.conf import settings
+
+dotenv.load_dotenv(settings.BASE_DIR / '.env')
+
+client = hvac.Client(
+    url=os.environ.get("VAULT_URL"),
+    token=os.environ.get("VAULT_TOKEN"),
+    verify=False
+)
+if not client.is_authenticated():
+    raise Exception("Vault authentication failed")
+
+envs = client.secrets.kv.read_secret_version(
+    path=os.environ.get("VAULT_PATH"),
+    mount_point="utg-scada"
+)['data']['data']
+
+
+def env(key, default=None):
+    if key in os.environ:
+        return os.environ.get(key, default)
+    else:
+        return envs.get(key, default)

utg_base/logging.py

@@ -21,7 +21,6 @@ class UtgBaseFilter(logging.Filter):
 
 
 class UtgBaseLogging:
-    enable_file = int(os.environ.get('LOGGING_FILE', False))
     enable_console_info = int(os.environ.get('LOGGING_CONSOLE_INFO', True))
     enable_db_debug = int(os.environ.get('LOGGING_DB_DEBUG', False))
     enable_loki = int(os.environ.get('LOGGING_LOKI', True))
@@ -51,13 +50,6 @@ class UtgBaseLogging:
             },
         },
         'handlers': {
-            'file': {
-                'level': 'ERROR',
-                'class': 'logging.FileHandler',
-                'filename': 'logs/django-error.log',
-                'formatter': 'simple',
-                'filters': ['trim_path'],
-            },
             'console_info': {
                 'level': 'INFO',
                 'class': 'logging.StreamHandler',
@@ -114,8 +106,6 @@ class UtgBaseLogging:
     def logging(cls):
         _logging = cls.__LOGGING.copy()
 
-        if cls.enable_file:
-            _logging['loggers']['django']['handlers'].append('file')
         if cls.enable_console_info:
             _logging['loggers']['django']['handlers'].append('console_info')
         if cls.enable_db_debug:

utg_base/models/__init__.py

@@ -1 +1,2 @@
 from .jwt_user import JWTUser
+from .timestamp import BaseTimestamp

utg_base/models/timestamp.py

@@ -0,0 +1,9 @@
+from django.db import models
+
+
+class BaseTimestamp(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        abstract = True

utg_base/utils/data.py

@@ -28,9 +28,24 @@ def deep_round(data: dict | list, ndigits: int, in_place=True):
     return deep_map(data, lambda value: isinstance(value, float), lambda value: round(value, ndigits), in_place)
 
 
-def safe_sum(*args, allow_null=True):
-    if isinstance(args[0], Iterable):
+def to_numeric_or_none(*args):
+    _is_iterable = isinstance(args[0], Iterable) and not isinstance(args[0], str)
+    if _is_iterable:
         args = args[0]
+    result = []
+
+    for x in args:
+        if isinstance(x, (int, float, complex, bool)):
+            result.append(x)
+        else:
+            result.append(None)
+    if not _is_iterable and len(result) == 1 and len(args) == 1:
+        return result[0]
+    return result
+
+
+def safe_sum(*args, allow_null=True):
+    args = to_numeric_or_none(*args)
 
     if all(arg is None for arg in args):
         return None
@@ -44,8 +59,7 @@ def safe_sum(*args, allow_null=True):
 
 
 def safe_subtract(*args, allow_null=False):
-    if isinstance(args[0], Iterable):
-        args = args[0]
+    args = to_numeric_or_none(*args)
 
     if all(arg is None for arg in args):
         return None
@@ -56,3 +70,37 @@ def safe_subtract(*args, allow_null=False):
     for arg in args[1:]:
         _sum -= arg or 0
     return _sum
+
+
+def safe_multiply(*args, allow_null=False):
+    args = to_numeric_or_none(*args)
+
+    if all(arg is None for arg in args):
+        return None
+    if not allow_null and any(arg is None for arg in args):
+        return None
+
+    result = 1
+    for arg in args:
+        value = 0 if allow_null and arg is None else arg
+        result *= value
+    return result
+
+
+def safe_divide(*args, allow_null=False):
+    args = to_numeric_or_none(*args)
+
+    if all(arg is None for arg in args):
+        return None
+    if not allow_null and any(arg is None for arg in args):
+        return None
+
+    result = 0 if allow_null and args[0] is None else args[0]
+
+    for arg in args[1:]:
+        value = 0 if allow_null and arg is None else arg
+        if value == 0:
+            return None
+        result /= value
+
+    return result

{utg_base-1.4.0.dist-info → utg_base-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.4.0
+Version: 1.5.1
 Summary: UTG Base Package
 Author: Rovshen
 Author-email: rovshenashirov1619@gmail.com
@@ -14,7 +14,9 @@ Requires-Dist: django-celery-results (>=2.6.0,<3.0.0)
 Requires-Dist: django-filter (>=23.5,<24.0)
 Requires-Dist: djangorestframework (>=3.16.1,<4.0.0)
 Requires-Dist: djangorestframework-simplejwt[crypto] (>=5.5.1,<6.0.0)
+Requires-Dist: dotenv (>=0.9.9,<0.10.0)
 Requires-Dist: drf-spectacular[sidecar] (>=0.29.0,<0.30.0)
+Requires-Dist: hvac (>=2.4.0,<3.0.0)
 Requires-Dist: inflect (>=7.2.1,<8.0.0)
 Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
 Description-Content-Type: text/markdown

{utg_base-1.4.0.dist-info → utg_base-1.5.1.dist-info}/RECORD

@@ -20,16 +20,18 @@ utg_base/celery/serializers/__init__.py,sha256=NjQ4dcnyoX9p5ljUBCjDegTKt7icia48G
 utg_base/celery/serializers/periodic_task.py,sha256=lQShBqUQUOvk6-VQocyGfATZHAAVrng-w6_VjD3_WH4,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=L2xbYvFZa3FitjiVD6HwA0vwdOCD0ofUez_rVx68Ozo,116
+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/task_result.py,sha256=c9HIcohrToRfz1jfZRRZ1ri15FOasjKgMYnzKcA2X8M,726
 utg_base/constants/__init__.py,sha256=nC8qE-2V6APtjSz8j0A-3ez8yyoRpdRO8pwQnvvpRMk,53
 utg_base/constants/available_languages.py,sha256=zQh0S0PMuYUdRW_RH36llvMxbvsfbdUtotDjFeysWfQ,56
-utg_base/logging.py,sha256=MNPUQ9Hdg-0YTFlJBOwhajqKz-8Y5P4POkqRNIU9ga8,5078
+utg_base/env.py,sha256=1Ljxt9clniKl_P2FKG9eoU-7lj00iLHKWDcSVd8wBD4,603
+utg_base/logging.py,sha256=6mqhirIz5p1ne3av4S8j02TD5lJ4HyDKvMQsfUJ62po,4667
 utg_base/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/middleware/locale.py,sha256=1hp_T_VuHCz0ITjwJ_F1rpf5kXQ0ulEmK1yoRWD1GRc,557
-utg_base/models/__init__.py,sha256=ylLp_n2WJqvmuG-4X8yv119Ikcx-OFSYHUcnggUeQeo,30
+utg_base/models/__init__.py,sha256=1zXygGICiR3iUCKdkNal9d3i3kNp654gFgBf_VlR2gI,67
 utg_base/models/jwt_user.py,sha256=6TQ5wB_OZBtGhRL-2MonBGZm0n0Y86s4BRTxiRlUJOk,375
+utg_base/models/timestamp.py,sha256=AkCliNXnvs8Z17b1mcS7gOK7v6h3Jul6WCyGyVAkb-w,217
 utg_base/references_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/references_api/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 utg_base/references_api/apps.py,sha256=thAGmO-ZT-OD9dHHBSQRL_RRt-Es_jt-mEmHgVTpERs,168
@@ -40,12 +42,12 @@ utg_base/references_api/utils.py,sha256=VzQMnGeWC0I-6BkK_9Lo9eSH6wd4C766oQ84n7SB
 utg_base/services/__init__.py,sha256=LqtwUiqEZPIbKRGJfve5D5m3ucV6Kw1Nbo5Jnj_hPhY,37
 utg_base/services/base_api.py,sha256=RBwzO6frYs2TeMKkAohUxtH9JhDTgmb9G5BFijajg68,5207
 utg_base/utils/__init__.py,sha256=5XmIPVpOl9Tjtzkx_bBeZD1uCpBE-R3WX6yiJii9Ip0,101
-utg_base/utils/data.py,sha256=XmGJStl2f5Bx2B5F45KOUlyS7JkxYiVdWu66_RA_sWQ,1635
+utg_base/utils/data.py,sha256=gbDEmEcmtaP1iCKEPG5I-q4orl8N3jvVc5eFNkkhG3c,2840
 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
 utg_base/utils/sql.py,sha256=rqIWcSjdjIMszdRnsnhV5TTYB8W17RPOujIQA9rKC_Y,762
 utg_base/utils/translation.py,sha256=HAUB64h0Maw82ehCoi0Yb6V6gj1Y5l5RMsv8_FMoV2U,456
-utg_base-1.4.0.dist-info/METADATA,sha256=MjQxUE3JqEN6wiA75E8t86l2uL22z9nbuLEwmjUxkK8,804
-utg_base-1.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-utg_base-1.4.0.dist-info/RECORD,,
+utg_base-1.5.1.dist-info/METADATA,sha256=vNvfSBSIv7V-dQA2MxM1Fcj-bU6wxSDiBrWAEh9mr1U,881
+utg_base-1.5.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+utg_base-1.5.1.dist-info/RECORD,,