Skip to content

Commit 5cacc3e

Browse files
christotheschristothes
committed
merge
1 parent fdfedb0 commit 5cacc3e

File tree

3 files changed

+4
-40
lines changed

3 files changed

+4
-40
lines changed

‎api/OpenAI.net8.0.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ public class ChatClient {
14711471
[Experimental("OPENAI001")]
14721472
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
14731473
[Experimental("OPENAI001")]
1474-
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
1474+
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
14751475
[Experimental("OPENAI001")]
14761476
public virtual CollectionResult GetChatCompletionMessages(string completionId, string after, int? limit, string order, RequestOptions options);
14771477
[Experimental("OPENAI001")]
@@ -5710,6 +5710,7 @@ public class VectorStoreClient {
57105710
public virtual Task<ClientResult> DeleteVectorStoreAsync(string vectorStoreId, RequestOptions options);
57115711
public virtual Task<ClientResult<VectorStoreDeletionResult>> DeleteVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
57125712
public virtual ClientResult<VectorStoreBatchFileJob> GetBatchFileJob(string vectorStoreId, string batchJobId, CancellationToken cancellationToken = default);
5713+
public virtual Task<ClientResult<VectorStoreBatchFileJob>> GetBatchFileJobAsync(string vectorStoreId, string batchJobId, CancellationToken cancellationToken = default);
57135714
public virtual ClientResult GetFileAssociation(string vectorStoreId, string fileId, RequestOptions options);
57145715
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
57155716
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
@@ -5724,10 +5725,8 @@ public class VectorStoreClient {
57245725
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
57255726
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
57265727
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5727-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57285728
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
57295729
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5730-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
57315730
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
57325731
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
57335732
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);

‎api/OpenAI.netstandard2.0.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ public class ChatClient {
13181318
public virtual ClientResult<ChatCompletion> GetChatCompletion(string completionId, CancellationToken cancellationToken = default);
13191319
public virtual Task<ClientResult> GetChatCompletionAsync(string completionId, RequestOptions options);
13201320
public virtual Task<ClientResult<ChatCompletion>> GetChatCompletionAsync(string completionId, CancellationToken cancellationToken = default);
1321-
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
1321+
public virtual CollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessages(string completionId, ChatCompletionCollectionOptions options = null, CancellationToken cancellationToken = default);
13221322
public virtual CollectionResult GetChatCompletionMessages(string completionId, string after, int? limit, string order, RequestOptions options);
13231323
public virtual AsyncCollectionResult<ChatCompletionMessageListDatum> GetChatCompletionMessagesAsync(string completionId, ChatCompletionMessageCollectionOptions options = null, CancellationToken cancellationToken = default);
13241324
public virtual AsyncCollectionResult GetChatCompletionMessagesAsync(string completionId, string after, int? limit, string order, RequestOptions options);
@@ -5065,6 +5065,7 @@ public class VectorStoreClient {
50655065
public virtual Task<ClientResult> DeleteVectorStoreAsync(string vectorStoreId, RequestOptions options);
50665066
public virtual Task<ClientResult<VectorStoreDeletionResult>> DeleteVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default);
50675067
public virtual ClientResult<VectorStoreBatchFileJob> GetBatchFileJob(string vectorStoreId, string batchJobId, CancellationToken cancellationToken = default);
5068+
public virtual Task<ClientResult<VectorStoreBatchFileJob>> GetBatchFileJobAsync(string vectorStoreId, string batchJobId, CancellationToken cancellationToken = default);
50685069
public virtual ClientResult GetFileAssociation(string vectorStoreId, string fileId, RequestOptions options);
50695070
public virtual ClientResult<VectorStoreFileAssociation> GetFileAssociation(string vectorStoreId, string fileId, CancellationToken cancellationToken = default);
50705071
public virtual Task<ClientResult> GetFileAssociationAsync(string vectorStoreId, string fileId, RequestOptions options);
@@ -5079,10 +5080,8 @@ public class VectorStoreClient {
50795080
public virtual AsyncCollectionResult GetFileAssociationsInBatchAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options);
50805081
public virtual ClientResult<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default);
50815082
public virtual CollectionResult<VectorStore> GetVectorStores(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5082-
public virtual CollectionResult<VectorStore> GetVectorStores(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
50835083
public virtual CollectionResult GetVectorStores(int? limit, string order, string after, string before, RequestOptions options);
50845084
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(VectorStoreCollectionOptions options = null, CancellationToken cancellationToken = default);
5085-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(ContinuationToken firstPageToken, CancellationToken cancellationToken = default);
50865085
public virtual AsyncCollectionResult GetVectorStoresAsync(int? limit, string order, string after, string before, RequestOptions options);
50875086
public virtual ClientResult<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreModificationOptions options, CancellationToken cancellationToken = default);
50885087
public virtual ClientResult ModifyVectorStore(string vectorStoreId, BinaryContent content, RequestOptions options = null);

‎src/Custom/VectorStores/VectorStoreClient.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -248,40 +248,6 @@ public virtual ClientResult<VectorStoreDeletionResult> DeleteVectorStore(string
248248
return ClientResult.FromValue(value, rawProtocolResponse);
249249
}
250250

251-
/// <summary>
252-
/// Rehydrates a page collection holding <see cref="VectorStore"/> instances from a page token.
253-
/// </summary>
254-
/// <param name="firstPageToken"> Page token corresponding to the first page of the collection to rehydrate. </param>
255-
/// <param name="cancellationToken">A token that can be used to cancel this method call.</param>
256-
/// <returns> A collection of <see cref="VectorStore"/>. </returns>
257-
public virtual AsyncCollectionResult<VectorStore> GetVectorStoresAsync(
258-
ContinuationToken firstPageToken,
259-
CancellationToken cancellationToken = default)
260-
{
261-
Argument.AssertNotNull(firstPageToken, nameof(firstPageToken));
262-
263-
VectorStoreCollectionPageToken pageToken = VectorStoreCollectionPageToken.FromToken(firstPageToken);
264-
return GetVectorStoresAsync(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions())
265-
as AsyncCollectionResult<VectorStore>;
266-
}
267-
268-
/// <summary>
269-
/// Rehydrates a page collection holding <see cref="VectorStore"/> instances from a page token.
270-
/// </summary>
271-
/// <param name="firstPageToken"> Page token corresponding to the first page of the collection to rehydrate. </param>
272-
/// <param name="cancellationToken">A token that can be used to cancel this method call.</param>
273-
/// <returns> A collection of <see cref="VectorStore"/>. </returns>
274-
public virtual CollectionResult<VectorStore> GetVectorStores(
275-
ContinuationToken firstPageToken,
276-
CancellationToken cancellationToken = default)
277-
{
278-
Argument.AssertNotNull(firstPageToken, nameof(firstPageToken));
279-
280-
VectorStoreCollectionPageToken pageToken = VectorStoreCollectionPageToken.FromToken(firstPageToken);
281-
return GetVectorStores(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions())
282-
as CollectionResult<VectorStore>;
283-
}
284-
285251
/// <summary>
286252
/// Associates a single, uploaded file with a vector store, beginning ingestion of the file into the vector store.
287253
/// </summary>

0 commit comments

Comments
 (0)