SK-1758 Add detect support in Python SDK

- Fix errors in detect python SDK v2

Author: skyflow-vivek

skyflow/utils/_skyflow_messages.py

@@ -147,50 +147,50 @@ class Error(Enum):
         FILE_INVALID_JSON = f"{error_prefix} Initialization failed. File at {{}} is not in valid JSON format. Verify the file contents."
         INVALID_JSON_FORMAT_IN_CREDENTIALS_ENV = f"{error_prefix} Validation error. Invalid JSON format in SKYFLOW_CREDENTIALS environment variable."
 
-        INVALID_TEXT_IN_DEIDENTIFY: f"{error_prefix} Validation error. The text field is required and must be a non-empty string. Specify a valid text."
-        INVALID_ENTITIES_IN_DEIDENTIFY: f"{error_prefix} Validation error. The entities field must be an array of DetectEntities enums. Specify a valid entities."
-        INVALID_ALLOW_REGEX_LIST: f"{error_prefix} Validation error. The allowRegexList field must be an array of strings. Specify a valid allowRegexList."
-        INVALID_RESTRICT_REGEX_LIST: f"{error_prefix} Validation error. The restrictRegexList field must be an array of strings. Specify a valid restrictRegexList."
-        INVALID_TOKEN_FORMAT: f"{error_prefix} Validation error. The tokenFormat key must be an instance of TokenFormat. Specify a valid token format."
-        INVALID_TRANSFORMATIONS: f"{error_prefix} Validation error. The transformations key must be an instance of Transformations. Specify a valid transformations."
-
-        INVALID_TEXT_IN_REIDENTIFY: f"{error_prefix} Validation error. The text field is required and must be a non-empty string. Specify a valid text."
-        INVALID_REDACTED_ENTITIES_IN_REIDENTIFY: f"{error_prefix} Validation error. The redactedEntities field must be an array of DetectEntities enums. Specify a valid redactedEntities."
-        INVALID_MASKED_ENTITIES_IN_REIDENTIFY: f"{error_prefix} Validation error. The maskedEntities field must be an array of DetectEntities enums. Specify a valid maskedEntities."
-        INVALID_PLAIN_TEXT_ENTITIES_IN_REIDENTIFY: f"{error_prefix} Validation error. The plainTextEntities field must be an array of DetectEntities enums. Specify a valid plainTextEntities."
-
-        INVALID_DEIDENTIFY_FILE_REQUEST: f"{error_prefix} Validation error. Invalid deidentify file request. Specify a valid deidentify file request."
-        EMPTY_FILE_OBJECT: f"{error_prefix} Validation error. File object cannot be empty. Specify a valid file object."
-        INVALID_FILE_FORMAT: f"{error_prefix} Validation error. Invalid file format. Specify a valid file format."
-        MISSING_FILE_SOURCE: f"{error_prefix} Validation error. Provide exactly one of filePath, base64, or fileObject."
-        INVALID_FILE_OBJECT: f"{error_prefix} Validation error. Invalid file object. Specify a valid file object."
-        INVALID_BASE64_STRING: f"{error_prefix} Validation error. Invalid base64 string. Specify a valid base64 string."
-        INVALID_DEIDENTIFY_FILE_OPTIONS: f"{error_prefix} Validation error. Invalid deidentify file options. Specify a valid deidentify file options."
-        INVALID_ENTITIES: f"{error_prefix} Validation error. Invalid entities. Specify valid entities as string array."
-        EMPTY_ENTITIES: f"{error_prefix} Validation error. Entities cannot be empty. Specify valid entities."
-        EMPTY_ALLOW_REGEX_LIST: f"{error_prefix} Validation error. Allow regex list cannot be empty. Specify valid allow regex list."
-        INVALID_ALLOW_REGEX: f"{error_prefix} Validation error. Invalid allow regex. Specify valid allow regex at index {{}}."
-        EMPTY_RESTRICT_REGEX_LIST: f"{error_prefix} Validation error. Restrict regex list cannot be empty. Specify valid restrict regex list."
-        INVALID_RESTRICT_REGEX: f"{error_prefix} Validation error. Invalid restrict regex. Specify valid restrict regex at index {{}}."
-        INVALID_OUTPUT_PROCESSED_IMAGE: f"{error_prefix} Validation error. Invalid output processed image. Specify valid output processed image as string."
-        INVALID_OUTPUT_OCR_TEXT: f"{error_prefix} Validation error. Invalid output ocr text. Specify valid output ocr text as string."
-        INVALID_MASKING_METHOD: f"{error_prefix} Validation error. Invalid masking method. Specify valid masking method as string."
-        INVALID_PIXEL_DENSITY: f"{error_prefix} Validation error. Invalid pixel density. Specify valid pixel density as string."
-        INVALID_OUTPUT_TRANSCRIPTION: f"{error_prefix} Validation error. Invalid output transcription. Specify valid output transcription as string."
-        INVALID_OUTPUT_PROCESSED_AUDIO: f"{error_prefix} Validation error. Invalid output processed audio. Specify valid output processed audio as string."
-        INVALID_MAX_RESOLUTION: f"{error_prefix} Validation error. Invalid max resolution. Specify valid max resolution as string."
-        INVALID_BLEEP: f"{error_prefix} Validation error. Invalid bleep. Specify valid bleep as object."
-        INVALID_FILE_OR_ENCODED_FILE: f"{error_prefix} . Error while decoding base64 and saving file"
-        INVALID_FILE_TYPE : f"{error_prefix} Validation error. Invalid file type. Specify a valid file type."
-        INVALID_FILE_NAME: f"{error_prefix} Validation error. Invalid file name. Specify a valid file name."
-        FILE_READ_ERROR: f"{error_prefix} Validation error. Unable to read file. Verify the file path." 
-        INVALID_BASE64_HEADER: f"{error_prefix} Validation error. Invalid base64 header. Specify a valid base64 header."
-        INVALID_WAIT_TIME: f"{error_prefix} Validation error. Invalid wait time. Specify a valid wait time as number and should not be greater than 20 secs."
-        INVALID_OUTPUT_DIRECTORY: f"{error_prefix} Validation error. Invalid output directory. Specify a valid output directory as string."
-        INVALID_OUTPUT_DIRECTORY_PATH: f"{error_prefix} Validation error. Invalid output directory path. Specify a valid output directory path as string."
-        EMPTY_RUN_ID: f"{error_prefix} Validation error. Run id cannot be empty. Specify a valid run id."
-        INVALID_RUN_ID: f"{error_prefix} Validation error. Invalid run id. Specify a valid run id as string."
-        INTERNAL_SERVER_ERROR: f"{error_prefix}. Internal server error. {{}}."
+        INVALID_TEXT_IN_DEIDENTIFY = f"{error_prefix} Validation error. The text field is required and must be a non-empty string. Specify a valid text."
+        INVALID_ENTITIES_IN_DEIDENTIFY = f"{error_prefix} Validation error. The entities field must be an array of DetectEntities enums. Specify a valid entities."
+        INVALID_ALLOW_REGEX_LIST = f"{error_prefix} Validation error. The allowRegexList field must be an array of strings. Specify a valid allowRegexList."
+        INVALID_RESTRICT_REGEX_LIST = f"{error_prefix} Validation error. The restrictRegexList field must be an array of strings. Specify a valid restrictRegexList."
+        INVALID_TOKEN_FORMAT = f"{error_prefix} Validation error. The tokenFormat key must be an instance of TokenFormat. Specify a valid token format."
+        INVALID_TRANSFORMATIONS = f"{error_prefix} Validation error. The transformations key must be an instance of Transformations. Specify a valid transformations."
+
+        INVALID_TEXT_IN_REIDENTIFY = f"{error_prefix} Validation error. The text field is required and must be a non-empty string. Specify a valid text."
+        INVALID_REDACTED_ENTITIES_IN_REIDENTIFY = f"{error_prefix} Validation error. The redactedEntities field must be an array of DetectEntities enums. Specify a valid redactedEntities."
+        INVALID_MASKED_ENTITIES_IN_REIDENTIFY = f"{error_prefix} Validation error. The maskedEntities field must be an array of DetectEntities enums. Specify a valid maskedEntities."
+        INVALID_PLAIN_TEXT_ENTITIES_IN_REIDENTIFY = f"{error_prefix} Validation error. The plainTextEntities field must be an array of DetectEntities enums. Specify a valid plainTextEntities."
+
+        INVALID_DEIDENTIFY_FILE_REQUEST = f"{error_prefix} Validation error. Invalid deidentify file request. Specify a valid deidentify file request."
+        EMPTY_FILE_OBJECT = f"{error_prefix} Validation error. File object cannot be empty. Specify a valid file object."
+        INVALID_FILE_FORMAT = f"{error_prefix} Validation error. Invalid file format. Specify a valid file format."
+        MISSING_FILE_SOURCE = f"{error_prefix} Validation error. Provide exactly one of filePath, base64, or fileObject."
+        INVALID_FILE_OBJECT = f"{error_prefix} Validation error. Invalid file object. Specify a valid file object."
+        INVALID_BASE64_STRING = f"{error_prefix} Validation error. Invalid base64 string. Specify a valid base64 string."
+        INVALID_DEIDENTIFY_FILE_OPTIONS = f"{error_prefix} Validation error. Invalid deidentify file options. Specify a valid deidentify file options."
+        INVALID_ENTITIES = f"{error_prefix} Validation error. Invalid entities. Specify valid entities as string array."
+        EMPTY_ENTITIES = f"{error_prefix} Validation error. Entities cannot be empty. Specify valid entities."
+        EMPTY_ALLOW_REGEX_LIST = f"{error_prefix} Validation error. Allow regex list cannot be empty. Specify valid allow regex list."
+        INVALID_ALLOW_REGEX = f"{error_prefix} Validation error. Invalid allow regex. Specify valid allow regex at index {{}}."
+        EMPTY_RESTRICT_REGEX_LIST = f"{error_prefix} Validation error. Restrict regex list cannot be empty. Specify valid restrict regex list."
+        INVALID_RESTRICT_REGEX = f"{error_prefix} Validation error. Invalid restrict regex. Specify valid restrict regex at index {{}}."
+        INVALID_OUTPUT_PROCESSED_IMAGE = f"{error_prefix} Validation error. Invalid output processed image. Specify valid output processed image as string."
+        INVALID_OUTPUT_OCR_TEXT = f"{error_prefix} Validation error. Invalid output ocr text. Specify valid output ocr text as string."
+        INVALID_MASKING_METHOD = f"{error_prefix} Validation error. Invalid masking method. Specify valid masking method as string."
+        INVALID_PIXEL_DENSITY = f"{error_prefix} Validation error. Invalid pixel density. Specify valid pixel density as string."
+        INVALID_OUTPUT_TRANSCRIPTION = f"{error_prefix} Validation error. Invalid output transcription. Specify valid output transcription as string."
+        INVALID_OUTPUT_PROCESSED_AUDIO = f"{error_prefix} Validation error. Invalid output processed audio. Specify valid output processed audio as string."
+        INVALID_MAX_RESOLUTION = f"{error_prefix} Validation error. Invalid max resolution. Specify valid max resolution as string."
+        INVALID_BLEEP = f"{error_prefix} Validation error. Invalid bleep. Specify valid bleep as object."
+        INVALID_FILE_OR_ENCODED_FILE = f"{error_prefix} . Error while decoding base64 and saving file"
+        INVALID_FILE_TYPE  = f"{error_prefix} Validation error. Invalid file type. Specify a valid file type."
+        INVALID_FILE_NAME = f"{error_prefix} Validation error. Invalid file name. Specify a valid file name."
+        FILE_READ_ERROR = f"{error_prefix} Validation error. Unable to read file. Verify the file path." 
+        INVALID_BASE64_HEADER = f"{error_prefix} Validation error. Invalid base64 header. Specify a valid base64 header."
+        INVALID_WAIT_TIME = f"{error_prefix} Validation error. Invalid wait time. Specify a valid wait time as number and should not be greater than 20 secs."
+        INVALID_OUTPUT_DIRECTORY = f"{error_prefix} Validation error. Invalid output directory. Specify a valid output directory as string."
+        INVALID_OUTPUT_DIRECTORY_PATH = f"{error_prefix} Validation error. Invalid output directory path. Specify a valid output directory path as string."
+        EMPTY_RUN_ID = f"{error_prefix} Validation error. Run id cannot be empty. Specify a valid run id."
+        INVALID_RUN_ID = f"{error_prefix} Validation error. Invalid run id. Specify a valid run id as string."
+        INTERNAL_SERVER_ERROR = f"{error_prefix}. Internal server error. {{}}."
 
     class Info(Enum):
         CLIENT_INITIALIZED = f"{INFO}: [{error_prefix}] Initialized skyflow client."

