Bump dependencies; YoloV8 library v4 breaking changes adaptation; Add…

… DbWeightsDataAccess tests; DbWeightsDataAccess before changes data loading capability;
Neakita · Mar 12, 2024 · e09df02 · e09df02
1 parent f688177
commit e09df02
Show file tree

Hide file tree

Showing 16 changed files with 110 additions and 36 deletions.
diff --git a/SightKeeper.Application.Tests/SightKeeper.Application.Tests.csproj b/SightKeeper.Application.Tests/SightKeeper.Application.Tests.csproj
@@ -12,7 +12,7 @@
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
+        <PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
         <PackageReference Include="xunit" Version="2.7.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/SightKeeper.Application/SightKeeper.Application.csproj b/SightKeeper.Application/SightKeeper.Application.csproj
@@ -10,10 +10,10 @@
         <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
         <PackageReference Include="FluentValidation" Version="11.9.0" />
         <PackageReference Include="Serilog" Version="3.1.1" />
-        <PackageReference Include="SerilogTimings" Version="3.0.1" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
+        <PackageReference Include="SerilogTimings" Version="3.1.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
         <PackageReference Include="System.Reactive" Version="6.0.0" />
-        <PackageReference Include="YamlDotNet" Version="15.1.1" />
+        <PackageReference Include="YamlDotNet" Version="15.1.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/SightKeeper.Data.Tests/DbContextTests.cs b/SightKeeper.Data.Tests/DbContextTests.cs
@@ -27,11 +27,13 @@ public void ShouldCreateSqLiteAppDbFileWithSomeData()
         var itemClass = dataSet.CreateItemClass("Test item class", 0);
         asset.CreateItem(itemClass, new Bounding(0, 0, 1, 1));
 
-        DbWeightsDataAccess weightsDataAccess = new(dbContext);
-        weightsDataAccess.CreateWeights(dataSet.Weights, Array.Empty<byte>(), Array.Empty<byte>(), Size.Medium,
+        DbWeightsDataAccess weightsDataAccessTests = new(dbContext);
+        var weights = weightsDataAccessTests.CreateWeights(dataSet.Weights, [0], [1], Size.Medium,
 	        new WeightsMetrics(11, new LossMetrics(12, 13, 14)), Array.Empty<ItemClass>());
 
         dbContext.DataSets.Add(dataSet);
         dbContext.SaveChanges();
+
+        weightsDataAccessTests.LoadWeightsONNXData(weights).Content.Single().Should().Be(0);
     }
 }
diff --git a/SightKeeper.Data.Tests/DbWeightsDataAccessTests.cs b/SightKeeper.Data.Tests/DbWeightsDataAccessTests.cs
@@ -0,0 +1,33 @@
+using SightKeeper.Data.Services;
+using SightKeeper.Domain.Model.DataSets;
+using SightKeeper.Tests.Common;
+
+namespace SightKeeper.Data.Tests;
+
+public sealed class DbWeightsDataAccessTests : DbRelatedTests
+{
+	[Fact]
+	public void ShouldSaveAndLoadWeights()
+	{
+		var dataSet = DomainTestsHelper.NewDataSet;
+		var dbContext = DbContextFactory.CreateDbContext();
+		dbContext.Add(dataSet);
+		DbWeightsDataAccess weightsDataAccess = new(dbContext);
+		var weights = weightsDataAccess.CreateWeights(dataSet.Weights, [0], [1], Size.Large, new WeightsMetrics(), Array.Empty<ItemClass>());
+		dbContext.SaveChanges();
+		weightsDataAccess.LoadWeightsONNXData(weights).Content.Single().Should().Be(0);
+		weightsDataAccess.LoadWeightsPTData(weights).Content.Single().Should().Be(1);
+	}
+
+	[Fact]
+	public void ShouldSaveAndLoadWeightsWithoutSaving()
+	{
+		var dataSet = DomainTestsHelper.NewDataSet;
+		var dbContext = DbContextFactory.CreateDbContext();
+		dbContext.Add(dataSet);
+		DbWeightsDataAccess weightsDataAccess = new(dbContext);
+		var weights = weightsDataAccess.CreateWeights(dataSet.Weights, [0], [1], Size.Large, new WeightsMetrics(), Array.Empty<ItemClass>());
+		weightsDataAccess.LoadWeightsONNXData(weights).Content.Single().Should().Be(0);
+		weightsDataAccess.LoadWeightsPTData(weights).Content.Single().Should().Be(1);
+	}
+}
diff --git a/SightKeeper.Data/Configuration/WeightsDataConfiguration.cs b/SightKeeper.Data/Configuration/WeightsDataConfiguration.cs
@@ -9,7 +9,8 @@ public void Configure(EntityTypeBuilder<DbWeightsData> builder)
 	{
 		builder.HasFlakeIdKey();
 		builder.ToTable("WeightsData");
-		builder.ComplexProperty(weightsData => weightsData.Data, subBuilder => subBuilder.Property(weights => weights.Content).HasColumnName("Content"));
+		// probably builder.ComplexProperty can be used, but https://github.com/dotnet/efcore/issues/9849 or smthng (Works with SqLite, but won't with InMemory)
+		builder.OwnsOne(weightsData => weightsData.Data, subBuilder => subBuilder.Property(weights => weights.Content).HasColumnName("Content"));
 		builder.Property(weightsData => weightsData.Format);
 		builder.HasIndex("WeightsId", "Format").IsUnique();
 	}

