Merge pull request #107 from AssemblyAI/fern-bot/06-14-2024-0930PM

🌿 Fern Regeneration -- June 14, 2024
AssemblyAI · Jun 14, 2024 · 27de673 · 27de673
2 parents 61073c9 + 22cae2f
commit 27de673
Show file tree

Hide file tree

Showing 14 changed files with 851 additions and 223 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'com.assemblyai'
             artifactId = 'assemblyai-java'
-            version = '1.1.3'
+            version = '1.2.0'
             from components.java
             pom {
                 scm {

diff --git a/sample-app/src/main/java/sample/App.java b/sample-app/src/main/java/sample/App.java
@@ -4,7 +4,7 @@
 import com.assemblyai.api.RealtimeTranscriber;
 import com.assemblyai.api.resources.files.types.UploadedFile;
 import com.assemblyai.api.resources.lemur.requests.LemurTaskParams;
-import com.assemblyai.api.resources.lemur.types.LemurTaskResponse;
+import com.assemblyai.api.resources.lemur.types.*;
 import com.assemblyai.api.resources.realtime.requests.CreateRealtimeTemporaryTokenParams;
 import com.assemblyai.api.resources.realtime.types.AudioEncoding;
 import com.assemblyai.api.resources.realtime.types.RealtimeTemporaryTokenResponse;
@@ -70,6 +70,10 @@ public static void main(String... args) throws IOException, InterruptedException
 
         System.out.println("Summary: " + response.getResponse());
 
+        LemurResponse response2 = client.lemur().getResponse(response.getRequestId());
+
+        System.out.println("Summary 2: " + ((LemurTaskResponse)response2.get()).getResponse());
+
         transcript = client.transcripts().delete(transcript.getId());
         System.out.println("Delete transcript. " + transcript);
 

diff --git a/src/main/java/com/assemblyai/api/core/Environment.java b/src/main/java/com/assemblyai/api/core/Environment.java
@@ -16,7 +16,6 @@ public String getUrl() {
         return this.url;
     }
 
-
     public static Environment custom(String url) {
         return new Environment(url);
     }

diff --git a/src/main/java/com/assemblyai/api/resources/lemur/LemurClient.java b/src/main/java/com/assemblyai/api/resources/lemur/LemurClient.java
@@ -14,6 +14,7 @@
 import com.assemblyai.api.resources.lemur.requests.LemurTaskParams;
 import com.assemblyai.api.resources.lemur.types.LemurActionItemsResponse;
 import com.assemblyai.api.resources.lemur.types.LemurQuestionAnswerResponse;
+import com.assemblyai.api.resources.lemur.types.LemurResponse;
 import com.assemblyai.api.resources.lemur.types.LemurSummaryResponse;
 import com.assemblyai.api.resources.lemur.types.LemurTaskResponse;
 import com.assemblyai.api.resources.lemur.types.PurgeLemurRequestDataResponse;
@@ -241,6 +242,47 @@ public LemurActionItemsResponse actionItems(LemurActionItemsParams request, Requ
         }
     }
 
+    /**
+     * Retrieve a LeMUR response that was previously generated.
+     */
+    public LemurResponse getResponse(String requestId) {
+        return getResponse(requestId, null);
+    }
+
+    /**
+     * Retrieve a LeMUR response that was previously generated.
+     */
+    public LemurResponse getResponse(String requestId, RequestOptions requestOptions) {
+        HttpUrl httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
+                .newBuilder()
+                .addPathSegments("lemur/v3")
+                .addPathSegment(requestId)
+                .build();
+        Request okhttpRequest = new Request.Builder()
+                .url(httpUrl)
+                .method("GET", null)
+                .headers(Headers.of(clientOptions.headers(requestOptions)))
+                .addHeader("Content-Type", "application/json")
+                .build();
+        try {
+            OkHttpClient client = clientOptions.httpClient();
+            if (requestOptions != null && requestOptions.getTimeout().isPresent()) {
+                client = clientOptions.httpClientWithTimeout(requestOptions);
+            }
+            Response response = client.newCall(okhttpRequest).execute();
+            ResponseBody responseBody = response.body();
+            if (response.isSuccessful()) {
+                return ObjectMappers.JSON_MAPPER.readValue(responseBody.string(), LemurResponse.class);
+            }
+            throw new ApiError(
+                    response.code(),
+                    ObjectMappers.JSON_MAPPER.readValue(
+                            responseBody != null ? responseBody.string() : "{}", Object.class));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Delete the data for a previously submitted LeMUR request.
      * The LLM response data, as well as any context provided in the original request will be removed.

diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/ILemurBaseResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/ILemurBaseResponse.java
@@ -5,4 +5,6 @@
 
 public interface ILemurBaseResponse {
     String getRequestId();
+
+    LemurUsage getUsage();
 }
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
@@ -20,12 +20,16 @@
 public final class LemurActionItemsResponse implements ILemurBaseResponse {
     private final String requestId;
 
+    private final LemurUsage usage;
+
     private final String response;
 
     private final Map<String, Object> additionalProperties;
 
-    private LemurActionItemsResponse(String requestId, String response, Map<String, Object> additionalProperties) {
+    private LemurActionItemsResponse(
+            String requestId, LemurUsage usage, String response, Map<String, Object> additionalProperties) {
         this.requestId = requestId;
+        this.usage = usage;
         this.response = response;
         this.additionalProperties = additionalProperties;
     }
@@ -39,6 +43,15 @@ public String getRequestId() {
         return requestId;
     }
 
+    /**
+     * @return The usage numbers for the LeMUR request
+     */
+    @JsonProperty("usage")
+    @java.lang.Override
+    public LemurUsage getUsage() {
+        return usage;
+    }
+
     /**
      * @return The response generated by LeMUR
      */
@@ -59,12 +72,12 @@ public Map<String, Object> getAdditionalProperties() {
     }
 
     private boolean equalTo(LemurActionItemsResponse other) {
-        return requestId.equals(other.requestId) && response.equals(other.response);
+        return requestId.equals(other.requestId) && usage.equals(other.usage) && response.equals(other.response);
     }
 
     @java.lang.Override
     public int hashCode() {
-        return Objects.hash(this.requestId, this.response);
+        return Objects.hash(this.requestId, this.usage, this.response);
     }
 
     @java.lang.Override
@@ -77,11 +90,15 @@ public static RequestIdStage builder() {
     }
 
     public interface RequestIdStage {
-        ResponseStage requestId(String requestId);
+        UsageStage requestId(String requestId);
 
         Builder from(LemurActionItemsResponse other);
     }
 
+    public interface UsageStage {
+        ResponseStage usage(LemurUsage usage);
+    }
+
     public interface ResponseStage {
         _FinalStage response(String response);
     }
@@ -91,9 +108,11 @@ public interface _FinalStage {
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements RequestIdStage, ResponseStage, _FinalStage {
+    public static final class Builder implements RequestIdStage, UsageStage, ResponseStage, _FinalStage {
         private String requestId;
 
+        private LemurUsage usage;
+
         private String response;
 
         @JsonAnySetter
@@ -104,6 +123,7 @@ private Builder() {}
         @java.lang.Override
         public Builder from(LemurActionItemsResponse other) {
             requestId(other.getRequestId());
+            usage(other.getUsage());
             response(other.getResponse());
             return this;
         }
@@ -114,11 +134,22 @@ public Builder from(LemurActionItemsResponse other) {
          */
         @java.lang.Override
         @JsonSetter("request_id")
-        public ResponseStage requestId(String requestId) {
+        public UsageStage requestId(String requestId) {
             this.requestId = requestId;
             return this;
         }
 
+        /**
+         * <p>The usage numbers for the LeMUR request</p>
+         * @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;
+            return this;
+        }
+
         /**
          * <p>The response generated by LeMUR</p>
          * @return Reference to {@code this} so that method calls can be chained together.
@@ -132,7 +163,7 @@ public _FinalStage response(String response) {
 
         @java.lang.Override
         public LemurActionItemsResponse build() {
-            return new LemurActionItemsResponse(requestId, response, additionalProperties);
+            return new LemurActionItemsResponse(requestId, usage, response, additionalProperties);
         }
     }
 }
diff --git a/src/main/java/com/assemblyai/api/resources/lemur/types/LemurBaseResponse.java b/src/main/java/com/assemblyai/api/resources/lemur/types/LemurBaseResponse.java
@@ -20,10 +20,13 @@
 public final class LemurBaseResponse implements ILemurBaseResponse {
     private final String requestId;
 
+    private final LemurUsage usage;
+
     private final Map<String, Object> additionalProperties;
 
-    private LemurBaseResponse(String requestId, Map<String, Object> additionalProperties) {
+    private LemurBaseResponse(String requestId, LemurUsage usage, Map<String, Object> additionalProperties) {
         this.requestId = requestId;
+        this.usage = usage;
         this.additionalProperties = additionalProperties;
     }
 
@@ -36,6 +39,15 @@ 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;
@@ -48,12 +60,12 @@ public Map<String, Object> getAdditionalProperties() {
     }
 
     private boolean equalTo(LemurBaseResponse other) {
-        return requestId.equals(other.requestId);
+        return requestId.equals(other.requestId) && usage.equals(other.usage);
     }
 
     @java.lang.Override
     public int hashCode() {
-        return Objects.hash(this.requestId);
+        return Objects.hash(this.requestId, this.usage);
     }
 
     @java.lang.Override
@@ -66,19 +78,25 @@ public static RequestIdStage builder() {
     }
 
     public interface RequestIdStage {
-        _FinalStage requestId(String requestId);
+        UsageStage requestId(String requestId);
 
         Builder from(LemurBaseResponse other);
     }
 
+    public interface UsageStage {
+        _FinalStage usage(LemurUsage usage);
+    }
+
     public interface _FinalStage {
         LemurBaseResponse build();
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements RequestIdStage, _FinalStage {
+    public static final class Builder implements RequestIdStage, UsageStage, _FinalStage {
         private String requestId;
 
+        private LemurUsage usage;
+
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
@@ -87,6 +105,7 @@ private Builder() {}
         @java.lang.Override
         public Builder from(LemurBaseResponse other) {
             requestId(other.getRequestId());
+            usage(other.getUsage());
             return this;
         }
 
@@ -96,14 +115,25 @@ public Builder from(LemurBaseResponse other) {
          */
         @java.lang.Override
         @JsonSetter("request_id")
-        public _FinalStage requestId(String requestId) {
+        public UsageStage requestId(String requestId) {
             this.requestId = requestId;
             return this;
         }
 
+        /**
+         * <p>The usage numbers for the LeMUR request</p>
+         * @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 LemurBaseResponse build() {
-            return new LemurBaseResponse(requestId, additionalProperties);
+            return new LemurBaseResponse(requestId, usage, additionalProperties);
         }
     }
 }