skyflow/utils/_utils.py

@@ -393,7 +393,7 @@ def parse_deidentify_text_response(api_response: DeidentifyStringResponse):
     )
 
 def parse_reidentify_text_response(api_response: ReidentifyStringResponse):
-    return ReidentifyTextResponse(api_response.processed_text)
+    return ReidentifyTextResponse(api_response.text)
 
 def log_and_reject_error(description, status_code, request_id, http_status=None, grpc_code=None, details=None, logger = None):
     raise SkyflowError(description, status_code, request_id, grpc_code, http_status, details)

skyflow/utils/validations/_validations.py

@@ -583,11 +583,11 @@ def validate_deidentify_text_request(self, request: DeidentifyTextRequest):
         raise SkyflowError(SkyflowMessages.Error.INVALID_ENTITIES_IN_DEIDENTIFY.value, invalid_input_error_code)
 
     # Validate allowed_regex_list if present
-    if request.allow_regex_list is not None and not isinstance(request.allowed_regex_list, list):
+    if request.allow_regex_list is not None and not isinstance(request.allow_regex_list, list):
         raise SkyflowError(SkyflowMessages.Error.INVALID_ALLOW_REGEX_LIST.value, invalid_input_error_code)
 
     # Validate restricted_regex_list if present
-    if request.restrict_regex_list is not None and not isinstance(request.restricted_regex_list, list):
+    if request.restrict_regex_list is not None and not isinstance(request.restrict_regex_list, list):
         raise SkyflowError(SkyflowMessages.Error.INVALID_RESTRICT_REGEX_LIST.value, invalid_input_error_code)
 
     # Validate token_format if present

tests/utils/test__utils.py

@@ -475,7 +475,7 @@ def test_parse_deidentify_text_response_no_entities(self):
     def test_parse_reidentify_text_response(self):
         """Test parsing reidentify text response."""
         mock_api_response = Mock()
-        mock_api_response.processed_text = "Reidentified text with actual values"
+        mock_api_response.text = "Reidentified text with actual values"
 
         result = parse_reidentify_text_response(mock_api_response)