diff --git a/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs b/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs index 02e7b5e66..bd13cea7c 100644 --- a/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs +++ b/src/SIL.Machine.AspNetCore/Services/ClearMLService.cs @@ -146,10 +146,11 @@ public async Task StopTaskAsync(string id, CancellationToken cancellationT } public async Task> GetTasksForCurrentQueueAsync( + string? queueName = null, CancellationToken cancellationToken = default ) { - var body = new JsonObject { ["name"] = _options.CurrentValue.Queue }; + var body = new JsonObject { ["name"] = queueName ?? _options.CurrentValue.Queue }; JsonObject? result = await CallAsync("queues", "get_all_ex", body, cancellationToken); var tasks = (JsonArray?)result?["data"]?["queues"]?[0]?["entries"]; IEnumerable taskIds = tasks?.Select(t => (string)t?["id"]!) ?? new List(); diff --git a/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs b/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs index 51750dedc..95d432d3d 100644 --- a/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs +++ b/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs @@ -40,5 +40,5 @@ Task StartBuildAsync( Task CancelBuildAsync(string engineId, CancellationToken cancellationToken = default); - Task GetQueueSizeAsync(CancellationToken cancellationToken = default); + Task GetQueueSizeAsync(string? queueName = null, CancellationToken cancellationToken = default); } diff --git a/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs b/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs index 74a2cec11..1c06142f3 100644 --- a/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs +++ b/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs @@ -146,7 +146,7 @@ public Task TrainSegmentPairAsync( throw new NotSupportedException(); } - public Task GetQueueSizeAsync(CancellationToken cancellationToken = default) + public Task GetQueueSizeAsync(string? queueName = null, CancellationToken cancellationToken = default) { return Task.FromResult(_clearMLMonitorService.QueueSize); } diff --git a/src/SIL.Machine.AspNetCore/Services/ServalTranslationEngineServiceV1.cs b/src/SIL.Machine.AspNetCore/Services/ServalTranslationEngineServiceV1.cs index fb87853c6..14cc9ff2f 100644 --- a/src/SIL.Machine.AspNetCore/Services/ServalTranslationEngineServiceV1.cs +++ b/src/SIL.Machine.AspNetCore/Services/ServalTranslationEngineServiceV1.cs @@ -130,7 +130,10 @@ ServerCallContext context ) { ITranslationEngineService engineService = GetEngineService(request.EngineType); - return new GetQueueSizeResponse { Size = await engineService.GetQueueSizeAsync(context.CancellationToken) }; + return new GetQueueSizeResponse + { + Size = await engineService.GetQueueSizeAsync(request.queueName, context.CancellationToken) + }; } public override async Task HealthCheck(Empty request, ServerCallContext context) diff --git a/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs b/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs index 3f1ffaf7f..717aca402 100644 --- a/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs +++ b/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs @@ -205,7 +205,7 @@ public async Task CancelBuildAsync(string engineId, CancellationToken cancellati } } - public Task GetQueueSizeAsync(CancellationToken cancellationToken = default) + public Task GetQueueSizeAsync(string? queueName = null, CancellationToken cancellationToken = default) { return Task.FromResult(Convert.ToInt32(_jobStorage.GetMonitoringApi().EnqueuedCount("smt_transfer"))); }