utg-base 1.4.0__tar.gz → 1.5.0__tar.gz

{utg_base-1.4.0 → utg_base-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.4.0
+Version: 1.5.0
 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 → utg_base-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.4.0"
+version = "1.5.0"
 description = "UTG Base Package"
 authors = ["Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"
@@ -18,6 +18,8 @@ inflect = "^7.2.1"
 celery = "^5.5.3"
 django-celery-beat = "^2.8.1"
 django-celery-results = "^2.6.0"
+hvac = "^2.4.0"
+dotenv = "^0.9.9"
 
 [[tool.poetry.source]]
 name = "PyPI"

{utg_base-1.4.0 → utg_base-1.5.0}/src/utg_base/celery/views/__init__.py

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

utg_base-1.5.0/src/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-1.4.0 → utg_base-1.5.0}/src/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-1.5.0/src/utg_base/models/__init__.py

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

utg_base-1.5.0/src/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-1.4.0 → utg_base-1.5.0}/src/utg_base/utils/data.py

@@ -24,13 +24,24 @@ def deep_map(data: dict | list, func_cond, func_map, in_place=True):
     return data
 
 
-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 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):
-    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
@@ -44,8 +55,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 +66,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/src/utg_base/models/__init__.py

@@ -1 +0,0 @@
-from .jwt_user import JWTUser