Merge pull request #25 from knnlabs/Conduit2

nickna · web-flow · commit 5c64c4d8bc83 · 2025-06-09T10:04:54.000-07:00
Conduit2
diff --git a/ConduitLLM.Admin.Tests/ConduitLLM.Admin.Tests.csproj b/ConduitLLM.Admin.Tests/ConduitLLM.Admin.Tests.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <NoWarn>CS8600;CS8602;CS8603;CS8604;CS8620;CS8625;xUnit2013</NoWarn>
+    <NoWarn>xUnit2013</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ConduitLLM.Admin.Tests/Controllers/IpFilterControllerTests.cs b/ConduitLLM.Admin.Tests/Controllers/IpFilterControllerTests.cs
@@ -120,7 +120,7 @@ public async Task GetFilterById_NonexistentFilter_ReturnsNotFound()
             // Arrange
             _mockService
                 .Setup(s => s.GetFilterByIdAsync(999))
-                .ReturnsAsync((IpFilterDto)null);
+                .ReturnsAsync((IpFilterDto?)null);
 
             // Act
             var result = await _controller.GetFilterById(999);
@@ -163,7 +163,7 @@ public async Task CreateFilter_ValidFilter_ReturnsCreatedWithFilter()
             var createdResult = Assert.IsType<CreatedAtActionResult>(result);
             Assert.Equal(StatusCodes.Status201Created, createdResult.StatusCode);
             Assert.Equal("GetFilterById", createdResult.ActionName);
-            Assert.Equal(3, createdResult.RouteValues["id"]);
+            Assert.Equal(3, createdResult.RouteValues?["id"]);
             
             var returnValue = Assert.IsType<IpFilterDto>(createdResult.Value);
             Assert.Equal(3, returnValue.Id);
diff --git a/ConduitLLM.Admin.Tests/Controllers/VirtualKeysControllerTests.cs b/ConduitLLM.Admin.Tests/Controllers/VirtualKeysControllerTests.cs
@@ -62,7 +62,7 @@ public async Task GenerateKey_ValidRequest_ReturnsCreatedResponse()
             var createdAtActionResult = Assert.IsType<CreatedAtActionResult>(result);
             Assert.Equal(StatusCodes.Status201Created, createdAtActionResult.StatusCode);
             Assert.Equal("GetKeyById", createdAtActionResult.ActionName);
-            Assert.Equal(1, createdAtActionResult.RouteValues["id"]);
+            Assert.Equal(1, createdAtActionResult.RouteValues?["id"]);
             
             var returnValue = Assert.IsType<CreateVirtualKeyResponseDto>(createdAtActionResult.Value);
             Assert.Equal("vk_testkeystring", returnValue.VirtualKey);
@@ -215,7 +215,7 @@ public async Task GetKeyById_NonExistingKey_ReturnsNotFound()
             // Arrange
             _mockVirtualKeyService
                 .Setup(s => s.GetVirtualKeyInfoAsync(999))
-                .ReturnsAsync((VirtualKeyDto)null);
+                .ReturnsAsync((VirtualKeyDto?)null);
 
             // Act
             var result = await _controller.GetKeyById(999);
diff --git a/ConduitLLM.Admin.Tests/Security/MasterKeyAuthorizationHandlerTests.cs b/ConduitLLM.Admin.Tests/Security/MasterKeyAuthorizationHandlerTests.cs
@@ -129,7 +129,7 @@ public async Task HandleRequirementAsync_NullMasterKeyConfig_DoesNotSucceedRequi
             
             _mockConfiguration
                 .Setup(c => c[configKey])
-                .Returns((string)null);
+                .Returns((string?)null);
             
             _httpContext.Request.Headers["X-API-Key"] = "any-key";
 
diff --git a/ConduitLLM.Admin.Tests/Services/AdminProviderCredentialServiceTests.cs b/ConduitLLM.Admin.Tests/Services/AdminProviderCredentialServiceTests.cs
@@ -41,15 +41,15 @@ public async Task TestProviderConnectionAsync_OpenRouter_ValidKey_ReturnsSuccess
                 Id = 1,
                 ProviderName = "OpenRouter",
                 ApiKey = "valid-key",
