Allow weights creation directly in library with specified creation da…

…te, move WeightsDataAccess from domain to application
Neakita · Aug 24, 2024 · 7cc053b · 7cc053b
1 parent f5e86f8
commit 7cc053b
Show file tree

Hide file tree

Showing 28 changed files with 65 additions and 162 deletions.
diff --git a/SightKeeper.Application/Annotating/HotKeyScreenshoter.cs b/SightKeeper.Application/Annotating/HotKeyScreenshoter.cs
@@ -1,7 +1,6 @@
 using CommunityToolkit.Diagnostics;
 using SharpHook.Native;
 using SightKeeper.Application.Input;
-using SightKeeper.Domain.Model.DataSets;
 using SightKeeper.Domain.Model.DataSets.Detector;
 
 namespace SightKeeper.Application.Annotating;

diff --git a/SightKeeper.Application/Annotating/Screenshoter.cs b/SightKeeper.Application/Annotating/Screenshoter.cs
@@ -1,7 +1,6 @@
 using SightKeeper.Domain.Model;
 using SightKeeper.Domain.Model.DataSets.Detector;
 using SightKeeper.Domain.Model.DataSets.Screenshots;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Application.Annotating;
 

diff --git a/SightKeeper.Application/Annotating/StreamScreenshoter.cs b/SightKeeper.Application/Annotating/StreamScreenshoter.cs
@@ -1,5 +1,4 @@
-using SightKeeper.Domain.Model.DataSets;
-using SightKeeper.Domain.Model.DataSets.Detector;
+using SightKeeper.Domain.Model.DataSets.Detector;
 
 namespace SightKeeper.Application.Annotating;
 

diff --git a/SightKeeper.Application/Prediction/Handling/ScreenshoterDetectionHandler.cs b/SightKeeper.Application/Prediction/Handling/ScreenshoterDetectionHandler.cs
@@ -1,7 +1,5 @@
 using System.Reactive.Linq;
-using SightKeeper.Domain.Model.DataSets;
 using SightKeeper.Domain.Model.DataSets.Detector;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Application.Prediction.Handling;
 

diff --git a/SightKeeper.Application/Prediction/ONNXDetector.cs b/SightKeeper.Application/Prediction/ONNXDetector.cs
@@ -7,7 +7,6 @@
 using SightKeeper.Domain.Model.DataSets;
 using SightKeeper.Domain.Model.DataSets.Tags;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 using SixLabors.ImageSharp;
 using RectangleF = System.Drawing.RectangleF;
 using Size = SixLabors.ImageSharp.Size;

diff --git a/SightKeeper.Application/Training/Trainer.cs b/SightKeeper.Application/Training/Trainer.cs
@@ -3,7 +3,6 @@
 using SightKeeper.Application.Extensions;
 using SightKeeper.Domain.Model.DataSets.Detector;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Application.Training;
 

diff --git a/...eper.Domain/Services/WeightsDataAccess.cs → SightKeeper.Application/WeightsDataAccess.cs b/...eper.Domain/Services/WeightsDataAccess.cs → SightKeeper.Application/WeightsDataAccess.cs
@@ -2,33 +2,35 @@
 using SightKeeper.Domain.Model.DataSets.Tags;
 using SightKeeper.Domain.Model.DataSets.Weights;
 
