diff --git a/src/cli/FishAudio.CLI/CliRuntime.cs b/src/cli/FishAudio.CLI/CliRuntime.cs index 4532a98..99d5522 100644 --- a/src/cli/FishAudio.CLI/CliRuntime.cs +++ b/src/cli/FishAudio.CLI/CliRuntime.cs @@ -17,7 +17,7 @@ internal static class CliRuntime private static readonly string[] ApiKeyEnvironmentVariables = [@"FISHAUDIO_API_KEY"]; private const string CredentialFileDirectoryName = ".fish-audio"; - public static async Task CreateClientAsync(ParseResult parseResult, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task CreateClientAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { var apiKey = await TryResolveApiKeyAsync(parseResult, cancellationToken).ConfigureAwait(false); var authorizations = string.IsNullOrWhiteSpace(apiKey) @@ -46,7 +46,7 @@ internal static class CliRuntime "Design", "CA1031:Do not catch general exception types", Justification = "Generated CLI commands map unexpected failures to a stable exit code.")] - public static async Task RunAsync(Func action, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task RunAsync(Func action, CancellationToken cancellationToken = default) { try { @@ -75,13 +75,13 @@ public static async Task RunAsync(Func action, CancellationToken canc } } - public static async Task TryResolveApiKeyAsync(ParseResult parseResult, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task TryResolveApiKeyAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { var probe = await ProbeAuthAsync(parseResult, cancellationToken).ConfigureAwait(false); return probe.Active?.RawValue; } - public static async Task GetAuthStatusAsync(ParseResult parseResult, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task GetAuthStatusAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { var probe = await ProbeAuthAsync(parseResult, cancellationToken).ConfigureAwait(false); return new AuthStatusInfo( @@ -98,7 +98,7 @@ public static async Task GetAuthStatusAsync(ParseResult parseRes .ToArray()); } - public static async Task WriteUserSecretAsync(string name, string value, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteUserSecretAsync(string name, string value, CancellationToken cancellationToken = default) { var path = GetUserSecretsPath(); var directory = Path.GetDirectoryName(path); @@ -113,7 +113,7 @@ public static async Task WriteUserSecretAsync(string name, string value, Cancell await File.WriteAllTextAsync(path, json, cancellationToken).ConfigureAwait(false); } - public static async Task ClearUserSecretAsync(string name, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task ClearUserSecretAsync(string name, CancellationToken cancellationToken = default) { var path = GetUserSecretsPath(); if (!File.Exists(path)) @@ -241,7 +241,7 @@ public static TimeSpan ParseDuration(string value, string optionName) - public static async Task ReadInputAsync( + public static async global::System.Threading.Tasks.Task ReadInputAsync( ParseResult parseResult, Option inputOption, Option requestJsonOption, @@ -284,7 +284,7 @@ public static TimeSpan ParseDuration(string value, string optionName) return await ReadFlexibleInputAsync(parseResult.GetValue(inputOption)!, cancellationToken).ConfigureAwait(false); } - public static async Task ReadRequestAsync( + public static async global::System.Threading.Tasks.Task ReadRequestAsync( ParseResult parseResult, Option inputOption, Option requestJsonOption, @@ -306,7 +306,7 @@ public static async Task ReadRequestAsync( : throw new CliException($"Unable to deserialize request JSON as {typeof(T).Name}."); } - public static async Task ReadRequestOrDefaultAsync( + public static async global::System.Threading.Tasks.Task ReadRequestOrDefaultAsync( ParseResult parseResult, Option inputOption, Option requestJsonOption, @@ -367,19 +367,19 @@ public static string SerializeStringArray(IEnumerable values) return JsonSerializer.Serialize(values.ToArray()); } - public static async Task WriteJsonAsync(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteJsonAsync(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default) { var json = JsonSerializer.Serialize(value, typeof(T), context); await WriteTextAsync(parseResult, PrettyJson(json), cancellationToken: cancellationToken).ConfigureAwait(false); } - public static async Task WriteJsonLineAsync(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteJsonLineAsync(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default) { var json = JsonSerializer.Serialize(value, typeof(T), context); await WriteTextAsync(parseResult, json + Environment.NewLine, append: true, cancellationToken: cancellationToken).ConfigureAwait(false); } - public static async Task WriteResponseAsync( + public static async global::System.Threading.Tasks.Task WriteResponseAsync( ParseResult parseResult, T value, JsonSerializerContext context, @@ -399,7 +399,7 @@ public static async Task WriteResponseAsync( await WriteTextAsync(parseResult, text, cancellationToken: cancellationToken).ConfigureAwait(false); } - public static async Task WriteResponseLineAsync( + public static async global::System.Threading.Tasks.Task WriteResponseLineAsync( ParseResult parseResult, T value, JsonSerializerContext context, @@ -419,7 +419,7 @@ public static async Task WriteResponseLineAsync( await WriteTextAsync(parseResult, text + Environment.NewLine, append: true, cancellationToken: cancellationToken).ConfigureAwait(false); } - public static async Task TryWriteOutputDirectoryAsync( + public static async global::System.Threading.Tasks.Task TryWriteOutputDirectoryAsync( ParseResult parseResult, T value, JsonSerializerContext context, @@ -445,7 +445,7 @@ public static async Task TryWriteOutputDirectoryAsync( return true; } - public static async Task WriteSuccessAsync(ParseResult parseResult, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteSuccessAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { if (parseResult.GetValue(CliOptions.Json)) { @@ -456,7 +456,7 @@ public static async Task WriteSuccessAsync(ParseResult parseResult, Cancellation await WriteTextAsync(parseResult, "success: true", cancellationToken: cancellationToken).ConfigureAwait(false); } - public static async Task WriteBinaryAsync(ParseResult parseResult, byte[] bytes, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteBinaryAsync(ParseResult parseResult, byte[] bytes, CancellationToken cancellationToken = default) { var outputPath = parseResult.GetValue(CliOptions.Output); if (string.IsNullOrWhiteSpace(outputPath)) @@ -467,7 +467,7 @@ public static async Task WriteBinaryAsync(ParseResult parseResult, byte[] bytes, await WriteBytesAsync(outputPath, bytes, cancellationToken).ConfigureAwait(false); } - public static async Task WriteStreamAsync(ParseResult parseResult, Stream stream, CancellationToken cancellationToken = default) + public static async global::System.Threading.Tasks.Task WriteStreamAsync(ParseResult parseResult, Stream stream, CancellationToken cancellationToken = default) { var outputPath = parseResult.GetValue(CliOptions.Output); if (string.IsNullOrWhiteSpace(outputPath)) @@ -504,13 +504,13 @@ public static string MaskSecret(string secret) return string.IsNullOrWhiteSpace(baseUrl) ? null : new Uri(baseUrl, UriKind.Absolute); } - private static async Task ReadUserSecretAsync(string name, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task ReadUserSecretAsync(string name, CancellationToken cancellationToken = default) { var values = await ReadUserSecretsAsync(cancellationToken).ConfigureAwait(false); return values.TryGetValue(name, out var value) && !string.IsNullOrWhiteSpace(value) ? value : null; } - private static async Task ReadCredentialFileAsync(CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task ReadCredentialFileAsync(CancellationToken cancellationToken = default) { var path = GetCredentialFilePath(); if (string.IsNullOrWhiteSpace(path) || !File.Exists(path)) @@ -522,7 +522,7 @@ public static string MaskSecret(string secret) return string.IsNullOrWhiteSpace(value) ? null : value.Trim(); } - private static async Task> ReadUserSecretsAsync(CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task> ReadUserSecretsAsync(CancellationToken cancellationToken = default) { var path = GetUserSecretsPath(); if (!File.Exists(path)) @@ -540,7 +540,7 @@ private static async Task> ReadUserSecretsAsync(Cance new Dictionary(StringComparer.Ordinal); } - private static async Task WriteTextAsync(ParseResult parseResult, string text, bool append = false, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task WriteTextAsync(ParseResult parseResult, string text, bool append = false, CancellationToken cancellationToken = default) { var outputPath = parseResult.GetValue(CliOptions.Output); if (string.IsNullOrWhiteSpace(outputPath)) @@ -570,7 +570,7 @@ private static async Task WriteTextAsync(ParseResult parseResult, string text, b } } - private static async Task WriteBytesAsync(string outputPath, byte[] bytes, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task WriteBytesAsync(string outputPath, byte[] bytes, CancellationToken cancellationToken = default) { var directory = Path.GetDirectoryName(outputPath); if (!string.IsNullOrWhiteSpace(directory)) @@ -586,12 +586,12 @@ private static bool EndsWithUnit(string value, char unit) return value.Length > 1 && value[^1] == unit; } - private static async Task WriteDeprecatedOptionWarningAsync(string oldOption, string replacement) + private static async global::System.Threading.Tasks.Task WriteDeprecatedOptionWarningAsync(string oldOption, string replacement) { await Console.Error.WriteLineAsync($"Warning: {oldOption} is deprecated; use {replacement}.").ConfigureAwait(false); } - private static async Task ReadFlexibleInputAsync(string input, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task ReadFlexibleInputAsync(string input, CancellationToken cancellationToken = default) { if (string.IsNullOrWhiteSpace(input)) { @@ -612,7 +612,7 @@ private static async Task ReadFlexibleInputAsync(string input, Cancellat return await ReadFileOrStdinAsync(input, cancellationToken).ConfigureAwait(false); } - private static async Task ReadFileOrStdinAsync(string pathOrDash, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task ReadFileOrStdinAsync(string pathOrDash, CancellationToken cancellationToken = default) { if (pathOrDash == "-") { @@ -830,7 +830,7 @@ private static void AppendLine(StringBuilder builder, int indent, string value) builder.AppendLine(value); } - private static async Task WriteItemFilesAsync(string outputDirectory, JsonArray items, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task WriteItemFilesAsync(string outputDirectory, JsonArray items, CancellationToken cancellationToken = default) { Directory.CreateDirectory(outputDirectory); @@ -880,7 +880,7 @@ await File.WriteAllTextAsync( } } - private static async Task TryWriteTextPropertyAsync( + private static async global::System.Threading.Tasks.Task TryWriteTextPropertyAsync( JsonObject item, string outputDirectory, string baseName, @@ -946,7 +946,7 @@ private static string SanitizeFileName(string value) return normalized; } - private static async Task WriteApiExceptionAsync(global::FishAudio.ApiException exception) + private static async global::System.Threading.Tasks.Task WriteApiExceptionAsync(global::FishAudio.ApiException exception) { var builder = new StringBuilder(); builder.Append("API error "); @@ -974,7 +974,7 @@ private static string PrettyJson(string json) return Encoding.UTF8.GetString(stream.ToArray()); } - private static async Task ProbeAuthAsync(ParseResult parseResult, CancellationToken cancellationToken = default) + private static async global::System.Threading.Tasks.Task ProbeAuthAsync(ParseResult parseResult, CancellationToken cancellationToken = default) { var optionSource = new AuthSourceProbe( Source: "option", diff --git a/src/cli/FishAudio.CLI/Commands/ModelCreateModelCommandApiCommand.g.cs b/src/cli/FishAudio.CLI/Commands/ModelCreateModelCommandApiCommand.g.cs index 54b138f..eaaeb0b 100644 --- a/src/cli/FishAudio.CLI/Commands/ModelCreateModelCommandApiCommand.g.cs +++ b/src/cli/FishAudio.CLI/Commands/ModelCreateModelCommandApiCommand.g.cs @@ -155,18 +155,18 @@ await CliRuntime.RunAsync(async () => RequestFile, global::FishAudio.SourceGenerationContext.Default, cancellationToken).ConfigureAwait(false); - var visibility = CliRuntime.WasSpecified(parseResult, Visibility) ? parseResult.GetValue(Visibility) : __requestBase is not null ? __requestBase.Visibility : default; + var visibility = CliRuntime.WasSpecified(parseResult, Visibility) ? parseResult.GetValue(Visibility) : (__requestBase is { } __VisibilityBaseValue ? __VisibilityBaseValue.Visibility : default); var type = parseResult.GetRequiredValue(Type); var title = parseResult.GetRequiredValue(Title); - var description = CliRuntime.WasSpecified(parseResult, DescriptionOption) ? parseResult.GetValue(DescriptionOption) : __requestBase is not null ? __requestBase.Description : default; - var coverImage = CliRuntime.WasSpecified(parseResult, CoverImage) ? parseResult.GetValue(CoverImage) : __requestBase is not null ? __requestBase.CoverImage : default; - var coverImagename = CliRuntime.WasSpecified(parseResult, CoverImagename) ? parseResult.GetValue(CoverImagename) : __requestBase is not null ? __requestBase.CoverImagename : default; + var description = CliRuntime.WasSpecified(parseResult, DescriptionOption) ? parseResult.GetValue(DescriptionOption) : (__requestBase is { } __DescriptionBaseValue ? __DescriptionBaseValue.Description : default); + var coverImage = CliRuntime.WasSpecified(parseResult, CoverImage) ? parseResult.GetValue(CoverImage) : (__requestBase is { } __CoverImageBaseValue ? __CoverImageBaseValue.CoverImage : default); + var coverImagename = CliRuntime.WasSpecified(parseResult, CoverImagename) ? parseResult.GetValue(CoverImagename) : (__requestBase is { } __CoverImagenameBaseValue ? __CoverImagenameBaseValue.CoverImagename : default); var trainMode = parseResult.GetRequiredValue(TrainMode); var voices = parseResult.GetRequiredValue(Voices); - var texts = CliRuntime.WasSpecified(parseResult, Texts) ? parseResult.GetValue(Texts) : __requestBase is not null ? __requestBase.Texts : default; - var tags = CliRuntime.WasSpecified(parseResult, Tags) ? parseResult.GetValue(Tags) : __requestBase is not null ? __requestBase.Tags : default; - var enhanceAudioQuality = CliRuntime.WasSpecified(parseResult, EnhanceAudioQuality) ? parseResult.GetValue(EnhanceAudioQuality) : __requestBase is not null ? __requestBase.EnhanceAudioQuality : default; - var generateSample = CliRuntime.WasSpecified(parseResult, GenerateSample) ? parseResult.GetValue(GenerateSample) : __requestBase is not null ? __requestBase.GenerateSample : default; + var texts = CliRuntime.WasSpecified(parseResult, Texts) ? parseResult.GetValue(Texts) : (__requestBase is { } __TextsBaseValue ? __TextsBaseValue.Texts : default); + var tags = CliRuntime.WasSpecified(parseResult, Tags) ? parseResult.GetValue(Tags) : (__requestBase is { } __TagsBaseValue ? __TagsBaseValue.Tags : default); + var enhanceAudioQuality = CliRuntime.WasSpecified(parseResult, EnhanceAudioQuality) ? parseResult.GetValue(EnhanceAudioQuality) : (__requestBase is { } __EnhanceAudioQualityBaseValue ? __EnhanceAudioQualityBaseValue.EnhanceAudioQuality : default); + var generateSample = CliRuntime.WasSpecified(parseResult, GenerateSample) ? parseResult.GetValue(GenerateSample) : (__requestBase is { } __GenerateSampleBaseValue ? __GenerateSampleBaseValue.GenerateSample : default); using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false); diff --git a/src/cli/FishAudio.CLI/Commands/ModelEditModelByIdCommandApiCommand.g.cs b/src/cli/FishAudio.CLI/Commands/ModelEditModelByIdCommandApiCommand.g.cs index 40bab74..eba3acc 100644 --- a/src/cli/FishAudio.CLI/Commands/ModelEditModelByIdCommandApiCommand.g.cs +++ b/src/cli/FishAudio.CLI/Commands/ModelEditModelByIdCommandApiCommand.g.cs @@ -101,12 +101,12 @@ await CliRuntime.RunAsync(async () => global::FishAudio.SourceGenerationContext.Default, cancellationToken).ConfigureAwait(false); var id = parseResult.GetRequiredValue(Id); - var title = CliRuntime.WasSpecified(parseResult, Title) ? parseResult.GetValue(Title) : __requestBase is not null ? __requestBase.Title : default; - var description = CliRuntime.WasSpecified(parseResult, DescriptionOption) ? parseResult.GetValue(DescriptionOption) : __requestBase is not null ? __requestBase.Description : default; - var coverImage = CliRuntime.WasSpecified(parseResult, CoverImage) ? parseResult.GetValue(CoverImage) : __requestBase is not null ? __requestBase.CoverImage : default; - var coverImagename = CliRuntime.WasSpecified(parseResult, CoverImagename) ? parseResult.GetValue(CoverImagename) : __requestBase is not null ? __requestBase.CoverImagename : default; - var visibility = CliRuntime.WasSpecified(parseResult, Visibility) ? parseResult.GetValue(Visibility) : __requestBase is not null ? __requestBase.Visibility : default; - var tags = CliRuntime.WasSpecified(parseResult, Tags) ? parseResult.GetValue(Tags) : __requestBase is not null ? __requestBase.Tags : default; + var title = CliRuntime.WasSpecified(parseResult, Title) ? parseResult.GetValue(Title) : (__requestBase is { } __TitleBaseValue ? __TitleBaseValue.Title : default); + var description = CliRuntime.WasSpecified(parseResult, DescriptionOption) ? parseResult.GetValue(DescriptionOption) : (__requestBase is { } __DescriptionBaseValue ? __DescriptionBaseValue.Description : default); + var coverImage = CliRuntime.WasSpecified(parseResult, CoverImage) ? parseResult.GetValue(CoverImage) : (__requestBase is { } __CoverImageBaseValue ? __CoverImageBaseValue.CoverImage : default); + var coverImagename = CliRuntime.WasSpecified(parseResult, CoverImagename) ? parseResult.GetValue(CoverImagename) : (__requestBase is { } __CoverImagenameBaseValue ? __CoverImagenameBaseValue.CoverImagename : default); + var visibility = CliRuntime.WasSpecified(parseResult, Visibility) ? parseResult.GetValue(Visibility) : (__requestBase is { } __VisibilityBaseValue ? __VisibilityBaseValue.Visibility : default); + var tags = CliRuntime.WasSpecified(parseResult, Tags) ? parseResult.GetValue(Tags) : (__requestBase is { } __TagsBaseValue ? __TagsBaseValue.Tags : default); using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false); diff --git a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateAsrCommandApiCommand.g.cs b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateAsrCommandApiCommand.g.cs index 3693d63..24e6280 100644 --- a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateAsrCommandApiCommand.g.cs +++ b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateAsrCommandApiCommand.g.cs @@ -101,8 +101,8 @@ await CliRuntime.RunAsync(async () => cancellationToken).ConfigureAwait(false); var audio = parseResult.GetRequiredValue(Audio); var audioname = parseResult.GetRequiredValue(Audioname); - var language = CliRuntime.WasSpecified(parseResult, Language) ? parseResult.GetValue(Language) : __requestBase is not null ? __requestBase.Language : default; - var ignoreTimestamps = CliRuntime.WasSpecified(parseResult, IgnoreTimestamps) ? parseResult.GetValue(IgnoreTimestamps) : __requestBase is not null ? __requestBase.IgnoreTimestamps : default; + var language = CliRuntime.WasSpecified(parseResult, Language) ? parseResult.GetValue(Language) : (__requestBase is { } __LanguageBaseValue ? __LanguageBaseValue.Language : default); + var ignoreTimestamps = CliRuntime.WasSpecified(parseResult, IgnoreTimestamps) ? parseResult.GetValue(IgnoreTimestamps) : (__requestBase is { } __IgnoreTimestampsBaseValue ? __IgnoreTimestampsBaseValue.IgnoreTimestamps : default); using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false); diff --git a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsCommandApiCommand.g.cs b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsCommandApiCommand.g.cs index 88c6cae..2ba89e4 100644 --- a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsCommandApiCommand.g.cs +++ b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsCommandApiCommand.g.cs @@ -180,26 +180,26 @@ await CliRuntime.RunAsync(async () => cancellationToken).ConfigureAwait(false); var model = parseResult.GetRequiredValue(Model); var text = parseResult.GetRequiredValue(Text); - var temperature = CliRuntime.WasSpecified(parseResult, Temperature) ? parseResult.GetValue(Temperature) : __requestBase is not null ? __requestBase.Temperature : default; - var topP = CliRuntime.WasSpecified(parseResult, TopP) ? parseResult.GetValue(TopP) : __requestBase is not null ? __requestBase.TopP : default; - var references = CliRuntime.WasSpecified(parseResult, References) ? parseResult.GetValue(References) : __requestBase is not null ? __requestBase.References : default; - var referenceId = CliRuntime.WasSpecified(parseResult, ReferenceId) ? parseResult.GetValue(ReferenceId) : __requestBase is not null ? __requestBase.ReferenceId : default; - var chunkLength = CliRuntime.WasSpecified(parseResult, ChunkLength) ? parseResult.GetValue(ChunkLength) : __requestBase is not null ? __requestBase.ChunkLength : default; - var normalize = CliRuntime.WasSpecified(parseResult, Normalize) ? parseResult.GetValue(Normalize) : __requestBase is not null ? __requestBase.Normalize : default; - var format = CliRuntime.WasSpecified(parseResult, Format) ? parseResult.GetValue(Format) : __requestBase is not null ? __requestBase.Format : default; - var sampleRate = CliRuntime.WasSpecified(parseResult, SampleRate) ? parseResult.GetValue(SampleRate) : __requestBase is not null ? __requestBase.SampleRate : default; - var mp3Bitrate = CliRuntime.WasSpecified(parseResult, Mp3Bitrate) ? parseResult.GetValue(Mp3Bitrate) : __requestBase is not null ? __requestBase.Mp3Bitrate : default; - var opusBitrate = CliRuntime.WasSpecified(parseResult, OpusBitrate) ? parseResult.GetValue(OpusBitrate) : __requestBase is not null ? __requestBase.OpusBitrate : default; - var latency = CliRuntime.WasSpecified(parseResult, Latency) ? parseResult.GetValue(Latency) : __requestBase is not null ? __requestBase.Latency : default; - var maxNewTokens = CliRuntime.WasSpecified(parseResult, MaxNewTokens) ? parseResult.GetValue(MaxNewTokens) : __requestBase is not null ? __requestBase.MaxNewTokens : default; - var repetitionPenalty = CliRuntime.WasSpecified(parseResult, RepetitionPenalty) ? parseResult.GetValue(RepetitionPenalty) : __requestBase is not null ? __requestBase.RepetitionPenalty : default; - var minChunkLength = CliRuntime.WasSpecified(parseResult, MinChunkLength) ? parseResult.GetValue(MinChunkLength) : __requestBase is not null ? __requestBase.MinChunkLength : default; - var conditionOnPreviousChunks = CliRuntime.WasSpecified(parseResult, ConditionOnPreviousChunks) ? parseResult.GetValue(ConditionOnPreviousChunks) : __requestBase is not null ? __requestBase.ConditionOnPreviousChunks : default; - var earlyStopThreshold = CliRuntime.WasSpecified(parseResult, EarlyStopThreshold) ? parseResult.GetValue(EarlyStopThreshold) : __requestBase is not null ? __requestBase.EarlyStopThreshold : default; - - var __prosodyBase = __requestBase?.Prosody; var prosodySpeed = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) ? parseResult.GetValue(ProsodyOptions.Speed) : __prosodyBase is not null ? __prosodyBase.Speed : default; - var prosodyVolume = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) ? parseResult.GetValue(ProsodyOptions.Volume) : __prosodyBase is not null ? __prosodyBase.Volume : default; - var prosodyNormalizeLoudness = CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness) ? parseResult.GetValue(ProsodyOptions.NormalizeLoudness) : __prosodyBase is not null ? __prosodyBase.NormalizeLoudness : default; + var temperature = CliRuntime.WasSpecified(parseResult, Temperature) ? parseResult.GetValue(Temperature) : (__requestBase is { } __TemperatureBaseValue ? __TemperatureBaseValue.Temperature : default); + var topP = CliRuntime.WasSpecified(parseResult, TopP) ? parseResult.GetValue(TopP) : (__requestBase is { } __TopPBaseValue ? __TopPBaseValue.TopP : default); + var references = CliRuntime.WasSpecified(parseResult, References) ? parseResult.GetValue(References) : (__requestBase is { } __ReferencesBaseValue ? __ReferencesBaseValue.References : default); + var referenceId = CliRuntime.WasSpecified(parseResult, ReferenceId) ? parseResult.GetValue(ReferenceId) : (__requestBase is { } __ReferenceIdBaseValue ? __ReferenceIdBaseValue.ReferenceId : default); + var chunkLength = CliRuntime.WasSpecified(parseResult, ChunkLength) ? parseResult.GetValue(ChunkLength) : (__requestBase is { } __ChunkLengthBaseValue ? __ChunkLengthBaseValue.ChunkLength : default); + var normalize = CliRuntime.WasSpecified(parseResult, Normalize) ? parseResult.GetValue(Normalize) : (__requestBase is { } __NormalizeBaseValue ? __NormalizeBaseValue.Normalize : default); + var format = CliRuntime.WasSpecified(parseResult, Format) ? parseResult.GetValue(Format) : (__requestBase is { } __FormatBaseValue ? __FormatBaseValue.Format : default); + var sampleRate = CliRuntime.WasSpecified(parseResult, SampleRate) ? parseResult.GetValue(SampleRate) : (__requestBase is { } __SampleRateBaseValue ? __SampleRateBaseValue.SampleRate : default); + var mp3Bitrate = CliRuntime.WasSpecified(parseResult, Mp3Bitrate) ? parseResult.GetValue(Mp3Bitrate) : (__requestBase is { } __Mp3BitrateBaseValue ? __Mp3BitrateBaseValue.Mp3Bitrate : default); + var opusBitrate = CliRuntime.WasSpecified(parseResult, OpusBitrate) ? parseResult.GetValue(OpusBitrate) : (__requestBase is { } __OpusBitrateBaseValue ? __OpusBitrateBaseValue.OpusBitrate : default); + var latency = CliRuntime.WasSpecified(parseResult, Latency) ? parseResult.GetValue(Latency) : (__requestBase is { } __LatencyBaseValue ? __LatencyBaseValue.Latency : default); + var maxNewTokens = CliRuntime.WasSpecified(parseResult, MaxNewTokens) ? parseResult.GetValue(MaxNewTokens) : (__requestBase is { } __MaxNewTokensBaseValue ? __MaxNewTokensBaseValue.MaxNewTokens : default); + var repetitionPenalty = CliRuntime.WasSpecified(parseResult, RepetitionPenalty) ? parseResult.GetValue(RepetitionPenalty) : (__requestBase is { } __RepetitionPenaltyBaseValue ? __RepetitionPenaltyBaseValue.RepetitionPenalty : default); + var minChunkLength = CliRuntime.WasSpecified(parseResult, MinChunkLength) ? parseResult.GetValue(MinChunkLength) : (__requestBase is { } __MinChunkLengthBaseValue ? __MinChunkLengthBaseValue.MinChunkLength : default); + var conditionOnPreviousChunks = CliRuntime.WasSpecified(parseResult, ConditionOnPreviousChunks) ? parseResult.GetValue(ConditionOnPreviousChunks) : (__requestBase is { } __ConditionOnPreviousChunksBaseValue ? __ConditionOnPreviousChunksBaseValue.ConditionOnPreviousChunks : default); + var earlyStopThreshold = CliRuntime.WasSpecified(parseResult, EarlyStopThreshold) ? parseResult.GetValue(EarlyStopThreshold) : (__requestBase is { } __EarlyStopThresholdBaseValue ? __EarlyStopThresholdBaseValue.EarlyStopThreshold : default); + + var __prosodyBase = __requestBase is { } __ProsodyBaseValue ? __ProsodyBaseValue.Prosody : default; var prosodySpeed = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) ? parseResult.GetValue(ProsodyOptions.Speed) : (__prosodyBase is { } __ProsodyspeedBaseValue ? __ProsodyspeedBaseValue.Speed : default); + var prosodyVolume = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) ? parseResult.GetValue(ProsodyOptions.Volume) : (__prosodyBase is { } __ProsodyvolumeBaseValue ? __ProsodyvolumeBaseValue.Volume : default); + var prosodyNormalizeLoudness = CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness) ? parseResult.GetValue(ProsodyOptions.NormalizeLoudness) : (__prosodyBase is { } __ProsodynormalizeLoudnessBaseValue ? __ProsodynormalizeLoudnessBaseValue.NormalizeLoudness : default); var __prosodySpecified = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) || CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) || CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness); var prosody = __prosodySpecified || __prosodyBase is not null diff --git a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsStreamWithTimestampCommandApiCommand.g.cs b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsStreamWithTimestampCommandApiCommand.g.cs index 0c3647a..257ba5e 100644 --- a/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsStreamWithTimestampCommandApiCommand.g.cs +++ b/src/cli/FishAudio.CLI/Commands/OpenAPIV1CreateTtsStreamWithTimestampCommandApiCommand.g.cs @@ -180,26 +180,26 @@ await CliRuntime.RunAsync(async () => cancellationToken).ConfigureAwait(false); var model = parseResult.GetRequiredValue(Model); var text = parseResult.GetRequiredValue(Text); - var temperature = CliRuntime.WasSpecified(parseResult, Temperature) ? parseResult.GetValue(Temperature) : __requestBase is not null ? __requestBase.Temperature : default; - var topP = CliRuntime.WasSpecified(parseResult, TopP) ? parseResult.GetValue(TopP) : __requestBase is not null ? __requestBase.TopP : default; - var references = CliRuntime.WasSpecified(parseResult, References) ? parseResult.GetValue(References) : __requestBase is not null ? __requestBase.References : default; - var referenceId = CliRuntime.WasSpecified(parseResult, ReferenceId) ? parseResult.GetValue(ReferenceId) : __requestBase is not null ? __requestBase.ReferenceId : default; - var chunkLength = CliRuntime.WasSpecified(parseResult, ChunkLength) ? parseResult.GetValue(ChunkLength) : __requestBase is not null ? __requestBase.ChunkLength : default; - var normalize = CliRuntime.WasSpecified(parseResult, Normalize) ? parseResult.GetValue(Normalize) : __requestBase is not null ? __requestBase.Normalize : default; - var format = CliRuntime.WasSpecified(parseResult, Format) ? parseResult.GetValue(Format) : __requestBase is not null ? __requestBase.Format : default; - var sampleRate = CliRuntime.WasSpecified(parseResult, SampleRate) ? parseResult.GetValue(SampleRate) : __requestBase is not null ? __requestBase.SampleRate : default; - var mp3Bitrate = CliRuntime.WasSpecified(parseResult, Mp3Bitrate) ? parseResult.GetValue(Mp3Bitrate) : __requestBase is not null ? __requestBase.Mp3Bitrate : default; - var opusBitrate = CliRuntime.WasSpecified(parseResult, OpusBitrate) ? parseResult.GetValue(OpusBitrate) : __requestBase is not null ? __requestBase.OpusBitrate : default; - var latency = CliRuntime.WasSpecified(parseResult, Latency) ? parseResult.GetValue(Latency) : __requestBase is not null ? __requestBase.Latency : default; - var maxNewTokens = CliRuntime.WasSpecified(parseResult, MaxNewTokens) ? parseResult.GetValue(MaxNewTokens) : __requestBase is not null ? __requestBase.MaxNewTokens : default; - var repetitionPenalty = CliRuntime.WasSpecified(parseResult, RepetitionPenalty) ? parseResult.GetValue(RepetitionPenalty) : __requestBase is not null ? __requestBase.RepetitionPenalty : default; - var minChunkLength = CliRuntime.WasSpecified(parseResult, MinChunkLength) ? parseResult.GetValue(MinChunkLength) : __requestBase is not null ? __requestBase.MinChunkLength : default; - var conditionOnPreviousChunks = CliRuntime.WasSpecified(parseResult, ConditionOnPreviousChunks) ? parseResult.GetValue(ConditionOnPreviousChunks) : __requestBase is not null ? __requestBase.ConditionOnPreviousChunks : default; - var earlyStopThreshold = CliRuntime.WasSpecified(parseResult, EarlyStopThreshold) ? parseResult.GetValue(EarlyStopThreshold) : __requestBase is not null ? __requestBase.EarlyStopThreshold : default; - - var __prosodyBase = __requestBase?.Prosody; var prosodySpeed = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) ? parseResult.GetValue(ProsodyOptions.Speed) : __prosodyBase is not null ? __prosodyBase.Speed : default; - var prosodyVolume = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) ? parseResult.GetValue(ProsodyOptions.Volume) : __prosodyBase is not null ? __prosodyBase.Volume : default; - var prosodyNormalizeLoudness = CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness) ? parseResult.GetValue(ProsodyOptions.NormalizeLoudness) : __prosodyBase is not null ? __prosodyBase.NormalizeLoudness : default; + var temperature = CliRuntime.WasSpecified(parseResult, Temperature) ? parseResult.GetValue(Temperature) : (__requestBase is { } __TemperatureBaseValue ? __TemperatureBaseValue.Temperature : default); + var topP = CliRuntime.WasSpecified(parseResult, TopP) ? parseResult.GetValue(TopP) : (__requestBase is { } __TopPBaseValue ? __TopPBaseValue.TopP : default); + var references = CliRuntime.WasSpecified(parseResult, References) ? parseResult.GetValue(References) : (__requestBase is { } __ReferencesBaseValue ? __ReferencesBaseValue.References : default); + var referenceId = CliRuntime.WasSpecified(parseResult, ReferenceId) ? parseResult.GetValue(ReferenceId) : (__requestBase is { } __ReferenceIdBaseValue ? __ReferenceIdBaseValue.ReferenceId : default); + var chunkLength = CliRuntime.WasSpecified(parseResult, ChunkLength) ? parseResult.GetValue(ChunkLength) : (__requestBase is { } __ChunkLengthBaseValue ? __ChunkLengthBaseValue.ChunkLength : default); + var normalize = CliRuntime.WasSpecified(parseResult, Normalize) ? parseResult.GetValue(Normalize) : (__requestBase is { } __NormalizeBaseValue ? __NormalizeBaseValue.Normalize : default); + var format = CliRuntime.WasSpecified(parseResult, Format) ? parseResult.GetValue(Format) : (__requestBase is { } __FormatBaseValue ? __FormatBaseValue.Format : default); + var sampleRate = CliRuntime.WasSpecified(parseResult, SampleRate) ? parseResult.GetValue(SampleRate) : (__requestBase is { } __SampleRateBaseValue ? __SampleRateBaseValue.SampleRate : default); + var mp3Bitrate = CliRuntime.WasSpecified(parseResult, Mp3Bitrate) ? parseResult.GetValue(Mp3Bitrate) : (__requestBase is { } __Mp3BitrateBaseValue ? __Mp3BitrateBaseValue.Mp3Bitrate : default); + var opusBitrate = CliRuntime.WasSpecified(parseResult, OpusBitrate) ? parseResult.GetValue(OpusBitrate) : (__requestBase is { } __OpusBitrateBaseValue ? __OpusBitrateBaseValue.OpusBitrate : default); + var latency = CliRuntime.WasSpecified(parseResult, Latency) ? parseResult.GetValue(Latency) : (__requestBase is { } __LatencyBaseValue ? __LatencyBaseValue.Latency : default); + var maxNewTokens = CliRuntime.WasSpecified(parseResult, MaxNewTokens) ? parseResult.GetValue(MaxNewTokens) : (__requestBase is { } __MaxNewTokensBaseValue ? __MaxNewTokensBaseValue.MaxNewTokens : default); + var repetitionPenalty = CliRuntime.WasSpecified(parseResult, RepetitionPenalty) ? parseResult.GetValue(RepetitionPenalty) : (__requestBase is { } __RepetitionPenaltyBaseValue ? __RepetitionPenaltyBaseValue.RepetitionPenalty : default); + var minChunkLength = CliRuntime.WasSpecified(parseResult, MinChunkLength) ? parseResult.GetValue(MinChunkLength) : (__requestBase is { } __MinChunkLengthBaseValue ? __MinChunkLengthBaseValue.MinChunkLength : default); + var conditionOnPreviousChunks = CliRuntime.WasSpecified(parseResult, ConditionOnPreviousChunks) ? parseResult.GetValue(ConditionOnPreviousChunks) : (__requestBase is { } __ConditionOnPreviousChunksBaseValue ? __ConditionOnPreviousChunksBaseValue.ConditionOnPreviousChunks : default); + var earlyStopThreshold = CliRuntime.WasSpecified(parseResult, EarlyStopThreshold) ? parseResult.GetValue(EarlyStopThreshold) : (__requestBase is { } __EarlyStopThresholdBaseValue ? __EarlyStopThresholdBaseValue.EarlyStopThreshold : default); + + var __prosodyBase = __requestBase is { } __ProsodyBaseValue ? __ProsodyBaseValue.Prosody : default; var prosodySpeed = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) ? parseResult.GetValue(ProsodyOptions.Speed) : (__prosodyBase is { } __ProsodyspeedBaseValue ? __ProsodyspeedBaseValue.Speed : default); + var prosodyVolume = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) ? parseResult.GetValue(ProsodyOptions.Volume) : (__prosodyBase is { } __ProsodyvolumeBaseValue ? __ProsodyvolumeBaseValue.Volume : default); + var prosodyNormalizeLoudness = CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness) ? parseResult.GetValue(ProsodyOptions.NormalizeLoudness) : (__prosodyBase is { } __ProsodynormalizeLoudnessBaseValue ? __ProsodynormalizeLoudnessBaseValue.NormalizeLoudness : default); var __prosodySpecified = CliRuntime.WasSpecified(parseResult, ProsodyOptions.Speed) || CliRuntime.WasSpecified(parseResult, ProsodyOptions.Volume) || CliRuntime.WasSpecified(parseResult, ProsodyOptions.NormalizeLoudness); var prosody = __prosodySpecified || __prosodyBase is not null