Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions src/libs/tryAGI.OpenAI.CLI/GeneratedApi/CliRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal static class CliRuntime
private static readonly string[] ApiKeyEnvironmentVariables = [@"OPENAI_API_KEY"];
private const string CredentialFileDirectoryName = ".open-ai";

public static async Task<global::tryAGI.OpenAI.OpenAiClient> CreateClientAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task<global::tryAGI.OpenAI.OpenAiClient> CreateClientAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
{
var apiKey = await TryResolveApiKeyAsync(parseResult, cancellationToken).ConfigureAwait(false);
var authorizations = string.IsNullOrWhiteSpace(apiKey)
Expand Down Expand Up @@ -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<int> RunAsync(Func<Task> action, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task<int> RunAsync(Func<global::System.Threading.Tasks.Task> action, CancellationToken cancellationToken = default)
{
try
{
Expand Down Expand Up @@ -75,13 +75,13 @@ public static async Task<int> RunAsync(Func<Task> action, CancellationToken canc
}
}

public static async Task<string?> TryResolveApiKeyAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task<string?> TryResolveApiKeyAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
{
var probe = await ProbeAuthAsync(parseResult, cancellationToken).ConfigureAwait(false);
return probe.Active?.RawValue;
}

public static async Task<AuthStatusInfo> GetAuthStatusAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task<AuthStatusInfo> GetAuthStatusAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
{
var probe = await ProbeAuthAsync(parseResult, cancellationToken).ConfigureAwait(false);
return new AuthStatusInfo(
Expand All @@ -98,7 +98,7 @@ public static async Task<AuthStatusInfo> 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);
Expand All @@ -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))
Expand Down Expand Up @@ -241,7 +241,7 @@ public static TimeSpan ParseDuration(string value, string optionName)



public static async Task<string?> ReadInputAsync(
public static async global::System.Threading.Tasks.Task<string?> ReadInputAsync(
ParseResult parseResult,
Option<string?> inputOption,
Option<string?> requestJsonOption,
Expand Down Expand Up @@ -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<T> ReadRequestAsync<T>(
public static async global::System.Threading.Tasks.Task<T> ReadRequestAsync<T>(
ParseResult parseResult,
Option<string?> inputOption,
Option<string?> requestJsonOption,
Expand All @@ -306,7 +306,7 @@ public static async Task<T> ReadRequestAsync<T>(
: throw new CliException($"Unable to deserialize request JSON as {typeof(T).Name}.");
}

public static async Task<T?> ReadRequestOrDefaultAsync<T>(
public static async global::System.Threading.Tasks.Task<T?> ReadRequestOrDefaultAsync<T>(
ParseResult parseResult,
Option<string?> inputOption,
Option<string?> requestJsonOption,
Expand Down Expand Up @@ -367,19 +367,19 @@ public static string SerializeStringArray(IEnumerable<string> values)
return JsonSerializer.Serialize(values.ToArray());
}

public static async Task WriteJsonAsync<T>(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task WriteJsonAsync<T>(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<T>(ParseResult parseResult, T value, JsonSerializerContext context, CancellationToken cancellationToken = default)
public static async global::System.Threading.Tasks.Task WriteJsonLineAsync<T>(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<T>(
public static async global::System.Threading.Tasks.Task WriteResponseAsync<T>(
ParseResult parseResult,
T value,
JsonSerializerContext context,
Expand All @@ -399,7 +399,7 @@ public static async Task WriteResponseAsync<T>(
await WriteTextAsync(parseResult, text, cancellationToken: cancellationToken).ConfigureAwait(false);
}

public static async Task WriteResponseLineAsync<T>(
public static async global::System.Threading.Tasks.Task WriteResponseLineAsync<T>(
ParseResult parseResult,
T value,
JsonSerializerContext context,
Expand All @@ -419,7 +419,7 @@ public static async Task WriteResponseLineAsync<T>(
await WriteTextAsync(parseResult, text + Environment.NewLine, append: true, cancellationToken: cancellationToken).ConfigureAwait(false);
}

public static async Task<bool> TryWriteOutputDirectoryAsync<T>(
public static async global::System.Threading.Tasks.Task<bool> TryWriteOutputDirectoryAsync<T>(
ParseResult parseResult,
T value,
JsonSerializerContext context,
Expand All @@ -445,7 +445,7 @@ public static async Task<bool> TryWriteOutputDirectoryAsync<T>(
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))
{
Expand All @@ -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))
Expand All @@ -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))
Expand Down Expand Up @@ -504,13 +504,13 @@ public static string MaskSecret(string secret)
return string.IsNullOrWhiteSpace(baseUrl) ? null : new Uri(baseUrl, UriKind.Absolute);
}

private static async Task<string?> ReadUserSecretAsync(string name, CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<string?> 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<string?> ReadCredentialFileAsync(CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<string?> ReadCredentialFileAsync(CancellationToken cancellationToken = default)
{
var path = GetCredentialFilePath();
if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
Expand All @@ -522,7 +522,7 @@ public static string MaskSecret(string secret)
return string.IsNullOrWhiteSpace(value) ? null : value.Trim();
}

private static async Task<Dictionary<string, string>> ReadUserSecretsAsync(CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<Dictionary<string, string>> ReadUserSecretsAsync(CancellationToken cancellationToken = default)
{
var path = GetUserSecretsPath();
if (!File.Exists(path))
Expand All @@ -540,7 +540,7 @@ private static async Task<Dictionary<string, string>> ReadUserSecretsAsync(Cance
new Dictionary<string, string>(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))
Expand Down Expand Up @@ -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))
Expand All @@ -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<string> ReadFlexibleInputAsync(string input, CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<string> ReadFlexibleInputAsync(string input, CancellationToken cancellationToken = default)
{
if (string.IsNullOrWhiteSpace(input))
{
Expand All @@ -612,7 +612,7 @@ private static async Task<string> ReadFlexibleInputAsync(string input, Cancellat
return await ReadFileOrStdinAsync(input, cancellationToken).ConfigureAwait(false);
}

private static async Task<string> ReadFileOrStdinAsync(string pathOrDash, CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<string> ReadFileOrStdinAsync(string pathOrDash, CancellationToken cancellationToken = default)
{
if (pathOrDash == "-")
{
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -880,7 +880,7 @@ await File.WriteAllTextAsync(
}
}

private static async Task<bool> TryWriteTextPropertyAsync(
private static async global::System.Threading.Tasks.Task<bool> TryWriteTextPropertyAsync(
JsonObject item,
string outputDirectory,
string baseName,
Expand Down Expand Up @@ -946,7 +946,7 @@ private static string SanitizeFileName(string value)
return normalized;
}

private static async Task WriteApiExceptionAsync(global::tryAGI.OpenAI.ApiException exception)
private static async global::System.Threading.Tasks.Task WriteApiExceptionAsync(global::tryAGI.OpenAI.ApiException exception)
{
var builder = new StringBuilder();
builder.Append("API error ");
Expand Down Expand Up @@ -974,7 +974,7 @@ private static string PrettyJson(string json)
return Encoding.UTF8.GetString(stream.ToArray());
}

private static async Task<AuthProbeResult> ProbeAuthAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
private static async global::System.Threading.Tasks.Task<AuthProbeResult> ProbeAuthAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
{
var optionSource = new AuthSourceProbe(
Source: "option",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ await CliRuntime.RunAsync(async () =>
var threadId = parseResult.GetRequiredValue(ThreadId);
var role = parseResult.GetRequiredValue(Role);
var content = parseResult.GetRequiredValue(Content);
var attachments = CliRuntime.WasSpecified(parseResult, Attachments) ? parseResult.GetValue(Attachments) : __requestBase is not null ? __requestBase.Attachments : default;
var metadata = CliRuntime.WasSpecified(parseResult, Metadata) ? parseResult.GetValue(Metadata) : __requestBase is not null ? __requestBase.Metadata : default;
var attachments = CliRuntime.WasSpecified(parseResult, Attachments) ? parseResult.GetValue(Attachments) : (__requestBase is { } __AttachmentsBaseValue ? __AttachmentsBaseValue.Attachments : default);
var metadata = CliRuntime.WasSpecified(parseResult, Metadata) ? parseResult.GetValue(Metadata) : (__requestBase is { } __MetadataBaseValue ? __MetadataBaseValue.Metadata : default);
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);


Expand Down
Loading