Skip to content

Commit b92e555

Browse files
saileshwar-skyflowsaileshwar-skyflow
committed
SK-1908: Update tests and fix enums
1 parent d5b668b commit b92e555

File tree

7 files changed

+11
-260
lines changed

7 files changed

+11
-260
lines changed

‎skyflow/generated/rest/errors/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
from .bad_request_error import BadRequestError
44
from .not_found_error import NotFoundError
55
from .unauthorized_error import UnauthorizedError
6-
from .forbidden_error import ForbiddenError
76

8-
__all__ = ["BadRequestError", "NotFoundError", "UnauthorizedError", "ForbiddenError"]
7+
__all__ = ["BadRequestError", "NotFoundError", "UnauthorizedError"]

‎skyflow/generated/rest/errors/forbidden_error.py‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎skyflow/utils/_utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def get_vault_url(cluster_id, env,vault_id, logger = None):
6161
raise SkyflowError(SkyflowMessages.Error.INVALID_ENV.value.format(vault_id), invalid_input_error_code)
6262

6363
base_url = EnvUrls[env.name].value
64-
protocol = "https" if env != Env.PROD else "http"
64+
protocol = "https"
6565

6666
return f"{protocol}://{cluster_id}.{base_url}"
6767

‎skyflow/utils/enums/env.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from enum import Enum
22

33
class Env(Enum):
4-
DEV = 'DEV',
5-
SANDBOX = 'SANDBOX',
4+
DEV = 'DEV'
5+
SANDBOX = 'SANDBOX'
66
PROD = 'PROD'
77
STAGE = 'STAGE'
88

99
class EnvUrls(Enum):
10-
PROD = "vault.skyflowapis.com",
11-
SANDBOX = "vault.skyflowapis-preview.com",
10+
PROD = "vault.skyflowapis.com"
11+
SANDBOX = "vault.skyflowapis-preview.com"
1212
DEV = "vault.skyflowapis.dev"
1313
STAGE = "vault.skyflowapis.tech"

‎skyflow/vault/controller/_vault.py‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from skyflow.generated.rest import V1FieldRecords, V1BatchRecord, V1TokenizeRecordRequest, \
22
V1DetokenizeRecordRequest
3-
from skyflow.generated.rest.errors import BadRequestError, UnauthorizedError, ForbiddenError
43
from skyflow.utils import SkyflowMessages, parse_insert_response, \
54
handle_exception, parse_update_record_response, parse_delete_response, parse_detokenize_response, \
65
parse_tokenize_response, parse_query_response, parse_get_response, encode_column_values
@@ -74,26 +73,21 @@ def insert(self, request: InsertRequest):
7473

7574
try:
7675
log_info(SkyflowMessages.Info.INSERT_TRIGGERED.value, self.__vault_client.get_logger())
77-
7876
if request.continue_on_error:
7977
api_response = records_api.record_service_batch_operation(self.__vault_client.get_vault_id(),
8078
records=insert_body, continue_on_error=request.continue_on_error, byot=request.token_mode.value)
8179

8280
else:
8381
api_response = records_api.record_service_insert_record(self.__vault_client.get_vault_id(),
84-
request.table_name, records=insert_body,tokenization= request.return_tokens, upsert=request.upsert, homogeneous=request.homogeneous)
82+
request.table_name, records=insert_body,tokenization= request.return_tokens, upsert=request.upsert, homogeneous=request.homogeneous, byot=request.token_mode.value)
8583

8684
insert_response = parse_insert_response(api_response, request.continue_on_error)
8785
log_info(SkyflowMessages.Info.INSERT_SUCCESS.value, self.__vault_client.get_logger())
8886
return insert_response
8987

90-
except BadRequestError as e:
88+
except Exception as e:
9189
log_error_log(SkyflowMessages.ErrorLogs.INSERT_RECORDS_REJECTED.value, self.__vault_client.get_logger())
9290
handle_exception(e, self.__vault_client.get_logger())
93-
except UnauthorizedError as e:
94-
handle_exception(e, self.__vault_client.get_logger())
95-
except ForbiddenError as e:
96-
handle_exception(e, self.__vault_client.get_logger())
9791

9892
def update(self, request: UpdateRequest):
9993
log_info(SkyflowMessages.Info.VALIDATE_UPDATE_REQUEST.value, self.__vault_client.get_logger())
@@ -120,10 +114,6 @@ def update(self, request: UpdateRequest):
120114
except Exception as e:
121115
log_error_log(SkyflowMessages.ErrorLogs.UPDATE_REQUEST_REJECTED.value, logger = self.__vault_client.get_logger())
122116
handle_exception(e, self.__vault_client.get_logger())
123-
except UnauthorizedError as e:
124-
handle_exception(e, self.__vault_client.get_logger())
125-
except ForbiddenError as e:
126-
handle_exception(e, self.__vault_client.get_logger())
127117

128118
def delete(self, request: DeleteRequest):
129119
log_info(SkyflowMessages.Info.VALIDATING_DELETE_REQUEST.value, self.__vault_client.get_logger())
@@ -144,12 +134,6 @@ def delete(self, request: DeleteRequest):
144134
except Exception as e:
145135
log_error_log(SkyflowMessages.ErrorLogs.DELETE_REQUEST_REJECTED.value, logger = self.__vault_client.get_logger())
146136
handle_exception(e, self.__vault_client.get_logger())
147-
except UnauthorizedError as e:
148-
log_error_log(SkyflowMessages.ErrorLogs.DELETE_REQUEST_REJECTED.value,
149-
logger=self.__vault_client.get_logger())
150-
handle_exception(e, self.__vault_client.get_logger())
151-
except ForbiddenError as e:
152-
handle_exception(e, self.__vault_client.get_logger())
153137