diff --git a/...ations/20240312211014_Initial.Designer.cs → ...ations/20240312223758_Initial.Designer.cs b/...ations/20240312211014_Initial.Designer.cs → ...ations/20240312223758_Initial.Designer.cs
diff --git a/...Data/Migrations/20240312211014_Initial.cs → ...Data/Migrations/20240312223758_Initial.cs b/...Data/Migrations/20240312211014_Initial.cs → ...Data/Migrations/20240312223758_Initial.cs
diff --git a/SightKeeper.Data/Migrations/AppDbContextModelSnapshot.cs b/SightKeeper.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -16,7 +16,7 @@ partial class AppDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.2");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.3");
 
             modelBuilder.Entity("SightKeeper.Data.DbWeightsData", b =>
                 {

diff --git a/SightKeeper.Data/Services/DbWeightsDataAccess.cs b/SightKeeper.Data/Services/DbWeightsDataAccess.cs
@@ -1,4 +1,5 @@
 using FlakeId;
+using Microsoft.EntityFrameworkCore;
 using SightKeeper.Domain.Model.DataSets;
 
 namespace SightKeeper.Data.Services;
@@ -8,25 +9,50 @@ public sealed class DbWeightsDataAccess : WeightsDataAccess
     public DbWeightsDataAccess(AppDbContext dbContext)
     {
 	    _dbContext = dbContext;
+	    _dbContext.SavedChanges += OnDbContextSavedChanges;
     }
+
     public override WeightsData LoadWeightsONNXData(Weights weights)
     {
-	    throw new NotImplementedException();
+	    return LoadWeightsData(weights, DbWeightsData.DataFormat.ONNX);
     }
     public override WeightsData LoadWeightsPTData(Weights weights)
     {
-	    throw new NotImplementedException();
+	    return LoadWeightsData(weights, DbWeightsData.DataFormat.PT);
     }
 
     protected override void SaveWeightsData(Weights weights, WeightsData onnxData, WeightsData ptData)
     {
-	    _dbContext.Add(new DbWeightsData(onnxData, weights, DbWeightsData.DataFormat.ONNX));
-	    _dbContext.Add(new DbWeightsData(ptData, weights, DbWeightsData.DataFormat.PT));
+	    DbWeightsData onnxWeightsData = new(onnxData, weights, DbWeightsData.DataFormat.ONNX);
+	    _dbContext.Add(onnxWeightsData);
+	    _unsavedWeightsData.Add((weights, DbWeightsData.DataFormat.ONNX), onnxData);
+	    DbWeightsData ptWeightsData = new(ptData, weights, DbWeightsData.DataFormat.PT);
+	    _dbContext.Add(ptWeightsData);
+	    _unsavedWeightsData.Add((weights, DbWeightsData.DataFormat.PT), ptData);
     }
     protected override void RemoveWeightsData(Weights weights)
     {
-	    throw new NotImplementedException();
+	    _unsavedWeightsData.Remove((weights, DbWeightsData.DataFormat.ONNX));
+	    _unsavedWeightsData.Remove((weights, DbWeightsData.DataFormat.PT));
     }
 
     private readonly AppDbContext _dbContext;
+    private readonly Dictionary<(Weights, DbWeightsData.DataFormat), WeightsData> _unsavedWeightsData = new();
+
+    private WeightsData LoadWeightsData(Weights weights, DbWeightsData.DataFormat format)
+    {
+	    if (_unsavedWeightsData.TryGetValue((weights, format), out var unsavedWeightsData))
+		    return unsavedWeightsData;
+	    var weightsEntry = _dbContext.Entry(weights);
+	    var weightsId = weightsEntry.Property<Id>("Id").CurrentValue;
+	    return _dbContext.Set<DbWeightsData>()
+		    .AsNoTracking()
+		    .Where(weightsData => EF.Property<Id>(weightsData.Weights, "Id") == weightsId && weightsData.Format == format)
+		    .Select(weightsData => weightsData.Data)
+		    .Single();
+    }
+    private void OnDbContextSavedChanges(object? sender, SavedChangesEventArgs e)
+    {
+	    _unsavedWeightsData.Clear();
+    }
 }
diff --git a/SightKeeper.Data/SightKeeper.Data.csproj b/SightKeeper.Data/SightKeeper.Data.csproj
@@ -9,11 +9,11 @@
     <ItemGroup>
         <PackageReference Include="DynamicData" Version="8.3.27" />
         <PackageReference Include="FlakeId" Version="1.1.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/SightKeeper.Domain.Model/DataSets/WeightsDataAccess.cs b/SightKeeper.Domain.Model/DataSets/WeightsDataAccess.cs
@@ -3,7 +3,7 @@
 
 namespace SightKeeper.Domain.Model.DataSets;
 
-public abstract class WeightsDataAccess
+public abstract class WeightsDataAccess : IDisposable
 {
 	public IObservable<Weights> WeightsCreated => _weightsCreated.AsObservable();
 	public IObservable<Weights> WeightsRemoved => _weightsRemoved.AsObservable();
@@ -30,6 +30,12 @@ public void RemoveWeights(Weights weights)
 		RemoveWeightsData(weights);
 		_weightsRemoved.OnNext(weights);
 	}
+	public void Dispose()
+	{
+		_weightsCreated.Dispose();
+		_weightsRemoved.Dispose();
+		GC.SuppressFinalize(this);
+	}
 
 	protected abstract void SaveWeightsData(Weights weights, WeightsData onnxData, WeightsData ptData);
 	protected abstract void RemoveWeightsData(Weights weights);

diff --git a/SightKeeper.Domain.Model/SightKeeper.Domain.Model.csproj b/SightKeeper.Domain.Model/SightKeeper.Domain.Model.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
       <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
       <PackageReference Include="EmptyConstructor.Fody" Version="3.0.3" />
-      <PackageReference Include="Fody" Version="6.5.3">
+      <PackageReference Include="Fody" Version="6.8.0">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

diff --git a/SightKeeper.Services.Tests/SightKeeper.Services.Tests.csproj b/SightKeeper.Services.Tests/SightKeeper.Services.Tests.csproj
@@ -14,7 +14,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="Serilog" Version="3.1.1" />
-        <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
+        <PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
         <PackageReference Include="xunit" Version="2.7.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/SightKeeper.Services.Windows/SightKeeper.Services.Windows.csproj b/SightKeeper.Services.Windows/SightKeeper.Services.Windows.csproj
@@ -15,7 +15,7 @@
       <PackageReference Include="SharpDX" Version="4.2.0" />
       <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
       <PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
-      <PackageReference Include="System.Drawing.Common" Version="8.0.2" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
     </ItemGroup>
 
 </Project>
diff --git a/SightKeeper.Services/Prediction/ONNXDetector.cs b/SightKeeper.Services/Prediction/ONNXDetector.cs
@@ -35,9 +35,15 @@ public Weights? Weights
     private void SetWeights(Weights weights)
     {
         var weightsData = weightsDataAccess.LoadWeightsONNXData(weights);
-        _predictor = new YoloV8(new ModelSelector(weightsData.Content), CreateMetadata(weights.Library.DataSet));
-        _predictor.Parameters.Confidence = ProbabilityThreshold;
-        _predictor.Parameters.IoU = IoU;
+        YoloV8Builder builder = new();
+        builder.UseOnnxModel(new BinarySelector(weightsData.Content));
+        builder.WithMetadata(CreateMetadata(weights.Library.DataSet));
+        builder.WithConfiguration(configuration =>
+        {
+	        configuration.Confidence = ProbabilityThreshold;
+	        configuration.IoU = IoU;
+        });
+        _predictor = builder.Build();
     }
 
     public float ProbabilityThreshold
@@ -47,7 +53,7 @@ public float ProbabilityThreshold
         {
             _probabilityThreshold = value;
             if (_predictor != null)
-                _predictor.Parameters.Confidence = value;
+                _predictor.Configuration.Confidence = value;
         }
     }
 
