output logs and images in integration tests

Author: James Tayler

.dockerignore

@@ -21,5 +21,6 @@
 **/obj
 **/secrets.dev.yaml
 **/values.dev.yaml
+docker-test-output/
 LICENSE
 README.md

.gitignore

@@ -344,3 +344,4 @@ test/TensorFlowNET.Examples/mnist
 site/
 
 /OnnxStack.WebUI/wwwroot/images/Results/*
+docker-test-output/*

Dockerfile

@@ -9,6 +9,6 @@ RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.d
 RUN git clone https://huggingface.co/runwayml/stable-diffusion-v1-5 -b onnx
 
 COPY . .
-RUN ls -ltr
 RUN dotnet build OnnxStackCore.sln
-RUN dotnet test OnnxStackCore.sln
+
+ENTRYPOINT ["dotnet", "test", "OnnxStackCore.sln"]

OnnxStack.IntegrationTests/OnnxStack.IntegrationTests.csproj

@@ -14,10 +14,12 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
         <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.16.2" />
         <PackageReference Include="Microsoft.ML.OnnxRuntime.Extensions" Version="0.9.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
         <PackageReference Include="xunit" Version="2.4.2"/>
+        <PackageReference Include="Xunit.Extensions.Logging" Version="1.1.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

OnnxStack.IntegrationTests/StableDiffusionTests.cs

@@ -1,28 +1,32 @@
+using System.Security.Cryptography;
 using FluentAssertions;
+using FluentAssertions.Execution;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using OnnxStack.Core;
 using OnnxStack.StableDiffusion.Common;
 using OnnxStack.StableDiffusion.Config;
 using OnnxStack.StableDiffusion.Enums;
+using SixLabors.ImageSharp;
 using Xunit.Abstractions;
 
 namespace OnnxStack.IntegrationTests;
 
 public class StableDiffusionTests
 {
-    private readonly ITestOutputHelper _testOutputHelper;
     private readonly IStableDiffusionService _stableDiffusion;
+    private readonly ILogger<StableDiffusionTests> _logger;
 
     public StableDiffusionTests(ITestOutputHelper testOutputHelper)
     {
-        _testOutputHelper = testOutputHelper;
-        
         var services = new ServiceCollection();
-        services.AddLogging();
+        services.AddLogging(builder => builder.AddConsole());
+        services.AddLogging(builder => builder.AddXunit(testOutputHelper));
         services.AddOnnxStack();
         services.AddOnnxStackStableDiffusion();
         var provider = services.BuildServiceProvider();
         _stableDiffusion = provider.GetRequiredService<IStableDiffusionService>();
+        _logger = provider.GetRequiredService<ILogger<StableDiffusionTests>>();
     }
 
     [Fact]
@@ -32,6 +36,7 @@ public async Task GivenStableDiffusion15_WhenLoadModel_ThenModelIsLoaded()
         var model = _stableDiffusion.Models.Single(m => m.Name == "StableDiffusion 1.5");
 
         //act
+        _logger.LogInformation("Attempting to load model {0}", model.Name);
         var isModelLoaded = await _stableDiffusion.LoadModel(model);
 
         //assert
@@ -43,6 +48,7 @@ public async Task GivenTextToImage_WhenInference_ThenImageGenerated()
     {
         //arrange
         var model = _stableDiffusion.Models.Single(m => m.Name == "StableDiffusion 1.5");
+        _logger.LogInformation("Attempting to load model {0}", model.Name);
         await _stableDiffusion.LoadModel(model);
 
         var prompt = new PromptOptions
@@ -60,23 +66,49 @@ public async Task GivenTextToImage_WhenInference_ThenImageGenerated()
             Height = 512,
             InferenceSteps = 10,
             GuidanceScale = 7.0f,
-            Seed = -1
+            Seed = 1
         };
 
         var steps = 0;
 
         //act
         var image = await _stableDiffusion.GenerateAsImageAsync(model, prompt, scheduler, (currentStep, totalSteps) =>
         {
-            _testOutputHelper.WriteLine($"Step {currentStep}/{totalSteps}");
+            _logger.LogInformation($"Step {currentStep}/{totalSteps}");
             steps++;
         });
 
+        var imagesDirectory = Path.Combine(Directory.GetCurrentDirectory(), "images");
+        if (!Directory.Exists(imagesDirectory))
+        {
+            _logger.LogInformation($"Creating directory {imagesDirectory}");
+            Directory.CreateDirectory(imagesDirectory);
+        }
+        else
+        {
+            _logger.LogInformation($"Directory {imagesDirectory} already exists");
+        }
+
+        var fileName = $"{imagesDirectory}/{nameof(GivenTextToImage_WhenInference_ThenImageGenerated)}-{DateTime.Now:yyyyMMddHHmmss}.png";
+        _logger.LogInformation($"Saving generated image to {fileName}");
+        await image.SaveAsPngAsync(fileName);
+
         //assert
-        steps.Should().Be(10);
-        image.Should().NotBeNull();
-        image.Size.IsEmpty.Should().BeFalse();
-        image.Width.Should().Be(512);
-        image.Height.Should().Be(512);
+        using (new AssertionScope())
+        {
+            steps.Should().Be(10);
+            image.Should().NotBeNull();
+            image.Size.IsEmpty.Should().BeFalse();
+            image.Width.Should().Be(512);
+            image.Height.Should().Be(512);
+        
+            File.Exists(fileName).Should().BeTrue();
+            var md5 = MD5.Create();
+            var hash = md5.ComputeHash(File.ReadAllBytes(fileName));
+            var hashString = string.Join("", hash.Select(b => b.ToString("X2")));
+            _logger.LogInformation($"MD5 Hash of generated image: {hashString}");
+            
+            hashString.Should().Be("E518D0E4F67CBD5E93513574D30F3FD7");
+        }
     }
 }

OnnxStackCore.sln

@@ -6,6 +6,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnnxStack.StableDiffusion",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnnxStack.IntegrationTests", "OnnxStack.IntegrationTests\OnnxStack.IntegrationTests.csproj", "{9336EF88-5290-451F-972C-CF9550EF545D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{556184C8-7C99-4F06-86EF-EAAF52165252}"
+	ProjectSection(SolutionItems) = preProject
+		Dockerfile = Dockerfile
+		.dockerignore = .dockerignore
+		.gitignore = .gitignore
+		docker-compose.yml = docker-compose.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

docker-compose.yml

@@ -4,4 +4,4 @@ services:
   app:
     build: .
     volumes:
-      - ./output:/app/images
+      - "./docker-test-output:/app/OnnxStack.IntegrationTests/bin/Debug/net7.0/images"