add db WIP 2, 80%

refactor, renames

Azaion.Common/Services/AnnotationService.cs

@@ -8,8 +8,10 @@ using Azaion.Common.DTO.Queue;
 using Azaion.CommonSecurity.DTO;
 using Azaion.CommonSecurity.Services;
 using LinqToDB;
+using MediatR;
 using MessagePack;
 using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 using RabbitMQ.Stream.Client;
 using RabbitMQ.Stream.Client.Reliable;
 
@@ -20,17 +22,23 @@ public class AnnotationService
     private readonly AzaionApiClient _apiClient;
     private readonly IDbFactory _dbFactory;
     private readonly FailsafeAnnotationsProducer _producer;
+    private readonly IGalleryService _galleryService;
+    private readonly IMediator _mediator;
     private readonly QueueConfig _queueConfig;
     private Consumer _consumer = null!;
 
     public AnnotationService(AzaionApiClient apiClient,
         IDbFactory dbFactory,
         FailsafeAnnotationsProducer producer,
-        IOptions<QueueConfig> queueConfig)
+        IOptions<QueueConfig> queueConfig,
+        IGalleryService galleryService,
+        IMediator mediator)
     {
         _apiClient = apiClient;
         _dbFactory = dbFactory;
         _producer = producer;
+        _galleryService = galleryService;
+        _mediator = mediator;
         _queueConfig = queueConfig.Value;
 
         Task.Run(async () => await Init()).Wait();
@@ -53,8 +61,8 @@ public class AnnotationService
     }
 
     //AI / Manual
-    public async Task SaveAnnotation(string fName, List<YoloLabel>? labels, SourceEnum source, MemoryStream? stream = null, CancellationToken token = default) =>
-        await SaveAnnotationInner(DateTime.UtcNow, fName, labels, source, stream, _apiClient.User.Role, _apiClient.User.Email, token);
+    public async Task SaveAnnotation(string fName, string imageExtension, List<Detection> detections, SourceEnum source, Stream? stream = null, CancellationToken token = default) =>
+        await SaveAnnotationInner(DateTime.UtcNow, fName, imageExtension, detections, source, stream, _apiClient.User.Role, _apiClient.User.Email, token);
 
     //Queue (only from operators)
     public async Task Consume(AnnotationCreatedMessage message, CancellationToken cancellationToken = default)
@@ -65,7 +73,8 @@ public class AnnotationService
         await SaveAnnotationInner(
             message.CreatedDate,
             message.Name,
-            YoloLabel.Deserialize(message.Label),
+            message.ImageExtension,
+            JsonConvert.DeserializeObject<List<Detection>>(message.Detections) ?? [],
             message.Source,
             new MemoryStream(message.Image),
             message.CreatedRole,
@@ -73,7 +82,7 @@ public class AnnotationService
             cancellationToken);
     }
 
-    private async Task SaveAnnotationInner(DateTime createdDate, string fName, List<YoloLabel>? labels, SourceEnum source, MemoryStream? stream,
+    private async Task SaveAnnotationInner(DateTime createdDate, string fName, string imageExtension, List<Detection> detections, SourceEnum source, Stream? stream,
         RoleEnum createdRole,
         string createdEmail,
         CancellationToken token = default)
@@ -85,7 +94,7 @@ public class AnnotationService
         //   sourceEnum: (manual)     if was in received.json then <AnnotationValidatedMessage> else <AnnotationCreatedMessage>
         //   sourceEnum: (queue, AI)  if queue CreatedMessage with the same user - do nothing Add to received.json
 
-        var classes = labels?.Select(x => x.ClassNumber).Distinct().ToList() ?? [];
+        var classes = detections.Select(x => x.ClassNumber).Distinct().ToList() ?? [];
         AnnotationStatus status;
 
         var annotation = await _dbFactory.Run(async db =>
@@ -108,11 +117,12 @@ public class AnnotationService
                 {
                     CreatedDate = createdDate,
                     Name = fName,
-                    Classes = classes,
+                    ImageExtension = imageExtension,
                     CreatedEmail = createdEmail,
                     CreatedRole = createdRole,
                     AnnotationStatus = status,
-                    Source = source
+                    Source = source,
+                    Detections = detections
                 };
                 await db.InsertAsync(ann, token: token);
             }
@@ -124,9 +134,10 @@ public class AnnotationService
             var img = System.Drawing.Image.FromStream(stream);
             img.Save(annotation.ImagePath, ImageFormat.Jpeg); //todo: check png images coming from queue
         }
-        if (labels != null)
-            await YoloLabel.WriteToFile(labels, annotation.LabelPath, token);
-
+        await YoloLabel.WriteToFile(detections, annotation.LabelPath, token);
+        await _galleryService.CreateThumbnail(annotation, token);
         await _producer.SendToQueue(annotation, token);
+
+        await _mediator.Publish(new AnnotationCreatedEvent(annotation), token);
     }
 }