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

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

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

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

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

{utg_base-1.17.0 → utg_base-1.17.1}/src/utg_base/env.py

@@ -1,10 +1,11 @@
 import os
 import typing
+from functools import wraps
 
 import dotenv
 import hvac
 from django.conf import settings
-from environs import Env, _StrType
+from environs import Env, _StrType, EnvError
 
 dotenv.load_dotenv(settings.BASE_DIR / '.env')
 
@@ -27,6 +28,34 @@ envs = client.secrets.kv.read_secret_version(
 
 
 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)