Fixes #118

sillsdev · Oct 26, 2023 · cae03fc · cae03fc
1 parent c9e43f6
commit cae03fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/Machine/src/SIL.Machine.AspNetCore/Services/ClearMLMonitorService.cs b/src/Machine/src/SIL.Machine.AspNetCore/Services/ClearMLMonitorService.cs
@@ -1,4 +1,6 @@
-namespace SIL.Machine.AspNetCore.Services;
+using Microsoft.AspNetCore.DataProtection.KeyManagement.Internal;
+
+namespace SIL.Machine.AspNetCore.Services;
 
 public class ClearMLMonitorService : RecurrentTask
 {
@@ -53,7 +55,9 @@ await _clearMLService.GetTasksByIdAsync(
                     trainingEngines.Select(e => e.CurrentBuild!.JobId),
                     cancellationToken
                 )
-            ).ToDictionary(t => t.Id);
+            )
+                .UnionBy(await _clearMLService.GetTasksForCurrentQueueAsync(cancellationToken), t => t.Id)
+                .ToDictionary(t => t.Id);
 
             Dictionary<string, int> queuePositions = tasks.Values
                 .Where(t => t.Status is ClearMLTaskStatus.Queued or ClearMLTaskStatus.Created)

diff --git a/src/Machine/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs b/src/Machine/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs
@@ -145,6 +145,17 @@ public async Task<bool> StopTaskAsync(string id, CancellationToken cancellationT
         return updated == 1;
     }
 
+    public async Task<IReadOnlyList<ClearMLTask>> GetTasksForCurrentQueueAsync(
+        CancellationToken cancellationToken = default
+    )
+    {
+        var body = new JsonObject { ["name"] = _options.CurrentValue.Queue };
+        JsonObject? result = await CallAsync("queues", "get_all_ex", body, cancellationToken);
+        var tasks = (JsonArray?)result?["data"]?["queues"]?[0]?["entries"];
+        IEnumerable<string> taskIds = tasks?.Select(t => (string)t?["id"]!) ?? new List<string>();
+        return await GetTasksByIdAsync(taskIds, cancellationToken);
+    }
+
     public async Task<ClearMLTask?> GetTaskByNameAsync(string name, CancellationToken cancellationToken = default)
     {
         IReadOnlyList<ClearMLTask> tasks = await GetTasksAsync(new JsonObject { ["name"] = name }, cancellationToken);

diff --git a/src/Machine/src/SIL.Machine.AspNetCore/Services/IClearMLService.cs b/src/Machine/src/SIL.Machine.AspNetCore/Services/IClearMLService.cs
@@ -20,6 +20,7 @@ Task<string> CreateTaskAsync(
     Task<bool> EnqueueTaskAsync(string id, CancellationToken cancellationToken = default);
     Task<bool> DequeueTaskAsync(string id, CancellationToken cancellationToken = default);
     Task<bool> StopTaskAsync(string id, CancellationToken cancellationToken = default);
+    Task<IReadOnlyList<ClearMLTask>> GetTasksForCurrentQueueAsync(CancellationToken cancellationToken = default);
     Task<ClearMLTask?> GetTaskByNameAsync(string name, CancellationToken cancellationToken = default);
     Task<IReadOnlyList<ClearMLTask>> GetTasksByIdAsync(
         IEnumerable<string> ids,