Skip to content

Commit 00c08db

Browse files
christotheschristothes
committed
merge
2 parents 240e285 + 7c91d8d commit 00c08db

File tree

309 files changed

+30353
-26608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+30353
-26608
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4334,7 +4334,12 @@ public class RealtimeClient {
43344334
protected RealtimeClient();
43354335
public RealtimeClient(ApiKeyCredential credential, OpenAIClientOptions options);
43364336
public RealtimeClient(ApiKeyCredential credential);
4337+
[Experimental("OPENAI001")]
4338+
public RealtimeClient(AuthenticationPolicy authenticationPolicy, OpenAIClientOptions options);
4339+
[Experimental("OPENAI001")]
4340+
public RealtimeClient(AuthenticationPolicy authenticationPolicy);
43374341
protected internal RealtimeClient(ClientPipeline pipeline, OpenAIClientOptions options);
4342+
public RealtimeClient(string apiKey);
43384343
public ClientPipeline Pipeline { get; }
43394344
public event EventHandler<BinaryData> OnReceivingCommand { add; remove; }
43404345
public event EventHandler<BinaryData> OnSendingCommand { add; remove; }
@@ -5796,24 +5801,19 @@ public class VectorStoreClient {
57965801
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
57975802
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
57985803
public virtual Task<ClientResult<VectorStoreFileAssociation>> GetFileAssociationAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
5799-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
58005804
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
58015805
public virtual CollectionResult GetFileAssociations(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5802-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5803-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5804-
public virtual CollectionResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5805-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
58065806
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
58075807
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5808-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5809-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5810-
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5808+
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatch(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5809+
public virtual CollectionResult GetFileAssociationsInBatch(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5810+
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5811+
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
58115812
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
5813+
public virtual Task<ClientResult<VectorStore>> GetVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
58125814
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5813-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
58145815
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
58155816
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5816-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
58175817
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
58185818
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
58195819
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);
@@ -5833,11 +5833,15 @@ public class VectorStoreClient {
58335833
public virtual Task<ClientResult<VectorStoreFileAssociation>> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, IDictionary<string, BinaryData> attributes, CancellationToken cancellationToken = default);
58345834
}
58355835
[Experimental("OPENAI001")]
5836-
public class VectorStoreCollectionOptions {
5836+
public class VectorStoreCollectionOptions : IJsonModel<VectorStoreCollectionOptions>, IPersistableModel<VectorStoreCollectionOptions> {
58375837
public string AfterId { get; set; }
58385838
public string BeforeId { get; set; }
58395839
public VectorStoreCollectionOrder? Order { get; set; }
58405840
public int? PageSizeLimit { get; set; }
5841+
protected virtual VectorStoreCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5842+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5843+
protected virtual VectorStoreCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5844+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
58415845
}
58425846
[Experimental("OPENAI001")]
58435847
public readonly partial struct VectorStoreCollectionOrder : IEquatable<VectorStoreCollectionOrder> {
@@ -5909,12 +5913,16 @@ public class VectorStoreFileAssociation : IJsonModel<VectorStoreFileAssociation>
59095913
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
59105914
}
59115915
[Experimental("OPENAI001")]
5912-
public class VectorStoreFileAssociationCollectionOptions {
5916+
public class VectorStoreFileAssociationCollectionOptions : IJsonModel<VectorStoreFileAssociationCollectionOptions>, IPersistableModel<VectorStoreFileAssociationCollectionOptions> {
59135917
public string AfterId { get; set; }
59145918
public string BeforeId { get; set; }
59155919
public VectorStoreFileStatusFilter? Filter { get; set; }
59165920
public VectorStoreFileAssociationCollectionOrder? Order { get; set; }
59175921
public int? PageSizeLimit { get; set; }
5922+
protected virtual VectorStoreFileAssociationCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5923+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5924+
protected virtual VectorStoreFileAssociationCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5925+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
59185926
}
59195927
[Experimental("OPENAI001")]
59205928
public readonly partial struct VectorStoreFileAssociationCollectionOrder : IEquatable<VectorStoreFileAssociationCollectionOrder> {
@@ -5928,6 +5936,7 @@ public class VectorStoreFileAssociationCollectionOptions {
59285936
public override readonly int GetHashCode();
59295937
public static bool operator ==(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
59305938
public static implicit operator VectorStoreFileAssociationCollectionOrder(string value);
5939+
public static implicit operator VectorStoreFileAssociationCollectionOrder?(string value);
59315940
public static bool operator !=(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
59325941
public override readonly string ToString();
59335942
}

‎api/OpenAI.netstandard2.0.cs‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3800,7 +3800,10 @@ public class RealtimeClient {
38003800
protected RealtimeClient();
38013801
public RealtimeClient(ApiKeyCredential credential, OpenAIClientOptions options);
38023802
public RealtimeClient(ApiKeyCredential credential);
3803+
public RealtimeClient(AuthenticationPolicy authenticationPolicy, OpenAIClientOptions options);
3804+
public RealtimeClient(AuthenticationPolicy authenticationPolicy);
38033805
protected internal RealtimeClient(ClientPipeline pipeline, OpenAIClientOptions options);
3806+
public RealtimeClient(string apiKey);
38043807
public ClientPipeline Pipeline { get; }
38053808
public event EventHandler<BinaryData> OnReceivingCommand { add; remove; }
38063809
public event EventHandler<BinaryData> OnSendingCommand { add; remove; }
@@ -5146,24 +5149,19 @@ public class VectorStoreClient {
51465149
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
51475150
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
51485151
public virtual Task<ClientResult<VectorStoreFileAssociation>> GetFileAssociationAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
5149-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51505152
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
51515153
public virtual CollectionResult GetFileAssociations(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5152-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5153-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5154-
public virtual CollectionResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5155-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51565154
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
51575155
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5158-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5159-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5160-
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5156+
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatch(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5157+
public virtual CollectionResult GetFileAssociationsInBatch(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5158+
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5159+
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
51615160
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
5161+
public virtual Task<ClientResult<VectorStore>> GetVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
51625162
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5163-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51645163
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
51655164
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5166-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51675165
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
51685166
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
51695167
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);
@@ -5182,11 +5180,15 @@ public class VectorStoreClient {
51825180
public virtual Task<ClientResult> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, BinaryContent content, RequestOptions options = null);
51835181
public virtual Task<ClientResult<VectorStoreFileAssociation>> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, IDictionary<string, BinaryData> attributes, CancellationToken cancellationToken = default);
51845182
}
5185-
public class VectorStoreCollectionOptions {
5183+
public class VectorStoreCollectionOptions : IJsonModel<VectorStoreCollectionOptions>, IPersistableModel<VectorStoreCollectionOptions> {
51865184
public string AfterId { get; set; }
51875185
public string BeforeId { get; set; }
51885186
public VectorStoreCollectionOrder? Order { get; set; }
51895187
public int? PageSizeLimit { get; set; }
5188+
protected virtual VectorStoreCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5189+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5190+
protected virtual VectorStoreCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5191+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
51905192
}
51915193
public readonly partial struct VectorStoreCollectionOrder : IEquatable<VectorStoreCollectionOrder> {
51925194
public VectorStoreCollectionOrder(string value);
@@ -5251,12 +5253,16 @@ public class VectorStoreFileAssociation : IJsonModel<VectorStoreFileAssociation>
52515253
protected virtual VectorStoreFileAssociation PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
52525254
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
52535255
}
5254-
public class VectorStoreFileAssociationCollectionOptions {
5256+
public class VectorStoreFileAssociationCollectionOptions : IJsonModel<VectorStoreFileAssociationCollectionOptions>, IPersistableModel<VectorStoreFileAssociationCollectionOptions> {
52555257
public string AfterId { get; set; }
52565258
public string BeforeId { get; set; }
52575259
public VectorStoreFileStatusFilter? Filter { get; set; }
52585260
public VectorStoreFileAssociationCollectionOrder? Order { get; set; }
52595261
public int? PageSizeLimit { get; set; }
5262+
protected virtual VectorStoreFileAssociationCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5263+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5264+
protected virtual VectorStoreFileAssociationCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5265+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
52605266
}
52615267
public readonly partial struct VectorStoreFileAssociationCollectionOrder : IEquatable<VectorStoreFileAssociationCollectionOrder> {
52625268
public VectorStoreFileAssociationCollectionOrder(string value);
@@ -5269,6 +5275,7 @@ public class VectorStoreFileAssociationCollectionOptions {
52695275
public override readonly int GetHashCode();
52705276
public static bool operator ==(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
52715277
public static implicit operator VectorStoreFileAssociationCollectionOrder(string value);
5278+
public static implicit operator VectorStoreFileAssociationCollectionOrder?(string value);
52725279
public static bool operator !=(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
52735280
public override readonly string ToString();
52745281
}

‎codegen/generator/src/OpenAI.Library.Plugin.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250722.1" />
11+
<PackageReference Include="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250827.2" />
1212
</ItemGroup>
1313

1414
<!-- Copy output to package dist path for local execution and -->

0 commit comments

Comments
 (0)