misc

Author: dclipca

SpongeEngine.KoboldSharp.Tests/Integration/IntegrationTestBase.cs

@@ -19,17 +19,15 @@ protected IntegrationTestBase(ITestOutputHelper output)
             Logger = LoggerFactory
                 .Create(builder => builder.AddXUnit(output))
                 .CreateLogger(GetType());
-
-            var httpClient = new HttpClient 
-            { 
-                BaseAddress = new Uri(TestConfig.NativeApiBaseUrl),
-                Timeout = TimeSpan.FromSeconds(TestConfig.TimeoutSeconds)
-            };
 
             Client = new KoboldSharpClient(
                 new KoboldSharpClientOptions() 
                 {
-                    HttpClient = httpClient,
+                    HttpClient = new HttpClient 
+                    { 
+                        BaseAddress = new Uri(TestConfig.NativeApiBaseUrl),
+                        Timeout = TimeSpan.FromSeconds(TestConfig.TimeoutSeconds)
+                    },
                     BaseUrl = TestConfig.BaseUrl,
                     Logger = Logger,
                 });

SpongeEngine.KoboldSharp.Tests/Unit/StableDiffusion/ImageToImage.cs

@@ -86,7 +86,7 @@ public async Task ImageToImage_WithDifferentDenoisingStrength_ShouldWork()
                 };
 
                 // Log what we're doing
-                Logger.LogInformation($"Testing denoising strength: {strength}");
+                Client.Options.Logger.LogInformation($"Testing denoising strength: {strength}");
 
                 // Act
                 var result = await Client.ImageToImageAsync(request);
@@ -97,7 +97,7 @@ public async Task ImageToImage_WithDifferentDenoisingStrength_ShouldWork()
                 result.Images.Should().HaveCount(1);
                 result.Images[0].Should().Be(mockBase64Image);
 
-                Logger.LogInformation($"Successfully generated image with denoising strength {strength}");
+                Client.Options.Logger.LogInformation($"Successfully generated image with denoising strength {strength}");
             }
         }
 

SpongeEngine.KoboldSharp.Tests/Unit/UnitTestBase.cs

@@ -8,32 +8,20 @@ namespace SpongeEngine.KoboldSharp.Tests.Unit
     public abstract class UnitTestBase : TestBase
     {
         protected readonly WireMockServer Server;
-        protected readonly ILogger Logger;
-        protected readonly string BaseUrl;
         protected readonly KoboldSharpClient Client;
-        protected readonly HttpClient HttpClient;
 
         protected UnitTestBase(ITestOutputHelper output)
         {
             Server = WireMockServer.Start();
-            BaseUrl = Server.Urls[0];
-            Logger = LoggerFactory
-                .Create(builder => builder.AddXUnit(output))
-                .CreateLogger(GetType());
-            HttpClient = new HttpClient { BaseAddress = new Uri(BaseUrl) };
             Client = new KoboldSharpClient(
                 new KoboldSharpClientOptions() 
                 {
-                    HttpClient = HttpClient,
+                    HttpClient = new HttpClient { BaseAddress = new Uri(Server.Urls[0]) },
                     BaseUrl = TestConfig.BaseUrl,
-                    Logger = Logger,
+                    Logger = LoggerFactory
+                        .Create(builder => builder.AddXUnit(output))
+                        .CreateLogger(GetType()),
                 });
         }
-
-        public virtual void Dispose()
-        {
-            HttpClient.Dispose();
-            Server.Dispose();
-        }
     }
 }