utg-base 1.5.5__tar.gz → 1.5.7__tar.gz

{utg_base-1.5.5 → utg_base-1.5.7}/PKG-INFO

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

{utg_base-1.5.5 → utg_base-1.5.7}/pyproject.toml

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

{utg_base-1.5.5 → utg_base-1.5.7}/src/utg_base/env.py

@@ -6,6 +6,10 @@ 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"),

{utg_base-1.5.5 → utg_base-1.5.7}/src/utg_base/references_api/utils.py

@@ -102,7 +102,7 @@ def create_view_set(model: Model):
 
 
 def create_serializer_for_create(model: Model):
-    @extend_schema_serializer(component_name='Admin' + get_serializer_name(model))
+    @extend_schema_serializer(component_name='Admin1' + get_serializer_name(model))
     class Serializer(serializers.ModelSerializer):
         class Meta:
             fields = '__all__'
@@ -114,7 +114,7 @@ def create_serializer_for_create(model: Model):
 def create_serializer_for_partial_update(model: Model):
     fields_list = get_model_fields_list(model)
 
-    @extend_schema_serializer(component_name='Admin' + get_serializer_name(model))
+    @extend_schema_serializer(component_name='Admin2' + get_serializer_name(model))
     class Serializer(serializers.ModelSerializer):
         class Meta:
             fields = '__all__'
@@ -147,7 +147,7 @@ def create_serializer(model: Model, depth=0):
             parsed_url = urlparse(value.url)
             return f'{parsed_url.path}?{parsed_url.query}'
 
-    @extend_schema_serializer(component_name='Admin' + get_serializer_name(model))
+    @extend_schema_serializer(component_name='Admin3' + get_serializer_name(model))
     class Serializer(serializers.ModelSerializer):
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)

{utg_base-1.5.5 → utg_base-1.5.7}/src/utg_base/services/base_api.py

@@ -14,10 +14,19 @@ class BaseServiceAPI:
     base_url: str = None
     default_response_processor: Callable[[Response], Any] = None
 
-    def request(self, method, path, data=None, json=None, params=None, headers=None,
-                authenticator: Callable[[dict], dict] | None = 'default',
-                response_processor: Callable[[Response], Any] | None = 'default',
-                **kwargs):
+    @classmethod
+    def request(
+            cls,
+            method,
+            path,
+            data=None,
+            json=None,
+            params=None,
+            headers=None,
+            authenticator: Callable[[dict], dict] | None = 'default',
+            response_processor: Callable[[Response], Any] | None = 'default',
+            **kwargs
+    ):
         """
         Make an HTTP request using the requests' library.
 
@@ -53,12 +62,12 @@ class BaseServiceAPI:
         if callable(authenticator):
             headers = authenticator(headers)
 
-        if authenticator == 'default' and hasattr(self, 'authenticate') and callable(self.authenticate):
-            headers = self.authenticate(headers)
+        if authenticator == 'default' and hasattr(cls, 'authenticate') and callable(cls.authenticate):
+            headers = cls.authenticate(headers)
 
         response = requests.request(
             method=method,
-            url=self.base_url + path,
+            url=cls.base_url + path,
             data=data,
             json=json,
             params=params,
@@ -68,8 +77,8 @@ class BaseServiceAPI:
         )
 
         if response_processor == 'default':
-            if hasattr(self, 'default_response_processor') and callable(self.default_response_processor):
-                return self.default_response_processor(response)
+            if hasattr(cls, 'default_response_processor') and callable(cls.default_response_processor):
+                return cls.default_response_processor(response)
             return response
 
         if response_processor is not None:
@@ -77,8 +86,9 @@ class BaseServiceAPI:
 
         return response
 
-    def call(self, method, path, data=None, json=None, params=None, headers=None):
-        data = self.request(
+    @classmethod
+    def call(cls, method, path, data=None, json=None, params=None, headers=None):
+        data = cls.request(
             method=method,
             path=path,
             data=data,
@@ -88,7 +98,7 @@ class BaseServiceAPI:
             response_processor=call_processor
         )
         return {
-            'path': self.base_url + path,
+            'path': cls.base_url + path,
             'method': method,
             'status': data['status'],
             'reason': data['reason'],
@@ -96,10 +106,11 @@ class BaseServiceAPI:
             'response': data['response'],
         }
 
-    def authenticate(self, headers: dict) -> dict:
+    @classmethod
+    def authenticate(cls, headers: dict) -> dict:
         """
         Example authenticate method:
-            authenticate(self, headers):
+            authenticate(cls, headers):
                 headers['Authorization'] = 'Bearer YOUR_ACCESS_TOKEN'
                 return headers
         :param headers:
@@ -107,22 +118,53 @@ class BaseServiceAPI:
         """
         return headers
 
-    def get(self, path, data=None, json=None, params=None, headers=None,
+    @classmethod
+    def get(
+            cls,
+            path,
+            data=None,
+            json=None,
+            params=None,
+            headers=None,
             authenticator: Callable[[dict], dict] | None = 'default',
-            response_processor: Callable[[Response], Any] | None = 'default'):
-        return self.request('get', path, data, json, params, headers, authenticator, response_processor)
-
-    def post(self, path, data=None, json=None, params=None, headers=None,
-             authenticator: Callable[[dict], dict] | None = 'default',
-             response_processor: Callable[[Response], Any] | None = 'default'):
-        return self.request('post', path, data, json, params, headers, authenticator, response_processor)
-
-    def put(self, path, data=None, json=None, params=None, headers=None,
+            response_processor: Callable[[Response], Any] | None = 'default'
+    ):
+        return cls.request('get', path, data, json, params, headers, authenticator, response_processor)
+
+    @classmethod
+    def post(
+            cls,
+            path,
+            data=None,
+            json=None,
+            params=None,
+            headers=None,
             authenticator: Callable[[dict], dict] | None = 'default',
-            response_processor: Callable[[Response], Any] | None = 'default'):
-        return self.request('put', path, data, json, params, headers, authenticator, response_processor)
-
-    def patch(self, path, data=None, json=None, params=None, headers=None,
-              authenticator: Callable[[dict], dict] | None = 'default',
-              response_processor: Callable[[Response], Any] | None = 'default'):
-        return self.request('patch', path, data, json, params, headers, authenticator, response_processor)
+            response_processor: Callable[[Response], Any] | None = 'default'
+    ):
+        return cls.request('post', path, data, json, params, headers, authenticator, response_processor)
+
+    @classmethod
+    def put(
+            cls,
+            path,
+            data=None,
+            json=None,
+            params=None,
+            headers=None,
+            authenticator: Callable[[dict], dict] | None = 'default',
+            response_processor: Callable[[Response], Any] | None = 'default'
+    ):
+        return cls.request('put', path, data, json, params, headers, authenticator, response_processor)
+
+    @classmethod
+    def patch(
+            cls,
+            path,
+            data=None,
+            json=None,
+            params=None, headers=None,
+            authenticator: Callable[[dict], dict] | None = 'default',
+            response_processor: Callable[[Response], Any] | None = 'default'
+    ):
+        return cls.request('patch', path, data, json, params, headers, authenticator, response_processor)