ElevenLabs-DotNet 2.0.1 (#27)

- Pass some cancellation tokens to internals
RageAgainstThePixel · Nov 11, 2023 · 1828fe8 · 1828fe8
1 parent e488bba
commit 1828fe8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj b/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj
@@ -14,8 +14,10 @@
     <Company>RageAgainstThePixel</Company>
     <Copyright>2023</Copyright>
     <PackageTags>ElevenLabs, AI, ML, Voice, TTS</PackageTags>
-    <Version>2.0.0</Version>
-    <PackageReleaseNotes>Version 2.0.0
+    <Version>2.0.1</Version>
+    <PackageReleaseNotes>Version 2.0.1
+- Pass some cancellation tokens to internals
+Version 2.0.0
 Refactoring to support latest API changes
 - Biggest Change is the new VoiceClip signature for all endpoints which contains all the information about the generated clip.
 - Refactored HistoryEndpoint

diff --git a/ElevenLabs-DotNet/Extensions/HttpResponseMessageExtensions.cs b/ElevenLabs-DotNet/Extensions/HttpResponseMessageExtensions.cs
@@ -10,9 +10,9 @@ namespace ElevenLabs.Extensions
 {
     internal static class HttpResponseMessageExtensions
     {
-        public static async Task<string> ReadAsStringAsync(this HttpResponseMessage response, bool debugResponse = false, [CallerMemberName] string methodName = null)
+        public static async Task<string> ReadAsStringAsync(this HttpResponseMessage response, bool debugResponse = false, CancellationToken cancellationToken = default, [CallerMemberName] string methodName = null)
         {
-            var responseAsString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            var responseAsString = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
 
             if (!response.IsSuccessStatusCode)
             {

diff --git a/ElevenLabs-DotNet/History/HistoryEndpoint.cs b/ElevenLabs-DotNet/History/HistoryEndpoint.cs
@@ -43,7 +43,7 @@ public async Task<HistoryInfo> GetHistoryAsync(int? pageSize = null, string star
             }
 
             var response = await Api.Client.GetAsync(GetUrl(queryParameters: parameters), cancellationToken);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken: cancellationToken);
             return JsonSerializer.Deserialize<HistoryInfo>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -56,7 +56,7 @@ public async Task<HistoryInfo> GetHistoryAsync(int? pageSize = null, string star
         public async Task<HistoryItem> GetHistoryItemAsync(string id, CancellationToken cancellationToken = default)
         {
             var response = await Api.Client.GetAsync(GetUrl($"/{id}"), cancellationToken);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken: cancellationToken);
             return JsonSerializer.Deserialize<HistoryItem>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -98,7 +98,7 @@ public async Task<VoiceClip> DownloadHistoryAudioAsync(HistoryItem historyItem,
         public async Task<bool> DeleteHistoryItemAsync(string id, CancellationToken cancellationToken = default)
         {
             var response = await Api.Client.DeleteAsync(GetUrl($"/{id}"), cancellationToken);
-            await response.ReadAsStringAsync(EnableDebug);
+            await response.ReadAsStringAsync(EnableDebug, cancellationToken: cancellationToken);
             return response.IsSuccessStatusCode;
         }
 

diff --git a/ElevenLabs-DotNet/VoiceGeneration/VoiceGenerationEndpoint.cs b/ElevenLabs-DotNet/VoiceGeneration/VoiceGenerationEndpoint.cs
@@ -25,7 +25,7 @@ public VoiceGenerationEndpoint(ElevenLabsClient api) : base(api) { }
         public async Task<GeneratedVoiceOptions> GetVoiceGenerationOptionsAsync(CancellationToken cancellationToken = default)
         {
             var response = await Api.Client.GetAsync(GetUrl("/generate-voice/parameters"), cancellationToken);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken: cancellationToken);
             return JsonSerializer.Deserialize<GeneratedVoiceOptions>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -66,7 +66,7 @@ public async Task<Voice> CreateVoiceAsync(CreateVoiceRequest createVoiceRequest,
         {
             var payload = JsonSerializer.Serialize(createVoiceRequest).ToJsonStringContent();
             var response = await Api.Client.PostAsync(GetUrl("/create-voice"), payload, cancellationToken);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken: cancellationToken);
             return JsonSerializer.Deserialize<Voice>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
     }

diff --git a/ElevenLabs-DotNet/Voices/VoicesEndpoint.cs b/ElevenLabs-DotNet/Voices/VoicesEndpoint.cs
@@ -44,7 +44,7 @@ public VoicesEndpoint(ElevenLabsClient api) : base(api) { }
         public async Task<IReadOnlyList<Voice>> GetAllVoicesAsync(CancellationToken cancellationToken = default)
         {
             var response = await Api.Client.GetAsync(GetUrl(), cancellationToken).ConfigureAwait(false);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             var voices = JsonSerializer.Deserialize<VoiceList>(responseAsString, ElevenLabsClient.JsonSerializationOptions).Voices;
             var voiceSettingsTasks = new List<Task>();
 
@@ -70,7 +70,7 @@ async Task LocalGetVoiceSettings()
         public async Task<VoiceSettings> GetDefaultVoiceSettingsAsync(CancellationToken cancellationToken = default)
         {
             var response = await Api.Client.GetAsync(GetUrl("/settings/default"), cancellationToken).ConfigureAwait(false);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             return JsonSerializer.Deserialize<VoiceSettings>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -88,7 +88,7 @@ public async Task<VoiceSettings> GetVoiceSettingsAsync(string voiceId, Cancellat
             }
 
             var response = await Api.Client.GetAsync(GetUrl($"/{voiceId}/settings"), cancellationToken).ConfigureAwait(false);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             return JsonSerializer.Deserialize<VoiceSettings>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -107,7 +107,7 @@ public async Task<Voice> GetVoiceAsync(string voiceId, bool withSettings = false
             }
 
             var response = await Api.Client.GetAsync(GetUrl($"/{voiceId}?with_settings={withSettings}"), cancellationToken).ConfigureAwait(false);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             return JsonSerializer.Deserialize<Voice>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
         }
 
@@ -127,7 +127,7 @@ public async Task<bool> EditVoiceSettingsAsync(string voiceId, VoiceSettings voi
 
             var payload = JsonSerializer.Serialize(voiceSettings).ToJsonStringContent();
             var response = await Api.Client.PostAsync(GetUrl($"/{voiceId}/settings/edit"), payload, cancellationToken).ConfigureAwait(false);
-            await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             return response.IsSuccessStatusCode;
         }
 
@@ -182,7 +182,7 @@ public async Task<Voice> AddVoiceAsync(string name, IEnumerable<string> samplePa
             }
 
             var response = await Api.Client.PostAsync(GetUrl("/add"), form, cancellationToken).ConfigureAwait(false);
-            var responseAsString = await response.ReadAsStringAsync(EnableDebug).ConfigureAwait(false);
+            var responseAsString = await response.ReadAsStringAsync(EnableDebug, cancellationToken).ConfigureAwait(false);
             var voiceResponse = JsonSerializer.Deserialize<VoiceResponse>(responseAsString, ElevenLabsClient.JsonSerializationOptions);
             return await GetVoiceAsync(voiceResponse.VoiceId, cancellationToken: cancellationToken).ConfigureAwait(false);
         }