refactor: dubbing response can be jsonified & renamings that more in …

…line with the API reference
RageAgainstThePixel · Jul 6, 2024 · 348188c · 348188c
1 parent 958a27d
commit 348188c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/ElevenLabs-DotNet-Tests/Test_Fixture_07_DubbingEndpoint.cs b/ElevenLabs-DotNet-Tests/Test_Fixture_07_DubbingEndpoint.cs
@@ -24,18 +24,18 @@ public async Task Test_01_Dubbing_File()
             Watermark = false,
         };
 
-        (string dubbingId, float expectedDurationSecs) = await ElevenLabsClient.DubbingEndpoint.StartDubbingAsync(request);
-        Assert.IsFalse(string.IsNullOrEmpty(dubbingId));
-        Assert.IsTrue(expectedDurationSecs > 0);
-        Console.WriteLine($"Expected Duration: {expectedDurationSecs:0.00} seconds");
+        DubbingResponse response = await ElevenLabsClient.DubbingEndpoint.StartDubbingAsync(request);
+        Assert.IsFalse(string.IsNullOrEmpty(response.DubbingId));
+        Assert.IsTrue(response.ExpectedDurationSeconds > 0);
+        Console.WriteLine($"Expected Duration: {response.ExpectedDurationSeconds:0.00} seconds");
 
-        Assert.IsTrue(await ElevenLabsClient.DubbingEndpoint.WaitForDubbingCompletionAsync(dubbingId, progress: new Progress<string>(msg => Console.WriteLine(msg))));
+        Assert.IsTrue(await ElevenLabsClient.DubbingEndpoint.WaitForDubbingCompletionAsync(response.DubbingId, progress: new Progress<string>(msg => Console.WriteLine(msg))));
 
         FileInfo srcFile = new(audio.FilePath);
         FileInfo dubbedPath = new($"{srcFile.FullName}.dubbed.{request.TargetLanguage}{srcFile.Extension}");
         {
             await using FileStream fs = File.Open(dubbedPath.FullName, FileMode.Create);
-            await foreach (byte[] chunk in ElevenLabsClient.DubbingEndpoint.GetDubbedFileAsync(dubbingId, request.TargetLanguage))
+            await foreach (byte[] chunk in ElevenLabsClient.DubbingEndpoint.GetDubbedFileAsync(response.DubbingId, request.TargetLanguage))
             {
                 await fs.WriteAsync(chunk);
             }
@@ -45,7 +45,7 @@ public async Task Test_01_Dubbing_File()
 
         FileInfo transcriptPath = new($"{srcFile.FullName}.dubbed.{request.TargetLanguage}.srt");
         {
-            string transcriptFile = await ElevenLabsClient.DubbingEndpoint.GetTranscriptForDubAsync(dubbingId, request.TargetLanguage, "srt");
+            string transcriptFile = await ElevenLabsClient.DubbingEndpoint.GetTranscriptForDubAsync(response.DubbingId, request.TargetLanguage, "srt");
             await File.WriteAllTextAsync(transcriptPath.FullName, transcriptFile);
         }
         Assert.IsTrue(transcriptPath.Exists);
@@ -67,18 +67,18 @@ public async Task Test_02_Dubbing_Url()
             Watermark = true,
         };
 
-        (string dubbingId, float expectedDurationSecs) = await ElevenLabsClient.DubbingEndpoint.StartDubbingAsync(request);
-        Assert.IsFalse(string.IsNullOrEmpty(dubbingId));
-        Assert.IsTrue(expectedDurationSecs > 0);
-        Console.WriteLine($"Expected Duration: {expectedDurationSecs:0.00} seconds");
+        DubbingResponse response = await ElevenLabsClient.DubbingEndpoint.StartDubbingAsync(request);
+        Assert.IsFalse(string.IsNullOrEmpty(response.DubbingId));
+        Assert.IsTrue(response.ExpectedDurationSeconds > 0);
+        Console.WriteLine($"Expected Duration: {response.ExpectedDurationSeconds:0.00} seconds");
 
