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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.16.1
+Version: 1.17.0
 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.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.16.1"
+version = "1.17.0"
 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.16.1 → utg_base-1.17.0}/src/utg_base/env.py

@@ -1,8 +1,10 @@
 import os
+import typing
 
 import dotenv
 import hvac
 from django.conf import settings
+from environs import Env, _StrType
 
 dotenv.load_dotenv(settings.BASE_DIR / '.env')
 
@@ -24,8 +26,12 @@ envs = client.secrets.kv.read_secret_version(
 )['data']['data']
 
 
-def env(key, default=None):
-    if key in os.environ:
-        return os.environ.get(key, default)
-    else:
-        return envs.get(key, default)
+class VaultEnv(Env):
+    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()