-namespace SightKeeper.Domain.Services;
+namespace SightKeeper.Application;
 
 public abstract class WeightsDataAccess
 {
 	public Weights<TTag> CreateWeights<TTag>(
 		WeightsLibrary<TTag> library,
 		byte[] data,
+		DateTime creationDate,
 		ModelSize modelSize,
 		WeightsMetrics metrics,
 		IEnumerable<TTag> tags) where TTag : Tag, MinimumTagsCount
 	{
-		var weights = library.CreateWeights(modelSize, metrics, tags);
-		SaveWeightsData(weights, new WeightsData(data));
+		var weights = library.CreateWeights(creationDate, modelSize, metrics, tags);
+		SaveWeightsData(weights, data);
 		return weights;
 	}
 
 	public Weights<TTag, TKeyPointTag> CreateWeights<TTag, TKeyPointTag>(
 		WeightsLibrary<TTag, TKeyPointTag> library,
 		byte[] data,
+		DateTime creationDate,
 		ModelSize modelSize,
 		WeightsMetrics metrics,
 		IEnumerable<(TTag, IEnumerable<TKeyPointTag>)> tags)
 		where TTag : PoserTag
 		where TKeyPointTag : KeyPointTag<TTag>
 	{
-		var weights = library.CreateWeights(modelSize, metrics, tags);
-		SaveWeightsData(weights, new WeightsData(data));
+		var weights = library.CreateWeights(creationDate, modelSize, metrics, tags);
+		SaveWeightsData(weights, data);
 		return weights;
 	}
 
@@ -46,8 +48,8 @@ public void RemoveWeights<TTag, TKeyPointTag>(Weights<TTag, TKeyPointTag> weight
 		RemoveWeightsData(weights);
 	}
 
-	public abstract WeightsData LoadWeightsData(Weights weights);
+	public abstract byte[] LoadWeightsData(Weights weights);
 
-	protected abstract void SaveWeightsData(Weights weights, WeightsData data);
+	protected abstract void SaveWeightsData(Weights weights, byte[] data);
 	protected abstract void RemoveWeightsData(Weights weights);
 }
diff --git a/SightKeeper.Avalonia/DataSets/DataSetViewModel.cs b/SightKeeper.Avalonia/DataSets/DataSetViewModel.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Reactive.Disposables;
 using DynamicData;
+using SightKeeper.Application;
 using SightKeeper.Avalonia.ViewModels;
 using SightKeeper.Domain.Model;
 using SightKeeper.Domain.Model.DataSets;
 using SightKeeper.Domain.Model.DataSets.Tags;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Avalonia.DataSets;
 

diff --git a/SightKeeper.Avalonia/DataSets/DataSetsListViewModel.cs b/SightKeeper.Avalonia/DataSets/DataSetsListViewModel.cs
@@ -6,7 +6,6 @@
 using SightKeeper.Application.Extensions;
 using SightKeeper.Avalonia.ViewModels;
 using SightKeeper.Domain.Model.DataSets;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Avalonia.DataSets;
 

diff --git a/SightKeeper.Avalonia/Setup/ServicesBootstrapper.cs b/SightKeeper.Avalonia/Setup/ServicesBootstrapper.cs
@@ -9,7 +9,6 @@
 using SightKeeper.Data.Binary.Formatters;
 using SightKeeper.Data.Binary.Services;
 using SightKeeper.Domain.Model.DataSets;
-using SightKeeper.Domain.Services;
 using GamesDataAccess = SightKeeper.Application.Games.GamesDataAccess;
 
 namespace SightKeeper.Avalonia.Setup;

diff --git a/SightKeeper.Avalonia/ViewModels/Annotating/ScreenshoterViewModel.cs b/SightKeeper.Avalonia/ViewModels/Annotating/ScreenshoterViewModel.cs
@@ -2,7 +2,6 @@
 using System.Reactive.Subjects;
 using CommunityToolkit.Diagnostics;
 using SightKeeper.Application.Annotating;
-using SightKeeper.Domain.Model.DataSets;
 using SightKeeper.Domain.Model.DataSets.Detector;
 
 namespace SightKeeper.Avalonia.ViewModels.Annotating;

diff --git a/SightKeeper.Avalonia/ViewModels/Annotating/SelectedDataSetViewModel.cs b/SightKeeper.Avalonia/ViewModels/Annotating/SelectedDataSetViewModel.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Reactive.Disposables;
 using DynamicData;