-        Assert.IsTrue(await ElevenLabsClient.DubbingEndpoint.WaitForDubbingCompletionAsync(dubbingId, progress: new Progress<string>(msg => Console.WriteLine(msg))));
+        Assert.IsTrue(await ElevenLabsClient.DubbingEndpoint.WaitForDubbingCompletionAsync(response.DubbingId, progress: new Progress<string>(msg => Console.WriteLine(msg))));
 
         string assetsDir = Path.GetFullPath("../../../Assets");
         FileInfo dubbedPath = new(Path.Combine(assetsDir, $"online.dubbed.{request.TargetLanguage}.mp4"));
         {
             await using FileStream fs = File.Open(dubbedPath.FullName, FileMode.Create);
-            await foreach (byte[] chunk in ElevenLabsClient.DubbingEndpoint.GetDubbedFileAsync(dubbingId, request.TargetLanguage))
+            await foreach (byte[] chunk in ElevenLabsClient.DubbingEndpoint.GetDubbedFileAsync(response.DubbingId, request.TargetLanguage))
             {
                 await fs.WriteAsync(chunk);
             }
@@ -88,7 +88,7 @@ public async Task Test_02_Dubbing_Url()
 
         FileInfo transcriptPath = new(Path.Combine(assetsDir, $"online.dubbed.{request.TargetLanguage}.srt"));
         {
-            string transcriptFile = await ElevenLabsClient.DubbingEndpoint.GetTranscriptForDubAsync(dubbingId, request.TargetLanguage, "srt");
+            string transcriptFile = await ElevenLabsClient.DubbingEndpoint.GetTranscriptForDubAsync(response.DubbingId, request.TargetLanguage, "srt");
             await File.WriteAllTextAsync(transcriptPath.FullName, transcriptFile);
         }
         Assert.IsTrue(transcriptPath.Exists);

diff --git a/ElevenLabs-DotNet/Dubbing/DubbingEndpoint.cs b/ElevenLabs-DotNet/Dubbing/DubbingEndpoint.cs
@@ -42,11 +42,11 @@ public sealed class DubbingEndpoint(ElevenLabsClient client) : ElevenLabsBaseEnd
     /// in seconds if the operation succeeds.
     /// </returns>
     /// <exception cref="ArgumentNullException">Thrown when <paramref name="request"/> is <see langword="null"/>.</exception>
-    public async Task<(string DubbingId, float ExpectedDurationSecs)> StartDubbingAsync(DubbingRequest request, CancellationToken cancellationToken = default)
+    public async Task<DubbingResponse> StartDubbingAsync(DubbingRequest request, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(request);
 
-        using MultipartFormDataContent content = new();
+        using MultipartFormDataContent content = [];
 
         if (!string.IsNullOrEmpty(request.Mode))
         {
@@ -126,10 +126,8 @@ public sealed class DubbingEndpoint(ElevenLabsClient client) : ElevenLabsBaseEnd
         using HttpResponseMessage response = await client.Client.PostAsync(GetUrl(), content, cancellationToken).ConfigureAwait(false);
         await response.CheckResponseAsync(cancellationToken).ConfigureAwait(false);
 
-        using var responseDoc = JsonDocument.Parse(await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false));
-        string dubbingId = responseDoc.RootElement.GetProperty(DubbingId).GetString();
-        float expectedDurationSeconds = responseDoc.RootElement.GetProperty(ExpectedDurationSecs).GetSingle();
-        return (dubbingId, expectedDurationSeconds);
+        using Stream responseStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+        return await JsonSerializer.DeserializeAsync<DubbingResponse>(responseStream, cancellationToken: cancellationToken).ConfigureAwait(false);
     }
 
     private static void AppendFileToForm(MultipartFormDataContent content, string name, FileInfo fileInfo, MediaTypeHeaderValue mediaType)
@@ -172,7 +170,7 @@ public async Task<bool> WaitForDubbingCompletionAsync(string dubbingId, int? max
         timeoutInterval ??= DefaultTimeoutInterval;
         for (int i = 0; i < maxRetries; i++)
         {
-            DubbingMetadataResponse metadata = await GetDubbingProjectMetadataAsync(dubbingId, cancellationToken).ConfigureAwait(false);
+            DubbingProjectMetadata metadata = await GetDubbingProjectMetadataAsync(dubbingId, cancellationToken).ConfigureAwait(false);
             if (metadata.Status.Equals("dubbed", StringComparison.Ordinal))
             {
                 return true;
@@ -192,14 +190,14 @@ public async Task<bool> WaitForDubbingCompletionAsync(string dubbingId, int? max
         return false;
     }
 
-    private async Task<DubbingMetadataResponse> GetDubbingProjectMetadataAsync(string dubbingId, CancellationToken cancellationToken = default)
+    private async Task<DubbingProjectMetadata> GetDubbingProjectMetadataAsync(string dubbingId, CancellationToken cancellationToken = default)
     {
         string url = $"{GetUrl()}/{dubbingId}";
         HttpResponseMessage response = await client.Client.GetAsync(url, cancellationToken).ConfigureAwait(false);
         await response.CheckResponseAsync(cancellationToken).ConfigureAwait(false);
         string responseBody = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-        return JsonSerializer.Deserialize<DubbingMetadataResponse>(responseBody)
-            ?? throw new JsonException("Could not deserialize the response!");
+        return JsonSerializer.Deserialize<DubbingProjectMetadata>(responseBody)
+            ?? throw new JsonException("Could not deserialize the dubbing project metadata!");
     }
 
     /// <summary>

diff --git a/...DotNet/Dubbing/DubbingMetadataResponse.cs → ...-DotNet/Dubbing/DubbingProjectMetadata.cs b/...DotNet/Dubbing/DubbingMetadataResponse.cs → ...-DotNet/Dubbing/DubbingProjectMetadata.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-public sealed class DubbingMetadataResponse
+public sealed class DubbingProjectMetadata
 {
     [JsonPropertyName("dubbing_id")]
     public string DubbingId { get; set; }

diff --git a/ElevenLabs-DotNet/Dubbing/DubbingResponse.cs b/ElevenLabs-DotNet/Dubbing/DubbingResponse.cs
@@ -0,0 +1,12 @@
+namespace ElevenLabs.Dubbing;
+
+using System.Text.Json.Serialization;
+
+public sealed class DubbingResponse
+{
+    [JsonPropertyName("dubbing_id")]
+    public string DubbingId { get; set; }
+
+    [JsonPropertyName("expected_duration_sec")]
+    public float ExpectedDurationSeconds { get; set; }
+}