@@ -58,7 +64,7 @@ public float IoU
         {
             _iou = value;
             if (_predictor != null)
-                _predictor.Parameters.IoU = value;
+                _predictor.Configuration.IoU = value;
         }
     }
 
@@ -82,9 +88,9 @@ public async Task<ImmutableList<DetectionItem>> DetectAsync(byte[] image, Cancel
         return result;
     }
 
-    private float _probabilityThreshold = YoloV8Parameters.Default.Confidence;
-    private float _iou = YoloV8Parameters.Default.IoU;
-    private YoloV8? _predictor;
+    private float _probabilityThreshold = YoloV8Configuration.Default.Confidence;
+    private float _iou = YoloV8Configuration.Default.IoU;
+    private YoloV8Predictor? _predictor;
     private Weights? _weights;
     private Dictionary<int, ItemClass>? _itemClasses;
 

diff --git a/SightKeeper.Services/SightKeeper.Services.csproj b/SightKeeper.Services/SightKeeper.Services.csproj
@@ -13,10 +13,10 @@
 
     <ItemGroup>
       <PackageReference Include="Autofac" Version="8.0.0" />
-      <PackageReference Include="SerilogTimings" Version="3.0.1" />
-      <PackageReference Include="SharpHook" Version="5.3.0" />
-      <PackageReference Include="SharpHook.Reactive" Version="5.3.0" />
-      <PackageReference Include="YoloV8" Version="3.1.1" />
+      <PackageReference Include="SerilogTimings" Version="3.1.0" />
+      <PackageReference Include="SharpHook" Version="5.3.1" />
+      <PackageReference Include="SharpHook.Reactive" Version="5.3.1" />
+      <PackageReference Include="YoloV8" Version="4.0.0" />
     </ItemGroup>
 
 </Project>