diff --git a/pom.xml b/pom.xml
index 38869a73..d0895606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.skyflow
skyflow-java
- 2.0.0
+ 3.0.0-beta.6-dev.ad00cc3
jar
${project.groupId}:${project.artifactId}
@@ -42,6 +42,7 @@
4.13.2
2.3.1
1.3.5
+ ${project.version}
@@ -139,6 +140,12 @@
+
+
+ src/main/resources
+ true
+
+
org.apache.maven.plugins
diff --git a/src/main/java/com/skyflow/VaultClient.java b/src/main/java/com/skyflow/VaultClient.java
index edb8ee47..b6974f5d 100644
--- a/src/main/java/com/skyflow/VaultClient.java
+++ b/src/main/java/com/skyflow/VaultClient.java
@@ -17,16 +17,15 @@
import com.skyflow.generated.rest.resources.records.requests.RecordServiceBatchOperationBody;
import com.skyflow.generated.rest.resources.records.requests.RecordServiceInsertRecordBody;
import com.skyflow.generated.rest.resources.records.requests.RecordServiceUpdateRecordBody;
-import com.skyflow.generated.rest.resources.records.requests.UploadFileV2Request;
import com.skyflow.generated.rest.resources.strings.StringsClient;
import com.skyflow.generated.rest.resources.strings.requests.DeidentifyStringRequest;
import com.skyflow.generated.rest.resources.strings.requests.ReidentifyStringRequest;
-import com.skyflow.generated.rest.resources.strings.types.ReidentifyStringRequestFormat;
+import com.skyflow.generated.rest.resources.strings.types.DeidentifyStringRequestEntityTypesItem;
import com.skyflow.generated.rest.resources.tokens.TokensClient;
import com.skyflow.generated.rest.resources.tokens.requests.V1DetokenizePayload;
import com.skyflow.generated.rest.resources.tokens.requests.V1TokenizePayload;
-import com.skyflow.generated.rest.types.*;
import com.skyflow.generated.rest.types.Transformations;
+import com.skyflow.generated.rest.types.*;
import com.skyflow.logs.InfoLogs;
import com.skyflow.serviceaccount.util.Token;
import com.skyflow.utils.Constants;
@@ -36,9 +35,8 @@
import com.skyflow.vault.data.FileUploadRequest;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.UpdateRequest;
-import com.skyflow.vault.detect.*;
import com.skyflow.vault.detect.DeidentifyFileRequest;
-import com.skyflow.vault.detect.DeidentifyTextRequest;
+import com.skyflow.vault.detect.*;
import com.skyflow.vault.tokens.ColumnValue;
import com.skyflow.vault.tokens.DetokenizeData;
import com.skyflow.vault.tokens.DetokenizeRequest;
@@ -49,7 +47,6 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.*;
import java.util.stream.Collectors;
@@ -84,7 +81,7 @@ protected StringsClient getDetectTextApi() {
return this.apiClient.strings();
}
- protected FilesClient getDetectFileAPi(){
+ protected FilesClient getDetectFileAPi() {
return this.apiClient.files();
}
@@ -218,14 +215,12 @@ protected V1TokenizePayload getTokenizePayload(TokenizeRequest request) {
protected File getFileForFileUpload(FileUploadRequest fileUploadRequest) throws IOException {
if (fileUploadRequest.getFilePath() != null) {
return new File(fileUploadRequest.getFilePath());
- }
- else if (fileUploadRequest.getBase64() != null) {
+ } else if (fileUploadRequest.getBase64() != null) {
byte[] decodedBytes = Base64.getDecoder().decode(fileUploadRequest.getBase64());
File file = new File(fileUploadRequest.getFileName());
Files.write(file.toPath(), decodedBytes);
return file;
- }
- else if (fileUploadRequest.getFileObject() != null) {
+ } else if (fileUploadRequest.getFileObject() != null) {
return fileUploadRequest.getFileObject();
}
return null;
@@ -236,7 +231,7 @@ protected void setBearerToken() throws SkyflowException {
Validations.validateCredentials(this.finalCredentials);
if (this.finalCredentials.getApiKey() != null) {
LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
- token=this.finalCredentials.getApiKey();
+ token = this.finalCredentials.getApiKey();
} else if (Token.isExpired(token)) {
LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog());
token = Utils.generateBearerToken(this.finalCredentials);
@@ -248,60 +243,73 @@ protected void setBearerToken() throws SkyflowException {
}
protected DeidentifyTextResponse getDeIdentifyTextResponse(DeidentifyStringResponse deidentifyStringResponse) {
- List entities = deidentifyStringResponse.getEntities() != null
- ? deidentifyStringResponse.getEntities().stream()
- .map(this::convertDetectedEntityToEntityInfo)
- .collect(Collectors.toList())
- : null;
+ Optional> detectedEntities = deidentifyStringResponse.getEntities();
+
+ List entities = new ArrayList<>();
+
+ if (detectedEntities.isPresent()) {
+ for (StringResponseEntities e : detectedEntities.get()) {
+ entities.add(convertDetectedEntityToEntityInfo(e));
+ }
+ }
return new DeidentifyTextResponse(
- deidentifyStringResponse.getProcessedText(),
+ deidentifyStringResponse.getProcessedText().get(),
entities,
- deidentifyStringResponse.getWordCount(),
- deidentifyStringResponse.getCharacterCount()
+ deidentifyStringResponse.getWordCount().get(),
+ deidentifyStringResponse.getCharacterCount().get()
);
}
protected DeidentifyStringRequest getDeidentifyStringRequest(DeidentifyTextRequest deIdentifyTextRequest, String vaultId) throws SkyflowException {
List entities = deIdentifyTextRequest.getEntities();
- List mappedEntityTypes = null;
+ List mappedEntityTypes = null;
if (entities != null) {
mappedEntityTypes = deIdentifyTextRequest.getEntities().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> DeidentifyStringRequestEntityTypesItem.valueOf(detectEntity.name()))
.collect(Collectors.toList());
}
TokenFormat tokenFormat = deIdentifyTextRequest.getTokenFormat();
- Optional> vaultToken = Optional.empty();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> vaultToken = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(deIdentifyTextRequest.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(deIdentifyTextRequest.getRestrictRegexList());
Optional transformations = Optional.ofNullable(getTransformations(deIdentifyTextRequest.getTransformations()));
if (tokenFormat != null) {
if (tokenFormat.getVaultToken() != null && !tokenFormat.getVaultToken().isEmpty()) {
- vaultToken = Optional.of(tokenFormat.getVaultToken().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ vaultToken = Optional.of(
+ tokenFormat.getVaultToken().stream()
+ .map(detectEntity -> TokenTypeMappingVaultTokenItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
+
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
- entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityTypes = Optional.of(
+ tokenFormat.getEntityOnly().stream()
+ .map(detectEntity -> TokenTypeMappingEntityOnlyItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
+
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
- entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityUniqueCounter = Optional.of(
+ tokenFormat.getEntityUniqueCounter().stream()
+ .map(detectEntity -> TokenTypeMappingEntityUnqCounterItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
+
}
- TokenType tokenType = TokenType.builder()
+ TokenTypeMapping tokenType = TokenTypeMapping.builder()
.vaultToken(vaultToken)
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
@@ -309,8 +317,8 @@ protected DeidentifyStringRequest getDeidentifyStringRequest(DeidentifyTextReque
return DeidentifyStringRequest.builder()
- .vaultId(vaultId)
.text(deIdentifyTextRequest.getText())
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -320,29 +328,29 @@ protected DeidentifyStringRequest getDeidentifyStringRequest(DeidentifyTextReque
}
protected ReidentifyStringRequest getReidentifyStringRequest(ReidentifyTextRequest reidentifyTextRequest, String vaultId) throws SkyflowException {
- List maskEntities = null;
- List redactedEntities = null;
- List plaintextEntities = null;
+ Optional> maskEntities = null;
+ Optional> redactedEntities = null;
+ Optional> plaintextEntities = null;
if (reidentifyTextRequest.getMaskedEntities() != null) {
- maskEntities = reidentifyTextRequest.getMaskedEntities().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList());
+ maskEntities = Optional.of(reidentifyTextRequest.getMaskedEntities().stream()
+ .map(detectEntity -> FormatMaskedItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList()));
}
if (reidentifyTextRequest.getPlainTextEntities() != null) {
- plaintextEntities = reidentifyTextRequest.getPlainTextEntities().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList());
+ plaintextEntities = Optional.of(reidentifyTextRequest.getPlainTextEntities().stream()
+ .map(detectEntity -> FormatPlaintextItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList()));
}
if (reidentifyTextRequest.getRedactedEntities() != null) {
- redactedEntities = reidentifyTextRequest.getRedactedEntities().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList());
+ redactedEntities = Optional.of(reidentifyTextRequest.getRedactedEntities().stream()
+ .map(detectEntity -> FormatRedactedItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList()));
}
- ReidentifyStringRequestFormat reidentifyStringRequestFormat = ReidentifyStringRequestFormat.builder()
+ Format reidentifyStringRequestFormat = Format.builder()
.masked(maskEntities)
.plaintext(plaintextEntities)
.redacted(redactedEntities)
@@ -357,7 +365,7 @@ protected ReidentifyStringRequest getReidentifyStringRequest(ReidentifyTextReque
}
- private EntityInfo convertDetectedEntityToEntityInfo(DetectedEntity detectedEntity) {
+ private EntityInfo convertDetectedEntityToEntityInfo(StringResponseEntities detectedEntity) {
TextIndex textIndex = new TextIndex(
detectedEntity.getLocation().get().getStartIndex().orElse(0),
detectedEntity.getLocation().get().getEndIndex().orElse(0)
@@ -391,17 +399,17 @@ private Transformations getTransformations(com.skyflow.vault.detect.Transformati
return null;
}
- List entityTypes = null;
+ Optional> entityTypes = null;
if (!transformations.getShiftDates().getEntities().isEmpty()) {
- entityTypes = transformations.getShiftDates().getEntities().stream()
- .map(entity -> TransformationsShiftDatesEntityTypesItem.valueOf(entity.name()))
- .collect(Collectors.toList());
+ entityTypes = Optional.of(transformations.getShiftDates().getEntities().stream()
+ .map(entity -> ShiftDatesEntityTypesItem.valueOf(entity.name()))
+ .collect(Collectors.toList()));
} else {
- entityTypes = Collections.emptyList();
+ entityTypes = Optional.of(Collections.emptyList());
}
return Transformations.builder()
- .shiftDates(TransformationsShiftDates.builder()
+ .shiftDates(ShiftDates.builder()
.maxDays(transformations.getShiftDates().getMax())
.minDays(transformations.getShiftDates().getMin())
.entityTypes(entityTypes)
@@ -409,24 +417,22 @@ private Transformations getTransformations(com.skyflow.vault.detect.Transformati
.build();
}
- private List getEntityTypes(List entities){
- List mappedEntityTypes = null;
- if (entities != null) {
- mappedEntityTypes = entities.stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList());
- }
+ private > List getEntityTypes(List entities, Class type) {
+ if (entities == null) return Collections.emptyList();
- return mappedEntityTypes;
+ return entities.stream()
+ .map(e -> Enum.valueOf(type, e.name()))
+ .collect(Collectors.toList());
}
- protected com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest getDeidentifyTextFileRequest(DeidentifyFileRequest request, String vaultId, String base64Content){
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+
+ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText getDeidentifyTextFileRequest(DeidentifyFileRequest request, String vaultId, String base64Content) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileRequestDeidentifyTextEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
Optional transformations = Optional.ofNullable(getTransformations(request.getTransformations()));
@@ -435,31 +441,31 @@ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequ
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityOnlyItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityUnqCounterItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
}
- TokenTypeWithoutVault tokenType = TokenTypeWithoutVault.builder()
+ TokenTypeMapping tokenType = TokenTypeMapping.builder()
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
.build();
- DeidentifyTextRequestFile file = DeidentifyTextRequestFile.builder()
+ FileDataDeidentifyText file = FileDataDeidentifyText.builder()
.base64(base64Content)
.build();
// Build the final request
- com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest req =
- com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest.builder()
- .vaultId(vaultId)
+ com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText req =
+ com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -471,54 +477,62 @@ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequ
}
- protected DeidentifyAudioRequest getDeidentifyAudioRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String dataFormat) throws SkyflowException {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileAudioRequestDeidentifyAudio getDeidentifyAudioRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String dataFormat) throws SkyflowException {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileAudioRequestDeidentifyAudioEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
Optional transformations = Optional.ofNullable(getTransformations(request.getTransformations()));
if (tokenFormat != null) {
-
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
- entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityTypes = Optional.of(
+ tokenFormat.getEntityOnly().stream()
+ .map(detectEntity -> DeidentifyFileAudioRequestDeidentifyAudioEntityTypesItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ ).map(list -> (List) (List) list);
}
+
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
- entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityUniqueCounter = Optional.of(
+ (List) (List)
+ tokenFormat.getEntityUniqueCounter().stream()
+ .map(detectEntity -> DeidentifyFileAudioRequestDeidentifyAudioEntityTypesItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
+
}
- TokenTypeWithoutVault tokenType = TokenTypeWithoutVault.builder()
+ TokenTypeMapping tokenType = TokenTypeMapping.builder()
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
.build();
- DeidentifyAudioRequestFile deidentifyAudioRequestFile = DeidentifyAudioRequestFile.builder().base64(base64Content).dataFormat(mapAudioDataFormat(dataFormat)).build();
+ FileDataDeidentifyAudio deidentifyAudioRequestFile = FileDataDeidentifyAudio.builder().base64(base64Content).dataFormat(mapAudioDataFormat(dataFormat)).build();
DetectOutputTranscriptions transcription = request.getOutputTranscription();
- DeidentifyAudioRequestOutputTranscription outputTranscriptionType = null;
+ Optional outputTranscriptionType = null;
if (transcription != null) {
- outputTranscriptionType = DeidentifyAudioRequestOutputTranscription.valueOf(transcription.name());
+ outputTranscriptionType = Optional.of(DeidentifyFileAudioRequestDeidentifyAudioOutputTranscription.valueOf(transcription.name()));
}
- return DeidentifyAudioRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileAudioRequestDeidentifyAudio.builder()
.file(deidentifyAudioRequestFile)
+ .vaultId(vaultId)
.allowRegex(allowRegex)
.restrictRegex(restrictRegex)
.entityTypes(mappedEntityTypes)
- .bleepFrequency(request.getBleep() != null ? request.getBleep().getFrequency() : null)
- .bleepGain(request.getBleep() != null ? request.getBleep().getGain() : null)
- .bleepStartPadding(request.getBleep() != null ? request.getBleep().getStartPadding() : null)
- .bleepStopPadding(request.getBleep() != null ? request.getBleep().getStopPadding() : null)
+ .bleepFrequency(request.getBleep() != null
+ ? (int) Math.round(request.getBleep().getFrequency())
+ : null)
+ .bleepGain(request.getBleep() != null ? (int) Math.round(request.getBleep().getGain()) : null)
+ .bleepStartPadding(request.getBleep() != null ? (float) Math.round(request.getBleep().getStartPadding()) : null)
+ .bleepStopPadding(request.getBleep() != null ? (float) Math.round(request.getBleep().getStopPadding()) : null)
.outputProcessedAudio(request.getOutputProcessedAudio())
.outputTranscription(outputTranscriptionType)
.tokenType(tokenType)
@@ -526,43 +540,48 @@ protected DeidentifyAudioRequest getDeidentifyAudioRequest(DeidentifyFileRequest
.build();
}
- protected DeidentifyPdfRequest getDeidentifyPdfRequest(DeidentifyFileRequest request, String vaultId, String base64Content) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileDocumentPdfRequestDeidentifyPdf getDeidentifyPdfRequest(DeidentifyFileRequest request, String vaultId, String base64Content) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileDocumentPdfRequestDeidentifyPdfEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
if (tokenFormat != null) {
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
- entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityTypes = Optional.of(
+ (List) (List)
+ tokenFormat.getEntityOnly().stream()
+ .map(detectEntity -> DeidentifyFileDocumentPdfRequestDeidentifyPdfEntityTypesItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
- entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
- .collect(Collectors.toList()));
+ entityUniqueCounter = Optional.of(
+ (List) (List)
+ tokenFormat.getEntityUniqueCounter().stream()
+ .map(detectEntity -> DeidentifyFileDocumentPdfRequestDeidentifyPdfEntityTypesItem.valueOf(detectEntity.name()))
+ .collect(Collectors.toList())
+ );
}
+
}
- TokenTypeWithoutVault tokenType = TokenTypeWithoutVault.builder()
+ TokenTypeMapping tokenType = TokenTypeMapping.builder()
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
.build();
- DeidentifyPdfRequestFile file = DeidentifyPdfRequestFile.builder()
+ FileDataDeidentifyPdf file = FileDataDeidentifyPdf.builder()
.base64(base64Content)
.build();
- return DeidentifyPdfRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileDocumentPdfRequestDeidentifyPdf.builder()
.file(file)
- .density(request.getPixelDensity() != null ? request.getPixelDensity().doubleValue() : null)
- .maxResolution(request.getMaxResolution() != null ? request.getMaxResolution().doubleValue() : null)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -570,30 +589,30 @@ protected DeidentifyPdfRequest getDeidentifyPdfRequest(DeidentifyFileRequest req
.build();
}
- protected DeidentifyImageRequest getDeidentifyImageRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileImageRequestDeidentifyImage getDeidentifyImageRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileImageRequestDeidentifyImageEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
- TokenTypeWithoutVault tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
+ TokenTypeMapping tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
- DeidentifyImageRequestFile file = DeidentifyImageRequestFile.builder()
+ FileDataDeidentifyImage file = FileDataDeidentifyImage.builder()
.base64(base64Content)
- .dataFormat(DeidentifyImageRequestFileDataFormat.valueOf(format.toUpperCase()))
+ .dataFormat(FileDataDeidentifyImageDataFormat.valueOf(format.toUpperCase()))
.build();
- Optional maskingMethod = Optional.empty();
+ Optional maskingMethod = Optional.empty();
if (request.getMaskingMethod() != null) {
- maskingMethod = Optional.of(DeidentifyImageRequestMaskingMethod.valueOf(request.getMaskingMethod().name()));
+ maskingMethod = Optional.of(DeidentifyFileImageRequestDeidentifyImageMaskingMethod.valueOf(request.getMaskingMethod().name()));
}
- return DeidentifyImageRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileImageRequestDeidentifyImage.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.maskingMethod(maskingMethod)
.tokenType(tokenType)
@@ -604,25 +623,25 @@ protected DeidentifyImageRequest getDeidentifyImageRequest(DeidentifyFileRequest
.build();
}
- protected DeidentifyPresentationRequest getDeidentifyPresentationRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileRequestDeidentifyPresentation getDeidentifyPresentationRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileRequestDeidentifyPresentationEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
- TokenTypeWithoutVault tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
+ TokenTypeMapping tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
- DeidentifyPresentationRequestFile file = DeidentifyPresentationRequestFile.builder()
+ FileDataDeidentifyPresentation file = FileDataDeidentifyPresentation.builder()
.base64(base64Content)
- .dataFormat(DeidentifyPresentationRequestFileDataFormat.valueOf(format.toUpperCase()))
+ .dataFormat(FileDataDeidentifyPresentationDataFormat.valueOf(format.toUpperCase()))
.build();
- return DeidentifyPresentationRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileRequestDeidentifyPresentation.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -630,25 +649,25 @@ protected DeidentifyPresentationRequest getDeidentifyPresentationRequest(Deident
.build();
}
- protected DeidentifySpreadsheetRequest getDeidentifySpreadsheetRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileRequestDeidentifySpreadsheet getDeidentifySpreadsheetRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileRequestDeidentifySpreadsheetEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
- TokenTypeWithoutVault tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
+ TokenTypeMapping tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
- DeidentifySpreadsheetRequestFile file = DeidentifySpreadsheetRequestFile.builder()
+ FileDataDeidentifySpreadsheet file = FileDataDeidentifySpreadsheet.builder()
.base64(base64Content)
- .dataFormat(DeidentifySpreadsheetRequestFileDataFormat.valueOf(format.toUpperCase()))
+ .dataFormat(FileDataDeidentifySpreadsheetDataFormat.valueOf(format.toUpperCase()))
.build();
- return DeidentifySpreadsheetRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileRequestDeidentifySpreadsheet.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -656,26 +675,26 @@ protected DeidentifySpreadsheetRequest getDeidentifySpreadsheetRequest(Deidentif
.build();
}
- protected DeidentifyStructuredTextRequest getDeidentifyStructuredTextRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileRequestDeidentifyStructuredText getDeidentifyStructuredTextRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
+ List mappedEntityTypes = getEntityTypes(request.getEntities(), DeidentifyFileRequestDeidentifyStructuredTextEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
Optional transformations = Optional.ofNullable(getTransformations(request.getTransformations()));
- TokenTypeWithoutVault tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
+ TokenTypeMapping tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
- DeidentifyStructuredTextRequestFile file = DeidentifyStructuredTextRequestFile.builder()
+ FileDataDeidentifyStructuredText file = FileDataDeidentifyStructuredText.builder()
.base64(base64Content)
- .dataFormat(DeidentifyStructuredTextRequestFileDataFormat.valueOf(format.toUpperCase()))
+ .dataFormat(FileDataDeidentifyStructuredTextDataFormat.valueOf(format.toUpperCase()))
.build();
- return DeidentifyStructuredTextRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileRequestDeidentifyStructuredText.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -684,25 +703,26 @@ protected DeidentifyStructuredTextRequest getDeidentifyStructuredTextRequest(Dei
.build();
}
- protected DeidentifyDocumentRequest getDeidentifyDocumentRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ protected DeidentifyFileRequestDeidentifyDocument getDeidentifyDocumentRequest(DeidentifyFileRequest request, String vaultId, String base64Content, String format) {
+ List mappedEntityTypes =
+ getEntityTypes(request.getEntities(), DeidentifyFileRequestDeidentifyDocumentEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
- TokenTypeWithoutVault tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
+ TokenTypeMapping tokenType = buildTokenType(tokenFormat, entityTypes, entityUniqueCounter);
- DeidentifyDocumentRequestFile file = DeidentifyDocumentRequestFile.builder()
+ FileDataDeidentifyDocument file = FileDataDeidentifyDocument.builder()
.base64(base64Content)
- .dataFormat(DeidentifyDocumentRequestFileDataFormat.valueOf(format.toUpperCase()))
+ .dataFormat(FileDataDeidentifyDocumentDataFormat.valueOf(format.toUpperCase()))
.build();
- return DeidentifyDocumentRequest.builder()
- .vaultId(vaultId)
+ return DeidentifyFileRequestDeidentifyDocument.builder()
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -713,12 +733,13 @@ protected DeidentifyDocumentRequest getDeidentifyDocumentRequest(DeidentifyFileR
protected com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest getDeidentifyGenericFileRequest(
DeidentifyFileRequest request, String vaultId, String base64Content, String fileExtension) {
- List mappedEntityTypes = getEntityTypes(request.getEntities());
+ List mappedEntityTypes =
+ getEntityTypes(request.getEntities(), DeidentifyFileRequestEntityTypesItem.class);
TokenFormat tokenFormat = request.getTokenFormat();
- Optional> entityTypes = Optional.empty();
- Optional> entityUniqueCounter = Optional.empty();
+ Optional> entityTypes = Optional.empty();
+ Optional> entityUniqueCounter = Optional.empty();
Optional> allowRegex = Optional.ofNullable(request.getAllowRegexList());
Optional> restrictRegex = Optional.ofNullable(request.getRestrictRegexList());
Optional transformations = Optional.ofNullable(getTransformations(request.getTransformations()));
@@ -726,31 +747,31 @@ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequ
if (tokenFormat != null) {
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityOnlyItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityUnqCounterItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
}
- TokenTypeWithoutVault tokenType = TokenTypeWithoutVault.builder()
+ TokenTypeMapping tokenType = TokenTypeMapping.builder()
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
.build();
- DeidentifyFileRequestFile file =
- DeidentifyFileRequestFile.builder()
+ FileData file =
+ FileData.builder()
.base64(base64Content)
- .dataFormat(fileExtension != null ? DeidentifyFileRequestFileDataFormat.valueOf(fileExtension.toUpperCase()) : null)
+ .dataFormat(fileExtension != null ? FileDataDataFormat.valueOf(fileExtension.toUpperCase()) : null)
.build();
return com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest.builder()
- .vaultId(vaultId)
.file(file)
+ .vaultId(vaultId)
.entityTypes(mappedEntityTypes)
.tokenType(tokenType)
.allowRegex(allowRegex)
@@ -759,36 +780,38 @@ protected com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequ
.build();
}
- private TokenTypeWithoutVault buildTokenType(TokenFormat tokenFormat,
- Optional> entityTypes,
- Optional> entityUniqueCounter) {
+ private TokenTypeMapping buildTokenType(TokenFormat tokenFormat,
+ Optional> entityTypes,
+ Optional> entityUniqueCounter) {
if (tokenFormat != null) {
if (tokenFormat.getEntityOnly() != null && !tokenFormat.getEntityOnly().isEmpty()) {
entityTypes = Optional.of(tokenFormat.getEntityOnly().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityOnlyItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
if (tokenFormat.getEntityUniqueCounter() != null && !tokenFormat.getEntityUniqueCounter().isEmpty()) {
entityUniqueCounter = Optional.of(tokenFormat.getEntityUniqueCounter().stream()
- .map(detectEntity -> EntityType.valueOf(detectEntity.name()))
+ .map(detectEntity -> TokenTypeMappingEntityUnqCounterItem.valueOf(detectEntity.name()))
.collect(Collectors.toList()));
}
}
- return TokenTypeWithoutVault.builder()
+ return TokenTypeMapping.builder()
.entityOnly(entityTypes)
.entityUnqCounter(entityUniqueCounter)
.build();
+
}
- private DeidentifyAudioRequestFileDataFormat mapAudioDataFormat(String dataFormat) throws SkyflowException {
+
+ private FileDataDeidentifyAudioDataFormat mapAudioDataFormat(String dataFormat) throws SkyflowException {
switch (dataFormat) {
case "mp3":
- return DeidentifyAudioRequestFileDataFormat.MP_3;
+ return FileDataDeidentifyAudioDataFormat.MP_3;
case "wav":
- return DeidentifyAudioRequestFileDataFormat.WAV;
+ return FileDataDeidentifyAudioDataFormat.WAV;
default:
throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.InvalidAudioFileType.getMessage());
}
diff --git a/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java b/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
index 43251c61..8d0c42a4 100644
--- a/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
+++ b/src/main/java/com/skyflow/enums/DetectOutputTranscriptions.java
@@ -4,7 +4,6 @@ public enum DetectOutputTranscriptions {
DIARIZED_TRANSCRIPTION("diarized_transcription"),
MEDICAL_DIARIZED_TRANSCRIPTION("medical_diarized_transcription"),
MEDICAL_TRANSCRIPTION("medical_transcription"),
- PLAINTEXT_TRANSCRIPTION("plaintext_transcription"),
TRANSCRIPTION("transcription");
private final String detectOutputTranscriptions;
diff --git a/src/main/java/com/skyflow/generated/rest/ApiClient.java b/src/main/java/com/skyflow/generated/rest/ApiClient.java
index 7c5ae554..1eb1e429 100644
--- a/src/main/java/com/skyflow/generated/rest/ApiClient.java
+++ b/src/main/java/com/skyflow/generated/rest/ApiClient.java
@@ -31,11 +31,11 @@ public class ApiClient {
protected final Supplier authenticationClient;
- protected final Supplier guardrailsClient;
+ protected final Supplier filesClient;
protected final Supplier stringsClient;
- protected final Supplier filesClient;
+ protected final Supplier guardrailsClient;
public ApiClient(ClientOptions clientOptions) {
this.clientOptions = clientOptions;
@@ -45,9 +45,9 @@ public ApiClient(ClientOptions clientOptions) {
this.tokensClient = Suppliers.memoize(() -> new TokensClient(clientOptions));
this.queryClient = Suppliers.memoize(() -> new QueryClient(clientOptions));
this.authenticationClient = Suppliers.memoize(() -> new AuthenticationClient(clientOptions));
- this.guardrailsClient = Suppliers.memoize(() -> new GuardrailsClient(clientOptions));
- this.stringsClient = Suppliers.memoize(() -> new StringsClient(clientOptions));
this.filesClient = Suppliers.memoize(() -> new FilesClient(clientOptions));
+ this.stringsClient = Suppliers.memoize(() -> new StringsClient(clientOptions));
+ this.guardrailsClient = Suppliers.memoize(() -> new GuardrailsClient(clientOptions));
}
public AuditClient audit() {
@@ -74,16 +74,16 @@ public AuthenticationClient authentication() {
return this.authenticationClient.get();
}
- public GuardrailsClient guardrails() {
- return this.guardrailsClient.get();
+ public FilesClient files() {
+ return this.filesClient.get();
}
public StringsClient strings() {
return this.stringsClient.get();
}
- public FilesClient files() {
- return this.filesClient.get();
+ public GuardrailsClient guardrails() {
+ return this.guardrailsClient.get();
}
public static ApiClientBuilder builder() {
diff --git a/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java b/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
index b361812a..4f8f5f78 100644
--- a/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
+++ b/src/main/java/com/skyflow/generated/rest/ApiClientBuilder.java
@@ -57,9 +57,6 @@ public ApiClientBuilder httpClient(OkHttpClient httpClient) {
}
public ApiClient build() {
- if (token == null) {
- throw new RuntimeException("Please provide token");
- }
this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.token);
clientOptionsBuilder.environment(this.environment);
return new ApiClient(clientOptionsBuilder.build());
diff --git a/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java b/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
index 1fb7b844..405d0208 100644
--- a/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
+++ b/src/main/java/com/skyflow/generated/rest/AsyncApiClient.java
@@ -31,11 +31,11 @@ public class AsyncApiClient {
protected final Supplier authenticationClient;
- protected final Supplier guardrailsClient;
+ protected final Supplier filesClient;
protected final Supplier stringsClient;
- protected final Supplier filesClient;
+ protected final Supplier guardrailsClient;
public AsyncApiClient(ClientOptions clientOptions) {
this.clientOptions = clientOptions;
@@ -45,9 +45,9 @@ public AsyncApiClient(ClientOptions clientOptions) {
this.tokensClient = Suppliers.memoize(() -> new AsyncTokensClient(clientOptions));
this.queryClient = Suppliers.memoize(() -> new AsyncQueryClient(clientOptions));
this.authenticationClient = Suppliers.memoize(() -> new AsyncAuthenticationClient(clientOptions));
- this.guardrailsClient = Suppliers.memoize(() -> new AsyncGuardrailsClient(clientOptions));
- this.stringsClient = Suppliers.memoize(() -> new AsyncStringsClient(clientOptions));
this.filesClient = Suppliers.memoize(() -> new AsyncFilesClient(clientOptions));
+ this.stringsClient = Suppliers.memoize(() -> new AsyncStringsClient(clientOptions));
+ this.guardrailsClient = Suppliers.memoize(() -> new AsyncGuardrailsClient(clientOptions));
}
public AsyncAuditClient audit() {
@@ -74,16 +74,16 @@ public AsyncAuthenticationClient authentication() {
return this.authenticationClient.get();
}
- public AsyncGuardrailsClient guardrails() {
- return this.guardrailsClient.get();
+ public AsyncFilesClient files() {
+ return this.filesClient.get();
}
public AsyncStringsClient strings() {
return this.stringsClient.get();
}
- public AsyncFilesClient files() {
- return this.filesClient.get();
+ public AsyncGuardrailsClient guardrails() {
+ return this.guardrailsClient.get();
}
public static AsyncApiClientBuilder builder() {
diff --git a/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java b/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
index 8e4b8474..55a1c518 100644
--- a/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
+++ b/src/main/java/com/skyflow/generated/rest/AsyncApiClientBuilder.java
@@ -57,9 +57,6 @@ public AsyncApiClientBuilder httpClient(OkHttpClient httpClient) {
}
public AsyncApiClient build() {
- if (token == null) {
- throw new RuntimeException("Please provide token");
- }
this.clientOptionsBuilder.addHeader("Authorization", "Bearer " + this.token);
clientOptionsBuilder.environment(this.environment);
return new AsyncApiClient(clientOptionsBuilder.build());
diff --git a/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java b/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
index fe635bf1..59ac5f99 100644
--- a/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
+++ b/src/main/java/com/skyflow/generated/rest/core/ClientOptions.java
@@ -34,7 +34,7 @@ private ClientOptions(
{
put("X-Fern-Language", "JAVA");
put("X-Fern-SDK-Name", "com.skyflow.fern:api-sdk");
- put("X-Fern-SDK-Version", "0.0.322");
+ put("X-Fern-SDK-Version", "0.0.378");
}
});
this.headerSuppliers = headerSuppliers;
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java b/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
index 782d2d2b..1f157223 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
+++ b/src/main/java/com/skyflow/generated/rest/resources/files/AsyncFilesClient.java
@@ -5,19 +5,19 @@
import com.skyflow.generated.rest.core.ClientOptions;
import com.skyflow.generated.rest.core.RequestOptions;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyAudioRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyDocumentRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileAudioRequestDeidentifyAudio;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileDocumentPdfRequestDeidentifyPdf;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileImageRequestDeidentifyImage;
import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyImageRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPdfRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPresentationRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifySpreadsheetRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyStructuredTextRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyDocument;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyPresentation;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifySpreadsheet;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyStructuredText;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText;
import com.skyflow.generated.rest.resources.files.requests.GetRunRequest;
-import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequest;
+import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequestReidentifyFile;
import com.skyflow.generated.rest.types.DeidentifyFileResponse;
-import com.skyflow.generated.rest.types.DeidentifyStatusResponse;
+import com.skyflow.generated.rest.types.DetectRunsResponse;
import com.skyflow.generated.rest.types.ReidentifyFileResponse;
import java.util.concurrent.CompletableFuture;
@@ -53,10 +53,27 @@ public CompletableFuture deidentifyFile(
return this.rawClient.deidentifyFile(request, requestOptions).thenApply(response -> response.body());
}
+ /**
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ */
+ public CompletableFuture deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request) {
+ return this.rawClient.deidentifyAudio(request).thenApply(response -> response.body());
+ }
+
+ /**
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ */
+ public CompletableFuture deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyAudio(request, requestOptions).thenApply(response -> response.body());
+ }
+
/**
* De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyDocument(DeidentifyDocumentRequest request) {
+ public CompletableFuture deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request) {
return this.rawClient.deidentifyDocument(request).thenApply(response -> response.body());
}
@@ -64,14 +81,15 @@ public CompletableFuture deidentifyDocument(DeidentifyDo
* De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture deidentifyDocument(
- DeidentifyDocumentRequest request, RequestOptions requestOptions) {
+ DeidentifyFileRequestDeidentifyDocument request, RequestOptions requestOptions) {
return this.rawClient.deidentifyDocument(request, requestOptions).thenApply(response -> response.body());
}
/**
* De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyPdf(DeidentifyPdfRequest request) {
+ public CompletableFuture deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request) {
return this.rawClient.deidentifyPdf(request).thenApply(response -> response.body());
}
@@ -79,14 +97,15 @@ public CompletableFuture deidentifyPdf(DeidentifyPdfRequ
* De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture deidentifyPdf(
- DeidentifyPdfRequest request, RequestOptions requestOptions) {
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request, RequestOptions requestOptions) {
return this.rawClient.deidentifyPdf(request, requestOptions).thenApply(response -> response.body());
}
/**
* De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyImage(DeidentifyImageRequest request) {
+ public CompletableFuture deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request) {
return this.rawClient.deidentifyImage(request).thenApply(response -> response.body());
}
@@ -94,44 +113,31 @@ public CompletableFuture deidentifyImage(DeidentifyImage
* De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture deidentifyImage(
- DeidentifyImageRequest request, RequestOptions requestOptions) {
+ DeidentifyFileImageRequestDeidentifyImage request, RequestOptions requestOptions) {
return this.rawClient.deidentifyImage(request, requestOptions).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
- */
- public CompletableFuture deidentifyText(DeidentifyTextRequest request) {
- return this.rawClient.deidentifyText(request).thenApply(response -> response.body());
- }
-
- /**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
- */
- public CompletableFuture deidentifyText(
- DeidentifyTextRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyText(request, requestOptions).thenApply(response -> response.body());
- }
-
- /**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyStructuredText(DeidentifyStructuredTextRequest request) {
- return this.rawClient.deidentifyStructuredText(request).thenApply(response -> response.body());
+ public CompletableFuture deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request) {
+ return this.rawClient.deidentifyPresentation(request).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyStructuredText(
- DeidentifyStructuredTextRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyStructuredText(request, requestOptions).thenApply(response -> response.body());
+ public CompletableFuture deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyPresentation(request, requestOptions).thenApply(response -> response.body());
}
/**
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifySpreadsheet(DeidentifySpreadsheetRequest request) {
+ public CompletableFuture deidentifySpreadsheet(
+ DeidentifyFileRequestDeidentifySpreadsheet request) {
return this.rawClient.deidentifySpreadsheet(request).thenApply(response -> response.body());
}
@@ -139,67 +145,75 @@ public CompletableFuture deidentifySpreadsheet(Deidentif
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture deidentifySpreadsheet(
- DeidentifySpreadsheetRequest request, RequestOptions requestOptions) {
+ DeidentifyFileRequestDeidentifySpreadsheet request, RequestOptions requestOptions) {
return this.rawClient.deidentifySpreadsheet(request, requestOptions).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyPresentation(DeidentifyPresentationRequest request) {
- return this.rawClient.deidentifyPresentation(request).thenApply(response -> response.body());
+ public CompletableFuture deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request) {
+ return this.rawClient.deidentifyStructuredText(request).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyPresentation(
- DeidentifyPresentationRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyPresentation(request, requestOptions).thenApply(response -> response.body());
+ public CompletableFuture deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyStructuredText(request, requestOptions).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyAudio(DeidentifyAudioRequest request) {
- return this.rawClient.deidentifyAudio(request).thenApply(response -> response.body());
+ public CompletableFuture deidentifyText(DeidentifyFileRequestDeidentifyText request) {
+ return this.rawClient.deidentifyText(request).thenApply(response -> response.body());
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture deidentifyAudio(
- DeidentifyAudioRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyAudio(request, requestOptions).thenApply(response -> response.body());
+ public CompletableFuture deidentifyText(
+ DeidentifyFileRequestDeidentifyText request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyText(request, requestOptions).thenApply(response -> response.body());
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public CompletableFuture getRun(String runId, GetRunRequest request) {
- return this.rawClient.getRun(runId, request).thenApply(response -> response.body());
+ public CompletableFuture reidentifyFile(ReidentifyFileRequestReidentifyFile request) {
+ return this.rawClient.reidentifyFile(request).thenApply(response -> response.body());
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public CompletableFuture getRun(
- String runId, GetRunRequest request, RequestOptions requestOptions) {
- return this.rawClient.getRun(runId, request, requestOptions).thenApply(response -> response.body());
+ public CompletableFuture reidentifyFile(
+ ReidentifyFileRequestReidentifyFile request, RequestOptions requestOptions) {
+ return this.rawClient.reidentifyFile(request, requestOptions).thenApply(response -> response.body());
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public CompletableFuture reidentifyFile(ReidentifyFileRequest request) {
- return this.rawClient.reidentifyFile(request).thenApply(response -> response.body());
+ public CompletableFuture getRun(String runId) {
+ return this.rawClient.getRun(runId).thenApply(response -> response.body());
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public CompletableFuture reidentifyFile(
- ReidentifyFileRequest request, RequestOptions requestOptions) {
- return this.rawClient.reidentifyFile(request, requestOptions).thenApply(response -> response.body());
+ public CompletableFuture getRun(String runId, GetRunRequest request) {
+ return this.rawClient.getRun(runId, request).thenApply(response -> response.body());
+ }
+
+ /**
+ * Returns the status of a detect run.
+ */
+ public CompletableFuture getRun(
+ String runId, GetRunRequest request, RequestOptions requestOptions) {
+ return this.rawClient.getRun(runId, request, requestOptions).thenApply(response -> response.body());
}
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java b/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
index 4672288a..014f3cf8 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
+++ b/src/main/java/com/skyflow/generated/rest/resources/files/AsyncRawFilesClient.java
@@ -14,21 +14,20 @@
import com.skyflow.generated.rest.core.RequestOptions;
import com.skyflow.generated.rest.errors.BadRequestError;
import com.skyflow.generated.rest.errors.InternalServerError;
-import com.skyflow.generated.rest.errors.NotFoundError;
import com.skyflow.generated.rest.errors.UnauthorizedError;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyAudioRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyDocumentRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileAudioRequestDeidentifyAudio;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileDocumentPdfRequestDeidentifyPdf;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileImageRequestDeidentifyImage;
import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyImageRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPdfRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPresentationRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifySpreadsheetRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyStructuredTextRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyDocument;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyPresentation;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifySpreadsheet;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyStructuredText;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText;
import com.skyflow.generated.rest.resources.files.requests.GetRunRequest;
-import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequest;
+import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequestReidentifyFile;
import com.skyflow.generated.rest.types.DeidentifyFileResponse;
-import com.skyflow.generated.rest.types.DeidentifyStatusResponse;
+import com.skyflow.generated.rest.types.DetectRunsResponse;
import com.skyflow.generated.rest.types.ErrorResponse;
import com.skyflow.generated.rest.types.ReidentifyFileResponse;
import java.io.IOException;
@@ -140,21 +139,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyDocument(
- DeidentifyDocumentRequest request) {
- return deidentifyDocument(request, null);
+ public CompletableFuture> deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request) {
+ return deidentifyAudio(request, null);
}
/**
- * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyDocument(
- DeidentifyDocumentRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/document")
+ .addPathSegments("v1/detect/deidentify/file/audio")
.build();
RequestBody body;
try {
@@ -228,21 +227,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyPdf(
- DeidentifyPdfRequest request) {
- return deidentifyPdf(request, null);
+ public CompletableFuture> deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request) {
+ return deidentifyDocument(request, null);
}
/**
- * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyPdf(
- DeidentifyPdfRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/document/pdf")
+ .addPathSegments("v1/detect/deidentify/file/document")
.build();
RequestBody body;
try {
@@ -316,21 +315,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyImage(
- DeidentifyImageRequest request) {
- return deidentifyImage(request, null);
+ public CompletableFuture> deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request) {
+ return deidentifyPdf(request, null);
}
/**
- * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyImage(
- DeidentifyImageRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/image")
+ .addPathSegments("v1/detect/deidentify/file/document/pdf")
.build();
RequestBody body;
try {
@@ -404,21 +403,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyText(
- DeidentifyTextRequest request) {
- return deidentifyText(request, null);
+ public CompletableFuture> deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request) {
+ return deidentifyImage(request, null);
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyText(
- DeidentifyTextRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/text")
+ .addPathSegments("v1/detect/deidentify/file/image")
.build();
RequestBody body;
try {
@@ -492,21 +491,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyStructuredText(
- DeidentifyStructuredTextRequest request) {
- return deidentifyStructuredText(request, null);
+ public CompletableFuture> deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request) {
+ return deidentifyPresentation(request, null);
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyStructuredText(
- DeidentifyStructuredTextRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/structured_text")
+ .addPathSegments("v1/detect/deidentify/file/presentation")
.build();
RequestBody body;
try {
@@ -583,7 +582,7 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture> deidentifySpreadsheet(
- DeidentifySpreadsheetRequest request) {
+ DeidentifyFileRequestDeidentifySpreadsheet request) {
return deidentifySpreadsheet(request, null);
}
@@ -591,7 +590,7 @@ public CompletableFuture> deidenti
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public CompletableFuture> deidentifySpreadsheet(
- DeidentifySpreadsheetRequest request, RequestOptions requestOptions) {
+ DeidentifyFileRequestDeidentifySpreadsheet request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("v1/detect/deidentify/file/spreadsheet")
@@ -668,21 +667,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyPresentation(
- DeidentifyPresentationRequest request) {
- return deidentifyPresentation(request, null);
+ public CompletableFuture> deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request) {
+ return deidentifyStructuredText(request, null);
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyPresentation(
- DeidentifyPresentationRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/presentation")
+ .addPathSegments("v1/detect/deidentify/file/structured_text")
.build();
RequestBody body;
try {
@@ -756,21 +755,21 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyAudio(
- DeidentifyAudioRequest request) {
- return deidentifyAudio(request, null);
+ public CompletableFuture> deidentifyText(
+ DeidentifyFileRequestDeidentifyText request) {
+ return deidentifyText(request, null);
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public CompletableFuture> deidentifyAudio(
- DeidentifyAudioRequest request, RequestOptions requestOptions) {
+ public CompletableFuture> deidentifyText(
+ DeidentifyFileRequestDeidentifyText request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/audio")
+ .addPathSegments("v1/detect/deidentify/file/text")
.build();
RequestBody body;
try {
@@ -844,34 +843,41 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public CompletableFuture> getRun(
- String runId, GetRunRequest request) {
- return getRun(runId, request, null);
+ public CompletableFuture> reidentifyFile(
+ ReidentifyFileRequestReidentifyFile request) {
+ return reidentifyFile(request, null);
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public CompletableFuture> getRun(
- String runId, GetRunRequest request, RequestOptions requestOptions) {
- HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ public CompletableFuture> reidentifyFile(
+ ReidentifyFileRequestReidentifyFile request, RequestOptions requestOptions) {
+ HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/runs")
- .addPathSegment(runId);
- QueryStringMapper.addQueryParameter(httpUrl, "vault_id", request.getVaultId(), false);
- Request.Builder _requestBuilder = new Request.Builder()
- .url(httpUrl.build())
- .method("GET", null)
+ .addPathSegments("v1/detect/reidentify/file")
+ .build();
+ RequestBody body;
+ try {
+ body = RequestBody.create(
+ ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
+ } catch (JsonProcessingException e) {
+ throw new ApiClientException("Failed to serialize request", e);
+ }
+ Request okhttpRequest = new Request.Builder()
+ .url(httpUrl)
+ .method("POST", body)
.headers(Headers.of(clientOptions.headers(requestOptions)))
- .addHeader("Accept", "application/json");
- Request okhttpRequest = _requestBuilder.build();
+ .addHeader("Content-Type", "application/json")
+ .addHeader("Accept", "application/json")
+ .build();
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
client = clientOptions.httpClientWithTimeout(requestOptions);
}
- CompletableFuture> future = new CompletableFuture<>();
+ CompletableFuture> future = new CompletableFuture<>();
client.newCall(okhttpRequest).enqueue(new Callback() {
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
@@ -879,7 +885,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
if (response.isSuccessful()) {
future.complete(new ApiClientHttpResponse<>(
ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), DeidentifyStatusResponse.class),
+ responseBody.string(), ReidentifyFileResponse.class),
response));
return;
}
@@ -896,11 +902,6 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
response));
return;
- case 404:
- future.completeExceptionally(new NotFoundError(
- ObjectMappers.JSON_MAPPER.readValue(responseBodyString, Object.class),
- response));
- return;
case 500:
future.completeExceptionally(new InternalServerError(
ObjectMappers.JSON_MAPPER.readValue(responseBodyString, ErrorResponse.class),
@@ -930,49 +931,50 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public CompletableFuture> reidentifyFile(
- ReidentifyFileRequest request) {
- return reidentifyFile(request, null);
+ public CompletableFuture> getRun(String runId) {
+ return getRun(runId, GetRunRequest.builder().build());
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public CompletableFuture> reidentifyFile(
- ReidentifyFileRequest request, RequestOptions requestOptions) {
- HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+ public CompletableFuture> getRun(String runId, GetRunRequest request) {
+ return getRun(runId, request, null);
+ }
+
+ /**
+ * Returns the status of a detect run.
+ */
+ public CompletableFuture> getRun(
+ String runId, GetRunRequest request, RequestOptions requestOptions) {
+ HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/reidentify/file")
- .build();
- RequestBody body;
- try {
- body = RequestBody.create(
- ObjectMappers.JSON_MAPPER.writeValueAsBytes(request), MediaTypes.APPLICATION_JSON);
- } catch (JsonProcessingException e) {
- throw new ApiClientException("Failed to serialize request", e);
+ .addPathSegments("v1/detect/runs")
+ .addPathSegment(runId);
+ if (request.getVaultId().isPresent()) {
+ QueryStringMapper.addQueryParameter(
+ httpUrl, "vault_id", request.getVaultId().get(), false);
}
- Request okhttpRequest = new Request.Builder()
- .url(httpUrl)
- .method("POST", body)
+ Request.Builder _requestBuilder = new Request.Builder()
+ .url(httpUrl.build())
+ .method("GET", null)
.headers(Headers.of(clientOptions.headers(requestOptions)))
- .addHeader("Content-Type", "application/json")
- .addHeader("Accept", "application/json")
- .build();
+ .addHeader("Accept", "application/json");
+ Request okhttpRequest = _requestBuilder.build();
OkHttpClient client = clientOptions.httpClient();
if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
client = clientOptions.httpClientWithTimeout(requestOptions);
}
- CompletableFuture> future = new CompletableFuture<>();
+ CompletableFuture> future = new CompletableFuture<>();
client.newCall(okhttpRequest).enqueue(new Callback() {
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
try (ResponseBody responseBody = response.body()) {
if (response.isSuccessful()) {
future.complete(new ApiClientHttpResponse<>(
- ObjectMappers.JSON_MAPPER.readValue(
- responseBody.string(), ReidentifyFileResponse.class),
+ ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), DetectRunsResponse.class),
response));
return;
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java b/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
index 5eee1560..8d083d76 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
+++ b/src/main/java/com/skyflow/generated/rest/resources/files/FilesClient.java
@@ -5,19 +5,19 @@
import com.skyflow.generated.rest.core.ClientOptions;
import com.skyflow.generated.rest.core.RequestOptions;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyAudioRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyDocumentRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileAudioRequestDeidentifyAudio;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileDocumentPdfRequestDeidentifyPdf;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileImageRequestDeidentifyImage;
import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyImageRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPdfRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPresentationRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifySpreadsheetRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyStructuredTextRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyDocument;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyPresentation;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifySpreadsheet;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyStructuredText;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText;
import com.skyflow.generated.rest.resources.files.requests.GetRunRequest;
-import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequest;
+import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequestReidentifyFile;
import com.skyflow.generated.rest.types.DeidentifyFileResponse;
-import com.skyflow.generated.rest.types.DeidentifyStatusResponse;
+import com.skyflow.generated.rest.types.DetectRunsResponse;
import com.skyflow.generated.rest.types.ReidentifyFileResponse;
public class FilesClient {
@@ -51,81 +51,85 @@ public DeidentifyFileResponse deidentifyFile(DeidentifyFileRequest request, Requ
return this.rawClient.deidentifyFile(request, requestOptions).body();
}
+ /**
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ */
+ public DeidentifyFileResponse deidentifyAudio(DeidentifyFileAudioRequestDeidentifyAudio request) {
+ return this.rawClient.deidentifyAudio(request).body();
+ }
+
+ /**
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ */
+ public DeidentifyFileResponse deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyAudio(request, requestOptions).body();
+ }
+
/**
* De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyDocument(DeidentifyDocumentRequest request) {
+ public DeidentifyFileResponse deidentifyDocument(DeidentifyFileRequestDeidentifyDocument request) {
return this.rawClient.deidentifyDocument(request).body();
}
/**
* De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyDocument(DeidentifyDocumentRequest request, RequestOptions requestOptions) {
+ public DeidentifyFileResponse deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request, RequestOptions requestOptions) {
return this.rawClient.deidentifyDocument(request, requestOptions).body();
}
/**
* De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyPdf(DeidentifyPdfRequest request) {
+ public DeidentifyFileResponse deidentifyPdf(DeidentifyFileDocumentPdfRequestDeidentifyPdf request) {
return this.rawClient.deidentifyPdf(request).body();
}
/**
* De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyPdf(DeidentifyPdfRequest request, RequestOptions requestOptions) {
+ public DeidentifyFileResponse deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request, RequestOptions requestOptions) {
return this.rawClient.deidentifyPdf(request, requestOptions).body();
}
/**
* De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyImage(DeidentifyImageRequest request) {
+ public DeidentifyFileResponse deidentifyImage(DeidentifyFileImageRequestDeidentifyImage request) {
return this.rawClient.deidentifyImage(request).body();
}
/**
* De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyImage(DeidentifyImageRequest request, RequestOptions requestOptions) {
+ public DeidentifyFileResponse deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request, RequestOptions requestOptions) {
return this.rawClient.deidentifyImage(request, requestOptions).body();
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
- */
- public DeidentifyFileResponse deidentifyText(DeidentifyTextRequest request) {
- return this.rawClient.deidentifyText(request).body();
- }
-
- /**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
- */
- public DeidentifyFileResponse deidentifyText(DeidentifyTextRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyText(request, requestOptions).body();
- }
-
- /**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyStructuredText(DeidentifyStructuredTextRequest request) {
- return this.rawClient.deidentifyStructuredText(request).body();
+ public DeidentifyFileResponse deidentifyPresentation(DeidentifyFileRequestDeidentifyPresentation request) {
+ return this.rawClient.deidentifyPresentation(request).body();
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyStructuredText(
- DeidentifyStructuredTextRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyStructuredText(request, requestOptions).body();
+ public DeidentifyFileResponse deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyPresentation(request, requestOptions).body();
}
/**
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifySpreadsheet(DeidentifySpreadsheetRequest request) {
+ public DeidentifyFileResponse deidentifySpreadsheet(DeidentifyFileRequestDeidentifySpreadsheet request) {
return this.rawClient.deidentifySpreadsheet(request).body();
}
@@ -133,64 +137,73 @@ public DeidentifyFileResponse deidentifySpreadsheet(DeidentifySpreadsheetRequest
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public DeidentifyFileResponse deidentifySpreadsheet(
- DeidentifySpreadsheetRequest request, RequestOptions requestOptions) {
+ DeidentifyFileRequestDeidentifySpreadsheet request, RequestOptions requestOptions) {
return this.rawClient.deidentifySpreadsheet(request, requestOptions).body();
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyPresentation(DeidentifyPresentationRequest request) {
- return this.rawClient.deidentifyPresentation(request).body();
+ public DeidentifyFileResponse deidentifyStructuredText(DeidentifyFileRequestDeidentifyStructuredText request) {
+ return this.rawClient.deidentifyStructuredText(request).body();
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyPresentation(
- DeidentifyPresentationRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyPresentation(request, requestOptions).body();
+ public DeidentifyFileResponse deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyStructuredText(request, requestOptions).body();
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyAudio(DeidentifyAudioRequest request) {
- return this.rawClient.deidentifyAudio(request).body();
+ public DeidentifyFileResponse deidentifyText(DeidentifyFileRequestDeidentifyText request) {
+ return this.rawClient.deidentifyText(request).body();
}
/**
- * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public DeidentifyFileResponse deidentifyAudio(DeidentifyAudioRequest request, RequestOptions requestOptions) {
- return this.rawClient.deidentifyAudio(request, requestOptions).body();
+ public DeidentifyFileResponse deidentifyText(
+ DeidentifyFileRequestDeidentifyText request, RequestOptions requestOptions) {
+ return this.rawClient.deidentifyText(request, requestOptions).body();
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public DeidentifyStatusResponse getRun(String runId, GetRunRequest request) {
- return this.rawClient.getRun(runId, request).body();
+ public ReidentifyFileResponse reidentifyFile(ReidentifyFileRequestReidentifyFile request) {
+ return this.rawClient.reidentifyFile(request).body();
}
/**
- * Returns the status of the detect run.
+ * Re-identifies tokens in a file.
*/
- public DeidentifyStatusResponse getRun(String runId, GetRunRequest request, RequestOptions requestOptions) {
- return this.rawClient.getRun(runId, request, requestOptions).body();
+ public ReidentifyFileResponse reidentifyFile(
+ ReidentifyFileRequestReidentifyFile request, RequestOptions requestOptions) {
+ return this.rawClient.reidentifyFile(request, requestOptions).body();
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public ReidentifyFileResponse reidentifyFile(ReidentifyFileRequest request) {
- return this.rawClient.reidentifyFile(request).body();
+ public DetectRunsResponse getRun(String runId) {
+ return this.rawClient.getRun(runId).body();
}
/**
- * Re-identifies tokens in a file.
+ * Returns the status of a detect run.
*/
- public ReidentifyFileResponse reidentifyFile(ReidentifyFileRequest request, RequestOptions requestOptions) {
- return this.rawClient.reidentifyFile(request, requestOptions).body();
+ public DetectRunsResponse getRun(String runId, GetRunRequest request) {
+ return this.rawClient.getRun(runId, request).body();
+ }
+
+ /**
+ * Returns the status of a detect run.
+ */
+ public DetectRunsResponse getRun(String runId, GetRunRequest request, RequestOptions requestOptions) {
+ return this.rawClient.getRun(runId, request, requestOptions).body();
}
}
diff --git a/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java b/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
index d0fb0bfc..164c4d18 100644
--- a/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
+++ b/src/main/java/com/skyflow/generated/rest/resources/files/RawFilesClient.java
@@ -14,21 +14,20 @@
import com.skyflow.generated.rest.core.RequestOptions;
import com.skyflow.generated.rest.errors.BadRequestError;
import com.skyflow.generated.rest.errors.InternalServerError;
-import com.skyflow.generated.rest.errors.NotFoundError;
import com.skyflow.generated.rest.errors.UnauthorizedError;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyAudioRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyDocumentRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileAudioRequestDeidentifyAudio;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileDocumentPdfRequestDeidentifyPdf;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileImageRequestDeidentifyImage;
import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyImageRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPdfRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyPresentationRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifySpreadsheetRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyStructuredTextRequest;
-import com.skyflow.generated.rest.resources.files.requests.DeidentifyTextRequest;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyDocument;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyPresentation;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifySpreadsheet;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyStructuredText;
+import com.skyflow.generated.rest.resources.files.requests.DeidentifyFileRequestDeidentifyText;
import com.skyflow.generated.rest.resources.files.requests.GetRunRequest;
-import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequest;
+import com.skyflow.generated.rest.resources.files.requests.ReidentifyFileRequestReidentifyFile;
import com.skyflow.generated.rest.types.DeidentifyFileResponse;
-import com.skyflow.generated.rest.types.DeidentifyStatusResponse;
+import com.skyflow.generated.rest.types.DetectRunsResponse;
import com.skyflow.generated.rest.types.ErrorResponse;
import com.skyflow.generated.rest.types.ReidentifyFileResponse;
import java.io.IOException;
@@ -115,20 +114,21 @@ public ApiClientHttpResponse deidentifyFile(
}
/**
- * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyDocument(DeidentifyDocumentRequest request) {
- return deidentifyDocument(request, null);
+ public ApiClientHttpResponse deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request) {
+ return deidentifyAudio(request, null);
}
/**
- * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an audio file. This operation includes options applicable to all supported audio file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyDocument(
- DeidentifyDocumentRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyAudio(
+ DeidentifyFileAudioRequestDeidentifyAudio request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/document")
+ .addPathSegments("v1/detect/deidentify/file/audio")
.build();
RequestBody body;
try {
@@ -182,20 +182,21 @@ public ApiClientHttpResponse deidentifyDocument(
}
/**
- * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyPdf(DeidentifyPdfRequest request) {
- return deidentifyPdf(request, null);
+ public ApiClientHttpResponse deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request) {
+ return deidentifyDocument(request, null);
}
/**
- * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a document file. This operation includes options applicable to all supported document file types.<br/><br/>For more specific options, see the file type-specific opertions (like <a href='#deidentify_pdf'>De-identify PDF</a>) where they're available. For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyPdf(
- DeidentifyPdfRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyDocument(
+ DeidentifyFileRequestDeidentifyDocument request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/document/pdf")
+ .addPathSegments("v1/detect/deidentify/file/document")
.build();
RequestBody body;
try {
@@ -249,20 +250,21 @@ public ApiClientHttpResponse deidentifyPdf(
}
/**
- * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyImage(DeidentifyImageRequest request) {
- return deidentifyImage(request, null);
+ public ApiClientHttpResponse deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request) {
+ return deidentifyPdf(request, null);
}
/**
- * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a PDF file. This operation includes options specific to PDF files.<br/><br/>For broader file type support, see <a href='#deidentify_document'>De-identify Document</a> and <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyImage(
- DeidentifyImageRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyPdf(
+ DeidentifyFileDocumentPdfRequestDeidentifyPdf request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/image")
+ .addPathSegments("v1/detect/deidentify/file/document/pdf")
.build();
RequestBody body;
try {
@@ -316,20 +318,21 @@ public ApiClientHttpResponse deidentifyImage(
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyText(DeidentifyTextRequest request) {
- return deidentifyText(request, null);
+ public ApiClientHttpResponse deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request) {
+ return deidentifyImage(request, null);
}
/**
- * De-identifies sensitive data from a text file. This operation includes options applicable to all supported image text types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from an image file. This operation includes options applicable to all supported image file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyText(
- DeidentifyTextRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyImage(
+ DeidentifyFileImageRequestDeidentifyImage request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/text")
+ .addPathSegments("v1/detect/deidentify/file/image")
.build();
RequestBody body;
try {
@@ -383,21 +386,21 @@ public ApiClientHttpResponse deidentifyText(
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyStructuredText(
- DeidentifyStructuredTextRequest request) {
- return deidentifyStructuredText(request, null);
+ public ApiClientHttpResponse deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request) {
+ return deidentifyPresentation(request, null);
}
/**
- * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyStructuredText(
- DeidentifyStructuredTextRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyPresentation(
+ DeidentifyFileRequestDeidentifyPresentation request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/structured_text")
+ .addPathSegments("v1/detect/deidentify/file/presentation")
.build();
RequestBody body;
try {
@@ -453,7 +456,8 @@ public ApiClientHttpResponse deidentifyStructuredText(
/**
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifySpreadsheet(DeidentifySpreadsheetRequest request) {
+ public ApiClientHttpResponse deidentifySpreadsheet(
+ DeidentifyFileRequestDeidentifySpreadsheet request) {
return deidentifySpreadsheet(request, null);
}
@@ -461,7 +465,7 @@ public ApiClientHttpResponse deidentifySpreadsheet(Deide
* De-identifies sensitive data from a spreadsheet file. This operation includes options applicable to all supported spreadsheet file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
public ApiClientHttpResponse deidentifySpreadsheet(
- DeidentifySpreadsheetRequest request, RequestOptions requestOptions) {
+ DeidentifyFileRequestDeidentifySpreadsheet request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("v1/detect/deidentify/file/spreadsheet")
@@ -518,20 +522,21 @@ public ApiClientHttpResponse deidentifySpreadsheet(
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyPresentation(DeidentifyPresentationRequest request) {
- return deidentifyPresentation(request, null);
+ public ApiClientHttpResponse deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request) {
+ return deidentifyStructuredText(request, null);
}
/**
- * De-identifies sensitive data from a presentation file. This operation includes options applicable to all supported presentation file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
+ * De-identifies sensitive data from a structured text file. This operation includes options applicable to all supported structured text file types.<br/><br/>For broader file type support, see <a href='#deidentify_file'>De-identify File</a>.
*/
- public ApiClientHttpResponse deidentifyPresentation(
- DeidentifyPresentationRequest request, RequestOptions requestOptions) {
+ public ApiClientHttpResponse deidentifyStructuredText(
+ DeidentifyFileRequestDeidentifyStructuredText request, RequestOptions requestOptions) {
HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
- .addPathSegments("v1/detect/deidentify/file/presentation")
+ .addPathSegments("v1/detect/deidentify/file/structured_text")
.build();
RequestBody body;
try {
@@ -585,20 +590,20 @@ public ApiClientHttpResponse