Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,16 @@ $RECYCLE.BIN/
# Vim temporary swap files
*.swp

# Project-specific
*.bak
*.org

appsettings.Development.json
appsettings.Production.json

# Live Unit Testing
*.lutconfig

# azd
.azure

Expand Down
43 changes: 43 additions & 0 deletions src/AzureOpenAIProxy.ApiApp/Builders/OpenAISettingsBuilder.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
using AzureOpenAIProxy.ApiApp.Configurations;

namespace AzureOpenAIProxy.ApiApp.Builders;

/// <summary>
/// This provides interface to the <see cref="OpenAISettingsBuilder"/> class.
/// </summary>
public interface IOpenAISettingsBuilder
{
/// <summary>
/// Sets the list of <see cref="OpenAIInstanceSettings"/> instances.
/// </summary>
/// <param name="instances">List of <see cref="OpenAIInstanceSettings"/> instances.</param>
void SetOpenAIInstances(IEnumerable<OpenAIInstanceSettings>? instances);

/// <summary>
/// Builds the <see cref="OpenAISettings"/> instance.
/// </summary>
/// <returns>Returns the <see cref="OpenAISettings"/> instance.</returns>
OpenAISettings Build();
}

/// <summary>
/// This represents the builder entity for <see cref="OpenAISettings"/> class.
/// </summary>
public class OpenAISettingsBuilder : IOpenAISettingsBuilder
{
private IEnumerable<OpenAIInstanceSettings>? _instances;

/// <inheritdoc />
public void SetOpenAIInstances(IEnumerable<OpenAIInstanceSettings>? instances)
{
this._instances = instances;
}

/// <inheritdoc />
public OpenAISettings Build()
{
var settings = new OpenAISettings() { Instances = (this._instances ?? []).ToList() };

return settings;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ public static class ServiceCollectionExtensions
/// </summary>
/// <param name="services"><see cref="IServiceCollection"/> instance.</param>
/// <returns>Returns <see cref="IServiceCollection"/> instance.</returns>
public static IServiceCollection AddOpenAISettingsFromAppSettings(this IServiceCollection services)
public static IServiceCollection AddOpenAISettings(this IServiceCollection services)
{
services.AddSingleton<OpenAISettings>(sp =>
{
//var settings = new OpenAISettingsBuilder()
// .WithAppSettings(sp)
// .WithKeyVault(sp)
// .Build();

var configuration = sp.GetService<IConfiguration>()
?? throw new InvalidOperationException($"{nameof(IConfiguration)} service is not registered.");

Expand All @@ -39,7 +44,7 @@ public static IServiceCollection AddOpenAISettingsFromAppSettings(this IServiceC
/// <returns>Returns <see cref="IServiceCollection"/> instance.</returns>
public static IServiceCollection AddOpenAIService(this IServiceCollection services)
{
services.AddOpenAISettingsFromAppSettings();
services.AddOpenAISettings();
services.AddHttpClient<IOpenAIService, OpenAIService>();

return services;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
using AzureOpenAIProxy.ApiApp.Builders;
using AzureOpenAIProxy.ApiApp.Configurations;

using FluentAssertions;

namespace AzureOpenAIProxy.ApiApp.Tests.Builders;

public class OpenAISettingsBuilderTests
{
[Fact]
public void Given_OpenAISettingsBuilder_When_Invoked_Build_Then_It_Should_Return_Instance()
{
// Arrange
var builder = new OpenAISettingsBuilder();

// Act
var result = builder.Build();

// Assert
result.Should().NotBeNull()
.And.BeOfType<OpenAISettings>();
}

[Fact]
public void Given_OpenAISettingsBuilder_When_Invoked_Build_Then_It_Should_Return_Empty()
{
// Arrange
var builder = new OpenAISettingsBuilder();

// Act
var result = builder.Build();

// Assert
result.Instances.Should().NotBeNull()
.And.BeEmpty();
}

[Theory]
[InlineData(0)]
[InlineData(1)]
[InlineData(10)]
public void Given_OpenAISettingsBuilder_When_Invoked_SetOpenAIInstances_Then_It_Should_Set_Instances(int count)
{
// Arrange
var builder = new OpenAISettingsBuilder();
var instances = Enumerable.Range(0, count).Select(p => new OpenAIInstanceSettings()).ToList();

// Act
builder.SetOpenAIInstances(instances);
var result = builder.Build();

// Assert
result.Instances.Should().HaveCount(count);
}

[Fact]
public void Given_OpenAISettingsBuilder_When_Invoked_SetOpenAIInstances_Then_It_Should_Return_Empty()
{
// Arrange
var builder = new OpenAISettingsBuilder();

// Act
builder.SetOpenAIInstances(null);
var result = builder.Build();

// Assert
result.Instances.Should().NotBeNull()
.And.BeEmpty();
}
}