+using SightKeeper.Application;
 using SightKeeper.Avalonia.DataSets;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Avalonia.ViewModels.Annotating;
 

diff --git a/SightKeeper.Avalonia/ViewModels/Dialogs/WeightsEditorViewModel.cs b/SightKeeper.Avalonia/ViewModels/Dialogs/WeightsEditorViewModel.cs
@@ -5,9 +5,9 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using DynamicData;
+using SightKeeper.Application;
 using SightKeeper.Avalonia.Dialogs;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Avalonia.ViewModels.Dialogs;
 

diff --git a/SightKeeper.Data/Binary/Conversion/DataSets/Classifier/ClassifierDataSetsConverter.cs b/SightKeeper.Data/Binary/Conversion/DataSets/Classifier/ClassifierDataSetsConverter.cs
@@ -1,12 +1,9 @@
 using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
 using CommunityToolkit.Diagnostics;
 using SightKeeper.Data.Binary.DataSets;
 using SightKeeper.Data.Binary.Services;
 using SightKeeper.Domain.Model.DataSets.Classifier;
 using SightKeeper.Domain.Model.DataSets.Screenshots;
-using SightKeeper.Domain.Model.DataSets.Tags;
-using SightKeeper.Domain.Model.DataSets.Weights;
 using ClassifierAsset = SightKeeper.Data.Binary.DataSets.Classifier.ClassifierAsset;
 using ClassifierDataSet = SightKeeper.Data.Binary.DataSets.Classifier.ClassifierDataSet;
 using Screenshot = SightKeeper.Data.Binary.DataSets.Screenshot;
