Merge pull request #42 from AssemblyAI/fern-bot/08-11-2024-1119PM

🌿 Fern Regeneration -- August 11, 2024

Author: Swimburger

src/AssemblyAI/Core/Public/ApiException.cs

@@ -1,10 +1,13 @@
+using System.Text.Json;
+using AssemblyAI.Core;
+
 namespace AssemblyAI;
 
 /// <summary>
 /// This exception type will be thrown for any non-2XX API responses.
 /// </summary>
 public class ApiException(string message, int statusCode, object body)
-    : AssemblyAIException(body is Error error ? error.Error_ : message)
+    : AssemblyAIException(GetMessageFromJsonBody(message, body))
 {
     /// <summary>
     /// The error code of the response that triggered the exception.
@@ -15,4 +18,18 @@ public class ApiException(string message, int statusCode, object body)
     /// The body of the response that triggered the exception.
     /// </summary>
     internal object Body { get; } = body;
-}
+    
+    private static string GetMessageFromJsonBody(string message, object body)
+    {
+        if (body is not string stringBody) return message;
+        try
+        {
+            var errorObject = JsonUtils.Deserialize<Error>(stringBody);
+            return errorObject.Error_;
+        }
+        catch (JsonException)
+        {
+            return stringBody;
+        }
+    }
+}

src/AssemblyAI/Files/FilesClient.cs

@@ -47,7 +47,7 @@ public async Task<UploadedFile> UploadAsync(Stream request, RequestOptions? opti
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 }

src/AssemblyAI/Lemur/LemurClient.cs

@@ -51,7 +51,7 @@ public async Task<LemurTaskResponse> TaskAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -90,7 +90,7 @@ public async Task<LemurSummaryResponse> SummaryAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -129,7 +129,7 @@ public async Task<LemurQuestionAnswerResponse> QuestionAnswerAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -167,7 +167,7 @@ public async Task<LemurActionItemsResponse> ActionItemsAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -206,7 +206,7 @@ public async Task<OneOf<LemurStringResponse, LemurQuestionAnswerResponse>> GetRe
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -244,7 +244,7 @@ public async Task<PurgeLemurRequestDataResponse> PurgeRequestDataAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 }

src/AssemblyAI/Realtime/RealtimeClient.cs

@@ -50,7 +50,7 @@ public async Task<RealtimeTemporaryTokenResponse> CreateTemporaryTokenAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 }

src/AssemblyAI/Transcripts/TranscriptsClient.cs

@@ -76,7 +76,7 @@ public async Task<TranscriptList> ListAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -114,7 +114,7 @@ public async Task<Transcript> SubmitAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -148,7 +148,7 @@ public async Task<Transcript> GetAsync(string transcriptId, RequestOptions? opti
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -183,7 +183,7 @@ public async Task<Transcript> DeleteAsync(string transcriptId, RequestOptions? o
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -221,7 +221,7 @@ public async Task<string> GetSubtitlesAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -258,7 +258,7 @@ public async Task<SentencesResponse> GetSentencesAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -295,7 +295,7 @@ public async Task<ParagraphsResponse> GetParagraphsAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -336,7 +336,7 @@ public async Task<WordSearchResponse> WordSearchAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 
@@ -373,7 +373,7 @@ public async Task<RedactedAudioResponse> GetRedactedAudioAsync(
         throw new ApiException(
             $"Error with status code {response.StatusCode}",
             response.StatusCode,
-            JsonUtils.Deserialize<object>(responseBody)
+            responseBody
         );
     }
 }