-                ApiBase = null
+                ApiBase = string.Empty
             };
 
             var dbCredential = new ProviderCredential
             {
                 Id = 1,
                 ProviderName = "OpenRouter",
                 ApiKey = "valid-key",
-                BaseUrl = null
+                BaseUrl = string.Empty
             };
 
             _mockProviderCredentialRepository
@@ -104,15 +104,15 @@ public async Task TestProviderConnectionAsync_OpenRouter_InvalidKey_ReturnsFailu
                 Id = 1,
                 ProviderName = "OpenRouter",
                 ApiKey = "invalid-key",
-                ApiBase = null
+                ApiBase = string.Empty
             };
 
             var dbCredential = new ProviderCredential
             {
                 Id = 1,
                 ProviderName = "OpenRouter",
                 ApiKey = "invalid-key",
-                BaseUrl = null
+                BaseUrl = string.Empty
             };
 
             _mockProviderCredentialRepository
@@ -168,15 +168,15 @@ public async Task TestProviderConnectionAsync_OtherProvider_UsesSimpleCheck()
                 Id = 1,
                 ProviderName = "OpenAI",
                 ApiKey = "sk-test",
-                ApiBase = null
+                ApiBase = string.Empty
             };
 
             var dbCredential = new ProviderCredential
             {
                 Id = 1,
                 ProviderName = "OpenAI",
                 ApiKey = "sk-test",
-                BaseUrl = null
+                BaseUrl = string.Empty
             };
 
             _mockProviderCredentialRepository
