Skip to content

Commit ae03646

Browse files
christotheschristothes
committed
merge
2 parents 2815731 + 7c91d8d commit ae03646

File tree

309 files changed

+30483
-26710
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

+30483
-26710
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4310,7 +4310,12 @@ public class RealtimeClient {
43104310
protected RealtimeClient();
43114311
public RealtimeClient(ApiKeyCredential credential, OpenAIClientOptions options);
43124312
public RealtimeClient(ApiKeyCredential credential);
4313+
[Experimental("OPENAI001")]
4314+
public RealtimeClient(AuthenticationPolicy authenticationPolicy, OpenAIClientOptions options);
4315+
[Experimental("OPENAI001")]
4316+
public RealtimeClient(AuthenticationPolicy authenticationPolicy);
43134317
protected internal RealtimeClient(ClientPipeline pipeline, OpenAIClientOptions options);
4318+
public RealtimeClient(string apiKey);
43144319
public ClientPipeline Pipeline { get; }
43154320
public event EventHandler<BinaryData> OnReceivingCommand { add; remove; }
43164321
public event EventHandler<BinaryData> OnSendingCommand { add; remove; }
@@ -5772,24 +5777,19 @@ public class VectorStoreClient {
57725777
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
57735778
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
57745779
public virtual Task<ClientResult<VectorStoreFileAssociation>> GetFileAssociationAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
5775-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57765780
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
57775781
public virtual CollectionResult GetFileAssociations(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5778-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5779-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5780-
public virtual CollectionResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5781-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57825782
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
57835783
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5784-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5785-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5786-
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5784+
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatch(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5785+
public virtual CollectionResult GetFileAssociationsInBatch(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5786+
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5787+
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
57875788
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
5789+
public virtual Task<ClientResult<VectorStore>> GetVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
57885790
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5789-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57905791
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
57915792
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5792-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57935793
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
57945794
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
57955795
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);
@@ -5809,11 +5809,15 @@ public class VectorStoreClient {
58095809
public virtual Task<ClientResult<VectorStoreFileAssociation>> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, IDictionary<string, BinaryData> attributes, CancellationToken cancellationToken = default);
58105810
}
58115811
[Experimental("OPENAI001")]
5812-
public class VectorStoreCollectionOptions {
5812+
public class VectorStoreCollectionOptions : IJsonModel<VectorStoreCollectionOptions>, IPersistableModel<VectorStoreCollectionOptions> {
58135813
public string AfterId { get; set; }
58145814
public string BeforeId { get; set; }
58155815
public VectorStoreCollectionOrder? Order { get; set; }
58165816
public int? PageSizeLimit { get; set; }
5817+
protected virtual VectorStoreCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5818+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5819+
protected virtual VectorStoreCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5820+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
58175821
}
58185822
[Experimental("OPENAI001")]
58195823
public readonly partial struct VectorStoreCollectionOrder : IEquatable<VectorStoreCollectionOrder> {
@@ -5885,12 +5889,16 @@ public class VectorStoreFileAssociation : IJsonModel<VectorStoreFileAssociation>
58855889
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
58865890
}
58875891
[Experimental("OPENAI001")]
5888-
public class VectorStoreFileAssociationCollectionOptions {
5892+
public class VectorStoreFileAssociationCollectionOptions : IJsonModel<VectorStoreFileAssociationCollectionOptions>, IPersistableModel<VectorStoreFileAssociationCollectionOptions> {
58895893
public string AfterId { get; set; }
58905894
public string BeforeId { get; set; }
58915895
public VectorStoreFileStatusFilter? Filter { get; set; }
58925896
public VectorStoreFileAssociationCollectionOrder? Order { get; set; }
58935897
public int? PageSizeLimit { get; set; }
5898+
protected virtual VectorStoreFileAssociationCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5899+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5900+
protected virtual VectorStoreFileAssociationCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5901+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
58945902
}
58955903
[Experimental("OPENAI001")]
58965904
public readonly partial struct VectorStoreFileAssociationCollectionOrder : IEquatable<VectorStoreFileAssociationCollectionOrder> {
@@ -5904,6 +5912,7 @@ public class VectorStoreFileAssociationCollectionOptions {
59045912
public override readonly int GetHashCode();
59055913
public static bool operator ==(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
59065914
public static implicit operator VectorStoreFileAssociationCollectionOrder(string value);
5915+
public static implicit operator VectorStoreFileAssociationCollectionOrder?(string value);
59075916
public static bool operator !=(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
59085917
public override readonly string ToString();
59095918
}

‎api/OpenAI.netstandard2.0.cs‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3778,7 +3778,10 @@ public class RealtimeClient {
37783778
protected RealtimeClient();
37793779
public RealtimeClient(ApiKeyCredential credential, OpenAIClientOptions options);
37803780
public RealtimeClient(ApiKeyCredential credential);
3781+
public RealtimeClient(AuthenticationPolicy authenticationPolicy, OpenAIClientOptions options);
3782+
public RealtimeClient(AuthenticationPolicy authenticationPolicy);
37813783
protected internal RealtimeClient(ClientPipeline pipeline, OpenAIClientOptions options);
3784+
public RealtimeClient(string apiKey);
37823785
public ClientPipeline Pipeline { get; }
37833786
public event EventHandler<BinaryData> OnReceivingCommand { add; remove; }
37843787
public event EventHandler<BinaryData> OnSendingCommand { add; remove; }
@@ -5124,24 +5127,19 @@ public class VectorStoreClient {
51245127
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
51255128
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
51265129
public virtual Task<ClientResult<VectorStoreFileAssociation>> GetFileAssociationAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
5127-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51285130
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
51295131
public virtual CollectionResult GetFileAssociations(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5130-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5131-
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociations(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5132-
public virtual CollectionResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5133-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51345132
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
51355133
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5136-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5137-
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsAsync(string vectorStoreId, string batchJobId, ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
5138-
public virtual AsyncCollectionResult GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5134+
public virtual CollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatch(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5135+
public virtual CollectionResult GetFileAssociationsInBatch(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
5136+
public virtual AsyncCollectionResult<VectorStoreFileAssociation> GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, VectorStoreFileAssociationCollectionOptions options = null, CancellationToken cancellationToken = default);
5137+
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
51395138
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
5139+
public virtual Task<ClientResult<VectorStore>> GetVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
51405140
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5141-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51425141
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
51435142
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5144-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
51455143
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
51465144
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
51475145
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);
@@ -5160,11 +5158,15 @@ public class VectorStoreClient {
51605158
public virtual Task<ClientResult> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, BinaryContent content, RequestOptions options = null);
51615159
public virtual Task<ClientResult<VectorStoreFileAssociation>> UpdateVectorStoreFileAttributesAsync(string vectorStoreId, string fileId, IDictionary<string, BinaryData> attributes, CancellationToken cancellationToken = default);
51625160
}
5163-
public class VectorStoreCollectionOptions {
5161+
public class VectorStoreCollectionOptions : IJsonModel<VectorStoreCollectionOptions>, IPersistableModel<VectorStoreCollectionOptions> {
51645162
public string AfterId { get; set; }
51655163
public string BeforeId { get; set; }
51665164
public VectorStoreCollectionOrder? Order { get; set; }
51675165
public int? PageSizeLimit { get; set; }
5166+
protected virtual VectorStoreCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5167+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5168+
protected virtual VectorStoreCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5169+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
51685170
}
51695171
public readonly partial struct VectorStoreCollectionOrder : IEquatable<VectorStoreCollectionOrder> {
51705172
public VectorStoreCollectionOrder(string value);
@@ -5229,12 +5231,16 @@ public class VectorStoreFileAssociation : IJsonModel<VectorStoreFileAssociation>
52295231
protected virtual VectorStoreFileAssociation PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
52305232
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
52315233
}
5232-
public class VectorStoreFileAssociationCollectionOptions {
5234+
public class VectorStoreFileAssociationCollectionOptions : IJsonModel<VectorStoreFileAssociationCollectionOptions>, IPersistableModel<VectorStoreFileAssociationCollectionOptions> {
52335235
public string AfterId { get; set; }
52345236
public string BeforeId { get; set; }
52355237
public VectorStoreFileStatusFilter? Filter { get; set; }
52365238
public VectorStoreFileAssociationCollectionOrder? Order { get; set; }
52375239
public int? PageSizeLimit { get; set; }
5240+
protected virtual VectorStoreFileAssociationCollectionOptions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
5241+
protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
5242+
protected virtual VectorStoreFileAssociationCollectionOptions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
5243+
protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
52385244
}
52395245
public readonly partial struct VectorStoreFileAssociationCollectionOrder : IEquatable<VectorStoreFileAssociationCollectionOrder> {
52405246
public VectorStoreFileAssociationCollectionOrder(string value);
@@ -5247,6 +5253,7 @@ public class VectorStoreFileAssociationCollectionOptions {
52475253
public override readonly int GetHashCode();
52485254
public static bool operator ==(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
52495255
public static implicit operator VectorStoreFileAssociationCollectionOrder(string value);
5256+
public static implicit operator VectorStoreFileAssociationCollectionOrder?(string value);
52505257
public static bool operator !=(VectorStoreFileAssociationCollectionOrder left, VectorStoreFileAssociationCollectionOrder right);
52515258
public override readonly string ToString();
52525259
}

‎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)