Merge pull request #88 from AssemblyAI/niels/fix-lemur-timeout

Fix LeMUR timeout

Author: Swimburger

sample-app/src/main/java/sample/App.java

@@ -15,18 +15,25 @@
 
 public final class App {
 
-    public static void main(String... args) throws IOException {
+    public static void main(String... args) throws IOException, InterruptedException {
         AssemblyAI client = AssemblyAI.builder()
                 .apiKey(System.getenv("ASSEMBLYAI_API_KEY"))
                 .build();
 
         Transcript transcript = client.transcripts().transcribe(
-                "https://storage.googleapis.com/client-docs-samples/nbc.mp3",
+                "https://storage.googleapis.com/aai-docs-samples/nbc.mp3",
                 TranscriptOptionalParams.builder()
                         .sentimentAnalysis(true)
                         .build()
         );
 
+        if(transcript.getStatus() == TranscriptStatus.ERROR)
+        {
+            System.out.println("Transcript error: " + transcript.getError().get());
+            System.exit(1);
+            return;
+        }
+
         for(SentimentAnalysisResult result: transcript.getSentimentAnalysisResults().get())
         {
             System.out.println("Text: " + result.getText());
@@ -52,6 +59,14 @@ public static void main(String... args) throws IOException {
                 .build());
         System.out.println("Search transcript. " + search);
 
+
+        LemurTaskResponse response = client.lemur().task(LemurTaskParams.builder()
+                .prompt("Summarize this transcript.")
+                .transcriptIds(List.of(transcript.getId()))
+                .build());
+
+        System.out.println("Summary: " + response.getResponse());
+
         transcript = client.transcripts().delete(transcript.getId());
         System.out.println("Delete transcript. " + transcript);
 
@@ -70,13 +85,6 @@ public static void main(String... args) throws IOException {
         TranscriptList transcripts = client.transcripts().list();
         System.out.println("List transcript. " + transcripts);
 
-        LemurTaskResponse response = client.lemur().task(LemurTaskParams.builder()
-                .prompt("Summarize this transcript.")
-                .transcriptIds(List.of(transcript.getId()))
-                .build());
-
-        System.out.println("Summary: " + response.getResponse());
-
         RealtimeTranscriber realtimeTranscriber = RealtimeTranscriber.builder()
                 .apiKey(System.getenv("ASSEMBLYAI_API_KEY"))
                 .onSessionBegins(System.out::println)

src/main/java/com/assemblyai/api/AssemblyAIBuilder.java

@@ -39,7 +39,7 @@ public AssemblyAI build() {
         this.clientOptionsBuilder.addHeader("Authorization", this.apiKey);
         clientOptionsBuilder.environment(this.environment);
         this.lemurClientOptionsBuilder.addHeader("Authorization", this.apiKey);
-        lemurClientOptionsBuilder.environment(this.environment);
+        lemurClientOptionsBuilder.environment(this.environment).disableTimeouts();
         return new AssemblyAI(clientOptionsBuilder.build(), lemurClientOptionsBuilder.build());
     }
 }

src/main/java/com/assemblyai/api/core/ClientOptions.java

@@ -7,11 +7,10 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+
 import okhttp3.OkHttpClient;
 
 public final class ClientOptions {
-    private boolean disableTimeouts;
-
     private final Environment environment;
 
     private final Map<String, String> headers;
@@ -24,8 +23,7 @@ private ClientOptions(
             Environment environment,
             Map<String, String> headers,
             Map<String, Supplier<String>> headerSuppliers,
-            OkHttpClient httpClient,
-            boolean disableTimeouts) {
+            OkHttpClient httpClient) {
         this.environment = environment;
         this.headers = new HashMap<>();
         this.headers.putAll(headers);
@@ -38,7 +36,6 @@ private ClientOptions(
                 "JAVA"));
         this.headerSuppliers = headerSuppliers;
         this.httpClient = httpClient;
-        this.disableTimeouts = disableTimeouts;
     }
 
     public Environment environment() {
@@ -61,14 +58,6 @@ public OkHttpClient httpClient() {
     }
 
     public OkHttpClient httpClientWithTimeout(RequestOptions requestOptions) {
-        if (this.disableTimeouts) {
-            return this.httpClient
-                    .newBuilder()
-                    .callTimeout(0, TimeUnit.SECONDS)
-                    .readTimeout(0, TimeUnit.SECONDS)
-                    .build();
-        }
-
         if (requestOptions == null) {
             return this.httpClient;
         }
@@ -123,10 +112,16 @@ public Builder disableTimeouts() {
         }
 
         public ClientOptions build() {
-            OkHttpClient okhttpClient = new OkHttpClient.Builder()
-                    .addInterceptor(new RetryInterceptor(3))
-                    .build();
-            return new ClientOptions(environment, headers, headerSuppliers, okhttpClient, this.disableTimeouts);
+            OkHttpClient.Builder okhttpClientBuilder = new OkHttpClient.Builder()
+                    .addInterceptor(new RetryInterceptor(3));
+            if (this.disableTimeouts) {
+                okhttpClientBuilder
+                        .callTimeout(0, TimeUnit.SECONDS)
+                        .connectTimeout(0, TimeUnit.SECONDS)
+                        .writeTimeout(0, TimeUnit.SECONDS)
+                        .readTimeout(0, TimeUnit.SECONDS);
+            }
+            return new ClientOptions(environment, headers, headerSuppliers, okhttpClientBuilder.build());
         }
     }
 }