Skip to content

Commit 5f2db73

Browse files
christotheschristothes
committed
fb
1 parent d2ccb54 commit 5f2db73

File tree

10 files changed

+88
-18
lines changed

10 files changed

+88
-18
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,14 @@ public class ChatClient {
14301430
public virtual Task<ClientResult> GetChatCompletionAsync(string completionId, RequestOptions options);
14311431
[Experimental("OPENAI001")]
14321432
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
1433+
[Experimental("OPENAI001")]
1434+
public virtual CollectionResult<ChatCompletion> GetChatCompletions(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1435+
[Experimental("OPENAI001")]
1436+
public virtual CollectionResult GetChatCompletions(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1437+
[Experimental("OPENAI001")]
1438+
public virtual AsyncCollectionResult<ChatCompletion> GetChatCompletionsAsync(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1439+
[Experimental("OPENAI001")]
1440+
public virtual AsyncCollectionResult GetChatCompletionsAsync(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
14331441
}
14341442
public class ChatCompletion : IJsonModel<ChatCompletion>, IPersistableModel<ChatCompletion> {
14351443
[Experimental("OPENAI001")]
@@ -1460,6 +1468,33 @@ public class ChatCompletion : IJsonModel<ChatCompletion>, IPersistableModel<Chat
14601468
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
14611469
}
14621470
[Experimental("OPENAI001")]
1471+
public class ChatCompletionCollectionOptions : IJsonModel<ChatCompletionCollectionOptions>, IPersistableModel<ChatCompletionCollectionOptions> {
1472+
public string AfterId { get; set; }
1473+
public IDictionary<string, string> Metadata { get; }
1474+
public string Model { get; set; }
1475+
public ChatCompletionCollectionOrder? Order { get; set; }
1476+
public int? PageSizeLimit { get; set; }
1477+
protected virtual ChatCompletionCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
1478+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
1479+
protected virtual ChatCompletionCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
1480+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
1481+
}
1482+
[Experimental("OPENAI001")]
1483+
public readonly partial struct ChatCompletionCollectionOrder : IEquatable<ChatCompletionCollectionOrder> {
1484+
public ChatCompletionCollectionOrder(string value);
1485+
public static ChatCompletionCollectionOrder Ascending { get; }
1486+
public static ChatCompletionCollectionOrder Descending { get; }
1487+
public readonly bool Equals(ChatCompletionCollectionOrder other);
1488+
[EditorBrowsable(EditorBrowsableState.Never)]
1489+
public override readonly bool Equals(object obj);
1490+
[EditorBrowsable(EditorBrowsableState.Never)]
1491+
public override readonly int GetHashCode();
1492+
public static bool operator ==(ChatCompletionCollectionOrder left, ChatCompletionCollectionOrder right);
1493+
public static implicit operator ChatCompletionCollectionOrder(string value);
1494+
public static bool operator !=(ChatCompletionCollectionOrder left, ChatCompletionCollectionOrder right);
1495+
public override readonly string ToString();
1496+
}
1497+
[Experimental("OPENAI001")]
14631498
public class ChatCompletionDeletionResult : IJsonModel<ChatCompletionDeletionResult>, IPersistableModel<ChatCompletionDeletionResult> {
14641499
public string ChatCompletionId { get; }
14651500
public bool Deleted { get; }

‎api/OpenAI.netstandard2.0.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,6 +1285,10 @@ public class ChatClient {
12851285
public virtual ClientResult<ChatCompletion> GetChatCompletion(string completionId, CancellationToken cancellationToken = default);
12861286
public virtual Task<ClientResult> GetChatCompletionAsync(string completionId, RequestOptions options);
12871287
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
1288+
public virtual CollectionResult<ChatCompletion> GetChatCompletions(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1289+
public virtual CollectionResult GetChatCompletions(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
1290+
public virtual AsyncCollectionResult<ChatCompletion> GetChatCompletionsAsync(ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
1291+
public virtual AsyncCollectionResult GetChatCompletionsAsync(string after, int? limit, string order, IDictionary<string, string> metadata, string model, RequestOptions options);
12881292
}
12891293
public class ChatCompletion : IJsonModel<ChatCompletion>, IPersistableModel<ChatCompletion> {
12901294
public IReadOnlyList<ChatMessageAnnotation> Annotations { get; }
@@ -1308,6 +1312,31 @@ public class ChatCompletion : IJsonModel<ChatCompletion>, IPersistableModel<Chat
13081312
protected virtual ChatCompletion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
13091313
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
13101314
}
1315+
public class ChatCompletionCollectionOptions : IJsonModel<ChatCompletionCollectionOptions>, IPersistableModel<ChatCompletionCollectionOptions> {
1316+
public string AfterId { get; set; }
1317+
public IDictionary<string, string> Metadata { get; }
1318+
public string Model { get; set; }
1319+
public ChatCompletionCollectionOrder? Order { get; set; }
1320+
public int? PageSizeLimit { get; set; }
1321+
protected virtual ChatCompletionCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
1322+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
1323+
protected virtual ChatCompletionCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
1324+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
1325+
}
1326+
public readonly partial struct ChatCompletionCollectionOrder : IEquatable<ChatCompletionCollectionOrder> {
1327+
public ChatCompletionCollectionOrder(string value);
1328+
public static ChatCompletionCollectionOrder Ascending { get; }
1329+
public static ChatCompletionCollectionOrder Descending { get; }
1330+
public readonly bool Equals(ChatCompletionCollectionOrder other);
1331+
[EditorBrowsable(EditorBrowsableState.Never)]
1332+
public override readonly bool Equals(object obj);
1333+
[EditorBrowsable(EditorBrowsableState.Never)]
1334+
public override readonly int GetHashCode();
1335+
public static bool operator ==(ChatCompletionCollectionOrder left, ChatCompletionCollectionOrder right);
1336+
public static implicit operator ChatCompletionCollectionOrder(string value);
1337+
public static bool operator !=(ChatCompletionCollectionOrder left, ChatCompletionCollectionOrder right);
1338+
public override readonly string ToString();
1339+
}
13111340
public class ChatCompletionDeletionResult : IJsonModel<ChatCompletionDeletionResult>, IPersistableModel<ChatCompletionDeletionResult> {
13121341
public string ChatCompletionId { get; }
13131342
public bool Deleted { get; }

‎specification/client/models/chat.models.tsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ alias ChatCompletionCollectionOrderQueryParameter = {
1717

1818
union ChatCompletionCollectionOrder {
1919
string,
20-
Asc: "asc",
21-
Desc: "desc",
20+
Ascending: "asc",
21+
Descending: "desc",
2222
}
2323

2424
@access(Access.public)

‎specification/main.tsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import "./client/threads.client.tsp";
1515
import "./client/vector-stores.client.tsp";
1616

1717
import "./client/models/audio.models.tsp";
18+
import "./client/models/chat.models.tsp";
1819
import "./client/models/common.models.tsp";
1920
import "./client/models/responses.models.tsp";
2021
import "./client/models/vector-stores.models.tsp";
21-
import "./client/models/chat.models.tsp";
2222

2323
import "./base/entrypoints/sdk.dotnet";

‎src/Custom/Chat/ChatCompletionCollectionOptions.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
namespace OpenAI.Chat;
2+
3+
// CUSTOM: Make public and use the correct namespace.
4+
[CodeGenType("ChatCompletionCollectionOptions")] public partial class ChatCompletionCollectionOptions { }

‎src/Custom/Chat/ChatCompletionCollectionOrder.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
namespace OpenAI.Chat;
2+
3+
// CUSTOM: Make public and use the correct namespace.
4+
[CodeGenType("ChatCompletionCollectionOrder")] public readonly partial struct ChatCompletionCollectionOrder { }

‎src/Custom/Chat/Internal/GeneratorStubs.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,4 @@ internal partial class InternalUnknownChatCompletionRequestMessageContentPart {
120120
[CodeGenType("ChatCompletionDeletedObject")] internal readonly partial struct InternalChatCompletionDeletedObject {}
121121
[CodeGenType("ChatCompletionMessageListObject")] internal readonly partial struct InternalChatCompletionMessageListObject {}
122122
[CodeGenType("ChatCompletionList")] internal partial class InternalChatCompletionList {}
123-
[CodeGenType("ChatCompletionMessageList")] internal partial class InternalChatCompletionMessageList {}
124-
[CodeGenType("ChatCompletionCollectionOptions")] public partial class ChatCompletionCollectionOptions {}
125-
[CodeGenType("ChatCompletionCollectionOrder")] public readonly partial struct ChatCompletionCollectionOrder { }
123+
[CodeGenType("ChatCompletionMessageList")] internal partial class InternalChatCompletionMessageList {}

‎src/Generated/Models/Chat/ChatCompletionCollectionOrder.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace OpenAI.Chat
1313
public readonly partial struct ChatCompletionCollectionOrder : IEquatable<ChatCompletionCollectionOrder>
1414
{
1515
private readonly string _value;
16-
private const string AscValue = "asc";
17-
private const string DescValue = "desc";
16+
private const string AscendingValue = "asc";
17+
private const string DescendingValue = "desc";
1818

1919
public ChatCompletionCollectionOrder(string value)
2020
{
@@ -23,9 +23,9 @@ public ChatCompletionCollectionOrder(string value)
2323
_value = value;
2424
}
2525

26-
public static ChatCompletionCollectionOrder Asc { get; } = new ChatCompletionCollectionOrder(AscValue);
26+
public static ChatCompletionCollectionOrder Ascending { get; } = new ChatCompletionCollectionOrder(AscendingValue);
2727

28-
public static ChatCompletionCollectionOrder Desc { get; } = new ChatCompletionCollectionOrder(DescValue);
28+
public static ChatCompletionCollectionOrder Descending { get; } = new ChatCompletionCollectionOrder(DescendingValue);
2929

3030
public static bool operator ==(ChatCompletionCollectionOrder left, ChatCompletionCollectionOrder right) => left.Equals(right);
3131

‎src/Generated/OpenAIModelFactory.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,11 +1070,6 @@ public static AudioTranscription AudioTranscription(string language = default, s
10701070
additionalBinaryDataProperties: null);
10711071
}
10721072

1073-
public static AudioTokenLogProbabilityDetails AudioTokenLogProbabilityDetails(string token = default, float logProbability = default, ReadOnlyMemory<byte> utf8Bytes = default)
1074-
{
1075-
return new AudioTokenLogProbabilityDetails(token, logProbability, utf8Bytes, additionalBinaryDataProperties: null);
1076-
}
1077-
10781073
public static ChatCompletionCollectionOptions ChatCompletionCollectionOptions(string afterId = default, int? pageSizeLimit = default, ChatCompletionCollectionOrder? order = default, IDictionary<string, string> metadata = default, string model = default)
10791074
{
10801075
metadata ??= new ChangeTrackingDictionary<string, string>();
@@ -1088,6 +1083,11 @@ public static ChatCompletionCollectionOptions ChatCompletionCollectionOptions(st
10881083
additionalBinaryDataProperties: null);
10891084
}
10901085

1086+
public static AudioTokenLogProbabilityDetails AudioTokenLogProbabilityDetails(string token = default, float logProbability = default, ReadOnlyMemory<byte> utf8Bytes = default)
1087+
{
1088+
return new AudioTokenLogProbabilityDetails(token, logProbability, utf8Bytes, additionalBinaryDataProperties: null);
1089+
}
1090+
10911091
public static ContainerListResource ContainerListResource(string @object = default, IEnumerable<ContainerResource> data = default, string firstId = default, string lastId = default, bool hasMore = default)
10921092
{
10931093
data ??= new ChangeTrackingList<ContainerResource>();

‎tests/Chat/ChatTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ public async Task GetChatCompletionsWithOrderFiltering()
12131213
// Test ascending order
12141214
ChatCompletionCollectionOptions ascOptions = new()
12151215
{
1216-
Order = ChatCompletionCollectionOrder.Asc,
1216+
Order = ChatCompletionCollectionOrder.Ascending,
12171217
PageSizeLimit = 5
12181218
};
12191219

@@ -1227,7 +1227,7 @@ public async Task GetChatCompletionsWithOrderFiltering()
12271227
// Test descending order
12281228
ChatCompletionCollectionOptions descOptions = new()
12291229
{
1230-
Order = ChatCompletionCollectionOrder.Desc,
1230+
Order = ChatCompletionCollectionOrder.Descending,
12311231
PageSizeLimit = 5
12321232
};
12331233

@@ -1430,7 +1430,7 @@ public async Task GetChatCompletionsWithCombinedFilters()
14301430
ChatCompletionCollectionOptions combinedOptions = new()
14311431
{
14321432
PageSizeLimit = 5,
1433-
Order = ChatCompletionCollectionOrder.Desc,
1433+
Order = ChatCompletionCollectionOrder.Descending,
14341434
Metadata = { [testKey] = "combined_value" }
14351435
};
14361436

0 commit comments

Comments
 (0)