From ac61f4d6973a7e0613723f8efc2419f18ea1082a Mon Sep 17 00:00:00 2001 From: Jose Arriaga Maldonado Date: Fri, 9 Aug 2024 11:55:05 -0700 Subject: [PATCH] Add improvements to pagination utilities and client methods --- .../Assistants/AssistantClient.Protocol.cs | 16 +- src/Custom/Assistants/AssistantClient.cs | 177 ++++-------------- .../Pagination/AssistantsPageEnumerator.cs | 2 + .../Pagination/MessagesPageEnumerator.cs | 2 + .../Pagination/RunStepsPageEnumerator.cs | 2 + .../Internal/Pagination/RunsPageEnumerator.cs | 2 + .../VectorStoreFileBatchesPageEnumerator.cs | 2 + .../VectorStoreFilesPageEnumerator.cs | 2 + .../Pagination/VectorStoresPageEnumerator.cs | 4 +- src/Custom/VectorStores/VectorStoreClient.cs | 140 +++----------- 10 files changed, 80 insertions(+), 269 deletions(-) diff --git a/src/Custom/Assistants/AssistantClient.Protocol.cs b/src/Custom/Assistants/AssistantClient.Protocol.cs index d96ee9617..dace80d8f 100644 --- a/src/Custom/Assistants/AssistantClient.Protocol.cs +++ b/src/Custom/Assistants/AssistantClient.Protocol.cs @@ -70,7 +70,7 @@ public virtual ClientResult CreateAssistant(BinaryContent content, RequestOption [EditorBrowsable(EditorBrowsableState.Never)] public virtual IAsyncEnumerable GetAssistantsAsync(int? limit, string order, string after, string before, RequestOptions options) { - AssistantsPageEnumerator enumerator = new AssistantsPageEnumerator(_pipeline, _endpoint, limit, order, after, before, options); + AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, limit, order, after, before, options); return PageCollectionHelpers.CreateAsync(enumerator); } @@ -101,7 +101,7 @@ public virtual IAsyncEnumerable GetAssistantsAsync(int? limit, str [EditorBrowsable(EditorBrowsableState.Never)] public virtual IEnumerable GetAssistants(int? limit, string order, string after, string before, RequestOptions options) { - AssistantsPageEnumerator enumerator = new AssistantsPageEnumerator(_pipeline, _endpoint, limit, order, after, before, options); + AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, limit, order, after, before, options); return PageCollectionHelpers.Create(enumerator); } @@ -259,7 +259,7 @@ public virtual IAsyncEnumerable GetMessagesAsync(string threadId, { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - MessagesPageEnumerator enumerator = new MessagesPageEnumerator(_pipeline, _endpoint, threadId, limit, order, after, before, options); + MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, limit, order, after, before, options); return PageCollectionHelpers.CreateAsync(enumerator); } @@ -295,7 +295,7 @@ public virtual IEnumerable GetMessages(string threadId, int? limit { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - MessagesPageEnumerator enumerator = new MessagesPageEnumerator(_pipeline, _endpoint, threadId, limit, order, after, before, options); + MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, limit, order, after, before, options); return PageCollectionHelpers.Create(enumerator); } @@ -381,7 +381,7 @@ public virtual IAsyncEnumerable GetRunsAsync(string threadId, int? { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - RunsPageEnumerator enumerator = new RunsPageEnumerator(_pipeline, _endpoint, threadId, limit, order, after, before, options); + RunsPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, limit, order, after, before, options); return PageCollectionHelpers.CreateAsync(enumerator); } @@ -417,7 +417,7 @@ public virtual IEnumerable GetRuns(string threadId, int? limit, st { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - RunsPageEnumerator enumerator = new RunsPageEnumerator(_pipeline, _endpoint, threadId, limit, order, after, before, options); + RunsPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, limit, order, after, before, options); return PageCollectionHelpers.Create(enumerator); } @@ -495,7 +495,7 @@ public virtual IAsyncEnumerable GetRunStepsAsync(string threadId, Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); - RunStepsPageEnumerator enumerator = new RunStepsPageEnumerator(_pipeline, _endpoint, threadId, runId, limit, order, after, before, options); + RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, runId, limit, order, after, before, options); return PageCollectionHelpers.CreateAsync(enumerator); } @@ -533,7 +533,7 @@ public virtual IEnumerable GetRunSteps(string threadId, string run Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); - RunStepsPageEnumerator enumerator = new RunStepsPageEnumerator(_pipeline, _endpoint, threadId, runId, limit, order, after, before, options); + RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, threadId, runId, limit, order, after, before, options); return PageCollectionHelpers.Create(enumerator); } diff --git a/src/Custom/Assistants/AssistantClient.cs b/src/Custom/Assistants/AssistantClient.cs index 611ef7edd..3ca8be2f8 100644 --- a/src/Custom/Assistants/AssistantClient.cs +++ b/src/Custom/Assistants/AssistantClient.cs @@ -118,14 +118,8 @@ public virtual AsyncPageCollection GetAssistantsAsync( AssistantCollectionOptions options = default, CancellationToken cancellationToken = default) { - AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetAssistantsAsync(options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -144,14 +138,8 @@ public virtual AsyncPageCollection GetAssistantsAsync( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); AssistantsPageToken pageToken = AssistantsPageToken.FromToken(firstPageToken); - AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetAssistantsAsync(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken.Before, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -167,14 +155,8 @@ public virtual PageCollection GetAssistants( AssistantCollectionOptions options = default, CancellationToken cancellationToken = default) { - AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetAssistants(options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -193,14 +175,8 @@ public virtual PageCollection GetAssistants( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); AssistantsPageToken pageToken = AssistantsPageToken.FromToken(firstPageToken); - AssistantsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetAssistants(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken.Before, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -486,15 +462,8 @@ public virtual AsyncPageCollection GetMessagesAsync( { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetMessagesAsync(threadId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -513,15 +482,8 @@ public virtual AsyncPageCollection GetMessagesAsync( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); MessagesPageToken pageToken = MessagesPageToken.FromToken(firstPageToken); - MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetMessagesAsync(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -541,15 +503,8 @@ public virtual PageCollection GetMessages( { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetMessages(threadId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -568,15 +523,9 @@ public virtual PageCollection GetMessages( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); MessagesPageToken pageToken = MessagesPageToken.FromToken(firstPageToken); - MessagesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetMessages(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as PageCollection; + } /// @@ -888,15 +837,8 @@ public virtual AsyncPageCollection GetRunsAsync( { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - RunsPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetRunsAsync(threadId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -915,15 +857,8 @@ public virtual AsyncPageCollection GetRunsAsync( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); RunsPageToken pageToken = RunsPageToken.FromToken(firstPageToken); - RunsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetRunsAsync(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -943,15 +878,8 @@ public virtual PageCollection GetRuns( { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); - RunsPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetRuns(threadId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -970,15 +898,8 @@ public virtual PageCollection GetRuns( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); RunsPageToken pageToken = RunsPageToken.FromToken(firstPageToken); - RunsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetRuns(pageToken?.ThreadId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -1168,16 +1089,8 @@ public virtual AsyncPageCollection GetRunStepsAsync( Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); - RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - runId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetRunStepsAsync(threadId, runId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -1196,16 +1109,8 @@ public virtual AsyncPageCollection GetRunStepsAsync( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); RunStepsPageToken pageToken = RunStepsPageToken.FromToken(firstPageToken); - RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.RunId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetRunStepsAsync(pageToken?.ThreadId, pageToken?.RunId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -1228,16 +1133,8 @@ public virtual PageCollection GetRunSteps( Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); - RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, - threadId, - runId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetRunSteps(threadId, runId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -1256,16 +1153,8 @@ public virtual PageCollection GetRunSteps( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); RunStepsPageToken pageToken = RunStepsPageToken.FromToken(firstPageToken); - RunStepsPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.ThreadId, - pageToken.RunId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetRunSteps(pageToken?.ThreadId, pageToken?.RunId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as PageCollection; } /// diff --git a/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs index 634dd6b15..66019bbb5 100644 --- a/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs +++ b/src/Custom/Assistants/Internal/Pagination/AssistantsPageEnumerator.cs @@ -21,6 +21,8 @@ internal partial class AssistantsPageEnumerator : PageEnumerator private readonly string _before; private readonly RequestOptions _options; + public virtual ClientPipeline Pipeline => _pipeline; + public AssistantsPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs index c8ee06035..53e09fec5 100644 --- a/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs +++ b/src/Custom/Assistants/Internal/Pagination/MessagesPageEnumerator.cs @@ -22,6 +22,8 @@ internal partial class MessagesPageEnumerator : PageEnumerator private readonly string _before; private readonly RequestOptions _options; + public virtual ClientPipeline Pipeline => _pipeline; + public MessagesPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs index d6d74d7d2..b5992ce78 100644 --- a/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs +++ b/src/Custom/Assistants/Internal/Pagination/RunStepsPageEnumerator.cs @@ -23,6 +23,8 @@ internal partial class RunStepsPageEnumerator : PageEnumerator private string? _after; + public virtual ClientPipeline Pipeline => _pipeline; + public RunStepsPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs b/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs index 3a0b827d0..f48ceb3c1 100644 --- a/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs +++ b/src/Custom/Assistants/Internal/Pagination/RunsPageEnumerator.cs @@ -22,6 +22,8 @@ internal partial class RunsPageEnumerator : PageEnumerator private readonly string _before; private readonly RequestOptions _options; + public virtual ClientPipeline Pipeline => _pipeline; + public RunsPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs index cd4f938e9..1445485dc 100644 --- a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs +++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFileBatchesPageEnumerator.cs @@ -24,6 +24,8 @@ internal partial class VectorStoreFileBatchesPageEnumerator : PageEnumerator _pipeline; + public VectorStoreFileBatchesPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs index 3063fb397..9a5e9bec3 100644 --- a/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs +++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoreFilesPageEnumerator.cs @@ -23,6 +23,8 @@ internal partial class VectorStoreFilesPageEnumerator : PageEnumerator _pipeline; + public VectorStoreFilesPageEnumerator( ClientPipeline pipeline, Uri endpoint, diff --git a/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs b/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs index 3e454f384..311a88372 100644 --- a/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs +++ b/src/Custom/VectorStores/Internal/Pagination/VectorStoresPageEnumerator.cs @@ -20,6 +20,8 @@ internal partial class VectorStoresPageEnumerator : PageEnumerator private string _after; + public virtual ClientPipeline Pipeline => _pipeline; + public VectorStoresPageEnumerator( ClientPipeline pipeline, Uri endpoint, @@ -96,7 +98,7 @@ internal virtual ClientResult GetVectorStores(int? limit, string order, string a return ClientResult.FromResponse(_pipeline.ProcessMessage(message, options)); } - private PipelineMessage CreateGetVectorStoresRequest(int? limit, string order, string after, string before, RequestOptions options) + internal PipelineMessage CreateGetVectorStoresRequest(int? limit, string order, string after, string before, RequestOptions options) { var message = _pipeline.CreateMessage(); message.ResponseClassifier = PipelineMessageClassifier200; diff --git a/src/Custom/VectorStores/VectorStoreClient.cs b/src/Custom/VectorStores/VectorStoreClient.cs index 161f4f6ab..1d5947894 100644 --- a/src/Custom/VectorStores/VectorStoreClient.cs +++ b/src/Custom/VectorStores/VectorStoreClient.cs @@ -214,14 +214,8 @@ public virtual AsyncPageCollection GetVectorStoresAsync( VectorStoreCollectionOptions options = default, CancellationToken cancellationToken = default) { - VectorStoresPageEnumerator enumerator = new(_pipeline, _endpoint, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetVectorStoresAsync(options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -240,14 +234,8 @@ public virtual AsyncPageCollection GetVectorStoresAsync( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); VectorStoresPageToken pageToken = VectorStoresPageToken.FromToken(firstPageToken); - VectorStoresPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetVectorStoresAsync(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -263,14 +251,8 @@ public virtual PageCollection GetVectorStores( VectorStoreCollectionOptions options = default, CancellationToken cancellationToken = default) { - VectorStoresPageEnumerator enumerator = new(_pipeline, _endpoint, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetVectorStores(options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -289,14 +271,8 @@ public virtual PageCollection GetVectorStores( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); VectorStoresPageToken pageToken = VectorStoresPageToken.FromToken(firstPageToken); - VectorStoresPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetVectorStores(pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -355,16 +331,8 @@ public virtual AsyncPageCollection GetFileAssociatio { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); - VectorStoreFilesPageEnumerator enumerator = new(_pipeline, _endpoint, - vectorStoreId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - options?.Filter?.ToString(), - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetFileAssociationsAsync(vectorStoreId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, options?.Filter?.ToString(), cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -383,16 +351,8 @@ public virtual AsyncPageCollection GetFileAssociatio Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); VectorStoreFilesPageToken pageToken = VectorStoreFilesPageToken.FromToken(firstPageToken); - VectorStoreFilesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.VectorStoreId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - pageToken.Filter, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetFileAssociationsAsync(pageToken?.VectorStoreId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, pageToken?.Filter, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -415,16 +375,8 @@ public virtual PageCollection GetFileAssociations( { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); - VectorStoreFilesPageEnumerator enumerator = new(_pipeline, _endpoint, - vectorStoreId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - options?.Filter?.ToString(), - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetFileAssociations(vectorStoreId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, options?.Filter?.ToString(), cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -443,16 +395,8 @@ public virtual PageCollection GetFileAssociations( Argument.AssertNotNull(firstPageToken, nameof(firstPageToken)); VectorStoreFilesPageToken pageToken = VectorStoreFilesPageToken.FromToken(firstPageToken); - VectorStoreFilesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.VectorStoreId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - pageToken.Filter, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetFileAssociations(pageToken?.VectorStoreId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, pageToken?.Filter, cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -680,17 +624,8 @@ public virtual AsyncPageCollection GetFileAssociatio Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); Argument.AssertNotNullOrEmpty(batchJobId, nameof(batchJobId)); - VectorStoreFileBatchesPageEnumerator enumerator = new(_pipeline, _endpoint, - vectorStoreId, - batchJobId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - options?.Filter?.ToString(), - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetFileAssociationsAsync(vectorStoreId, batchJobId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, options?.Filter?.ToString(), cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -732,17 +667,8 @@ public virtual AsyncPageCollection GetFileAssociatio nameof(vectorStoreId)); } - VectorStoreFileBatchesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.VectorStoreId, - pageToken.BatchId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - pageToken.Filter, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.CreateAsync(enumerator); + return GetFileAssociationsAsync(vectorStoreId, batchJobId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, pageToken?.Filter, cancellationToken.ToRequestOptions()) + as AsyncPageCollection; } /// @@ -770,17 +696,8 @@ public virtual PageCollection GetFileAssociations( Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); Argument.AssertNotNullOrEmpty(batchJobId, nameof(batchJobId)); - VectorStoreFileBatchesPageEnumerator enumerator = new(_pipeline, _endpoint, - vectorStoreId, - batchJobId, - options?.PageSize, - options?.Order?.ToString(), - options?.AfterId, - options?.BeforeId, - options?.Filter?.ToString(), - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetFileAssociations(vectorStoreId, batchJobId, options?.PageSize, options?.Order?.ToString(), options?.AfterId, options?.BeforeId, options?.Filter?.ToString(), cancellationToken.ToRequestOptions()) + as PageCollection; } /// @@ -823,16 +740,7 @@ public virtual PageCollection GetFileAssociations( nameof(vectorStoreId)); } - VectorStoreFileBatchesPageEnumerator enumerator = new(_pipeline, _endpoint, - pageToken.VectorStoreId, - pageToken.BatchId, - pageToken.Limit, - pageToken.Order, - pageToken.After, - pageToken.Before, - pageToken.Filter, - cancellationToken.ToRequestOptions()); - - return PageCollectionHelpers.Create(enumerator); + return GetFileAssociations(vectorStoreId, batchJobId, pageToken?.Limit, pageToken?.Order, pageToken?.After, pageToken?.Before, pageToken?.Filter, cancellationToken.ToRequestOptions()) + as PageCollection; } }