Change SMT model save location to be in build - always do it and auto…

…-save when delete.
sillsdev · Jun 7, 2024 · 346dd30 · 346dd30
1 parent a1b7210
commit 346dd30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/SIL.Machine.AspNetCore/Services/PostprocessBuildJob.cs b/src/SIL.Machine.AspNetCore/Services/PostprocessBuildJob.cs
@@ -30,7 +30,7 @@ CancellationToken cancellationToken
 
         await using (await @lock.WriterLockAsync(cancellationToken: CancellationToken.None))
         {
-            int additionalCorpusSize = await SaveModelAsync(engineId);
+            int additionalCorpusSize = await SaveModelAsync(engineId, buildId);
             await PlatformService.BuildCompletedAsync(
                 buildId,
                 corpusSize + additionalCorpusSize,
@@ -43,7 +43,7 @@ await PlatformService.BuildCompletedAsync(
         Logger.LogInformation("Build completed ({0}).", buildId);
     }
 
-    protected virtual Task<int> SaveModelAsync(string engineId)
+    protected virtual Task<int> SaveModelAsync(string engineId, string buildId)
     {
         return Task.FromResult(0);
     }

diff --git a/src/SIL.Machine.AspNetCore/Services/SmtTransferClearMLBuildJobFactory.cs b/src/SIL.Machine.AspNetCore/Services/SmtTransferClearMLBuildJobFactory.cs
@@ -37,9 +37,6 @@ public async Task<string> CreateJobScriptAsync(
                 + $"    'shared_file_uri': '{baseUri}',\n"
                 + $"    'shared_file_folder': '{folder}',\n"
                 + (buildOptions is not null ? $"    'build_options': '''{buildOptions}''',\n" : "")
-                // buildRevision + 1 because the build revision is incremented after the build job
-                // is finished successfully but the file should be saved with the new revision number
-                + (engine.IsModelPersisted ? $"    'save_model': '{engineId}',\n" : $"")
                 + $"    'clearml': True\n"
                 + "}\n"
                 + "run(args)\n";

diff --git a/src/SIL.Machine.AspNetCore/Services/SmtTransferPostprocessBuildJob.cs b/src/SIL.Machine.AspNetCore/Services/SmtTransferPostprocessBuildJob.cs
@@ -18,11 +18,11 @@ IOptionsMonitor<SmtTransferEngineOptions> options
     private readonly IRepository<TrainSegmentPair> _trainSegmentPairs = trainSegmentPairs;
     private readonly IOptionsMonitor<SmtTransferEngineOptions> _options = options;
 
-    protected override async Task<int> SaveModelAsync(string engineId)
+    protected override async Task<int> SaveModelAsync(string engineId, string buildId)
     {
         await using (
             Stream engineStream = await SharedFileService.OpenReadAsync(
-                $"models/{engineId}.zip",
+                $"builds/{buildId}/model.zip",
                 CancellationToken.None
             )
         )