@@ -67,14 +64,6 @@ public Domain.Model.DataSets.Classifier.ClassifierDataSet ConvertBack(
 	private readonly ScreenshotsConverter _screenshotsConverter;
 	private readonly ClassifierAssetsConverter _assetsConverter;
 
-	[UnsafeAccessor(UnsafeAccessorKind.Method)]
-	private static extern Weights<TTag> CreateWeights<TTag>(
-		WeightsLibrary<TTag> library,
-		ModelSize size,
-		WeightsMetrics metrics,
-		IEnumerable<ClassifierTag> tags)
-		where TTag : Domain.Model.DataSets.Tags.Tag, MinimumTagsCount;
-
 	private static void AddTags(Domain.Model.DataSets.Classifier.ClassifierDataSet dataSet, ImmutableArray<Tag> tags, ReverseConversionSession session)
 	{
 		foreach (var rawTag in tags)
@@ -110,7 +99,7 @@ private void AddWeights(Domain.Model.DataSets.Classifier.ClassifierDataSet dataS
 	{
 		foreach (var rawWeights in raw)
 		{
-			var weights = CreateWeights(dataSet.Weights, rawWeights.Size, rawWeights.Metrics, rawWeights.Tags.Select(tagId => (ClassifierTag)session.Tags[tagId]));
+			var weights = dataSet.Weights.CreateWeights(rawWeights.CreationDate, rawWeights.Size, rawWeights.Metrics, rawWeights.Tags.Select(tagId => (ClassifierTag)session.Tags[tagId]));
 			_weightsDataAccess.AssociateId(weights, rawWeights.Id);
 			session.Weights.Add(rawWeights.Id, weights);
 		}

diff --git a/SightKeeper.Data/Binary/Conversion/DataSets/Detector/DetectorDataSetsConverter.cs b/SightKeeper.Data/Binary/Conversion/DataSets/Detector/DetectorDataSetsConverter.cs
@@ -1,12 +1,9 @@
 using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
 using CommunityToolkit.Diagnostics;
 using SightKeeper.Data.Binary.DataSets;
 using SightKeeper.Data.Binary.Services;
 using SightKeeper.Domain.Model.DataSets.Detector;
 using SightKeeper.Domain.Model.DataSets.Screenshots;
-using SightKeeper.Domain.Model.DataSets.Tags;
-using SightKeeper.Domain.Model.DataSets.Weights;
 using DetectorAsset = SightKeeper.Data.Binary.DataSets.Detector.DetectorAsset;
 using DetectorDataSet = SightKeeper.Data.Binary.DataSets.Detector.DetectorDataSet;
 using Screenshot = SightKeeper.Data.Binary.DataSets.Screenshot;
@@ -69,14 +66,6 @@ internal Domain.Model.DataSets.Detector.DetectorDataSet ConvertBack(
 	private readonly WeightsConverter _weightsConverter;
 	private readonly DetectorAssetsConverter _assetsConverter;
 
-	[UnsafeAccessor(UnsafeAccessorKind.Method)]
-	private static extern Weights<TTag> CreateWeights<TTag>(
-		WeightsLibrary<TTag> library,
-		ModelSize size,
-		WeightsMetrics metrics,
-		IEnumerable<DetectorTag> tags)
-		where TTag : Domain.Model.DataSets.Tags.Tag, MinimumTagsCount;
-
 	private static void AddTags(Domain.Model.DataSets.Detector.DetectorDataSet dataSet, ImmutableArray<Tag> tags, ReverseConversionSession session)
 	{
 		foreach (var rawTag in tags)
@@ -113,7 +102,7 @@ private void AddWeights(Domain.Model.DataSets.Detector.DetectorDataSet dataSet,
 	{
 		foreach (var rawWeights in raw)
 		{
-			var weights = CreateWeights(dataSet.Weights, rawWeights.Size, rawWeights.Metrics, rawWeights.Tags.Select(tagId => (DetectorTag)session.Tags[tagId]));
+			var weights = dataSet.Weights.CreateWeights(rawWeights.CreationDate, rawWeights.Size, rawWeights.Metrics, rawWeights.Tags.Select(tagId => (DetectorTag)session.Tags[tagId]));
 			_weightsDataAccess.AssociateId(weights, rawWeights.Id);
 			session.Weights.Add(rawWeights.Id, weights);
 		}

diff --git a/SightKeeper.Data/Binary/Conversion/DataSets/Poser2D/Poser2DDataSetsConverter.cs b/SightKeeper.Data/Binary/Conversion/DataSets/Poser2D/Poser2DDataSetsConverter.cs
@@ -1,13 +1,10 @@
 using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
 using CommunityToolkit.Diagnostics;
 using FlakeId;
 using SightKeeper.Data.Binary.DataSets.Poser;
 using SightKeeper.Data.Binary.Services;
-using SightKeeper.Domain.Model.DataSets.Poser;
 using SightKeeper.Domain.Model.DataSets.Poser2D;
 using SightKeeper.Domain.Model.DataSets.Screenshots;
-using SightKeeper.Domain.Model.DataSets.Weights;
 using Poser2DAsset = SightKeeper.Data.Binary.DataSets.Poser2D.Poser2DAsset;
 using Poser2DDataSet = SightKeeper.Data.Binary.DataSets.Poser2D.Poser2DDataSet;
 using Poser2DTag = SightKeeper.Data.Binary.DataSets.Poser2D.Poser2DTag;
@@ -72,15 +69,6 @@ internal Domain.Model.DataSets.Poser2D.Poser2DDataSet ConvertBack(
 	private readonly WeightsConverter _weightsConverter;
 	private readonly Poser2DAssetsConverter _assetsConverter;
 
-	[UnsafeAccessor(UnsafeAccessorKind.Method)]
-	private static extern Weights<TTag, TKeyPointTag> CreateWeights<TTag, TKeyPointTag>(
-		WeightsLibrary<TTag, TKeyPointTag> library,
-		ModelSize size,
-		WeightsMetrics metrics,
-		ImmutableDictionary<Domain.Model.DataSets.Poser2D.Poser2DTag, ImmutableHashSet<KeyPointTag2D>> tags)
-		where TTag : PoserTag
-		where TKeyPointTag : KeyPointTag<TTag>;
-
 	private static void CreateTags(Domain.Model.DataSets.Poser2D.Poser2DDataSet dataSet, ImmutableArray<Poser2DTag> tags, ReverseConversionSession session)
 	{
 		foreach (var rawTag in tags)
@@ -136,18 +124,20 @@ private void CreateWeights(Domain.Model.DataSets.Poser2D.Poser2DDataSet dataSet,
 	{
 		foreach (var rawWeights in raw)
 		{
-			var weights = CreateWeights(dataSet.Weights, rawWeights.Size, rawWeights.Metrics, ConvertBack(rawWeights.Tags, session));
+			var weights = dataSet.Weights.CreateWeights(rawWeights.CreationDate, rawWeights.Size, rawWeights.Metrics, ConvertBack(rawWeights.Tags, session));
 			_weightsDataAccess.AssociateId(weights, rawWeights.Id);
 			session.Weights.Add(rawWeights.Id, weights);
 		}
 	}
 
-	private ImmutableDictionary<Domain.Model.DataSets.Poser2D.Poser2DTag, ImmutableHashSet<KeyPointTag2D>> ConvertBack(
+	private IEnumerable<(Domain.Model.DataSets.Poser2D.Poser2DTag, IEnumerable<KeyPointTag2D>)> ConvertBack(
 		ImmutableArray<(Id Id, ImmutableArray<Id> KeyPointIds)> tags,
 		ReverseConversionSession session)
 	{
-		return tags.ToImmutableDictionary(
-			t => (Domain.Model.DataSets.Poser2D.Poser2DTag)session.Tags[t.Id],
-			t => t.KeyPointIds.Select(id => (KeyPointTag2D)session.Tags[id]).ToImmutableHashSet());
+		foreach (var (tagId, keyPointIds) in tags)
+		{
+			yield return ((Domain.Model.DataSets.Poser2D.Poser2DTag)session.Tags[tagId],
+				keyPointIds.Select(id => (KeyPointTag2D)session.Tags[id]).ToImmutableList());
+		}
 	}
 }
diff --git a/SightKeeper.Data/Binary/Conversion/DataSets/WeightsConverter.cs b/SightKeeper.Data/Binary/Conversion/DataSets/WeightsConverter.cs
@@ -67,7 +67,7 @@ private static ImmutableArray<Id> Convert<TTag>(
 	}
 
 	private static ImmutableArray<(Id, ImmutableArray<Id>)> Convert<TTag, TKeyPointTag>(
-		IImmutableDictionary<TTag, IImmutableSet<TKeyPointTag>> tags,
+		ImmutableDictionary<TTag, ImmutableHashSet<TKeyPointTag>> tags,
 		ConversionSession session)
 		where TTag : PoserTag
 		where TKeyPointTag : KeyPointTag<TTag>

diff --git a/SightKeeper.Data/Binary/Services/FileSystemWeightsDataAccess.cs b/SightKeeper.Data/Binary/Services/FileSystemWeightsDataAccess.cs
@@ -1,7 +1,6 @@
-using System.Runtime.CompilerServices;
-using FlakeId;
+using FlakeId;
+using SightKeeper.Application;
 using SightKeeper.Domain.Model.DataSets.Weights;
-using SightKeeper.Domain.Services;
 
 namespace SightKeeper.Data.Binary.Services;
 
@@ -13,13 +12,9 @@ public string DirectoryPath
 		set => _dataAccess.DirectoryPath = value;
 	}
 
-	public override WeightsData LoadWeightsData(Weights weights)
+	public override byte[] LoadWeightsData(Weights weights)
 	{
-		var data = _dataAccess.ReadAllBytes(weights);
-		return CreateWeightsData(data);
-
-		[UnsafeAccessor(UnsafeAccessorKind.Constructor)]
-		static extern WeightsData CreateWeightsData(byte[] content);
+		return _dataAccess.ReadAllBytes(weights);
 	}
 
 	public Id GetId(Weights weights)
@@ -32,9 +27,9 @@ public void AssociateId(Weights weights, Id id)
 		_dataAccess.AssociateId(weights, id);
 	}
 
-	protected override void SaveWeightsData(Weights weights, WeightsData data)
+	protected override void SaveWeightsData(Weights weights, byte[] data)
 	{
-		_dataAccess.WriteAllBytes(weights, data.Content);
+		_dataAccess.WriteAllBytes(weights, data);
 	}
 
 	protected override void RemoveWeightsData(Weights weights)

diff --git a/SightKeeper.Domain.Tests/DataSets/Classifier/ClassifierWeightsLibraryTests.cs b/SightKeeper.Domain.Tests/DataSets/Classifier/ClassifierWeightsLibraryTests.cs
@@ -11,17 +11,15 @@ public void ShouldCreateWeights()
 		ClassifierDataSet dataSet = new();
 		var tag1 = dataSet.Tags.CreateTag("1");
 		var tag2 = dataSet.Tags.CreateTag("2");
-		SimpleWeightsDataAccess weightsDataAccess = new();
-		var weights = weightsDataAccess.CreateWeights(dataSet.Weights, [], ModelSize.Nano, new WeightsMetrics(), [tag1, tag2]);
+		var weights = dataSet.Weights.CreateWeights(DateTime.UtcNow, ModelSize.Nano, new WeightsMetrics(), [tag1, tag2]);
 		dataSet.Weights.Should().Contain(weights);
 	}
 
 	[Fact]
 	public void ShouldNotCreateWeightsWithNoTags()
 	{
 		ClassifierDataSet dataSet = new();
-		SimpleWeightsDataAccess weightsDataAccess = new();
-		Assert.ThrowsAny<Exception>(() => weightsDataAccess.CreateWeights(dataSet.Weights, [], ModelSize.Nano, new WeightsMetrics(), []));
+		Assert.ThrowsAny<Exception>(() => dataSet.Weights.CreateWeights(DateTime.UtcNow, ModelSize.Nano, new WeightsMetrics(), []));
 		dataSet.Weights.Should().BeEmpty();
 	}
 
@@ -30,8 +28,7 @@ public void ShouldNotCreateWeightsWithOneTag()
 	{
 		ClassifierDataSet dataSet = new();
 		var tag = dataSet.Tags.CreateTag("");
-		SimpleWeightsDataAccess weightsDataAccess = new();
-		Assert.ThrowsAny<Exception>(() => weightsDataAccess.CreateWeights(dataSet.Weights, [], ModelSize.Nano, new WeightsMetrics(), [tag]));
+		Assert.ThrowsAny<Exception>(() => dataSet.Weights.CreateWeights(DateTime.UtcNow, ModelSize.Nano, new WeightsMetrics(), [tag]));
 		dataSet.Weights.Should().BeEmpty();
 	}
 
@@ -41,8 +38,7 @@ public void ShouldNotCreateWeightsWithDuplicateTags()
 		ClassifierDataSet dataSet = new();
 		var tag1 = dataSet.Tags.CreateTag("1");
 		var tag2 = dataSet.Tags.CreateTag("2");
-		SimpleWeightsDataAccess weightsDataAccess = new();
-		Assert.ThrowsAny<Exception>(() => weightsDataAccess.CreateWeights(dataSet.Weights, [], ModelSize.Nano, new WeightsMetrics(), [tag1, tag1, tag2]));
+		Assert.ThrowsAny<Exception>(() => dataSet.Weights.CreateWeights(DateTime.UtcNow, ModelSize.Nano, new WeightsMetrics(), [tag1, tag1, tag2]));
 		dataSet.Weights.Should().BeEmpty();
 	}
 }