SK-1758 Add detect support in Python SDK

- Fix inconsistencies in detect Python SDK

Author: skyflow-vivek

skyflow/client/skyflow.py

@@ -191,6 +191,7 @@ def __add_vault_config(self, config):
                 "detect_controller": Detect(vault_client)
             }
             log_info(SkyflowMessages.Info.VAULT_CONTROLLER_INITIALIZED.value.format(config.get("vault_id")), self.__logger)
+            log_info(SkyflowMessages.Info.DETECT_CONTROLLER_INITIALIZED.value.format(config.get("vault_id")), self.__logger)
 
         def __add_connection_config(self, config):
             validate_connection_config(self.__logger, config)

skyflow/utils/__init__.py

@@ -2,4 +2,4 @@
 from ._skyflow_messages import SkyflowMessages
 from ._version import SDK_VERSION
 from ._helpers import get_base_url, format_scope
-from ._utils import get_credentials, get_vault_url, construct_invoke_connection_request, get_metrics, parse_insert_response, handle_exception, parse_update_record_response, parse_delete_response, parse_detokenize_response, parse_tokenize_response, parse_query_response, parse_get_response, parse_invoke_connection_response, validate_api_key, encode_column_values, parse_deidentify_text_response, parse_reidentify_text_response, convert_to_entity_type, convert_detected_entity_to_entity_info 
+from ._utils import get_credentials, get_vault_url, construct_invoke_connection_request, get_metrics, parse_insert_response, handle_exception, parse_update_record_response, parse_delete_response, parse_detokenize_response, parse_tokenize_response, parse_query_response, parse_get_response, parse_invoke_connection_response, validate_api_key, encode_column_values, parse_deidentify_text_response, parse_reidentify_text_response, convert_detected_entity_to_entity_info 

skyflow/utils/_utils.py

@@ -85,14 +85,6 @@ def to_lowercase_keys(dict):
 
     return result
 
-def convert_to_entity_type(detect_entities):
-    entity_types = None
-    if (detect_entities is not None and len(detect_entities) != 0):
-        entity_types = []
-        for entity in detect_entities:
-            entity_types.append(entity.value)
-    return entity_types
-
 def convert_detected_entity_to_entity_info(detected_entity):
     return EntityInfo(
         token=detected_entity.token,

skyflow/vault/controller/_detect.py

@@ -3,7 +3,7 @@
 from skyflow.generated.rest.types.transformations import Transformations
 from skyflow.generated.rest.types.transformations_shift_dates import TransformationsShiftDates
 from skyflow.utils._skyflow_messages import SkyflowMessages
-from skyflow.utils._utils import convert_to_entity_type, get_metrics, handle_exception, parse_deidentify_text_response, parse_reidentify_text_response
+from skyflow.utils._utils import get_metrics, handle_exception, parse_deidentify_text_response, parse_reidentify_text_response
 from skyflow.utils.constants import SKY_META_DATA_HEADER
 from skyflow.utils.logger import log_info, log_error_log
 from skyflow.utils.validations._validations import validate_deidentify_text_request, validate_reidentify_text_request
@@ -26,23 +26,23 @@ def __get_headers(self):
 
     def ___build_deidentify_text_body(self, request: DeidentifyTextRequest) -> Dict[str, Any]:
         deidentify_text_body = {}
-        parsed_entity_types = convert_to_entity_type(request.entities)
+        parsed_entity_types = request.entities
 
         parsed_token_type = None
         if request.token_format is not None:
             parsed_token_type = TokenType(
                 default = request.token_format.default,
-                vault_token = convert_to_entity_type(request.token_format.vault_token),
-                entity_unq_counter = convert_to_entity_type(request.token_format.entity_unique_counter),
-                entity_only = convert_to_entity_type(request.token_format.entity_only)
+                vault_token = request.token_format.vault_token,
+                entity_unq_counter = request.token_format.entity_unique_counter,
+                entity_only = request.token_format.entity_only
             )
         parsed_transformations = None
         if request.transformations is not None:
             parsed_transformations = Transformations(
                 shift_dates = TransformationsShiftDates(
-                    max_days = request.transformations.shift_days.max,
-                    min_days = request.transformations.shift_days.min,
-                    entity_types = convert_to_entity_type(request.transformations.shift_days.entities)
+                    max_days = request.transformations.shift_dates.max,
+                    min_days = request.transformations.shift_dates.min,
+                    entity_types = request.transformations.shift_dates.entities
                 )
             )
 
@@ -57,9 +57,9 @@ def ___build_deidentify_text_body(self, request: DeidentifyTextRequest) -> Dict[
 
     def ___build_reidentify_text_body(self, request: ReidentifyTextRequest) -> Dict[str, Any]:
         parsed_format = ReidentifyStringRequestFormat(
-            redacted=convert_to_entity_type(request.redacted_entities),
-            masked=convert_to_entity_type(request.masked_entities),
-            plaintext=convert_to_entity_type(request.plain_text_entities)
+            redacted=request.redacted_entities,
+            masked=request.masked_entities,
+            plaintext=request.plain_text_entities
         )
         reidentify_text_body = {}
         reidentify_text_body['text'] = request.text

skyflow/vault/detect/_transformations.py

@@ -1,5 +1,5 @@
 from skyflow.vault.detect._date_transformation import DateTransformation
 
 class Transformations:
-    def __init__(self, shift_days: DateTransformation):
-        self.shift_days = shift_days
+    def __init__(self, shift_dates: DateTransformation):
+        self.shift_dates = shift_dates

tests/utils/test__utils.py

@@ -11,7 +11,7 @@
     parse_insert_response, parse_update_record_response, parse_delete_response, parse_get_response, \
     parse_detokenize_response, parse_tokenize_response, parse_query_response, parse_invoke_connection_response, \
     handle_exception, validate_api_key, encode_column_values, parse_deidentify_text_response, \
-    parse_reidentify_text_response, convert_to_entity_type, convert_detected_entity_to_entity_info
+    parse_reidentify_text_response, convert_detected_entity_to_entity_info
 from skyflow.utils._utils import parse_path_params, to_lowercase_keys, get_metrics
 from skyflow.utils.enums import EnvUrls, Env, ContentType
 from skyflow.vault.connection import InvokeConnectionResponse
@@ -481,25 +481,6 @@ def test_parse_reidentify_text_response(self):
 
         self.assertEqual(result.processed_text, "Reidentified text with actual values")
 
-    def test_convert_to_entity_type_with_valid_entities(self):
-        """Test converting entity types with valid input."""
-        from skyflow.utils.enums import DetectEntities
-
-        detect_entities = [DetectEntities.EMAIL_ADDRESS, DetectEntities.PHONE_NUMBER]
-        result = convert_to_entity_type(detect_entities)
-
-        self.assertEqual(result, ["email_address", "phone_number"])
-
-    def test_convert_to_entity_type_with_empty_list(self):
-        """Test converting entity types with empty list."""
-        result = convert_to_entity_type([])
-        self.assertIsNone(result)
-
-    def test_convert_to_entity_type_with_none(self):
-        """Test converting entity types with None input."""
-        result = convert_to_entity_type(None)
-        self.assertIsNone(result)
-
     def test__convert_detected_entity_to_entity_info(self):
         """Test converting detected entity to EntityInfo object."""
         mock_detected_entity = Mock()