From 1828fe874606791f3ca4fdb61418029cd2ff98b4 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sat, 11 Nov 2023 08:28:48 -0500 Subject: [PATCH] ElevenLabs-DotNet 2.0.1 (#27) - Pass some cancellation tokens to internals --- ElevenLabs-DotNet/ElevenLabs-DotNet.csproj | 6 ++++-- .../Extensions/HttpResponseMessageExtensions.cs | 4 ++-- ElevenLabs-DotNet/History/HistoryEndpoint.cs | 6 +++--- .../VoiceGeneration/VoiceGenerationEndpoint.cs | 4 ++-- ElevenLabs-DotNet/Voices/VoicesEndpoint.cs | 12 ++++++------ 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj b/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj index e635d98..a096ce6 100644 --- a/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj +++ b/ElevenLabs-DotNet/ElevenLabs-DotNet.csproj @@ -14,8 +14,10 @@ RageAgainstThePixel 2023 ElevenLabs, AI, ML, Voice, TTS - 2.0.0 - Version 2.0.0 + 2.0.1 + 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 index 749542b..2b4e7fb 100644 --- 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 ReadAsStringAsync(this HttpResponseMessage response, bool debugResponse = false, [CallerMemberName] string methodName = null) + public static async Task 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 index 6f7b713..290bfe4 100644 --- a/ElevenLabs-DotNet/History/HistoryEndpoint.cs +++ b/ElevenLabs-DotNet/History/HistoryEndpoint.cs @@ -43,7 +43,7 @@ public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -56,7 +56,7 @@ public async Task GetHistoryAsync(int? pageSize = null, string star public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -98,7 +98,7 @@ public async Task DownloadHistoryAudioAsync(HistoryItem historyItem, public async Task 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 index 7c56837..08d3fc8 100644 --- 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 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -66,7 +66,7 @@ public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } } diff --git a/ElevenLabs-DotNet/Voices/VoicesEndpoint.cs b/ElevenLabs-DotNet/Voices/VoicesEndpoint.cs index 3e0bde6..95a39a4 100644 --- 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> 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(responseAsString, ElevenLabsClient.JsonSerializationOptions).Voices; var voiceSettingsTasks = new List(); @@ -70,7 +70,7 @@ async Task LocalGetVoiceSettings() public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -88,7 +88,7 @@ public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -107,7 +107,7 @@ public async Task 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); } @@ -127,7 +127,7 @@ public async Task 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 AddVoiceAsync(string name, IEnumerable 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(responseAsString, ElevenLabsClient.JsonSerializationOptions); return await GetVoiceAsync(voiceResponse.VoiceId, cancellationToken: cancellationToken).ConfigureAwait(false); }