Skip to content

DevMirror CI: build .dotnet.azure for a quick compilation check #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trrwilson merged 3 commits into from
Aug 8, 2024
Merged

DevMirror CI: build .dotnet.azure for a quick compilation check #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4af4943
add .dotnet.azure build to workflow for compilation checks
trrwilson Aug 8, 2024
ccce315
warning fixes; try parallel job
trrwilson Aug 8, 2024
d0147c7
fix copy/paste
trrwilson Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .dotnet.azure/.tests.staging/AoaiTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -172,10 +170,10 @@ public TClient GetTestClient()
/// test configuration.</param>
/// <param name="keyCredential">(Optional) The key credential to use instead of the one from the configuration.</param>
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);
Expand Down Expand Up @@ -612,7 +610,7 @@ protected virtual TModel ValidateAndParse<TModel>(ClientResult result) where TMo
{
var response = ValidateClientResultResponse(result);

TModel? model = ModelReaderWriter.Read<TModel>(response.Content, ModelReaderWriterOptions.Json);
TModel model = ModelReaderWriter.Read<TModel>(response.Content, ModelReaderWriterOptions.Json);
Assert.That(model, Is.Not.Null);
return model!;
}
Expand Down
2 changes: 1 addition & 1 deletion .dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureAssistantsPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions .dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureMessagesPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.Assistants;

internal partial class AzureMessagesPageEnumerator : MessagesPageEnumerator
Expand Down
8 changes: 3 additions & 5 deletions .dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunStepsPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.Assistants;

internal partial class AzureRunStepsPageEnumerator : RunStepsPageEnumerator
Expand All @@ -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)
Expand All @@ -23,7 +21,7 @@ public AzureRunStepsPageEnumerator(
_apiVersion = apiVersion;
}

internal override async Task<ClientResult> GetRunStepsAsync(string threadId, string runId, int? limit, string? order, string? after, string? before, RequestOptions? options)
internal override async Task<ClientResult> 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));
Expand All @@ -32,7 +30,7 @@ internal override async Task<ClientResult> 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));
Expand Down
2 changes: 0 additions & 2 deletions .dotnet.azure/src/Custom/Assistants/Internal/Pagination/AzureRunsPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.Assistants;

internal partial class AzureRunsPageEnumerator : RunsPageEnumerator
Expand Down
8 changes: 3 additions & 5 deletions .../src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFileBatchesPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.VectorStores;

internal partial class AzureVectorStoreFileBatchesPageEnumerator : VectorStoreFileBatchesPageEnumerator
Expand All @@ -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)
Expand All @@ -22,7 +20,7 @@ public AzureVectorStoreFileBatchesPageEnumerator(
_apiVersion = apiVersion;
}

internal override async Task<ClientResult> GetFileAssociationsAsync(string vectorStoreId, string batchId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options)
internal override async Task<ClientResult> 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));
Expand All @@ -31,7 +29,7 @@ internal override async Task<ClientResult> 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));
Expand Down
8 changes: 3 additions & 5 deletions ....azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoreFilesPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.VectorStores;

internal partial class AzureVectorStoreFilesPageEnumerator : VectorStoreFilesPageEnumerator
Expand All @@ -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)
Expand All @@ -23,15 +21,15 @@ public AzureVectorStoreFilesPageEnumerator(
_apiVersion = apiVersion;
}

internal override async Task<ClientResult> GetFileAssociationsAsync(string vectorStoreId, int? limit, string? order, string? after, string? before, string? filter, RequestOptions options)
internal override async Task<ClientResult> GetFileAssociationsAsync(string vectorStoreId, int? limit, string order, string after, string before, string filter, RequestOptions options)
{
Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));

using PipelineMessage message = CreateGetVectorStoreFilesRequest(vectorStoreId, limit, order, after, before, filter, options);
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));

Expand Down
2 changes: 0 additions & 2 deletions .dotnet.azure/src/Custom/VectorStores/Internal/Pagination/AzureVectorStoresPageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.ClientModel;
using System.ClientModel.Primitives;

#nullable enable

namespace Azure.AI.OpenAI.VectorStores;

internal partial class AzureVectorStoresPageEnumerator : VectorStoresPageEnumerator
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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