diff --git a/build.gradle b/build.gradle index 2f0c85bb..2cf462ae 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ publishing { maven(MavenPublication) { groupId = 'com.assemblyai' artifactId = 'assemblyai-java' - version = '1.2.1' + version = '2.0.0' from components.java pom { scm { diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/ILemurStringResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/ILemurStringResponse.java new file mode 100644 index 00000000..ebb057b5 --- /dev/null +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/ILemurStringResponse.java @@ -0,0 +1,8 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.assemblyai.api.resources.lemur.types; + +public interface ILemurStringResponse extends ILemurBaseResponse { + String getResponse(); +} diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurActionItemsResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurActionItemsResponse.java index 50491450..882ff08b 100644 --- a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurActionItemsResponse.java +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurActionItemsResponse.java @@ -17,23 +17,32 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = LemurActionItemsResponse.Builder.class) -public final class LemurActionItemsResponse implements ILemurBaseResponse { +public final class LemurActionItemsResponse implements ILemurStringResponse { + private final String response; + private final String requestId; private final LemurUsage usage; - private final String response; - private final Map additionalProperties; private LemurActionItemsResponse( - String requestId, LemurUsage usage, String response, Map additionalProperties) { + String response, String requestId, LemurUsage usage, Map additionalProperties) { + this.response = response; this.requestId = requestId; this.usage = usage; - this.response = response; this.additionalProperties = additionalProperties; } + /** + * @return The response generated by LeMUR. + */ + @JsonProperty("response") + @java.lang.Override + public String getResponse() { + return response; + } + /** * @return The ID of the LeMUR request */ @@ -52,14 +61,6 @@ public LemurUsage getUsage() { return usage; } - /** - * @return The response generated by LeMUR - */ - @JsonProperty("response") - public String getResponse() { - return response; - } - @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -72,12 +73,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(LemurActionItemsResponse other) { - return requestId.equals(other.requestId) && usage.equals(other.usage) && response.equals(other.response); + return response.equals(other.response) && requestId.equals(other.requestId) && usage.equals(other.usage); } @java.lang.Override public int hashCode() { - return Objects.hash(this.requestId, this.usage, this.response); + return Objects.hash(this.response, this.requestId, this.usage); } @java.lang.Override @@ -85,22 +86,22 @@ public String toString() { return ObjectMappers.stringify(this); } - public static RequestIdStage builder() { + public static ResponseStage builder() { return new Builder(); } - public interface RequestIdStage { - UsageStage requestId(String requestId); + public interface ResponseStage { + RequestIdStage response(String response); Builder from(LemurActionItemsResponse other); } - public interface UsageStage { - ResponseStage usage(LemurUsage usage); + public interface RequestIdStage { + UsageStage requestId(String requestId); } - public interface ResponseStage { - _FinalStage response(String response); + public interface UsageStage { + _FinalStage usage(LemurUsage usage); } public interface _FinalStage { @@ -108,13 +109,13 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements RequestIdStage, UsageStage, ResponseStage, _FinalStage { + public static final class Builder implements ResponseStage, RequestIdStage, UsageStage, _FinalStage { + private String response; + private String requestId; private LemurUsage usage; - private String response; - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -122,48 +123,48 @@ private Builder() {} @java.lang.Override public Builder from(LemurActionItemsResponse other) { + response(other.getResponse()); requestId(other.getRequestId()); usage(other.getUsage()); - response(other.getResponse()); return this; } /** - *

The ID of the LeMUR request

+ *

The response generated by LeMUR.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("request_id") - public UsageStage requestId(String requestId) { - this.requestId = requestId; + @JsonSetter("response") + public RequestIdStage response(String response) { + this.response = response; return this; } /** - *

The usage numbers for the LeMUR request

+ *

The ID of the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("usage") - public ResponseStage usage(LemurUsage usage) { - this.usage = usage; + @JsonSetter("request_id") + public UsageStage requestId(String requestId) { + this.requestId = requestId; return this; } /** - *

The response generated by LeMUR

+ *

The usage numbers for the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("response") - public _FinalStage response(String response) { - this.response = response; + @JsonSetter("usage") + public _FinalStage usage(LemurUsage usage) { + this.usage = usage; return this; } @java.lang.Override public LemurActionItemsResponse build() { - return new LemurActionItemsResponse(requestId, usage, response, additionalProperties); + return new LemurActionItemsResponse(response, requestId, usage, additionalProperties); } } } diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurResponse.java index 97d809cf..a8ed56f0 100644 --- a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurResponse.java +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurResponse.java @@ -31,13 +31,9 @@ public Object get() { public T visit(Visitor visitor) { if (this.type == 0) { - return visitor.visit((LemurTaskResponse) this.value); + return visitor.visit((LemurStringResponse) this.value); } else if (this.type == 1) { - return visitor.visit((LemurSummaryResponse) this.value); - } else if (this.type == 2) { return visitor.visit((LemurQuestionAnswerResponse) this.value); - } else if (this.type == 3) { - return visitor.visit((LemurActionItemsResponse) this.value); } throw new IllegalStateException("Failed to visit value. This should never happen."); } @@ -62,30 +58,18 @@ public String toString() { return this.value.toString(); } - public static LemurResponse of(LemurTaskResponse value) { + public static LemurResponse of(LemurStringResponse value) { return new LemurResponse(value, 0); } - public static LemurResponse of(LemurSummaryResponse value) { - return new LemurResponse(value, 1); - } - public static LemurResponse of(LemurQuestionAnswerResponse value) { - return new LemurResponse(value, 2); - } - - public static LemurResponse of(LemurActionItemsResponse value) { - return new LemurResponse(value, 3); + return new LemurResponse(value, 1); } public interface Visitor { - T visit(LemurTaskResponse value); - - T visit(LemurSummaryResponse value); + T visit(LemurStringResponse value); T visit(LemurQuestionAnswerResponse value); - - T visit(LemurActionItemsResponse value); } static final class Deserializer extends StdDeserializer { @@ -97,21 +81,13 @@ static final class Deserializer extends StdDeserializer { public LemurResponse deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { Object value = p.readValueAs(Object.class); try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, LemurTaskResponse.class)); - } catch (IllegalArgumentException e) { - } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, LemurSummaryResponse.class)); + return of(ObjectMappers.JSON_MAPPER.convertValue(value, LemurStringResponse.class)); } catch (IllegalArgumentException e) { } try { return of(ObjectMappers.JSON_MAPPER.convertValue(value, LemurQuestionAnswerResponse.class)); } catch (IllegalArgumentException e) { } - try { - return of(ObjectMappers.JSON_MAPPER.convertValue(value, LemurActionItemsResponse.class)); - } catch (IllegalArgumentException e) { - } throw new JsonParseException(p, "Failed to deserialize"); } } diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurStringResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurStringResponse.java new file mode 100644 index 00000000..15f20e26 --- /dev/null +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurStringResponse.java @@ -0,0 +1,170 @@ +/** + * This file was auto-generated by Fern from our API Definition. + */ +package com.assemblyai.api.resources.lemur.types; + +import com.assemblyai.api.core.ObjectMappers; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +@JsonDeserialize(builder = LemurStringResponse.Builder.class) +public final class LemurStringResponse implements ILemurStringResponse, ILemurBaseResponse { + private final String response; + + private final String requestId; + + private final LemurUsage usage; + + private final Map additionalProperties; + + private LemurStringResponse( + String response, String requestId, LemurUsage usage, Map additionalProperties) { + this.response = response; + this.requestId = requestId; + this.usage = usage; + this.additionalProperties = additionalProperties; + } + + /** + * @return The response generated by LeMUR. + */ + @JsonProperty("response") + @java.lang.Override + public String getResponse() { + return response; + } + + /** + * @return The ID of the LeMUR request + */ + @JsonProperty("request_id") + @java.lang.Override + public String getRequestId() { + return requestId; + } + + /** + * @return The usage numbers for the LeMUR request + */ + @JsonProperty("usage") + @java.lang.Override + public LemurUsage getUsage() { + return usage; + } + + @java.lang.Override + public boolean equals(Object other) { + if (this == other) return true; + return other instanceof LemurStringResponse && equalTo((LemurStringResponse) other); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + private boolean equalTo(LemurStringResponse other) { + return response.equals(other.response) && requestId.equals(other.requestId) && usage.equals(other.usage); + } + + @java.lang.Override + public int hashCode() { + return Objects.hash(this.response, this.requestId, this.usage); + } + + @java.lang.Override + public String toString() { + return ObjectMappers.stringify(this); + } + + public static ResponseStage builder() { + return new Builder(); + } + + public interface ResponseStage { + RequestIdStage response(String response); + + Builder from(LemurStringResponse other); + } + + public interface RequestIdStage { + UsageStage requestId(String requestId); + } + + public interface UsageStage { + _FinalStage usage(LemurUsage usage); + } + + public interface _FinalStage { + LemurStringResponse build(); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static final class Builder implements ResponseStage, RequestIdStage, UsageStage, _FinalStage { + private String response; + + private String requestId; + + private LemurUsage usage; + + @JsonAnySetter + private Map additionalProperties = new HashMap<>(); + + private Builder() {} + + @java.lang.Override + public Builder from(LemurStringResponse other) { + response(other.getResponse()); + requestId(other.getRequestId()); + usage(other.getUsage()); + return this; + } + + /** + *

The response generated by LeMUR.

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + @JsonSetter("response") + public RequestIdStage response(String response) { + this.response = response; + return this; + } + + /** + *

The ID of the LeMUR request

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + @JsonSetter("request_id") + public UsageStage requestId(String requestId) { + this.requestId = requestId; + return this; + } + + /** + *

The usage numbers for the LeMUR request

+ * @return Reference to {@code this} so that method calls can be chained together. + */ + @java.lang.Override + @JsonSetter("usage") + public _FinalStage usage(LemurUsage usage) { + this.usage = usage; + return this; + } + + @java.lang.Override + public LemurStringResponse build() { + return new LemurStringResponse(response, requestId, usage, additionalProperties); + } + } +} diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurSummaryResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurSummaryResponse.java index f2204d22..999d0b3f 100644 --- a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurSummaryResponse.java +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurSummaryResponse.java @@ -17,23 +17,32 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = LemurSummaryResponse.Builder.class) -public final class LemurSummaryResponse implements ILemurBaseResponse { +public final class LemurSummaryResponse implements ILemurStringResponse { + private final String response; + private final String requestId; private final LemurUsage usage; - private final String response; - private final Map additionalProperties; private LemurSummaryResponse( - String requestId, LemurUsage usage, String response, Map additionalProperties) { + String response, String requestId, LemurUsage usage, Map additionalProperties) { + this.response = response; this.requestId = requestId; this.usage = usage; - this.response = response; this.additionalProperties = additionalProperties; } + /** + * @return The response generated by LeMUR. + */ + @JsonProperty("response") + @java.lang.Override + public String getResponse() { + return response; + } + /** * @return The ID of the LeMUR request */ @@ -52,14 +61,6 @@ public LemurUsage getUsage() { return usage; } - /** - * @return The response generated by LeMUR - */ - @JsonProperty("response") - public String getResponse() { - return response; - } - @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -72,12 +73,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(LemurSummaryResponse other) { - return requestId.equals(other.requestId) && usage.equals(other.usage) && response.equals(other.response); + return response.equals(other.response) && requestId.equals(other.requestId) && usage.equals(other.usage); } @java.lang.Override public int hashCode() { - return Objects.hash(this.requestId, this.usage, this.response); + return Objects.hash(this.response, this.requestId, this.usage); } @java.lang.Override @@ -85,22 +86,22 @@ public String toString() { return ObjectMappers.stringify(this); } - public static RequestIdStage builder() { + public static ResponseStage builder() { return new Builder(); } - public interface RequestIdStage { - UsageStage requestId(String requestId); + public interface ResponseStage { + RequestIdStage response(String response); Builder from(LemurSummaryResponse other); } - public interface UsageStage { - ResponseStage usage(LemurUsage usage); + public interface RequestIdStage { + UsageStage requestId(String requestId); } - public interface ResponseStage { - _FinalStage response(String response); + public interface UsageStage { + _FinalStage usage(LemurUsage usage); } public interface _FinalStage { @@ -108,13 +109,13 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements RequestIdStage, UsageStage, ResponseStage, _FinalStage { + public static final class Builder implements ResponseStage, RequestIdStage, UsageStage, _FinalStage { + private String response; + private String requestId; private LemurUsage usage; - private String response; - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -122,48 +123,48 @@ private Builder() {} @java.lang.Override public Builder from(LemurSummaryResponse other) { + response(other.getResponse()); requestId(other.getRequestId()); usage(other.getUsage()); - response(other.getResponse()); return this; } /** - *

The ID of the LeMUR request

+ *

The response generated by LeMUR.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("request_id") - public UsageStage requestId(String requestId) { - this.requestId = requestId; + @JsonSetter("response") + public RequestIdStage response(String response) { + this.response = response; return this; } /** - *

The usage numbers for the LeMUR request

+ *

The ID of the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("usage") - public ResponseStage usage(LemurUsage usage) { - this.usage = usage; + @JsonSetter("request_id") + public UsageStage requestId(String requestId) { + this.requestId = requestId; return this; } /** - *

The response generated by LeMUR

+ *

The usage numbers for the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("response") - public _FinalStage response(String response) { - this.response = response; + @JsonSetter("usage") + public _FinalStage usage(LemurUsage usage) { + this.usage = usage; return this; } @java.lang.Override public LemurSummaryResponse build() { - return new LemurSummaryResponse(requestId, usage, response, additionalProperties); + return new LemurSummaryResponse(response, requestId, usage, additionalProperties); } } } diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurTaskResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurTaskResponse.java index 31bf467c..e1b0c715 100644 --- a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurTaskResponse.java +++ b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurTaskResponse.java @@ -17,23 +17,32 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) @JsonDeserialize(builder = LemurTaskResponse.Builder.class) -public final class LemurTaskResponse implements ILemurBaseResponse { +public final class LemurTaskResponse implements ILemurStringResponse { + private final String response; + private final String requestId; private final LemurUsage usage; - private final String response; - private final Map additionalProperties; private LemurTaskResponse( - String requestId, LemurUsage usage, String response, Map additionalProperties) { + String response, String requestId, LemurUsage usage, Map additionalProperties) { + this.response = response; this.requestId = requestId; this.usage = usage; - this.response = response; this.additionalProperties = additionalProperties; } + /** + * @return The response generated by LeMUR. + */ + @JsonProperty("response") + @java.lang.Override + public String getResponse() { + return response; + } + /** * @return The ID of the LeMUR request */ @@ -52,14 +61,6 @@ public LemurUsage getUsage() { return usage; } - /** - * @return The response generated by LeMUR. - */ - @JsonProperty("response") - public String getResponse() { - return response; - } - @java.lang.Override public boolean equals(Object other) { if (this == other) return true; @@ -72,12 +73,12 @@ public Map getAdditionalProperties() { } private boolean equalTo(LemurTaskResponse other) { - return requestId.equals(other.requestId) && usage.equals(other.usage) && response.equals(other.response); + return response.equals(other.response) && requestId.equals(other.requestId) && usage.equals(other.usage); } @java.lang.Override public int hashCode() { - return Objects.hash(this.requestId, this.usage, this.response); + return Objects.hash(this.response, this.requestId, this.usage); } @java.lang.Override @@ -85,22 +86,22 @@ public String toString() { return ObjectMappers.stringify(this); } - public static RequestIdStage builder() { + public static ResponseStage builder() { return new Builder(); } - public interface RequestIdStage { - UsageStage requestId(String requestId); + public interface ResponseStage { + RequestIdStage response(String response); Builder from(LemurTaskResponse other); } - public interface UsageStage { - ResponseStage usage(LemurUsage usage); + public interface RequestIdStage { + UsageStage requestId(String requestId); } - public interface ResponseStage { - _FinalStage response(String response); + public interface UsageStage { + _FinalStage usage(LemurUsage usage); } public interface _FinalStage { @@ -108,13 +109,13 @@ public interface _FinalStage { } @JsonIgnoreProperties(ignoreUnknown = true) - public static final class Builder implements RequestIdStage, UsageStage, ResponseStage, _FinalStage { + public static final class Builder implements ResponseStage, RequestIdStage, UsageStage, _FinalStage { + private String response; + private String requestId; private LemurUsage usage; - private String response; - @JsonAnySetter private Map additionalProperties = new HashMap<>(); @@ -122,48 +123,48 @@ private Builder() {} @java.lang.Override public Builder from(LemurTaskResponse other) { + response(other.getResponse()); requestId(other.getRequestId()); usage(other.getUsage()); - response(other.getResponse()); return this; } /** - *

The ID of the LeMUR request

+ *

The response generated by LeMUR.

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("request_id") - public UsageStage requestId(String requestId) { - this.requestId = requestId; + @JsonSetter("response") + public RequestIdStage response(String response) { + this.response = response; return this; } /** - *

The usage numbers for the LeMUR request

+ *

The ID of the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("usage") - public ResponseStage usage(LemurUsage usage) { - this.usage = usage; + @JsonSetter("request_id") + public UsageStage requestId(String requestId) { + this.requestId = requestId; return this; } /** - *

The response generated by LeMUR.

+ *

The usage numbers for the LeMUR request

* @return Reference to {@code this} so that method calls can be chained together. */ @java.lang.Override - @JsonSetter("response") - public _FinalStage response(String response) { - this.response = response; + @JsonSetter("usage") + public _FinalStage usage(LemurUsage usage) { + this.usage = usage; return this; } @java.lang.Override public LemurTaskResponse build() { - return new LemurTaskResponse(requestId, usage, response, additionalProperties); + return new LemurTaskResponse(response, requestId, usage, additionalProperties); } } } diff --git a/src/main/java/com/assemblyai/api/resources/transcripts/requests/TranscriptParams.java b/src/main/java/com/assemblyai/api/resources/transcripts/requests/TranscriptParams.java index 8b52c016..c6dfd5d3 100644 --- a/src/main/java/com/assemblyai/api/resources/transcripts/requests/TranscriptParams.java +++ b/src/main/java/com/assemblyai/api/resources/transcripts/requests/TranscriptParams.java @@ -225,6 +225,9 @@ public Optional getSpeechModel() { return speechModel; } + /** + * @return The URL to which we send webhook requests. We sends two different types of webhook requests. One request when a transcript is completed or failed, and one request when the redacted audio is ready if redact_pii_audio is enabled. + */ @JsonProperty("webhook_url") @java.lang.Override public Optional getWebhookUrl() { @@ -1404,6 +1407,10 @@ public _FinalStage webhookAuthHeaderName(Optional webhookAuthHeaderName) return this; } + /** + *

The URL to which we send webhook requests. We sends two different types of webhook requests. One request when a transcript is completed or failed, and one request when the redacted audio is ready if redact_pii_audio is enabled.

+ * @return Reference to {@code this} so that method calls can be chained together. + */ @java.lang.Override public _FinalStage webhookUrl(String webhookUrl) { this.webhookUrl = Optional.of(webhookUrl); diff --git a/src/main/java/com/assemblyai/api/resources/transcripts/types/TranscriptOptionalParams.java b/src/main/java/com/assemblyai/api/resources/transcripts/types/TranscriptOptionalParams.java index f91fd9ec..9225f696 100644 --- a/src/main/java/com/assemblyai/api/resources/transcripts/types/TranscriptOptionalParams.java +++ b/src/main/java/com/assemblyai/api/resources/transcripts/types/TranscriptOptionalParams.java @@ -211,6 +211,9 @@ public Optional getSpeechModel() { return speechModel; } + /** + * @return The URL to which we send webhook requests. We sends two different types of webhook requests. One request when a transcript is completed or failed, and one request when the redacted audio is ready if redact_pii_audio is enabled. + */ @JsonProperty("webhook_url") @java.lang.Override public Optional getWebhookUrl() {