diff --git a/.sdk-version b/.sdk-version index d5107dd..74fbdf9 100644 --- a/.sdk-version +++ b/.sdk-version @@ -1 +1 @@ -v3.105.0 +v3.107.0 diff --git a/README.md b/README.md index c1dd637..178b9c0 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Add this dependency to your project's POM: ai.reveng sdk - 3.105.0 + 3.107.0 compile ``` @@ -31,7 +31,7 @@ repositories { } dependencies { - implementation "ai.reveng:sdk:3.105.0" + implementation "ai.reveng:sdk:3.107.0" } ``` diff --git a/build.gradle b/build.gradle index f67dbec..ff2f479 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group = 'ai.reveng' -version = '3.105.0' +version = '3.107.0' @@ -171,7 +171,7 @@ mavenPublishing { publishToMavenCentral(true) signAllPublications() - coordinates("ai.reveng", "sdk", "3.105.0") + coordinates("ai.reveng", "sdk", "3.107.0") pom { name = "sdk" diff --git a/build.sbt b/build.sbt index 42f4669..386462b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "ai.reveng", name := "sdk", - version := "3.105.0", + version := "3.107.0", scalaVersion := "2.11.12", scalacOptions ++= Seq("-feature"), compile / javacOptions ++= Seq("-Xlint:deprecation"), diff --git a/docs/SandboxOptions.md b/docs/SandboxOptions.md index e2ffb62..4fb46e7 100644 --- a/docs/SandboxOptions.md +++ b/docs/SandboxOptions.md @@ -11,6 +11,9 @@ |**commandLineArgs** | **String** | The command line parameters to pass to the dynamic execution sandbox. Requires `sandbox` to be True. | [optional] | |**startMethod** | **SandboxStartMethod** | The method used by the sandbox to launch the sample. | [optional] | |**timeout** | **SandboxTimeout** | Maximum execution time for the sandbox run, in seconds. Allowed values: 120 (2m), 180 (3m), 300 (5m), 600 (10m). | [optional] | +|**archiveSha256Hash** | **String** | Hash of the uploaded archive to run in the sandbox. Set this when submitting an archive. | [optional] | +|**archiveEntryPath** | **String** | Path of the file inside the archive to execute. | [optional] | +|**archivePassword** | **String** | Password required to extract the archive, if any. | [optional] | diff --git a/docs/UploadResponse.md b/docs/UploadResponse.md index 8869a13..9acab80 100644 --- a/docs/UploadResponse.md +++ b/docs/UploadResponse.md @@ -10,6 +10,10 @@ |**sha256Hash** | **String** | | | |**fileType** | **UploadFileType** | | | |**filename** | **String** | | | +|**mime** | **String** | | | +|**isArchive** | **Boolean** | | | +|**canSandbox** | **Boolean** | | | +|**canExtract** | **Boolean** | | | diff --git a/docs/User.md b/docs/User.md index 5ec80da..cbb7914 100644 --- a/docs/User.md +++ b/docs/User.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**createdAt** | **OffsetDateTime** | | [optional] | +|**createdAt** | **OffsetDateTime** | | | |**email** | **String** | | | |**profile** | [**UserProfile**](UserProfile.md) | | | |**role** | [**RoleEnum**](#RoleEnum) | | | diff --git a/pom.xml b/pom.xml index 67367b9..812812c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ sdk jar sdk - 3.105.0 + 3.107.0 https://github.com/RevEngAI/sdk-java Java SDK for the RevEng.AI API diff --git a/src/main/java/ai/reveng/invoker/ApiClient.java b/src/main/java/ai/reveng/invoker/ApiClient.java index cae1079..1339167 100644 --- a/src/main/java/ai/reveng/invoker/ApiClient.java +++ b/src/main/java/ai/reveng/invoker/ApiClient.java @@ -148,7 +148,7 @@ protected void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenAPI-Generator/3.105.0/java"); + setUserAgent("OpenAPI-Generator/3.107.0/java"); authentications = new HashMap(); } diff --git a/src/main/java/ai/reveng/invoker/Configuration.java b/src/main/java/ai/reveng/invoker/Configuration.java index 72a41fc..7d5205d 100644 --- a/src/main/java/ai/reveng/invoker/Configuration.java +++ b/src/main/java/ai/reveng/invoker/Configuration.java @@ -18,7 +18,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class Configuration { - public static final String VERSION = "3.105.0"; + public static final String VERSION = "3.107.0"; private static final AtomicReference defaultApiClient = new AtomicReference<>(); private static volatile Supplier apiClientFactory = ApiClient::new; diff --git a/src/main/java/ai/reveng/model/SandboxOptions.java b/src/main/java/ai/reveng/model/SandboxOptions.java index 45e41a2..58222bf 100644 --- a/src/main/java/ai/reveng/model/SandboxOptions.java +++ b/src/main/java/ai/reveng/model/SandboxOptions.java @@ -72,6 +72,21 @@ public class SandboxOptions { @javax.annotation.Nullable private SandboxTimeout timeout = SandboxTimeout.NUMBER_120; + public static final String SERIALIZED_NAME_ARCHIVE_SHA256_HASH = "archive_sha_256_hash"; + @SerializedName(SERIALIZED_NAME_ARCHIVE_SHA256_HASH) + @javax.annotation.Nullable + private String archiveSha256Hash; + + public static final String SERIALIZED_NAME_ARCHIVE_ENTRY_PATH = "archive_entry_path"; + @SerializedName(SERIALIZED_NAME_ARCHIVE_ENTRY_PATH) + @javax.annotation.Nullable + private String archiveEntryPath; + + public static final String SERIALIZED_NAME_ARCHIVE_PASSWORD = "archive_password"; + @SerializedName(SERIALIZED_NAME_ARCHIVE_PASSWORD) + @javax.annotation.Nullable + private String archivePassword; + public SandboxOptions() { } @@ -150,6 +165,63 @@ public void setTimeout(@javax.annotation.Nullable SandboxTimeout timeout) { this.timeout = timeout; } + + public SandboxOptions archiveSha256Hash(@javax.annotation.Nullable String archiveSha256Hash) { + this.archiveSha256Hash = archiveSha256Hash; + return this; + } + + /** + * Hash of the uploaded archive to run in the sandbox. Set this when submitting an archive. + * @return archiveSha256Hash + */ + @javax.annotation.Nullable + public String getArchiveSha256Hash() { + return archiveSha256Hash; + } + + public void setArchiveSha256Hash(@javax.annotation.Nullable String archiveSha256Hash) { + this.archiveSha256Hash = archiveSha256Hash; + } + + + public SandboxOptions archiveEntryPath(@javax.annotation.Nullable String archiveEntryPath) { + this.archiveEntryPath = archiveEntryPath; + return this; + } + + /** + * Path of the file inside the archive to execute. + * @return archiveEntryPath + */ + @javax.annotation.Nullable + public String getArchiveEntryPath() { + return archiveEntryPath; + } + + public void setArchiveEntryPath(@javax.annotation.Nullable String archiveEntryPath) { + this.archiveEntryPath = archiveEntryPath; + } + + + public SandboxOptions archivePassword(@javax.annotation.Nullable String archivePassword) { + this.archivePassword = archivePassword; + return this; + } + + /** + * Password required to extract the archive, if any. + * @return archivePassword + */ + @javax.annotation.Nullable + public String getArchivePassword() { + return archivePassword; + } + + public void setArchivePassword(@javax.annotation.Nullable String archivePassword) { + this.archivePassword = archivePassword; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -208,7 +280,10 @@ public boolean equals(Object o) { return Objects.equals(this.enabled, sandboxOptions.enabled) && Objects.equals(this.commandLineArgs, sandboxOptions.commandLineArgs) && Objects.equals(this.startMethod, sandboxOptions.startMethod) && - Objects.equals(this.timeout, sandboxOptions.timeout)&& + Objects.equals(this.timeout, sandboxOptions.timeout) && + Objects.equals(this.archiveSha256Hash, sandboxOptions.archiveSha256Hash) && + Objects.equals(this.archiveEntryPath, sandboxOptions.archiveEntryPath) && + Objects.equals(this.archivePassword, sandboxOptions.archivePassword)&& Objects.equals(this.additionalProperties, sandboxOptions.additionalProperties); } @@ -218,7 +293,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(enabled, commandLineArgs, startMethod, timeout, additionalProperties); + return Objects.hash(enabled, commandLineArgs, startMethod, timeout, archiveSha256Hash, archiveEntryPath, archivePassword, additionalProperties); } private static int hashCodeNullable(JsonNullable a) { @@ -236,6 +311,9 @@ public String toString() { sb.append(" commandLineArgs: ").append(toIndentedString(commandLineArgs)).append("\n"); sb.append(" startMethod: ").append(toIndentedString(startMethod)).append("\n"); sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n"); + sb.append(" archiveSha256Hash: ").append(toIndentedString(archiveSha256Hash)).append("\n"); + sb.append(" archiveEntryPath: ").append(toIndentedString(archiveEntryPath)).append("\n"); + sb.append(" archivePassword: ").append(toIndentedString(archivePassword)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -255,7 +333,7 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("enabled", "command_line_args", "start_method", "timeout")); + openapiFields = new HashSet(Arrays.asList("enabled", "command_line_args", "start_method", "timeout", "archive_sha_256_hash", "archive_entry_path", "archive_password")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(0); @@ -285,6 +363,15 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("timeout") != null && !jsonObj.get("timeout").isJsonNull()) { SandboxTimeout.validateJsonElement(jsonObj.get("timeout")); } + if ((jsonObj.get("archive_sha_256_hash") != null && !jsonObj.get("archive_sha_256_hash").isJsonNull()) && !jsonObj.get("archive_sha_256_hash").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(java.util.Locale.ROOT, "Expected the field `archive_sha_256_hash` to be a primitive type in the JSON string but got `%s`", jsonObj.get("archive_sha_256_hash").toString())); + } + if ((jsonObj.get("archive_entry_path") != null && !jsonObj.get("archive_entry_path").isJsonNull()) && !jsonObj.get("archive_entry_path").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(java.util.Locale.ROOT, "Expected the field `archive_entry_path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("archive_entry_path").toString())); + } + if ((jsonObj.get("archive_password") != null && !jsonObj.get("archive_password").isJsonNull()) && !jsonObj.get("archive_password").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(java.util.Locale.ROOT, "Expected the field `archive_password` to be a primitive type in the JSON string but got `%s`", jsonObj.get("archive_password").toString())); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { diff --git a/src/main/java/ai/reveng/model/UploadResponse.java b/src/main/java/ai/reveng/model/UploadResponse.java index e17fada..e2637ba 100644 --- a/src/main/java/ai/reveng/model/UploadResponse.java +++ b/src/main/java/ai/reveng/model/UploadResponse.java @@ -65,6 +65,26 @@ public class UploadResponse { @javax.annotation.Nonnull private String filename; + public static final String SERIALIZED_NAME_MIME = "mime"; + @SerializedName(SERIALIZED_NAME_MIME) + @javax.annotation.Nonnull + private String mime; + + public static final String SERIALIZED_NAME_IS_ARCHIVE = "is_archive"; + @SerializedName(SERIALIZED_NAME_IS_ARCHIVE) + @javax.annotation.Nonnull + private Boolean isArchive; + + public static final String SERIALIZED_NAME_CAN_SANDBOX = "can_sandbox"; + @SerializedName(SERIALIZED_NAME_CAN_SANDBOX) + @javax.annotation.Nonnull + private Boolean canSandbox; + + public static final String SERIALIZED_NAME_CAN_EXTRACT = "can_extract"; + @SerializedName(SERIALIZED_NAME_CAN_EXTRACT) + @javax.annotation.Nonnull + private Boolean canExtract; + public UploadResponse() { } @@ -124,6 +144,82 @@ public void setFilename(@javax.annotation.Nonnull String filename) { this.filename = filename; } + + public UploadResponse mime(@javax.annotation.Nonnull String mime) { + this.mime = mime; + return this; + } + + /** + * Get mime + * @return mime + */ + @javax.annotation.Nonnull + public String getMime() { + return mime; + } + + public void setMime(@javax.annotation.Nonnull String mime) { + this.mime = mime; + } + + + public UploadResponse isArchive(@javax.annotation.Nonnull Boolean isArchive) { + this.isArchive = isArchive; + return this; + } + + /** + * Get isArchive + * @return isArchive + */ + @javax.annotation.Nonnull + public Boolean getIsArchive() { + return isArchive; + } + + public void setIsArchive(@javax.annotation.Nonnull Boolean isArchive) { + this.isArchive = isArchive; + } + + + public UploadResponse canSandbox(@javax.annotation.Nonnull Boolean canSandbox) { + this.canSandbox = canSandbox; + return this; + } + + /** + * Get canSandbox + * @return canSandbox + */ + @javax.annotation.Nonnull + public Boolean getCanSandbox() { + return canSandbox; + } + + public void setCanSandbox(@javax.annotation.Nonnull Boolean canSandbox) { + this.canSandbox = canSandbox; + } + + + public UploadResponse canExtract(@javax.annotation.Nonnull Boolean canExtract) { + this.canExtract = canExtract; + return this; + } + + /** + * Get canExtract + * @return canExtract + */ + @javax.annotation.Nonnull + public Boolean getCanExtract() { + return canExtract; + } + + public void setCanExtract(@javax.annotation.Nonnull Boolean canExtract) { + this.canExtract = canExtract; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -181,13 +277,17 @@ public boolean equals(Object o) { UploadResponse uploadResponse = (UploadResponse) o; return Objects.equals(this.sha256Hash, uploadResponse.sha256Hash) && Objects.equals(this.fileType, uploadResponse.fileType) && - Objects.equals(this.filename, uploadResponse.filename)&& + Objects.equals(this.filename, uploadResponse.filename) && + Objects.equals(this.mime, uploadResponse.mime) && + Objects.equals(this.isArchive, uploadResponse.isArchive) && + Objects.equals(this.canSandbox, uploadResponse.canSandbox) && + Objects.equals(this.canExtract, uploadResponse.canExtract)&& Objects.equals(this.additionalProperties, uploadResponse.additionalProperties); } @Override public int hashCode() { - return Objects.hash(sha256Hash, fileType, filename, additionalProperties); + return Objects.hash(sha256Hash, fileType, filename, mime, isArchive, canSandbox, canExtract, additionalProperties); } @Override @@ -197,6 +297,10 @@ public String toString() { sb.append(" sha256Hash: ").append(toIndentedString(sha256Hash)).append("\n"); sb.append(" fileType: ").append(toIndentedString(fileType)).append("\n"); sb.append(" filename: ").append(toIndentedString(filename)).append("\n"); + sb.append(" mime: ").append(toIndentedString(mime)).append("\n"); + sb.append(" isArchive: ").append(toIndentedString(isArchive)).append("\n"); + sb.append(" canSandbox: ").append(toIndentedString(canSandbox)).append("\n"); + sb.append(" canExtract: ").append(toIndentedString(canExtract)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -216,10 +320,10 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("sha_256_hash", "file_type", "filename")); + openapiFields = new HashSet(Arrays.asList("sha_256_hash", "file_type", "filename", "mime", "is_archive", "can_sandbox", "can_extract")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("sha_256_hash", "file_type", "filename")); + openapiRequiredFields = new HashSet(Arrays.asList("sha_256_hash", "file_type", "filename", "mime", "is_archive", "can_sandbox", "can_extract")); } /** @@ -250,6 +354,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (!jsonObj.get("filename").isJsonPrimitive()) { throw new IllegalArgumentException(String.format(java.util.Locale.ROOT, "Expected the field `filename` to be a primitive type in the JSON string but got `%s`", jsonObj.get("filename").toString())); } + if (!jsonObj.get("mime").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format(java.util.Locale.ROOT, "Expected the field `mime` to be a primitive type in the JSON string but got `%s`", jsonObj.get("mime").toString())); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { diff --git a/src/main/java/ai/reveng/model/User.java b/src/main/java/ai/reveng/model/User.java index ac422f2..d3681cf 100644 --- a/src/main/java/ai/reveng/model/User.java +++ b/src/main/java/ai/reveng/model/User.java @@ -53,7 +53,7 @@ public class User { public static final String SERIALIZED_NAME_CREATED_AT = "created_at"; @SerializedName(SERIALIZED_NAME_CREATED_AT) - @javax.annotation.Nullable + @javax.annotation.Nonnull private OffsetDateTime createdAt; public static final String SERIALIZED_NAME_EMAIL = "email"; @@ -202,7 +202,7 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti public User() { } - public User createdAt(@javax.annotation.Nullable OffsetDateTime createdAt) { + public User createdAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { this.createdAt = createdAt; return this; } @@ -211,12 +211,12 @@ public User createdAt(@javax.annotation.Nullable OffsetDateTime createdAt) { * Get createdAt * @return createdAt */ - @javax.annotation.Nullable + @javax.annotation.Nonnull public OffsetDateTime getCreatedAt() { return createdAt; } - public void setCreatedAt(@javax.annotation.Nullable OffsetDateTime createdAt) { + public void setCreatedAt(@javax.annotation.Nonnull OffsetDateTime createdAt) { this.createdAt = createdAt; } @@ -370,7 +370,7 @@ private String toIndentedString(Object o) { openapiFields = new HashSet(Arrays.asList("created_at", "email", "profile", "role", "tier", "user_id")); // a set of required properties/fields (JSON key names) - openapiRequiredFields = new HashSet(Arrays.asList("email", "profile", "role", "user_id")); + openapiRequiredFields = new HashSet(Arrays.asList("created_at", "email", "profile", "role", "user_id")); } /**