diff --git a/ConduitLLM.Admin.Tests/Services/AdminVirtualKeyServiceTests.cs b/ConduitLLM.Admin.Tests/Services/AdminVirtualKeyServiceTests.cs
@@ -114,7 +114,7 @@ public async Task GetVirtualKeyInfoAsync_NonExistingId_ReturnsNull()
 
             _mockVirtualKeyRepository
                 .Setup(r => r.GetByIdAsync(keyId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync((VirtualKey)null);
+                .ReturnsAsync((VirtualKey?)null);
 
             // Act
             var result = await _service.GetVirtualKeyInfoAsync(keyId);
@@ -231,7 +231,7 @@ public async Task UpdateVirtualKeyAsync_NonExistingId_ReturnsFalse()
 
             _mockVirtualKeyRepository
                 .Setup(r => r.GetByIdAsync(keyId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync((VirtualKey)null);
+                .ReturnsAsync((VirtualKey?)null);
 
             // Act
             var result = await _service.UpdateVirtualKeyAsync(keyId, updateRequest);
@@ -346,7 +346,7 @@ public async Task ResetSpendAsync_NonExistingId_ReturnsFalse()
 
             _mockVirtualKeyRepository
                 .Setup(r => r.GetByIdAsync(keyId, It.IsAny<CancellationToken>()))
-                .ReturnsAsync((VirtualKey)null);
+                .ReturnsAsync((VirtualKey?)null);
 
             // Act
             var result = await _service.ResetSpendAsync(keyId);
diff --git a/ConduitLLM.Admin/ConduitLLM.Admin.csproj b/ConduitLLM.Admin/ConduitLLM.Admin.csproj
@@ -15,6 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ConduitLLM.Configuration\ConduitLLM.Configuration.csproj" />
     <ProjectReference Include="..\ConduitLLM.Core\ConduitLLM.Core.csproj" />
+    <ProjectReference Include="..\ConduitLLM.Providers\ConduitLLM.Providers.csproj" />
     <!-- WebUI reference removed, now using API client -->
   </ItemGroup>
 
diff --git a/ConduitLLM.Admin/Controllers/AudioConfigurationController.cs b/ConduitLLM.Admin/Controllers/AudioConfigurationController.cs
@@ -15,7 +15,7 @@ namespace ConduitLLM.Admin.Controllers
     /// </summary>
     [ApiController]
     [Route("api/admin/audio")]
-    [Authorize(Policy = "MasterKeyAuth")]
+    [Authorize(Policy = "MasterKeyPolicy")]
     public class AudioConfigurationController : ControllerBase
     {
         private readonly IAdminAudioProviderService _providerService;
diff --git a/ConduitLLM.Admin/Dockerfile b/ConduitLLM.Admin/Dockerfile
@@ -11,6 +11,7 @@ WORKDIR /src
 COPY ["ConduitLLM.Admin/ConduitLLM.Admin.csproj", "ConduitLLM.Admin/"]
 COPY ["ConduitLLM.Configuration/ConduitLLM.Configuration.csproj", "ConduitLLM.Configuration/"]
 COPY ["ConduitLLM.Core/ConduitLLM.Core.csproj", "ConduitLLM.Core/"]
+COPY ["ConduitLLM.Providers/ConduitLLM.Providers.csproj", "ConduitLLM.Providers/"]
 RUN dotnet restore "ConduitLLM.Admin/ConduitLLM.Admin.csproj"
 COPY . .
 WORKDIR "/src/ConduitLLM.Admin"
diff --git a/ConduitLLM.Admin/Program.cs b/ConduitLLM.Admin/Program.cs
@@ -1,6 +1,7 @@
 using ConduitLLM.Admin.Extensions;
 using ConduitLLM.Configuration.Extensions;
 using ConduitLLM.Core.Extensions;
+using ConduitLLM.Providers.Extensions;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -78,6 +79,9 @@ public static void Main(string[] args)
         // Add Configuration services
         builder.Services.AddConfigurationServices(builder.Configuration);
         
+        // Add Provider services (needed for ILLMClientFactory)
+        builder.Services.AddProviderServices();
+        
         // Add Admin services
         builder.Services.AddAdminServices(builder.Configuration);
 
diff --git a/ConduitLLM.Tests/ConduitLLM.Tests.csproj b/ConduitLLM.Tests/ConduitLLM.Tests.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <NoWarn>CS8600;CS8602;CS8603;CS8604;CS8620;CS8625;xUnit2013</NoWarn>
+    <NoWarn>xUnit2013</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ConduitLLM.Tests/Integration/AudioApiIntegrationTests.cs b/ConduitLLM.Tests/Integration/AudioApiIntegrationTests.cs
@@ -163,7 +163,7 @@ public async Task TextToSpeech_WithValidText_ReturnsAudio()
                 Assert.NotNull(response);
                 Assert.NotNull(response.AudioData);
                 Assert.True(response.AudioData.Length > 0);
-                Assert.Equal(AudioFormat.Mp3.ToString(), response.Format.ToString());
+                Assert.Equal(AudioFormat.Mp3.ToString(), response.Format?.ToString());
                 _output.WriteLine($"Generated audio size: {response.AudioData.Length} bytes");
             }
             else
diff --git a/ConduitLLM.Tests/WebUI/AdminApiClientConfigurationTests.cs b/ConduitLLM.Tests/WebUI/AdminApiClientConfigurationTests.cs
@@ -87,7 +87,7 @@ public void ApiClient_HandlesNullOptions_WithDefaults()
         {
             // Arrange
             var optionsMock = new Mock<IOptions<AdminApiOptions>>();
-            optionsMock.Setup(o => o.Value).Returns((AdminApiOptions?)null);
+            optionsMock.Setup(o => o.Value).Returns(new AdminApiOptions());
 
             // Act
             using var httpClient = new HttpClient(_handlerMock.Object);
diff --git a/ConduitLLM.Tests/WebUI/AdminApiClientErrorHandlingTests.cs b/ConduitLLM.Tests/WebUI/AdminApiClientErrorHandlingTests.cs
@@ -74,7 +74,7 @@ public async Task ApiClient_HandlesHttpRequestException()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -101,7 +101,7 @@ public async Task ApiClient_HandlesTimeout()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -134,7 +134,7 @@ public async Task ApiClient_HandlesInvalidJson()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -167,7 +167,7 @@ public async Task ApiClient_HandlesServerError()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -200,7 +200,7 @@ public async Task ApiClient_HandlesUnauthorized()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -233,7 +233,7 @@ public async Task ApiClient_HandlesNotFound_ForGetAll()
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
                     It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
@@ -269,15 +269,15 @@ public async Task ApiClient_ReturnsEmptyCollection_WhenApiReturnsNull()
                     It.IsAny<EventId>(),
                     It.IsAny<It.IsAnyType>(),
                     It.IsAny<Exception>(),
-                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
+                    It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Never);
         }
 
         [Fact]
         public async Task ApiClient_SetsHeadersCorrectly()
         {
             // Arrange
-            HttpRequestMessage capturedRequest = null;
+            HttpRequestMessage? capturedRequest = null;
 
             _handlerMock.Protected()
                 .Setup<Task<HttpResponseMessage>>(
@@ -305,7 +305,7 @@ public async Task ApiClient_SetsHeadersCorrectly()
         public async Task ApiClient_ConstructsUrlsCorrectly()
         {
             // Arrange
-            HttpRequestMessage capturedRequest = null;
+            HttpRequestMessage? capturedRequest = null;
 
             _handlerMock.Protected()
                 .Setup<Task<HttpResponseMessage>>(
@@ -332,7 +332,7 @@ public async Task ApiClient_ConstructsUrlsCorrectly()
         public async Task ApiClient_HandlesUriEscaping()
         {
             // Arrange
-            HttpRequestMessage capturedRequest = null;
+            HttpRequestMessage? capturedRequest = null;
 
             _handlerMock.Protected()
                 .Setup<Task<HttpResponseMessage>>(
diff --git a/ConduitLLM.Tests/WebUI/AdminApiClientTests.cs b/ConduitLLM.Tests/WebUI/AdminApiClientTests.cs
@@ -108,9 +108,9 @@ public async Task GetAllVirtualKeysAsync_ReturnsEmptyList_WhenApiThrowsException
                 x => x.Log(
                     LogLevel.Error,
                     It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => v.ToString().Contains("Error retrieving virtual keys")),
+                    It.Is<It.IsAnyType>((v, t) => v != null && v.ToString() != null && v.ToString()!.Contains("Error retrieving virtual keys")),
                     It.IsAny<Exception>(),
-                    It.IsAny<Func<It.IsAnyType, Exception, string>>()),
+                    It.IsAny<Func<It.IsAnyType, Exception?, string>>()),
                 Times.Once);
         }
 
diff --git a/ConduitLLM.Tests/WebUI/Extensions/AdminApiClientTestExtensions.cs b/ConduitLLM.Tests/WebUI/Extensions/AdminApiClientTestExtensions.cs
@@ -26,7 +26,7 @@ public static class AdminApiClientTestExtensions
             DateTime startDate,
             DateTime endDate,
             int? virtualKeyId = null,
-            string modelName = null)
+            string? modelName = null)
         {
             // For test mocking only - real implementation would call the API
             return Task.FromResult(new List<ConduitLLM.Configuration.DTOs.DailyUsageStatsDto>());
@@ -46,7 +46,7 @@ public static class AdminApiClientTestExtensions
             DateTime startDate,
             DateTime endDate,
             int? virtualKeyId = null,
-            string modelName = null)
+            string? modelName = null)
         {
             // For test mocking only - real implementation would call the API
             return Task.FromResult(new List<ConduitLLM.Configuration.DTOs.Costs.DetailedCostDataDto>());
diff --git a/ConduitLLM.WebUI/Components/Pages/Configuration.razor b/ConduitLLM.WebUI/Components/Pages/Configuration.razor
diff --git a/ConduitLLM.WebUI/Components/Pages/ConfigurationTemplate.razor b/ConduitLLM.WebUI/Components/Pages/ConfigurationTemplate.razor
diff --git a/ConduitLLM.WebUI/Components/Pages/ModelCosts.razor b/ConduitLLM.WebUI/Components/Pages/ModelCosts.razor

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace ConduitLLM.Admin.Controllers`
`15`	`15`	`/// </summary>`
`16`	`16`	`[ApiController]`
`17`	`17`	`[Route("api/admin/audio")]`
`18`		`- [Authorize(Policy = "MasterKeyAuth")]`
	`18`	`+ [Authorize(Policy = "MasterKeyPolicy")]`
`19`	`19`	`public class AudioConfigurationController : ControllerBase`
`20`	`20`	`{`
`21`	`21`	`private readonly IAdminAudioProviderService _providerService;`