use nms in the model itself, simplify and make postprocess faster.

make inference in batches, fix c# handling, add overlap handling

Azaion.Common/Constants.cs

@@ -53,6 +53,7 @@ public class Constants
     public const double TRACKING_INTERSECTION_THRESHOLD   = 0.8;
     public const int    DEFAULT_FRAME_PERIOD_RECOGNITION  = 4;
 
+    public const int    DETECTION_BATCH_SIZE              = 4;
     # endregion AIRecognitionConfig
 
     #region Thumbnails

Azaion.Common/DTO/Label.cs

@@ -188,8 +188,8 @@ public class YoloLabel : Label
 [MessagePackObject]
 public class Detection : YoloLabel
 {
-    [IgnoreMember]public string AnnotationName { get; set; } = null!;
-    [Key("p")]    public double? Probability { get; set; }
+    [Key("an")] public string AnnotationName { get; set; } = null!;
+    [Key("p")]  public double? Probability { get; set; }
 
     //For db & serialization
     public Detection(){}

Azaion.Common/Database/Annotation.cs

@@ -21,8 +21,8 @@ public class Annotation
         _thumbDir = config.ThumbnailsDirectory;
     }
 
-    [IgnoreMember]public string                 Name              { get; set; } = null!;
-    [IgnoreMember]public string                 OriginalMediaName { get; set; } = null!;
+    [Key("n")]    public string                 Name              { get; set; } = null!;
+    [Key("mn")]   public string                 OriginalMediaName { get; set; } = null!;
     [IgnoreMember]public TimeSpan               Time              { get; set; }
     [IgnoreMember]public string                 ImageExtension    { get; set; } = null!;
     [IgnoreMember]public DateTime               CreatedDate       { get; set; }

Azaion.Common/Services/AnnotationService.cs

@@ -105,9 +105,6 @@ public class AnnotationService : INotificationHandler<AnnotationsDeletedEvent>
     public async Task<Annotation> SaveAnnotation(AnnotationImage a, CancellationToken cancellationToken = default)
     {
         a.Time = TimeSpan.FromMilliseconds(a.Milliseconds);
-        a.Name = a.OriginalMediaName.ToTimeName(a.Time);
-        foreach (var det in a.Detections)
-            det.AnnotationName = a.Name;
         return await SaveAnnotationInner(DateTime.Now, a.OriginalMediaName, a.Time, ".jpg", a.Detections.ToList(),
             a.Source, new MemoryStream(a.Image), a.CreatedRole, a.CreatedEmail, generateThumbnail: true, cancellationToken);
     }

Azaion.Common/Services/InferenceService.cs

@@ -3,23 +3,23 @@ using Azaion.Common.Database;
 using Azaion.Common.DTO.Config;
 using Azaion.CommonSecurity;
 using Azaion.CommonSecurity.DTO.Commands;
-using Azaion.CommonSecurity.Services;
 using MessagePack;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NetMQ;
 using NetMQ.Sockets;
+using Newtonsoft.Json;
 
 namespace Azaion.Common.Services;
 
 public interface IInferenceService
 {
-    Task RunInference(string mediaPath,  Func<AnnotationImage, Task> processAnnotation);
+    Task RunInference(List<string> mediaPaths, Func<AnnotationImage, Task> processAnnotation, CancellationToken ct = default);
 }
 
 public class PythonInferenceService(ILogger<PythonInferenceService> logger, IOptions<AIRecognitionConfig> aiConfigOptions) : IInferenceService
 {
-    public async Task RunInference(string mediaPath, Func<AnnotationImage, Task> processAnnotation)
+    public async Task RunInference(List<string> mediaPaths, Func<AnnotationImage, Task> processAnnotation, CancellationToken ct = default)
     {
         using var dealer = new DealerSocket();
         var clientId = Guid.NewGuid();
@@ -27,13 +27,14 @@ public class PythonInferenceService(ILogger<PythonInferenceService> logger, IOpt
         dealer.Connect($"tcp://{SecurityConstants.ZMQ_HOST}:{SecurityConstants.ZMQ_PORT}");
 
         var data = MessagePackSerializer.Serialize(aiConfigOptions.Value);
-        dealer.SendFrame(MessagePackSerializer.Serialize(new RemoteCommand(CommandType.Inference, mediaPath, data)));
+        var filename = JsonConvert.SerializeObject(mediaPaths);
+        dealer.SendFrame(MessagePackSerializer.Serialize(new RemoteCommand(CommandType.Inference, filename, data)));
 
-        while (true)
+        while (!ct.IsCancellationRequested)
         {
             try
             {
-                var annotationStream = dealer.Get<AnnotationImage>(bytes => bytes.Length == 4 && Encoding.UTF8.GetString(bytes) == "DONE");
+                var annotationStream = dealer.Get<AnnotationImage>(bytes => bytes.Length == 4 && Encoding.UTF8.GetString(bytes) == "DONE", ct: ct);
                 if (annotationStream == null)
                     break;
 
@@ -42,6 +43,7 @@ public class PythonInferenceService(ILogger<PythonInferenceService> logger, IOpt
             catch (Exception e)
             {
                 logger.LogError(e, e.Message);
+                break;
             }
         }
     }