diff --git a/.dotnet.azure/.tests.staging/AoaiTestBase.cs b/.dotnet.azure/.tests.staging/AoaiTestBase.cs index c73cf63dd..a04fef9ea 100644 --- a/.dotnet.azure/.tests.staging/AoaiTestBase.cs +++ b/.dotnet.azure/.tests.staging/AoaiTestBase.cs @@ -1,8 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#nullable enable - using System; using System.ClientModel; using System.ClientModel.Primitives; @@ -172,10 +170,10 @@ public TClient GetTestClient() /// test configuration. /// (Optional) The key credential to use instead of the one from the configuration. public virtual AzureOpenAIClient GetTestTopLevelClient( - object? config, // IConfiguration? config, - object? options = null, // TestClientOptions? options = null, - TokenCredential? tokenCredential = null, - ApiKeyCredential? keyCredential = null) + object config, // IConfiguration? config, + object options = null, // TestClientOptions? options = null, + TokenCredential tokenCredential = null, + ApiKeyCredential keyCredential = null) { string rawEndpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT"); Uri endpoint = new(rawEndpoint); @@ -612,7 +610,7 @@ protected virtual TModel ValidateAndParse(ClientResult result) where TMo { var response = ValidateClientResultResponse(result); - TModel? model = ModelReaderWriter.Read(response.Content, ModelReaderWriterOptions.Json); + TModel model = ModelReaderWriter.Read(response.Content, ModelReaderWriterOptions.Json); Assert.That(model, Is.Not.Null); return model!; } diff --git a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureAssistantsPageEnumerator.cs b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureAssistantsPageEnumerator.cs index d406c67da..9b1975a15 100644 --- a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureAssistantsPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureAssistantsPageEnumerator.cs @@ -34,7 +34,7 @@ internal override ClientResult GetAssistants(int? limit, string order, string af return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options)); } - private new PipelineMessage CreateGetAssistantsRequest(int? limit, string order, string after, string before, RequestOptions options) + private PipelineMessage CreateGetAssistantsRequest(int? limit, string order, string after, string before, RequestOptions options) => new AzureOpenAIPipelineMessageBuilder(Pipeline, _endpoint, _apiVersion) .WithAssistantsHeader() .WithOptions(options) diff --git a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureMessagesPageEnumerator.cs b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureMessagesPageEnumerator.cs index 6f2150dbb..46486b06b 100644 --- a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureMessagesPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureMessagesPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.Assistants; internal partial class AzureMessagesPageEnumerator : MessagesPageEnumerator diff --git a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunStepsPageEnumerator.cs b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunStepsPageEnumerator.cs index 633aa3d6e..9d66fbc3a 100644 --- a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunStepsPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunStepsPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.Assistants; internal partial class AzureRunStepsPageEnumerator : RunStepsPageEnumerator @@ -14,7 +12,7 @@ public AzureRunStepsPageEnumerator( ClientPipeline pipeline, Uri endpoint, string threadId, string runId, - int? limit, string? order, string? after, string? before, + int? limit, string order, string after, string before, string apiVersion, RequestOptions options) : base(pipeline, endpoint, threadId, runId, limit, order, after, before, options) @@ -23,7 +21,7 @@ public AzureRunStepsPageEnumerator( _apiVersion = apiVersion; } - internal override async Task GetRunStepsAsync(string threadId, string runId, int? limit, string? order, string? after, string? before, RequestOptions? options) + internal override async Task GetRunStepsAsync(string threadId, string runId, int? limit, string order, string after, string before, RequestOptions options) { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); @@ -32,7 +30,7 @@ internal override async Task GetRunStepsAsync(string threadId, str return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - internal override ClientResult GetRunSteps(string threadId, string runId, int? limit, string? order, string? after, string? before, RequestOptions? options) + internal override ClientResult GetRunSteps(string threadId, string runId, int? limit, string order, string after, string before, RequestOptions options) { Argument.AssertNotNullOrEmpty(threadId, nameof(threadId)); Argument.AssertNotNullOrEmpty(runId, nameof(runId)); diff --git a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunsPageEnumerator.cs b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunsPageEnumerator.cs index 2a180d2f9..0b394354a 100644 --- a/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunsPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunsPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.Assistants; internal partial class AzureRunsPageEnumerator : RunsPageEnumerator diff --git a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFileBatchesPageEnumerator.cs b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFileBatchesPageEnumerator.cs index d2505c8ab..bfb2bf07c 100644 --- a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFileBatchesPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFileBatchesPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.VectorStores; internal partial class AzureVectorStoreFileBatchesPageEnumerator : VectorStoreFileBatchesPageEnumerator @@ -13,7 +11,7 @@ internal partial class AzureVectorStoreFileBatchesPageEnumerator : VectorStoreFi public AzureVectorStoreFileBatchesPageEnumerator( ClientPipeline pipeline, Uri endpoint, - string vectorStoreId, string batchId, int? limit, string? order, string? after, string? before, string? filter, + string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, string apiVersion, RequestOptions options) : base(pipeline, endpoint, vectorStoreId, batchId, limit, order, after, before, filter, options) @@ -22,7 +20,7 @@ public AzureVectorStoreFileBatchesPageEnumerator( _apiVersion = apiVersion; } - internal override async Task GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options) + internal override async Task GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options) { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); Argument.AssertNotNullOrEmpty(batchId, nameof(batchId)); @@ -31,7 +29,7 @@ internal override async Task GetFileAssociationsAsync(string vecto return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - internal override ClientResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options) + internal override ClientResult GetFileAssociations(string vectorStoreId, string batchId, int? limit, string order, string after, string before, string filter, RequestOptions options) { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); Argument.AssertNotNullOrEmpty(batchId, nameof(batchId)); diff --git a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFilesPageEnumerator.cs b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFilesPageEnumerator.cs index 208ae233d..5cf8b09ff 100644 --- a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFilesPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFilesPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.VectorStores; internal partial class AzureVectorStoreFilesPageEnumerator : VectorStoreFilesPageEnumerator @@ -14,7 +12,7 @@ public AzureVectorStoreFilesPageEnumerator( ClientPipeline pipeline, Uri endpoint, string vectorStoreId, - int? limit, string? order, string? after, string? before, string? filter, + int? limit, string order, string after, string before, string filter, string apiVersion, RequestOptions options) : base(pipeline, endpoint, vectorStoreId, limit, order, after, before, filter, options) @@ -23,7 +21,7 @@ public AzureVectorStoreFilesPageEnumerator( _apiVersion = apiVersion; } - internal override async Task GetFileAssociationsAsync(string vectorStoreId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options) + internal override async Task GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options) { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); @@ -31,7 +29,7 @@ internal override async Task GetFileAssociationsAsync(string vecto return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false)); } - internal override ClientResult GetFileAssociations(string vectorStoreId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options) + internal override ClientResult GetFileAssociations(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options) { Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId)); diff --git a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoresPageEnumerator.cs b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoresPageEnumerator.cs index 23390e837..823045419 100644 --- a/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoresPageEnumerator.cs +++ b/.dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoresPageEnumerator.cs @@ -1,8 +1,6 @@ using System.ClientModel; using System.ClientModel.Primitives; -#nullable enable - namespace Azure.AI.OpenAI.VectorStores; internal partial class AzureVectorStoresPageEnumerator : VectorStoresPageEnumerator diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 906f5dbd3..8d6463250 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,3 +70,18 @@ jobs: --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate working-directory: .dotnet + + azure_build: # Development mirror only; validate AOAI compilation + runs-on: ubuntu-latest + steps: + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 8.x + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Build + run: dotnet build + working-directory: .dotnet.azure \ No newline at end of file