SK-1908: Add constants

Author: saileshwar-skyflow

skyflow/service_account/client/auth_client.py

@@ -1,12 +1,13 @@
 from skyflow.generated.rest.client import Skyflow
+from skyflow.utils.constants import OPTIONAL_TOKEN
 
 class AuthClient:
     def __init__(self, url):
         self.__url = url
         self.__api_client = self.initialize_api_client()
 
     def initialize_api_client(self):
-        return Skyflow(base_url=self.__url, token='token')
+        return Skyflow(base_url=self.__url, token=OPTIONAL_TOKEN)
 
     def get_auth_api(self):
         return self.__api_client.authentication

skyflow/utils/_utils.py

@@ -15,6 +15,7 @@
     V1DetokenizeResponse, V1TokenizeResponse, V1GetQueryResponse, V1BulkGetRecordResponse
 from skyflow.utils.logger import log_error_log
 from . import SkyflowMessages, SDK_VERSION
+from .constants import PROTOCOL
 from .enums import Env, ContentType, EnvUrls
 from skyflow.vault.data import InsertResponse, UpdateResponse, DeleteResponse, QueryResponse, GetResponse
 from .validations import validate_invoke_connection_params
@@ -61,7 +62,7 @@ def get_vault_url(cluster_id, env,vault_id, logger = None):
         raise SkyflowError(SkyflowMessages.Error.INVALID_ENV.value.format(vault_id), invalid_input_error_code)
 
     base_url = EnvUrls[env.name].value
-    protocol = "https"
+    protocol = PROTOCOL
 
     return f"{protocol}://{cluster_id}.{base_url}"
 

skyflow/utils/constants.py

@@ -0,0 +1,2 @@
+OPTIONAL_TOKEN='token'
+PROTOCOL='https'

skyflow/utils/validations/_validations.py

@@ -514,16 +514,20 @@ def validate_detokenize_request(logger, request):
         raise SkyflowError(SkyflowMessages.Error.EMPTY_TOKENS_LIST_VALUE.value, invalid_input_error_code)
 
     for item in request.data:
-        if 'token' not in item or 'redaction' not in item:
-            raise SkyflowError(SkyflowMessages.Error.INVALID_TOKENS_LIST_VALUE.value(type(request.data)), invalid_input_error_code)
+        if 'token' not in item:
+            raise SkyflowError(SkyflowMessages.Error.INVALID_TOKENS_LIST_VALUE.value.format(type(request.data)),
+                               invalid_input_error_code)
+
         token = item.get('token')
-        redaction = item.get('redaction')
+        redaction = item.get('redaction', None)
 
         if not isinstance(token, str) or not token:
-            raise SkyflowError(SkyflowMessages.Error.INVALID_TOKEN_TYPE.value.format("DETOKENIZE"), invalid_input_error_code)
+            raise SkyflowError(SkyflowMessages.Error.INVALID_TOKEN_TYPE.value.format("DETOKENIZE"),
+                               invalid_input_error_code)
 
-        if not isinstance(redaction, RedactionType) or not redaction:
-            raise SkyflowError(SkyflowMessages.Error.INVALID_REDACTION_TYPE.value.format(type(redaction)), invalid_input_error_code)
+        if redaction is not None and not isinstance(redaction, RedactionType):
+            raise SkyflowError(SkyflowMessages.Error.INVALID_REDACTION_TYPE.value.format(type(redaction)),
+                               invalid_input_error_code)
 
 def validate_tokenize_request(logger, request):
     parameters = request.values

skyflow/vault/controller/_vault.py

@@ -190,7 +190,10 @@ def detokenize(self, request: DetokenizeRequest):
         log_info(SkyflowMessages.Info.DETOKENIZE_REQUEST_RESOLVED.value, self.__vault_client.get_logger())
         self.__initialize()
         tokens_list = [
-            V1DetokenizeRecordRequest(token=item.get('token'), redaction=item.get('redaction').value if item.get('redaction') is not None else None)
+            V1DetokenizeRecordRequest(
+                token=item.get('token'),
+                redaction=item.get('redaction', None)
+            )
             for item in request.data
         ]
         tokens_api = self.__vault_client.get_tokens_api()