utg-base 1.6.0__tar.gz → 1.6.1__tar.gz

{utg_base-1.6.0 → utg_base-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.6.0
+Version: 1.6.1
 Summary: UTG Base Package
 Author: Rovshen
 Author-email: rovshenashirov1619@gmail.com

{utg_base-1.6.0 → utg_base-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.6.0"
+version = "1.6.1"
 description = "UTG Base Package"
 authors = ["Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"

{utg_base-1.6.0 → utg_base-1.6.1}/src/utg_base/api/spectacular.py

@@ -1,11 +1,11 @@
-import os
-
 from django.conf import settings
 from django.http import HttpResponseForbidden
 from django.urls import path
 from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
 from rest_framework.views import APIView
 
+from utg_base.env import env
+
 
 class DebugTokenRequiredMixin(APIView):
     """
@@ -14,7 +14,7 @@ class DebugTokenRequiredMixin(APIView):
 
     def dispatch(self, request, *args, **kwargs):
         token = request.headers.get("X-Debug-Token")
-        if not settings.DEBUG and token != os.environ.get("DJANGO_SECRET_KEY"):
+        if not settings.DEBUG and token != env("DJANGO_SECRET_KEY"):
             return HttpResponseForbidden("Forbidden")
         return super().dispatch(request, *args, **kwargs)
 

{utg_base-1.6.0 → utg_base-1.6.1}/src/utg_base/logging.py

@@ -1,6 +1,8 @@
 import logging
 import os
 
+from utg_base.env import env
+
 
 class UtgBaseFilter(logging.Filter):
     BASE_DIR = os.getcwd()
@@ -21,10 +23,10 @@ class UtgBaseFilter(logging.Filter):
 
 
 class UtgBaseLogging:
-    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))
-    enable_loki_debug = int(os.environ.get('LOGGING_LOKI_DEBUG', False))
+    enable_console_info = int(env('LOGGING_CONSOLE_INFO', True))
+    enable_db_debug = int(env('LOGGING_DB_DEBUG', False))
+    enable_loki = int(env('LOGGING_LOKI', True))
+    enable_loki_debug = int(env('LOGGING_LOKI_DEBUG', False))
 
     logger = logging.getLogger('main')
 
@@ -63,19 +65,19 @@ class UtgBaseLogging:
                 'filters': ['trim_path'],
             },
             'loki': {
-                'level': os.environ.get('LOKI_LEVEL', 'ERROR'),  # required
+                'level': env('LOKI_LEVEL', 'ERROR'),  # required
                 'class': 'django_loki.LokiHttpHandler',  # required
-                'host': os.environ.get('LOKI_HOST', os.environ.get('DB_HOST')),
+                'host': env('LOKI_HOST', env('DB_HOST')),
                 # required, your grafana/Loki server host, e.g:192.168.25.30
                 'formatter': 'loki',  # required, loki formatter,
-                'port': int(os.environ.get('LOKI_PORT', 3100)),
+                'port': int(env('LOKI_PORT', 3100)),
                 # optional, your grafana/Loki server port, default is 3100
-                'timeout': float(os.environ.get('LOKI_TIMEOUT', 0.5)),
+                'timeout': float(env('LOKI_TIMEOUT', 0.5)),
                 # optional, request Loki-server by http or https time out, default is 0.5
-                'protocol': os.environ.get('LOKI_PROTOCOL', 'http'),
+                'protocol': env('LOKI_PROTOCOL', 'http'),
                 # optional, Loki-server protocol, default is http
-                'source': os.environ.get('LOKI_SOURCE', 'Loki'),  # optional, label name for Loki, default is Loki
-                'src_host': os.environ.get('LOKI_SRC_HOST', 'localhost'),
+                'source': env('LOKI_SOURCE', 'Loki'),  # optional, label name for Loki, default is Loki
+                'src_host': env('LOKI_SRC_HOST', 'localhost'),
                 # optional, label name for Loki, default is localhost
                 'tz': 'Asia/Tashkent',
                 # optional, timezone for formatting timestamp, default is UTC, e.g:Asia/Shanghai

{utg_base-1.6.0 → utg_base-1.6.1}/src/utg_base/middleware/debug.py

@@ -1,10 +1,10 @@
-import os
-
 from django.utils.deprecation import MiddlewareMixin
 
+from utg_base.env import env
+
 
 class DebugOverrideMiddleware(MiddlewareMixin):
     def process_exception(self, request, exception):
-        if request.headers.get("X-Debug-Token") == os.environ.get("DJANGO_SECRET_KEY"):
+        if request.headers.get("X-Debug-Token") == env("DJANGO_SECRET_KEY"):
             from django.views import debug
             return debug.technical_500_response(request, type(exception), exception, exception.__traceback__)

{utg_base-1.6.0 → utg_base-1.6.1}/src/utg_base/utils/translation.py

@@ -1,13 +1,12 @@
-import os
-
 import requests
 from django.utils.translation import get_language
 
 from utg_base.constants import AVAILABLE_LANGUAGES
+from utg_base.env import env
 
 
 def translate(key: str) -> str:
-    base_url = os.environ.get('TRANSLATION_SERVICE_URL')
+    base_url = env('TRANSLATION_SERVICE_URL')
     lang = get_language()
     if lang == 'uz-cyr':
         lang = 'crl'