Skip to content

Commit f71b006

Browse files
christotheschristothes
committed
wip
1 parent 1409d97 commit f71b006

11 files changed

+377
-183
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,11 +1481,13 @@ public class ChatClient {
14811481
public virtual string Model { get; }
14821482
public ClientPipeline Pipeline { get; }
14831483
public virtual ClientResult<ChatCompletion> CompleteChat(params ChatMessage[] messages);
1484+
public virtual ClientResult CompleteChat(CreateChatCompletionOptions options, RequestOptions requestOptions = null);
14841485
[Experimental("OPENAI001")]
14851486
public virtual ClientResult<ChatCompletionResult> CompleteChat(CreateChatCompletionOptions options, CancellationToken cancellationToken = default);
14861487
public virtual ClientResult CompleteChat(BinaryContent content, RequestOptions options = null);
14871488
public virtual ClientResult<ChatCompletion> CompleteChat(IEnumerable<ChatMessage> messages, ChatCompletionOptions options = null, CancellationToken cancellationToken = default);
14881489
public virtual Task<ClientResult<ChatCompletion>> CompleteChatAsync(params ChatMessage[] messages);
1490+
public virtual Task<ClientResult> CompleteChatAsync(CreateChatCompletionOptions options, RequestOptions requestOptions = null);
14891491
[Experimental("OPENAI001")]
14901492
public virtual Task<ClientResult<ChatCompletionResult>> CompleteChatAsync(CreateChatCompletionOptions options, CancellationToken cancellationToken = default);
14911493
public virtual Task<ClientResult> CompleteChatAsync(BinaryContent content, RequestOptions options = null);
@@ -1506,34 +1508,42 @@ public class ChatClient {
15061508
public virtual Task<ClientResult<ChatCompletionDeletionResult>> DeleteChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
15071509
[Experimental("OPENAI001")]
15081510
public virtual ClientResult GetChatCompletion(GetChatCompletionOptions options, RequestOptions requestOptions = null);
1511+
public virtual ClientResult<ChatCompletionResult> GetChatCompletion(GetChatCompletionOptions options, CancellationToken cancellationToken = default);
15091512
[Experimental("OPENAI001")]
15101513
public virtual ClientResult GetChatCompletion(string completionId, RequestOptions options);
15111514
[Experimental("OPENAI001")]
15121515
public virtual ClientResult<ChatCompletion> GetChatCompletion(string completionId, CancellationToken cancellationToken = default);
15131516
[Experimental("OPENAI001")]
1517+
public virtual Task<ClientResult> GetChatCompletionAsync(GetChatCompletionOptions options, RequestOptions requestOptions = null);
1518+
public virtual Task<ClientResult<ChatCompletionResult>> GetChatCompletionAsync(GetChatCompletionOptions options, CancellationToken cancellationToken = default);
1519+
[Experimental("OPENAI001")]
15141520
public virtual Task<ClientResult> GetChatCompletionAsync(string completionId, RequestOptions options);
15151521
[Experimental("OPENAI001")]
15161522
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
15171523
[Experimental("OPENAI001")]
1524+
public virtual CollectionResult GetChatCompletionMessages(GetChatCompletionMessageOptions options, RequestOptions requestOptions = null);
1525+
[Experimental("OPENAI001")]
1526+
public virtual ClientResult<ChatCompletionList> GetChatCompletionMessages(GetChatCompletionMessageOptions options, CancellationToken cancellationToken = default);
1527+
[Experimental("OPENAI001")]
15181528
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
15191529
[Experimental("OPENAI001")]
1520-
public virtual CollectionResult GetChatCompletionMessages(string completionId, string after, int? limit, string order, RequestOptions options);
1530+
public virtual AsyncCollectionResult GetChatCompletionMessagesAsync(GetChatCompletionMessageOptions options, RequestOptions requestOptions = null);
15211531
[Experimental("OPENAI001")]
1522-
public virtual AsyncCollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessagesAsync(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
1532+
public virtual Task<ClientResult<ChatCompletionList>> GetChatCompletionMessagesAsync(GetChatCompletionMessageOptions options, CancellationToken cancellationToken = default);
15231533
[Experimental("OPENAI001")]
1524-
public virtual AsyncCollectionResult GetChatCompletionMessagesAsync(string completionId, string after, int? limit, string order, RequestOptions options);
1534+
public virtual AsyncCollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessagesAsync(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
15251535
[Experimental("OPENAI001")]
15261536
public virtual CollectionResult<ChatCompletion> GetChatCompletions(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
15271537
[Experimental("OPENAI001")]
1528-
public virtual CollectionResult<ChatCompletionResult> GetChatCompletions(string after, int? limit, ChatCompletionCollectionOrder? order, IDictionary<string, string> metadata, string model = null, CancellationToken cancellationToken = default);
1538+
public virtual CollectionResult GetChatCompletions(GetChatCompletionsOptions options, RequestOptions requestOptions);
15291539
[Experimental("OPENAI001")]
1530-
public virtual CollectionResult GetChatCompletions(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1540+
public virtual ClientResult<ChatCompletionList> GetChatCompletions(GetChatCompletionsOptions options, CancellationToken cancellationToken = default);
15311541
[Experimental("OPENAI001")]
15321542
public virtual AsyncCollectionResult<ChatCompletion> GetChatCompletionsAsync(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
15331543
[Experimental("OPENAI001")]
1534-
public virtual AsyncCollectionResult<ChatCompletionResult> GetChatCompletionsAsync(string after, int? limit, ChatCompletionCollectionOrder? order, IDictionary<string, string> metadata, string model = null, CancellationToken cancellationToken = default);
1544+
public virtual AsyncCollectionResult GetChatCompletionsAsync(GetChatCompletionsOptions options, RequestOptions requestOptions);
15351545
[Experimental("OPENAI001")]
1536-
public virtual AsyncCollectionResult GetChatCompletionsAsync(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1546+
public virtual Task<ClientResult<ChatCompletionList>> GetChatCompletionsAsync(GetChatCompletionsOptions options, CancellationToken cancellationToken = default);
15371547
[Experimental("OPENAI001")]
15381548
public virtual ClientResult UpdateChatCompletion(UpdateChatCompletionOptions options, RequestOptions requestOptions = null);
15391549
[Experimental("OPENAI001")]
@@ -2415,10 +2425,26 @@ public class FunctionChatMessage : ChatMessage, IJsonModel<FunctionChatMessage>,
24152425
[Experimental("OPENAI001")]
24162426
protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
24172427
}
2418-
public class GetChatCompletionOptions {
2428+
public partial struct GetChatCompletionMessageOptions {
2429+
public GetChatCompletionMessageOptions(string completionId);
2430+
public string After { get; set; }
2431+
public string CompletionId { get; set; }
2432+
public int? Limit { get; set; }
2433+
public string Order { get; set; }
2434+
}
2435+
public partial struct GetChatCompletionOptions {
24192436
public GetChatCompletionOptions(string completionId);
24202437
public string CompletionId { get; set; }
24212438
}
2439+
public class GetChatCompletionsOptions {
2440+
public GetChatCompletionsOptions(string model);
2441+
public string After { get; set; }
2442+
public int? Limit { get; set; }
2443+
public IDictionary<string, string> Metadata { get; set; }
2444+
public string Model { get; set; }
2445+
public string Order { get; set; }
2446+
public static GetChatCompletionsOptions Create(ChatClient client);
2447+
}
24222448
public static class OpenAIChatModelFactory {
24232449
[Experimental("OPENAI001")]
24242450
public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null);

‎api/OpenAI.netstandard2.0.cs‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,10 +1327,12 @@ public class ChatClient {
13271327
public virtual string Model { get; }
13281328
public ClientPipeline Pipeline { get; }
13291329
public virtual ClientResult<ChatCompletion> CompleteChat(params ChatMessage[] messages);
1330+
public virtual ClientResult CompleteChat(CreateChatCompletionOptions options, RequestOptions requestOptions = null);
13301331
public virtual ClientResult<ChatCompletionResult> CompleteChat(CreateChatCompletionOptions options, CancellationToken cancellationToken = default);
13311332
public virtual ClientResult CompleteChat(BinaryContent content, RequestOptions options = null);
13321333
public virtual ClientResult<ChatCompletion> CompleteChat(IEnumerable<ChatMessage> messages, ChatCompletionOptions options = null, CancellationToken cancellationToken = default);
13331334
public virtual Task<ClientResult<ChatCompletion>> CompleteChatAsync(params ChatMessage[] messages);
1335+
public virtual Task<ClientResult> CompleteChatAsync(CreateChatCompletionOptions options, RequestOptions requestOptions = null);
13341336
public virtual Task<ClientResult<ChatCompletionResult>> CompleteChatAsync(CreateChatCompletionOptions options, CancellationToken cancellationToken = default);
13351337
public virtual Task<ClientResult> CompleteChatAsync(BinaryContent content, RequestOptions options = null);
13361338
public virtual Task<ClientResult<ChatCompletion>> CompleteChatAsync(IEnumerable<ChatMessage> messages, ChatCompletionOptions options = null, CancellationToken cancellationToken = default);
@@ -1345,20 +1347,25 @@ public class ChatClient {
13451347
public virtual Task<ClientResult> DeleteChatCompletionAsync(string completionId, RequestOptions options);
13461348
public virtual Task<ClientResult<ChatCompletionDeletionResult>> DeleteChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
13471349
public virtual ClientResult GetChatCompletion(GetChatCompletionOptions options, RequestOptions requestOptions = null);
1350+
public virtual ClientResult<ChatCompletionResult> GetChatCompletion(GetChatCompletionOptions options, CancellationToken cancellationToken = default);
13481351
public virtual ClientResult GetChatCompletion(string completionId, RequestOptions options);
13491352
public virtual ClientResult<ChatCompletion> GetChatCompletion(string completionId, CancellationToken cancellationToken = default);
1353+
public virtual Task<ClientResult> GetChatCompletionAsync(GetChatCompletionOptions options, RequestOptions requestOptions = null);
1354+
public virtual Task<ClientResult<ChatCompletionResult>> GetChatCompletionAsync(GetChatCompletionOptions options, CancellationToken cancellationToken = default);
13501355
public virtual Task<ClientResult> GetChatCompletionAsync(string completionId, RequestOptions options);
13511356
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
1357+
public virtual CollectionResult GetChatCompletionMessages(GetChatCompletionMessageOptions options, RequestOptions requestOptions = null);
1358+
public virtual ClientResult<ChatCompletionList> GetChatCompletionMessages(GetChatCompletionMessageOptions options, CancellationToken cancellationToken = default);
13521359
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
1353-
public virtual CollectionResult GetChatCompletionMessages(string completionId, string after, int? limit, string order, RequestOptions options);
1360+
public virtual AsyncCollectionResult GetChatCompletionMessagesAsync(GetChatCompletionMessageOptions options, RequestOptions requestOptions = null);
1361+
public virtual Task<ClientResult<ChatCompletionList>> GetChatCompletionMessagesAsync(GetChatCompletionMessageOptions options, CancellationToken cancellationToken = default);
13541362
public virtual AsyncCollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessagesAsync(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
1355-
public virtual AsyncCollectionResult GetChatCompletionMessagesAsync(string completionId, string after, int? limit, string order, RequestOptions options);
13561363
public virtual CollectionResult<ChatCompletion> GetChatCompletions(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1357-
public virtual CollectionResult<ChatCompletionResult> GetChatCompletions(string after, int? limit, ChatCompletionCollectionOrder? order, IDictionary<string, string> metadata, string model = null, CancellationToken cancellationToken = default);
1358-
public virtual CollectionResult GetChatCompletions(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1364+
public virtual CollectionResult GetChatCompletions(GetChatCompletionsOptions options, RequestOptions requestOptions);
1365+
public virtual ClientResult<ChatCompletionList> GetChatCompletions(GetChatCompletionsOptions options, CancellationToken cancellationToken = default);
13591366
public virtual AsyncCollectionResult<ChatCompletion> GetChatCompletionsAsync(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1360-
public virtual AsyncCollectionResult<ChatCompletionResult> GetChatCompletionsAsync(string after, int? limit, ChatCompletionCollectionOrder? order, IDictionary<string, string> metadata, string model = null, CancellationToken cancellationToken = default);
1361-
public virtual AsyncCollectionResult GetChatCompletionsAsync(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1367+
public virtual AsyncCollectionResult GetChatCompletionsAsync(GetChatCompletionsOptions options, RequestOptions requestOptions);
1368+
public virtual Task<ClientResult<ChatCompletionList>> GetChatCompletionsAsync(GetChatCompletionsOptions options, CancellationToken cancellationToken = default);
13621369
public virtual ClientResult UpdateChatCompletion(UpdateChatCompletionOptions options, RequestOptions requestOptions = null);
13631370
public virtual ClientResult<ChatCompletionResult> UpdateChatCompletion(UpdateChatCompletionOptions options, CancellationToken cancellationToken = default);
13641371
public virtual ClientResult UpdateChatCompletion(string completionId, BinaryContent content, RequestOptions options = null);
@@ -2080,10 +2087,26 @@ public class FunctionChatMessage : ChatMessage, IJsonModel<FunctionChatMessage>,
20802087
protected override ChatMessage PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
20812088
protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
20822089
}
2083-
public class GetChatCompletionOptions {
2090+
public partial struct GetChatCompletionMessageOptions {
2091+
public GetChatCompletionMessageOptions(string completionId);
2092+
public string After { get; set; }
2093+
public string CompletionId { get; set; }
2094+
public int? Limit { get; set; }
2095+
public string Order { get; set; }
2096+
}
2097+
public partial struct GetChatCompletionOptions {
20842098
public GetChatCompletionOptions(string completionId);
20852099
public string CompletionId { get; set; }
20862100
}
2101+
public class GetChatCompletionsOptions {
2102+
public GetChatCompletionsOptions(string model);
2103+
public string After { get; set; }
2104+
public int? Limit { get; set; }
2105+
public IDictionary<string, string> Metadata { get; set; }
2106+
public string Model { get; set; }
2107+
public string Order { get; set; }
2108+
public static GetChatCompletionsOptions Create(ChatClient client);
2109+
}
20872110
public static class OpenAIChatModelFactory {
20882111
public static ChatCompletion ChatCompletion(string id = null, ChatFinishReason finishReason = ChatFinishReason.Stop, ChatMessageContent content = null, string refusal = null, IEnumerable<ChatToolCall> toolCalls = null, ChatMessageRole role = ChatMessageRole.System, ChatFunctionCall functionCall = null, IEnumerable<ChatTokenLogProbabilityDetails> contentTokenLogProbabilities = null, IEnumerable<ChatTokenLogProbabilityDetails> refusalTokenLogProbabilities = null, DateTimeOffset createdAt = default, string model = null, ChatServiceTier? serviceTier = null, string systemFingerprint = null, ChatTokenUsage usage = null, ChatOutputAudio outputAudio = null, IEnumerable<ChatMessageAnnotation> messageAnnotations = null);
20892112
[EditorBrowsable(EditorBrowsableState.Never)]

0 commit comments

Comments
 (0)