Correct Incorrect engine type error

EchoWordAlignment works
sillsdev · Nov 7, 2024 · 0dc5784 · 0dc5784
1 parent 089bb5b
commit 0dc5784
Show file tree

Hide file tree

Showing 9 changed files with 259 additions and 145 deletions.
diff --git a/src/Machine/src/Serval.Machine.Shared/Services/BuildJobService.cs b/src/Machine/src/Serval.Machine.Shared/Services/BuildJobService.cs
@@ -13,12 +13,12 @@ public Task<bool> IsEngineBuilding(string engineId, CancellationToken cancellati
         return Engines.ExistsAsync(e => e.EngineId == engineId && e.CurrentBuild != null, cancellationToken);
     }
 
-    public Task<IReadOnlyList<TEngine>> GetBuildingEnginesAsync(
+    public async Task<IReadOnlyList<TEngine>> GetBuildingEnginesAsync(
         BuildJobRunnerType runner,
         CancellationToken cancellationToken = default
     )
     {
-        return Engines.GetAllAsync(
+        return await Engines.GetAllAsync(
             e => e.CurrentBuild != null && e.CurrentBuild.BuildJobRunner == runner,
             cancellationToken
         );

diff --git a/src/Machine/src/Serval.Machine.Shared/Services/ClearMLMonitorService.cs b/src/Machine/src/Serval.Machine.Shared/Services/ClearMLMonitorService.cs
@@ -54,9 +54,9 @@ private async Task MonitorClearMLTasksPerDomain(IServiceScope scope, Cancellatio
                 IBuildJobService<WordAlignmentEngine>
             >();
 
-            Dictionary<ITrainingEngine, IBuildJobService<ITrainingEngine>> engineToBuildServiceDict = (
+            Dictionary<ITrainingEngine, IBuildJobServiceBase> engineToBuildServiceDict = (
                 await translationBuildJobService.GetBuildingEnginesAsync(BuildJobRunnerType.ClearML, cancellationToken)
-            ).ToDictionary(e => (ITrainingEngine)e, e => (IBuildJobService<ITrainingEngine>)translationBuildJobService);
+            ).ToDictionary(e => (ITrainingEngine)e, e => (IBuildJobServiceBase)translationBuildJobService);
 
             foreach (
                 var engine in await wordAlignmentBuildJobService.GetBuildingEnginesAsync(
@@ -65,7 +65,7 @@ var engine in await wordAlignmentBuildJobService.GetBuildingEnginesAsync(
                 )
             )
             {
-                engineToBuildServiceDict[engine] = (IBuildJobService<ITrainingEngine>)wordAlignmentBuildJobService;
+                engineToBuildServiceDict[engine] = wordAlignmentBuildJobService;
             }
 
             if (engineToBuildServiceDict.Count == 0)
@@ -237,7 +237,7 @@ await TrainJobFaultedAsync(
 
     private async Task<bool> TrainJobStartedAsync(
         IDataAccessContext dataAccessContext,
-        IBuildJobService<ITrainingEngine> buildJobService,
+        IBuildJobServiceBase buildJobService,
         IPlatformService platformService,
         string engineId,
         string buildId,
@@ -260,7 +260,7 @@ private async Task<bool> TrainJobStartedAsync(
     }
 
     private async Task<bool> TrainJobCompletedAsync(
-        IBuildJobService<ITrainingEngine> buildJobService,
+        IBuildJobServiceBase buildJobService,
         EngineType engineType,
         string engineId,
         string buildId,
@@ -291,7 +291,7 @@ CancellationToken cancellationToken
 
     private async Task TrainJobFaultedAsync(
         IDataAccessContext dataAccessContext,
-        IBuildJobService<ITrainingEngine> buildJobService,
+        IBuildJobServiceBase buildJobService,
         IPlatformService platformService,
         string engineId,
         string buildId,
@@ -324,7 +324,7 @@ await buildJobService.BuildJobFinishedAsync(
 
     private async Task TrainJobCanceledAsync(
         IDataAccessContext dataAccessContext,
-        IBuildJobService<ITrainingEngine> buildJobService,
+        IBuildJobServiceBase buildJobService,
         IPlatformService platformService,
         string engineId,
         string buildId,

diff --git a/src/Machine/src/Serval.Machine.Shared/Services/IBuildJobService.cs b/src/Machine/src/Serval.Machine.Shared/Services/IBuildJobService.cs
@@ -1,43 +1,10 @@
 namespace Serval.Machine.Shared.Services;
 
-public interface IBuildJobService<TEngine>
+public interface IBuildJobService<TEngine> : IBuildJobServiceBase
     where TEngine : ITrainingEngine
 {
     Task<IReadOnlyList<TEngine>> GetBuildingEnginesAsync(
         BuildJobRunnerType runner,
         CancellationToken cancellationToken = default
     );
-
-    Task<bool> IsEngineBuilding(string engineId, CancellationToken cancellationToken = default);
-
-    Task CreateEngineAsync(string engineId, string? name = null, CancellationToken cancellationToken = default);
-
-    Task DeleteEngineAsync(string engineId, CancellationToken cancellationToken = default);
-
-    Task<bool> StartBuildJobAsync(
-        BuildJobRunnerType runnerType,
-        EngineType engineType,
-        string engineId,
-        string buildId,
-        BuildStage stage,
-        object? data = default,
-        string? buildOptions = default,
-        CancellationToken cancellationToken = default
-    );
-
-    Task<(string? BuildId, BuildJobState State)> CancelBuildJobAsync(
-        string engineId,
-        CancellationToken cancellationToken = default
-    );
-
-    Task<bool> BuildJobStartedAsync(string engineId, string buildId, CancellationToken cancellationToken = default);
-
-    Task BuildJobFinishedAsync(
-        string engineId,
-        string buildId,
-        bool buildComplete,
-        CancellationToken cancellationToken = default
-    );
-
-    Task BuildJobRestartingAsync(string engineId, string buildId, CancellationToken cancellationToken = default);
 }
diff --git a/src/Machine/src/Serval.Machine.Shared/Services/IBuildJobServiceBase.cs b/src/Machine/src/Serval.Machine.Shared/Services/IBuildJobServiceBase.cs
@@ -0,0 +1,37 @@
+namespace Serval.Machine.Shared.Services;
+
+public interface IBuildJobServiceBase
+{
+    Task<bool> IsEngineBuilding(string engineId, CancellationToken cancellationToken = default);
+
+    Task CreateEngineAsync(string engineId, string? name = null, CancellationToken cancellationToken = default);
+
+    Task DeleteEngineAsync(string engineId, CancellationToken cancellationToken = default);
+
+    Task<bool> StartBuildJobAsync(
+        BuildJobRunnerType runnerType,
+        EngineType engineType,
+        string engineId,
+        string buildId,
+        BuildStage stage,
+        object? data = default,
+        string? buildOptions = default,
+        CancellationToken cancellationToken = default
+    );
+
+    Task<(string? BuildId, BuildJobState State)> CancelBuildJobAsync(
+        string engineId,
+        CancellationToken cancellationToken = default
+    );
+
+    Task<bool> BuildJobStartedAsync(string engineId, string buildId, CancellationToken cancellationToken = default);
+
+    Task BuildJobFinishedAsync(
+        string engineId,
+        string buildId,
+        bool buildComplete,
+        CancellationToken cancellationToken = default
+    );
+
+    Task BuildJobRestartingAsync(string engineId, string buildId, CancellationToken cancellationToken = default);
+}