diff --git a/Azaion.Annotator/Annotator.xaml.cs b/Azaion.Annotator/Annotator.xaml.cs index d7d1a19..700c4c7 100644 --- a/Azaion.Annotator/Annotator.xaml.cs +++ b/Azaion.Annotator/Annotator.xaml.cs @@ -243,9 +243,9 @@ public partial class Annotator return; var res = DgAnnotations.SelectedItems.Cast().ToList(); - var annotations = res.Select(x => x.Annotation).ToList(); + var annotationNames = res.Select(x => x.Annotation.Name).ToList(); - await _mediator.Publish(new AnnotationsDeletedEvent(annotations)); + await _mediator.Publish(new AnnotationsDeletedEvent(annotationNames)); break; } }; @@ -555,6 +555,7 @@ public partial class Annotator LvFiles.Items.Refresh(); IsInferenceNow = false; + StatusHelp.Text = "Розпізнавання зваершено"; AIDetectBtn.IsEnabled = true; } diff --git a/Azaion.Annotator/AnnotatorEventHandler.cs b/Azaion.Annotator/AnnotatorEventHandler.cs index 56c3f4c..05fce65 100644 --- a/Azaion.Annotator/AnnotatorEventHandler.cs +++ b/Azaion.Annotator/AnnotatorEventHandler.cs @@ -278,15 +278,18 @@ public class AnnotatorEventHandler( public async Task Handle(AnnotationsDeletedEvent notification, CancellationToken cancellationToken) { - var annResDict = formState.AnnotationResults.ToDictionary(x => x.Annotation.Name, x => x); - foreach (var ann in notification.Annotations) - { - if (!annResDict.TryGetValue(ann.Name, out var value)) - continue; + var namesSet = notification.AnnotationNames.ToHashSet(); - formState.AnnotationResults.Remove(value); - mainWindow.TimedAnnotations.Remove(ann); - } + var remainAnnotations = formState.AnnotationResults + .Where(x => !namesSet.Contains(x.Annotation?.Name ?? "")).ToList(); + formState.AnnotationResults.Clear(); + foreach (var ann in remainAnnotations) + formState.AnnotationResults.Add(ann); + + var timedAnnsToRemove = mainWindow.TimedAnnotations + .Where(x => namesSet.Contains(x.Value.Name)) + .Select(x => x.Value).ToList(); + mainWindow.TimedAnnotations.Remove(timedAnnsToRemove); if (formState.AnnotationResults.Count == 0) { @@ -307,7 +310,7 @@ public class AnnotatorEventHandler( mainWindow.AddAnnotation(e.Annotation); var log = string.Join(Environment.NewLine, e.Annotation.Detections.Select(det => - $"Розпізнавання: {annotationConfig.Value.DetectionClassesDict[det.ClassNumber].ShortName}: " + + $"Розпізнавання {e.Annotation.OriginalMediaName}: {annotationConfig.Value.DetectionClassesDict[det.ClassNumber].ShortName}: " + $"xy=({det.CenterX:F2},{det.CenterY:F2}), " + $"розмір=({det.Width:F2}, {det.Height:F2}), " + $"conf: {det.Confidence*100:F0}%")); diff --git a/Azaion.Common/Constants.cs b/Azaion.Common/Constants.cs index 84a9927..ceadd67 100644 --- a/Azaion.Common/Constants.cs +++ b/Azaion.Common/Constants.cs @@ -1,6 +1,4 @@ using System.Windows; -using System.Windows.Media; -using Azaion.Common.Database; using Azaion.Common.DTO; using Azaion.Common.DTO.Config; using Azaion.Common.Extensions; @@ -10,7 +8,7 @@ namespace Azaion.Common; public class Constants { public const string JPG_EXT = ".jpg"; - + public const string TXT_EXT = ".txt"; #region DirectoriesConfig public const string DEFAULT_VIDEO_DIR = "video"; diff --git a/Azaion.Common/DTO/AnnotationThumbnail.cs b/Azaion.Common/DTO/AnnotationThumbnail.cs index 988a267..73c9f17 100644 --- a/Azaion.Common/DTO/AnnotationThumbnail.cs +++ b/Azaion.Common/DTO/AnnotationThumbnail.cs @@ -28,6 +28,7 @@ public class AnnotationThumbnail(Annotation annotation) : INotifyPropertyChanged } public string ImageName => Path.GetFileName(Annotation.ImagePath); + public string CreatedEmail => Annotation.CreatedEmail; public bool IsSeed => Annotation.AnnotationStatus == AnnotationStatus.Created; public event PropertyChangedEventHandler? PropertyChanged; diff --git a/Azaion.Common/DTO/Queue/AnnotationCreatedMessage.cs b/Azaion.Common/DTO/Queue/AnnotationCreatedMessage.cs index 30a5fec..2b2a108 100644 --- a/Azaion.Common/DTO/Queue/AnnotationCreatedMessage.cs +++ b/Azaion.Common/DTO/Queue/AnnotationCreatedMessage.cs @@ -5,23 +5,23 @@ namespace Azaion.Common.DTO.Queue; using MessagePack; [MessagePackObject] -public class AnnotationCreatedMessage +public class AnnotationMessage { - [Key(0)] public DateTime CreatedDate { get; set; } - [Key(1)] public string Name { get; set; } = null!; - [Key(2)] public string OriginalMediaName { get; set; } = null!; - [Key(3)] public TimeSpan Time { get; set; } - [Key(4)] public string ImageExtension { get; set; } = null!; - [Key(5)] public string Detections { get; set; } = null!; - [Key(6)] public byte[] Image { get; set; } = null!; - [Key(7)] public RoleEnum CreatedRole { get; set; } - [Key(8)] public string CreatedEmail { get; set; } = null!; - [Key(9)] public SourceEnum Source { get; set; } + [Key(0)] public DateTime CreatedDate { get; set; } + [Key(1)] public string Name { get; set; } = null!; + [Key(2)] public string OriginalMediaName { get; set; } = null!; + [Key(3)] public TimeSpan Time { get; set; } + [Key(4)] public string ImageExtension { get; set; } = null!; + [Key(5)] public string Detections { get; set; } = null!; + [Key(6)] public byte[] Image { get; set; } = null!; + [Key(7)] public RoleEnum Role { get; set; } + [Key(8)] public string Email { get; set; } = null!; + [Key(9)] public SourceEnum Source { get; set; } [Key(10)] public AnnotationStatus Status { get; set; } } [MessagePackObject] -public class AnnotationValidatedMessage +public class AnnotationBulkMessage { - [Key(0)] public string Name { get; set; } = null!; + [Key(0)] public string[] AnnotationNames { get; set; } = null!; } \ No newline at end of file diff --git a/Azaion.Common/Database/Annotation.cs b/Azaion.Common/Database/Annotation.cs index 5b5c04c..2d0425a 100644 --- a/Azaion.Common/Database/Annotation.cs +++ b/Azaion.Common/Database/Annotation.cs @@ -59,5 +59,7 @@ public enum AnnotationStatus { None = 0, Created = 10, - Validated = 20 + Validated = 20, + ValidatedEdited = 25, + Deleted = 30 } \ No newline at end of file diff --git a/Azaion.Common/Database/AnnotationName.cs b/Azaion.Common/Database/AnnotationName.cs deleted file mode 100644 index 709066f..0000000 --- a/Azaion.Common/Database/AnnotationName.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Azaion.Common.Database; - -public class AnnotationName -{ - public string Name { get; set; } = null!; -} \ No newline at end of file diff --git a/Azaion.Common/Database/AnnotationQueueRecord.cs b/Azaion.Common/Database/AnnotationQueueRecord.cs new file mode 100644 index 0000000..8d95f6d --- /dev/null +++ b/Azaion.Common/Database/AnnotationQueueRecord.cs @@ -0,0 +1,8 @@ +namespace Azaion.Common.Database; + +public class AnnotationQueueRecord +{ + public DateTime DateTime { get; set; } + public AnnotationStatus Operation { get; set; } + public List AnnotationNames { get; set; } = null!; +} \ No newline at end of file diff --git a/Azaion.Common/Database/AnnotationsDb.cs b/Azaion.Common/Database/AnnotationsDb.cs index 69ed6ae..febcf8d 100644 --- a/Azaion.Common/Database/AnnotationsDb.cs +++ b/Azaion.Common/Database/AnnotationsDb.cs @@ -7,7 +7,7 @@ namespace Azaion.Common.Database; public class AnnotationsDb(DataOptions dataOptions) : DataConnection(dataOptions) { public ITable Annotations => this.GetTable(); - public ITable AnnotationsQueue => this.GetTable(); + public ITable AnnotationsQueueRecords => this.GetTable(); public ITable Detections => this.GetTable(); public ITable QueueOffsets => this.GetTable(); } \ No newline at end of file diff --git a/Azaion.Common/Database/DbFactory.cs b/Azaion.Common/Database/DbFactory.cs index fdce46d..25f0104 100644 --- a/Azaion.Common/Database/DbFactory.cs +++ b/Azaion.Common/Database/DbFactory.cs @@ -9,6 +9,7 @@ using LinqToDB.DataProvider.SQLite; using LinqToDB.Mapping; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Newtonsoft.Json; namespace Azaion.Common.Database; @@ -17,7 +18,6 @@ public interface IDbFactory Task Run(Func> func); Task Run(Func func); void SaveToDisk(); - Task DeleteAnnotations(List annotations, CancellationToken cancellationToken = default); Task DeleteAnnotations(List annotationNames, CancellationToken cancellationToken = default); } @@ -63,7 +63,7 @@ public class DbFactory : IDbFactory SQLiteConnection.CreateFile(_annConfig.AnnotationsDbFile); using var db = new AnnotationsDb(_fileDataOptions); db.CreateTable(); - db.CreateTable(); + db.CreateTable(); db.CreateTable(); db.CreateTable(); db.QueueOffsets.BulkCopy(new List @@ -98,12 +98,6 @@ public class DbFactory : IDbFactory _memoryConnection.BackupDatabase(_fileConnection, "main", "main", -1, null, -1); } - public async Task DeleteAnnotations(List annotations, CancellationToken cancellationToken = default) - { - var names = annotations.Select(x => x.Name).ToList(); - await DeleteAnnotations(names, cancellationToken); - } - public async Task DeleteAnnotations(List annotationNames, CancellationToken cancellationToken = default) { await Run(async db => @@ -142,8 +136,11 @@ public static class AnnotationsDbSchemaHolder builder.Entity() .HasTableName(Constants.DETECTIONS_TABLENAME); - builder.Entity() - .HasTableName(Constants.ANNOTATIONS_QUEUE_TABLENAME); + builder.Entity() + .HasTableName(Constants.ANNOTATIONS_QUEUE_TABLENAME) + .Property(x => x.AnnotationNames) + .HasDataType(DataType.NVarChar) + .HasConversion(list => JsonConvert.SerializeObject(list), str => JsonConvert.DeserializeObject>(str) ?? new List()); builder.Build(); } diff --git a/Azaion.Common/Events/AnnotationsDeletedEvent.cs b/Azaion.Common/Events/AnnotationsDeletedEvent.cs index 0b93a76..c597e2d 100644 --- a/Azaion.Common/Events/AnnotationsDeletedEvent.cs +++ b/Azaion.Common/Events/AnnotationsDeletedEvent.cs @@ -3,9 +3,10 @@ using MediatR; namespace Azaion.Common.Events; -public class AnnotationsDeletedEvent(List annotations) : INotification +public class AnnotationsDeletedEvent(List annotationNames, bool fromQueue = false) : INotification { - public List Annotations { get; set; } = annotations; + public List AnnotationNames { get; set; } = annotationNames; + public bool FromQueue { get; set; } = fromQueue; } public class AnnotationAddedEvent(Annotation annotation) : INotification diff --git a/Azaion.Common/Services/AnnotationService.cs b/Azaion.Common/Services/AnnotationService.cs index 4447584..0e11315 100644 --- a/Azaion.Common/Services/AnnotationService.cs +++ b/Azaion.Common/Services/AnnotationService.cs @@ -30,13 +30,16 @@ public class AnnotationService : IAnnotationService, INotificationHandler queueConfig, IOptions uiConfig, + IOptions directoriesConfig, IGalleryService galleryService, IMediator mediator, IAzaionApi api) @@ -48,11 +51,12 @@ public class AnnotationService : IAnnotationService, INotificationHandler await Init()).Wait(); + Task.Run(async () => await InitQueueConsumer()).Wait(); } - private async Task Init(CancellationToken cancellationToken = default) + private async Task InitQueueConsumer(CancellationToken cancellationToken = default) { if (!_api.CurrentUser.Role.IsValidator()) return; @@ -72,29 +76,40 @@ public class AnnotationService : IAnnotationService, INotificationHandler { - var msg = MessagePackSerializer.Deserialize(message.Data.Contents); + var email = (string)message.ApplicationProperties[nameof(User.Email)]!; + if (email == _api.CurrentUser.Email) //Don't process messages by yourself + return; + var annotationStatus = (AnnotationStatus)message.ApplicationProperties[nameof(AnnotationStatus)]; + if (annotationStatus.In(AnnotationStatus.Created, AnnotationStatus.ValidatedEdited)) + { + var msg = MessagePackSerializer.Deserialize(message.Data.Contents); + await SaveAnnotationInner( + msg.CreatedDate, + msg.OriginalMediaName, + msg.Time, + JsonConvert.DeserializeObject>(msg.Detections) ?? [], + msg.Source, + new MemoryStream(msg.Image), + msg.Role, + msg.Email, + fromQueue: true, + token: cancellationToken); + } + else + { + var msg = MessagePackSerializer.Deserialize(message.Data.Contents); + if (annotationStatus == AnnotationStatus.Validated) + await ValidateAnnotations(msg.AnnotationNames.ToList(), true, cancellationToken); + if (annotationStatus == AnnotationStatus.Deleted) + await _mediator.Publish(new AnnotationsDeletedEvent(msg.AnnotationNames.ToList(), fromQueue:true), cancellationToken); + } offsets.AnnotationsOffset = context.Offset; ThrottleExt.Throttle(() => { _api.UpdateOffsets(offsets); return Task.CompletedTask; - }, SaveTaskId, TimeSpan.FromSeconds(10), scheduleCallAfterCooldown: true); - - if (msg.CreatedEmail == _api.CurrentUser.Email) //Don't process messages by yourself - return; - - await SaveAnnotationInner( - msg.CreatedDate, - msg.OriginalMediaName, - msg.Time, - JsonConvert.DeserializeObject>(msg.Detections) ?? [], - msg.Source, - new MemoryStream(msg.Image), - msg.CreatedRole, - msg.CreatedEmail, - fromQueue: true, - token: cancellationToken); + }, SaveQueueOffsetTaskId, TimeSpan.FromSeconds(10), scheduleCallAfterCooldown: true); } }); } @@ -120,7 +135,7 @@ public class AnnotationService : IAnnotationService, INotificationHandler { @@ -128,25 +143,41 @@ public class AnnotationService : IAnnotationService, INotificationHandler x.Detections) .FirstOrDefaultAsync(x => x.Name == fName, token: token); - status = userRole.IsValidator() && source == SourceEnum.Manual - ? AnnotationStatus.Validated - : AnnotationStatus.Created; + if (userRole.IsValidator() && source == SourceEnum.Manual) + status = AnnotationStatus.Validated; if (fromQueue && ann is { AnnotationStatus: AnnotationStatus.Validated }) return ann; await db.Detections.DeleteAsync(x => x.AnnotationName == fName, token: token); - if (ann != null) + if (ann != null) //Annotation is already exists { - await db.Annotations + var annotationUpdatable = db.Annotations .Where(x => x.Name == fName) .Set(x => x.Source, source) + .Set(x => x.CreatedRole, userRole); + + if (status == AnnotationStatus.Validated) + { + if (status == AnnotationStatus.Validated) + status = AnnotationStatus.ValidatedEdited; //For further processing mark Annotations *edited* by Validator, not just simply Validated by button. + + annotationUpdatable = annotationUpdatable + .Set(x => x.ValidateDate, createdDate) + .Set(x => x.ValidateEmail, createdEmail); + } + else + { + annotationUpdatable = annotationUpdatable + .Set(x => x.CreatedDate, createdDate) + .Set(x => x.CreatedEmail, createdEmail); + } + + await annotationUpdatable .Set(x => x.AnnotationStatus, status) - .Set(x => x.CreatedDate, createdDate) - .Set(x => x.CreatedEmail, createdEmail) - .Set(x => x.CreatedRole, userRole) .UpdateAsync(token: token); + ann.Detections = detections; } else @@ -184,10 +215,11 @@ public class AnnotationService : IAnnotationService, INotificationHandler { _dbFactory.SaveToDisk(); @@ -196,12 +228,12 @@ public class AnnotationService : IAnnotationService, INotificationHandler annotations, CancellationToken token = default) + public async Task ValidateAnnotations(List annotationNames, bool fromQueue = false, CancellationToken token = default) { if (!_api.CurrentUser.Role.IsValidator()) return; - var annNames = annotations.Select(x => x.Name).ToHashSet(); + var annNames = annotationNames.ToHashSet(); await _dbFactory.Run(async db => { await db.Annotations @@ -211,6 +243,9 @@ public class AnnotationService : IAnnotationService, INotificationHandler x.ValidateEmail, _api.CurrentUser.Email) .UpdateAsync(token: token); }); + if (!fromQueue) + await _producer.SendToInnerQueue(annotationNames, AnnotationStatus.Validated, token); + ThrottleExt.Throttle(async () => { _dbFactory.SaveToDisk(); @@ -218,15 +253,25 @@ public class AnnotationService : IAnnotationService, INotificationHandler + { + _dbFactory.SaveToDisk(); + await Task.CompletedTask; + }, SaveTaskId, TimeSpan.FromSeconds(5), true); } } @@ -234,6 +279,5 @@ public interface IAnnotationService { Task SaveAnnotation(AnnotationImage a, CancellationToken ct = default); Task SaveAnnotation(string originalMediaName, TimeSpan time, List detections, Stream? stream = null, CancellationToken token = default); - Task ValidateAnnotations(List annotations, CancellationToken token = default); - + Task ValidateAnnotations(List annotationNames, bool fromQueue = false, CancellationToken token = default); } \ No newline at end of file diff --git a/Azaion.Common/Services/FailsafeProducer.cs b/Azaion.Common/Services/FailsafeProducer.cs index c46fcc2..750be53 100644 --- a/Azaion.Common/Services/FailsafeProducer.cs +++ b/Azaion.Common/Services/FailsafeProducer.cs @@ -3,12 +3,16 @@ using System.Net; using Azaion.Common.Database; using Azaion.Common.DTO.Config; using Azaion.Common.DTO.Queue; +using Azaion.Common.Extensions; +using Azaion.CommonSecurity.DTO; +using Azaion.CommonSecurity.Services; using LinqToDB; using MessagePack; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Newtonsoft.Json; using RabbitMQ.Stream.Client; +using RabbitMQ.Stream.Client.AMQP; using RabbitMQ.Stream.Client.Reliable; namespace Azaion.Common.Services; @@ -17,16 +21,15 @@ public class FailsafeAnnotationsProducer { private readonly ILogger _logger; private readonly IDbFactory _dbFactory; + private readonly IAzaionApi _azaionApi; private readonly QueueConfig _queueConfig; - private Producer _annotationProducer = null!; - private Producer _annotationConfirmProducer = null!; - - public FailsafeAnnotationsProducer(ILogger logger, IDbFactory dbFactory, IOptions queueConfig) + public FailsafeAnnotationsProducer(ILogger logger, IDbFactory dbFactory, IOptions queueConfig, IAzaionApi azaionApi) { _logger = logger; _dbFactory = dbFactory; + _azaionApi = azaionApi; _queueConfig = queueConfig.Value; Task.Run(async () => await ProcessQueue()); } @@ -41,107 +44,104 @@ public class FailsafeAnnotationsProducer }); } - private async Task Init(CancellationToken cancellationToken = default) + private async Task ProcessQueue(CancellationToken ct = default) { _annotationProducer = await Producer.Create(new ProducerConfig(await GetProducerQueueConfig(), Constants.MQ_ANNOTATIONS_QUEUE)); - _annotationConfirmProducer = await Producer.Create(new ProducerConfig(await GetProducerQueueConfig(), Constants.MQ_ANNOTATIONS_CONFIRM_QUEUE)); - } - - private async Task ProcessQueue(CancellationToken cancellationToken = default) - { - await Init(cancellationToken); - while (!cancellationToken.IsCancellationRequested) + while (!ct.IsCancellationRequested) { - var messages = await GetFromInnerQueue(cancellationToken); - foreach (var messagesChunk in messages.Chunk(10)) //Sending by 10 - { - var sent = false; - while (!sent || cancellationToken.IsCancellationRequested) //Waiting for send - { - try - { - var createdMessages = messagesChunk - .Where(x => x.Status == AnnotationStatus.Created) - .Select(x => new Message(MessagePackSerializer.Serialize(x))) - .ToList(); - if (createdMessages.Any()) - await _annotationProducer.Send(createdMessages, CompressionType.Gzip); - - var validatedMessages = messagesChunk - .Where(x => x.Status == AnnotationStatus.Validated) - .Select(x => new Message(MessagePackSerializer.Serialize(x))) - .ToList(); - if (validatedMessages.Any()) - await _annotationConfirmProducer.Send(validatedMessages, CompressionType.Gzip); - - await _dbFactory.Run(async db => - await db.AnnotationsQueue.DeleteAsync(aq => messagesChunk.Any(x => aq.Name == x.Name), token: cancellationToken)); - sent = true; - _dbFactory.SaveToDisk(); - } - catch (Exception e) - { - _logger.LogError(e, e.Message); - await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); - } - await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken); - } - } - await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken); - } - } - - private async Task> GetFromInnerQueue(CancellationToken cancellationToken = default) - { - return await _dbFactory.Run(async db => - { - var annotations = await db.AnnotationsQueue.Join( - db.Annotations.LoadWith(x => x.Detections), aq => aq.Name, a => a.Name, (aq, a) => a) - .ToListAsync(token: cancellationToken); - - var messages = new List(); - var badImages = new List(); - foreach (var annotation in annotations) + var sent = false; + while (!sent || !ct.IsCancellationRequested) //Waiting for send { try { - var image = await File.ReadAllBytesAsync(annotation.ImagePath, cancellationToken); - var annCreateMessage = new AnnotationCreatedMessage + var result = await _dbFactory.Run(async db => { - Name = annotation.Name, - OriginalMediaName = annotation.OriginalMediaName, - Time = annotation.Time, - CreatedRole = annotation.CreatedRole, - CreatedEmail = annotation.CreatedEmail, - CreatedDate = annotation.CreatedDate, - Status = annotation.AnnotationStatus, + var records = await db.AnnotationsQueueRecords.OrderBy(x => x.DateTime).ToListAsync(token: ct); + var editedCreatedNames = records + .Where(x => x.Operation.In(AnnotationStatus.Created, AnnotationStatus.ValidatedEdited)) + .Select(x => x.AnnotationNames.FirstOrDefault()) + .ToList(); - ImageExtension = annotation.ImageExtension, - Image = image, - Detections = JsonConvert.SerializeObject(annotation.Detections), - Source = annotation.Source, - }; - messages.Add(annCreateMessage); + var annotationsDict = await db.Annotations.LoadWith(x => x.Detections) + .Where(x => editedCreatedNames.Contains(x.Name)) + .ToDictionaryAsync(a => a.Name, token: ct); + + var messages = new List(); + foreach (var record in records) + { + var appProperties = new ApplicationProperties + { + { nameof(AnnotationStatus), record.Operation }, + { nameof(User.Email), _azaionApi.CurrentUser.Email } + }; + + if (record.Operation.In(AnnotationStatus.Validated, AnnotationStatus.Deleted)) + { + var message = new Message(MessagePackSerializer.Serialize(new AnnotationBulkMessage + { + AnnotationNames = record.AnnotationNames.ToArray() + })) { ApplicationProperties = appProperties }; + + messages.Add(message); + } + else + { + var annotation = annotationsDict.GetValueOrDefault(record.AnnotationNames.FirstOrDefault()); + if (annotation == null) + continue; + + var image = await File.ReadAllBytesAsync(annotation.ImagePath, ct); + var annMessage = new AnnotationMessage + { + Name = annotation.Name, + OriginalMediaName = annotation.OriginalMediaName, + Time = annotation.Time, + Role = annotation.CreatedRole, + Email = annotation.CreatedEmail, + CreatedDate = annotation.CreatedDate, + Status = annotation.AnnotationStatus, + + ImageExtension = annotation.ImageExtension, + Image = image, + Detections = JsonConvert.SerializeObject(annotation.Detections), + Source = annotation.Source, + }; + var message = new Message(MessagePackSerializer.Serialize(annMessage)) { ApplicationProperties = appProperties }; + + messages.Add(message); + } + } + + return (messages, records); + }); + + if (result.messages.Any()) + { + await _annotationProducer.Send(result.messages, CompressionType.Gzip); + await _dbFactory.Run(async db => await db.DeleteAsync(result.records, token: ct)); + sent = true; + _dbFactory.SaveToDisk(); + } } catch (Exception e) { _logger.LogError(e, e.Message); - badImages.Add(annotation.Name); + await Task.Delay(TimeSpan.FromSeconds(10), ct); } + await Task.Delay(TimeSpan.FromSeconds(10), ct); } - - if (badImages.Any()) - { - await db.AnnotationsQueue.Where(x => badImages.Contains(x.Name)).DeleteAsync(token: cancellationToken); - _dbFactory.SaveToDisk(); - } - return messages; - }); + } + await Task.Delay(TimeSpan.FromSeconds(5), ct); } - public async Task SendToInnerQueue(Annotation annotation, CancellationToken cancellationToken = default) + public async Task SendToInnerQueue(List annotationNames, AnnotationStatus status, CancellationToken cancellationToken = default) { await _dbFactory.Run(async db => - await db.InsertAsync(new AnnotationName { Name = annotation.Name }, token: cancellationToken)); + await db.InsertAsync(new AnnotationQueueRecord + { + DateTime = DateTime.UtcNow, + Operation = status, + AnnotationNames = annotationNames + }, token: cancellationToken)); } } \ No newline at end of file diff --git a/Azaion.Common/Services/GpsMatcherClient.cs b/Azaion.Common/Services/GpsMatcherClient.cs index fcb5077..12db99d 100644 --- a/Azaion.Common/Services/GpsMatcherClient.cs +++ b/Azaion.Common/Services/GpsMatcherClient.cs @@ -60,7 +60,7 @@ public class GpsMatcherClient : IGpsMatcherClient process.OutputDataReceived += (_, e) => { if (e.Data != null) Console.WriteLine(e.Data); }; process.ErrorDataReceived += (_, e) => { if (e.Data != null) Console.WriteLine(e.Data); }; - process.Start(); + //process.Start(); } catch (Exception e) { diff --git a/Azaion.Dataset/DatasetExplorer.xaml b/Azaion.Dataset/DatasetExplorer.xaml index 73eeb63..80ed4b5 100644 --- a/Azaion.Dataset/DatasetExplorer.xaml +++ b/Azaion.Dataset/DatasetExplorer.xaml @@ -30,7 +30,8 @@ - + + + diff --git a/Azaion.Dataset/DatasetExplorer.xaml.cs b/Azaion.Dataset/DatasetExplorer.xaml.cs index 8989eac..6e132ad 100644 --- a/Azaion.Dataset/DatasetExplorer.xaml.cs +++ b/Azaion.Dataset/DatasetExplorer.xaml.cs @@ -273,10 +273,9 @@ public partial class DatasetExplorer if (result != MessageBoxResult.Yes) return; - var annotations = ThumbnailsView.SelectedItems.Cast().Select(x => x.Annotation) - .ToList(); + var annotationNames = ThumbnailsView.SelectedItems.Cast().Select(x => x.Annotation.Name).ToList(); - await _mediator.Publish(new AnnotationsDeletedEvent(annotations)); + await _mediator.Publish(new AnnotationsDeletedEvent(annotationNames)); ThumbnailsView.SelectedIndex = Math.Min(SelectedAnnotations.Count, tempSelected); } diff --git a/Azaion.Dataset/DatasetExplorerEventHandler.cs b/Azaion.Dataset/DatasetExplorerEventHandler.cs index 0c222d5..b0ac4e9 100644 --- a/Azaion.Dataset/DatasetExplorerEventHandler.cs +++ b/Azaion.Dataset/DatasetExplorerEventHandler.cs @@ -99,7 +99,7 @@ public class DatasetExplorerEventHandler( var annotations = datasetExplorer.ThumbnailsView.SelectedItems.Cast() .Select(x => x.Annotation) .ToList(); - await annotationService.ValidateAnnotations(annotations, cancellationToken); + await annotationService.ValidateAnnotations(annotations.Select(x => x.Name).ToList(), token: cancellationToken); foreach (var ann in datasetExplorer.SelectedAnnotations.Where(x => annotations.Contains(x.Annotation))) { ann.Annotation.AnnotationStatus = AnnotationStatus.Validated; @@ -143,9 +143,8 @@ public class DatasetExplorerEventHandler( public async Task Handle(AnnotationsDeletedEvent notification, CancellationToken cancellationToken) { - var names = notification.Annotations.Select(x => x.Name).ToList(); var annThumbs = datasetExplorer.SelectedAnnotationDict - .Where(x => names.Contains(x.Key)) + .Where(x => notification.AnnotationNames.Contains(x.Key)) .Select(x => x.Value) .ToList(); foreach (var annThumb in annThumbs) diff --git a/Azaion.Inference/remote_command.pxd b/Azaion.Inference/remote_command.pxd index 2ead3a3..5f5b708 100644 --- a/Azaion.Inference/remote_command.pxd +++ b/Azaion.Inference/remote_command.pxd @@ -5,8 +5,8 @@ cdef enum CommandType: INFERENCE = 30 INFERENCE_DATA = 35 STOP_INFERENCE = 40 - AI_AVAILABILITY_CHECK = 80, - AI_AVAILABILITY_RESULT = 85, + AI_AVAILABILITY_CHECK = 80 + AI_AVAILABILITY_RESULT = 85 ERROR = 90 EXIT = 100 diff --git a/Azaion.Suite/App.xaml.cs b/Azaion.Suite/App.xaml.cs index ecb2d8d..f0dfe4d 100644 --- a/Azaion.Suite/App.xaml.cs +++ b/Azaion.Suite/App.xaml.cs @@ -46,7 +46,7 @@ public partial class App private readonly ICache _cache = new MemoryCache(); private IAzaionApi _azaionApi = null!; - private CancellationTokenSource _mainCancelTokenSource = new(); + private CancellationTokenSource _mainCTokenSource = new(); private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e) { @@ -89,7 +89,7 @@ public partial class App new ConfigUpdater().CheckConfig(); var secureAppConfig = ReadSecureAppConfig(); var apiDir = secureAppConfig.DirectoriesConfig.ApiResourcesDirectory; - _inferenceClient = new InferenceClient(new OptionsWrapper(secureAppConfig.InferenceClientConfig), _mainCancelTokenSource.Token); + _inferenceClient = new InferenceClient(new OptionsWrapper(secureAppConfig.InferenceClientConfig), _mainCTokenSource.Token); var login = new Login(); var loader = (IResourceLoader)_inferenceClient; @@ -244,7 +244,7 @@ public partial class App { var args = (KeyEventArgs)e; var keyEvent = new KeyEvent(sender, args, _formState.ActiveWindow); - ThrottleExt.Throttle(() => _mediator.Publish(keyEvent), KeyPressTaskId, TimeSpan.FromMilliseconds(50)); + ThrottleExt.Throttle(() => _mediator.Publish(keyEvent, _mainCTokenSource.Token), KeyPressTaskId, TimeSpan.FromMilliseconds(50)); //e.Handled = true; } diff --git a/Azaion.Suite/Azaion.Suite.csproj b/Azaion.Suite/Azaion.Suite.csproj index cde203f..0a1e040 100644 --- a/Azaion.Suite/Azaion.Suite.csproj +++ b/Azaion.Suite/Azaion.Suite.csproj @@ -33,8 +33,8 @@ - - + + @@ -62,8 +62,8 @@ - - + +