154138
def get(self, request: GetRequest):
155139
log_info(SkyflowMessages.Info.VALIDATE_GET_REQUEST.value, self.__vault_client.get_logger())
@@ -180,11 +164,6 @@ def get(self, request: GetRequest):
180164
except Exception as e:
181165
log_error_log(SkyflowMessages.ErrorLogs.GET_REQUEST_REJECTED.value, self.__vault_client.get_logger())
182166
handle_exception(e, self.__vault_client.get_logger())
183-
except UnauthorizedError as e:
184-
log_error_log(SkyflowMessages.ErrorLogs.GET_REQUEST_REJECTED.value, self.__vault_client.get_logger())
185-
handle_exception(e, self.__vault_client.get_logger())
186-
except ForbiddenError as e:
187-
handle_exception(e, self.__vault_client.get_logger())
188167

189168
def query(self, request: QueryRequest):
190169
log_info(SkyflowMessages.Info.VALIDATING_QUERY_REQUEST.value, self.__vault_client.get_logger())
@@ -204,22 +183,16 @@ def query(self, request: QueryRequest):
204183
except Exception as e:
205184
log_error_log(SkyflowMessages.ErrorLogs.QUERY_REQUEST_REJECTED.value, self.__vault_client.get_logger())
206185
handle_exception(e, self.__vault_client.get_logger())
207-
except UnauthorizedError as e:
208-
log_error_log(SkyflowMessages.ErrorLogs.QUERY_REQUEST_REJECTED.value, self.__vault_client.get_logger())
209-
handle_exception(e, self.__vault_client.get_logger())
210-
except ForbiddenError as e:
211-
handle_exception(e, self.__vault_client.get_logger())
212186

213187
def detokenize(self, request: DetokenizeRequest):
214188
log_info(SkyflowMessages.Info.VALIDATE_DETOKENIZE_REQUEST.value, self.__vault_client.get_logger())
215189
validate_detokenize_request(self.__vault_client.get_logger(), request)
216190
log_info(SkyflowMessages.Info.DETOKENIZE_REQUEST_RESOLVED.value, self.__vault_client.get_logger())
217191
self.__initialize()
218192
tokens_list = [
219-
V1DetokenizeRecordRequest(token=item.get('token'), redaction=item.get('redaction').value)
193+
V1DetokenizeRecordRequest(token=item.get('token'), redaction=item.get('redaction').value if item.get('redaction') is not None else None)
220194
for item in request.data
221195
]
222-
# payload = V1DetokenizePayload(detokenization_parameters=tokens_list, continue_on_error=request.continue_on_error)
223196
tokens_api = self.__vault_client.get_tokens_api()
224197
try:
225198
log_info(SkyflowMessages.Info.DETOKENIZE_TRIGGERED.value, self.__vault_client.get_logger())
@@ -234,12 +207,6 @@ def detokenize(self, request: DetokenizeRequest):
234207
except Exception as e:
235208
log_error_log(SkyflowMessages.ErrorLogs.DETOKENIZE_REQUEST_REJECTED.value, logger = self.__vault_client.get_logger())
236209
handle_exception(e, self.__vault_client.get_logger())
237-
except UnauthorizedError as e:
238-
log_error_log(SkyflowMessages.ErrorLogs.DETOKENIZE_REQUEST_REJECTED.value,
239-
logger=self.__vault_client.get_logger())
240-
handle_exception(e, self.__vault_client.get_logger())
241-
except ForbiddenError as e:
242-
handle_exception(e, self.__vault_client.get_logger())
243210

244211
def tokenize(self, request: TokenizeRequest):
245212
log_info(SkyflowMessages.Info.VALIDATING_TOKENIZE_REQUEST.value, self.__vault_client.get_logger())
@@ -251,7 +218,6 @@ def tokenize(self, request: TokenizeRequest):
251218
V1TokenizeRecordRequest(value=item["value"], column_group=item["column_group"])
252219
for item in request.values
253220
]
254-
# payload = V1TokenizePayload(tokenization_parameters=records_list)
255221
tokens_api = self.__vault_client.get_tokens_api()
256222
try:
257223
log_info(SkyflowMessages.Info.TOKENIZE_TRIGGERED.value, self.__vault_client.get_logger())
@@ -264,10 +230,4 @@ def tokenize(self, request: TokenizeRequest):
264230
return tokenize_response
265231
except Exception as e:
266232
log_error_log(SkyflowMessages.ErrorLogs.TOKENIZE_REQUEST_REJECTED.value, logger = self.__vault_client.get_logger())
267-
handle_exception(e, self.__vault_client.get_logger())
268-
except UnauthorizedError as e:
269-
log_error_log(SkyflowMessages.ErrorLogs.TOKENIZE_REQUEST_REJECTED.value,
270-
logger=self.__vault_client.get_logger())
271-
handle_exception(e, self.__vault_client.get_logger())
272-
except ForbiddenError as e:
273233
handle_exception(e, self.__vault_client.get_logger())

‎skyflow/vault/tokens/_detokenize_request.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from skyflow.utils.enums.redaction_type import RedactionType
2-
31
class DetokenizeRequest:
42
def __init__(self, data, continue_on_error = False):
53
self.data = data

0 commit comments

Comments
 (0)