utg-base 1.16.1__tar.gz → 1.17.1__tar.gz

{utg_base-1.16.1 → utg_base-1.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.16.1
+Version: 1.17.1
 Summary: UTG Base Package
 Author: Olimboy
 Author-email: shavkatov.olimboy@mail.ru
@@ -17,6 +17,7 @@ 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: environs (>=14.5.0,<15.0.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)

{utg_base-1.16.1 → utg_base-1.17.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.16.1"
+version = "1.17.1"
 description = "UTG Base Package"
 authors = ["Olimboy <shavkatov.olimboy@mail.ru>", "Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"
@@ -21,6 +21,7 @@ django-celery-results = "^2.6.0"
 hvac = "^2.4.0"
 dotenv = "^0.9.9"
 django-redis = "^6.0.0"
+environs = "^14.5.0"
 
 [[tool.poetry.source]]
 name = "PyPI"

utg_base-1.17.1/src/utg_base/env.py

@@ -0,0 +1,66 @@
+import os
+import typing
+from functools import wraps
+
+import dotenv
+import hvac
+from django.conf import settings
+from environs import Env, _StrType, EnvError
+
+dotenv.load_dotenv(settings.BASE_DIR / '.env')
+
+assert os.environ.get('VAULT_URL') is not None, "VAULT_URL not defined, please set VAULT_URL on .env file"
+assert os.environ.get('VAULT_TOKEN') is not None, "VAULT_TOKEN not defined, please set VAULT_TOKEN on .env file"
+assert os.environ.get('VAULT_PATH') is not None, "VAULT_PATH not defined, please set VAULT_PATH on .env file"
+
+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']
+
+
+class VaultEnv(Env):
+    _wrap_methods = {
+        'int', 'bool', 'str', 'float', 'decimal',
+        'list', 'dict', 'json',
+        'datetime', 'date', 'time', 'timedelta',
+        'path', 'log_level', 'uuid', 'url', 'enum',
+        'dj_db_url', 'dj_email_url', 'dj_cache_url'
+    }
+
+    def __call__(self, key, default=None, **kwargs):
+        try:
+            return super().__call__(key, default=default, **kwargs)
+        except EnvError:
+            return default
+
+    def __getattribute__(self, name):
+        attr = super().__getattribute__(name)
+
+        if callable(attr) and name in self._wrap_methods:
+            @wraps(attr)
+            def wrapper(*args, **kwargs):
+                if len(args) < 2:
+                    kwargs.setdefault("default", None)
+                return attr(*args, **kwargs)
+
+            return wrapper
+
+        return attr
+
+    def _get_value(self, env_key: _StrType, default: typing.Any) -> typing.Any:
+        if env_key in os.environ:
+            return os.environ.get(env_key, default)
+        else:
+            return envs.get(env_key, default)
+
+
+env = VaultEnv()

utg_base-1.16.1/src/utg_base/env.py

@@ -1,31 +0,0 @@
-import os
-
-import dotenv
-import hvac
-from django.conf import settings
-
-dotenv.load_dotenv(settings.BASE_DIR / '.env')
-
-assert os.environ.get('VAULT_URL') is not None, "VAULT_URL not defined, please set VAULT_URL on .env file"
-assert os.environ.get('VAULT_TOKEN') is not None, "VAULT_TOKEN not defined, please set VAULT_TOKEN on .env file"
-assert os.environ.get('VAULT_PATH') is not None, "VAULT_PATH not defined, please set VAULT_PATH on .env file"
-
-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)