Merge pull request #137 from skyflowapi/SK-1731-fix-inconsistencies

SK-1731: Fix inconsistencies

Author: saileshwar-skyflow

samples/vault_api/invoke_connection.py

@@ -55,7 +55,7 @@
 invoke_connection_request = InvokeConnectionRequest(
     method=Method.POST,
     body=body,
-    request_headers=headers,  # optional
+    headers=headers,  # optional
     path_params=path_params,  # optional
     query_params=query_params,  # optional
 )

samples/vault_api/tokenize_records.py

@@ -49,7 +49,7 @@
 # sample data
 tokenize_values = [{"<VALUE_FIELD>": "<VALUE>", "<COLUMN_GROUP_FIELD>": "<VALUE>"}]
 
-tokenize_request = TokenizeRequest(tokenize_parameters=tokenize_values)
+tokenize_request = TokenizeRequest(values=tokenize_values)
 
 response = skyflow_client.vault("VAULT_ID").tokenize(tokenize_request)
 

skyflow/utils/_utils.py

@@ -78,9 +78,9 @@ def construct_invoke_connection_request(request, connection_url, logger) -> Prep
     url = parse_path_params(connection_url.rstrip('/'), request.path_params)
 
     try:
-        if isinstance(request.request_headers, dict):
+        if isinstance(request.headers, dict):
             header = to_lowercase_keys(json.loads(
-                json.dumps(request.request_headers)))
+                json.dumps(request.headers)))
         else:
             raise SkyflowError(SkyflowMessages.Error.INVALID_REQUEST_HEADERS.value, invalid_input_error_code)
     except Exception:
@@ -224,7 +224,7 @@ def parse_insert_response(api_response, continue_on_error):
                 errors.append(error)
 
             insert_response.inserted_fields = inserted_fields
-            insert_response.error_data = errors
+            insert_response.errors = errors
 
     else:
         for record in api_response.records:
@@ -255,20 +255,20 @@ def parse_delete_response(api_response: V1BulkDeleteRecordResponse):
     delete_response = DeleteResponse()
     deleted_ids = api_response.record_id_response
     delete_response.deleted_ids = deleted_ids
-    delete_response.error = []
+    delete_response.errors = []
     return delete_response
 
 
 def parse_get_response(api_response: V1BulkGetRecordResponse):
     get_response = GetResponse()
     data = []
-    error = []
+    errors = []
     for record in api_response.records:
         field_data = {field: value for field, value in record.fields.items()}
         data.append(field_data)
 
     get_response.data = data
-    get_response.error = error
+    get_response.errors = errors
 
     return get_response
 

skyflow/vault/connection/_invoke_connection_request.py

@@ -4,9 +4,9 @@ def __init__(self,
                  body = None,
                  path_params = None,
                  query_params = None,
-                 request_headers = None):
+                 headers = None):
         self.body = body if body is not None else {}
         self.method = method
         self.path_params = path_params if path_params is not None else {}
         self.query_params = query_params if query_params is not None else {}
-        self.request_headers = request_headers if request_headers is not None else {}
+        self.headers = headers if headers is not None else {}

skyflow/vault/controller/_vault.py

@@ -240,7 +240,7 @@ def tokenize(self, request: TokenizeRequest):
 
         records_list = [
             V1TokenizeRecordRequest(value=item["value"], column_group=item["column_group"])
-            for item in request.tokenize_parameters
+            for item in request.values
         ]
         payload = V1TokenizePayload(tokenization_parameters=records_list)
         tokens_api = self.__vault_client.get_tokens_api()

skyflow/vault/data/_delete_response.py

@@ -1,10 +1,10 @@
 class DeleteResponse:
-    def __init__(self, deleted_ids = None, error = None):
+    def __init__(self, deleted_ids = None, errors = None):
         self.deleted_ids = deleted_ids
-        self.error = error
+        self.errors = errors
 
     def __repr__(self):
-        return f"DeleteResponse(deleted_ids={self.deleted_ids}, error={self.error})"
+        return f"DeleteResponse(deleted_ids={self.deleted_ids}, errors={self.errors})"
 
     def __str__(self):
         return self.__repr__()

skyflow/vault/data/_get_response.py

@@ -1,10 +1,10 @@
 class GetResponse:
-    def __init__(self, data=None, error = None):
+    def __init__(self, data=None, errors = None):
         self.data = data if data else []
-        self.error = error
+        self.errors = errors
 
     def __repr__(self):
-        return f"GetResponse(data={self.data}, error={self.error})"
+        return f"GetResponse(data={self.data}, errors={self.errors})"
 
     def __str__(self):
         return self.__repr__()

skyflow/vault/data/_insert_response.py

@@ -1,12 +1,12 @@
 class InsertResponse:
-    def __init__(self, inserted_fields = None, error_data=None):
-        if error_data is None:
-            error_data = list()
+    def __init__(self, inserted_fields = None, errors=None):
+        if errors is None:
+            errors = list()
         self.inserted_fields = inserted_fields
-        self.error_data = error_data
+        self.errors = errors
 
     def __repr__(self):
-        return f"InsertResponse(inserted_fields={self.inserted_fields}, error={self.error_data})"
+        return f"InsertResponse(inserted_fields={self.inserted_fields}, errors={self.errors})"
 
     def __str__(self):
         return self.__repr__()

skyflow/vault/data/_query_response.py

@@ -1,10 +1,10 @@
 class QueryResponse:
     def __init__(self):
         self.fields = []
-        self.error = []
+        self.errors = []
 
     def __repr__(self):
-        return f"QueryResponse(fields={self.fields}, error={self.error})"
+        return f"QueryResponse(fields={self.fields}, errors={self.errors})"
 
     def __str__(self):
         return self.__repr__()

skyflow/vault/data/_update_response.py

@@ -1,10 +1,10 @@
 class UpdateResponse:
-    def __init__(self, updated_field = None, error=None):
+    def __init__(self, updated_field = None, errors=None):
         self.updated_field = updated_field
-        self.error = error if error is not None else []
+        self.errors = errors if errors is not None else []
 
     def __repr__(self):
-        return f"UpdateResponse(updated_field={self.updated_field}, error={self.error})"
+        return f"UpdateResponse(updated_field={self.updated_field}, errors={self.errors})"
 
     def __str__(self):
         return self.__repr__()