First round reviewer comments

sillsdev · Feb 6, 2024 · 2c5ff85 · 2c5ff85
1 parent 77a7f9b
commit 2c5ff85
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/src/SIL.Machine.AspNetCore/Configuration/IMachineBuilderExtensions.cs b/src/SIL.Machine.AspNetCore/Configuration/IMachineBuilderExtensions.cs
@@ -211,7 +211,7 @@ public static IMachineBuilder AddHangfireJobServer(
 
         builder.Services.AddHangfireServer(o =>
         {
-            o.Queues = [.. queues];
+            o.Queues = queues.ToArray();
         });
         return builder;
     }

diff --git a/src/SIL.Machine.AspNetCore/Models/ModelDownloadUrl.cs b/src/SIL.Machine.AspNetCore/Models/ModelDownloadUrl.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace SIL.Machine.AspNetCore.Models
+{
+    public class ModelDownloadUrl
+    {
+        public string Url { get; set; } = default!;
+        public int ModelRevision { get; set; } = default!;
+        public DateTime ExipiresAt { get; set; } = default!;
+    }
+}
diff --git a/src/SIL.Machine.AspNetCore/Models/TranslationEngine.cs b/src/SIL.Machine.AspNetCore/Models/TranslationEngine.cs
@@ -7,7 +7,7 @@ public class TranslationEngine : IEntity
     public string EngineId { get; set; } = default!;
     public string SourceLanguage { get; set; } = default!;
     public string TargetLanguage { get; set; } = default!;
-    public bool IsModelRetrievable { get; set; } = false;
+    public bool IsModelPersisted { get; set; } = false;
     public int BuildRevision { get; set; }
     public Build? CurrentBuild { get; set; }
 }
diff --git a/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs b/src/SIL.Machine.AspNetCore/Services/ITranslationEngineService.cs
@@ -9,7 +9,7 @@ Task CreateAsync(
         string? engineName,
         string sourceLanguage,
         string targetLanguage,
-        bool isModelRetrievable = false,
+        bool isModelPersisted = false,
         CancellationToken cancellationToken = default
     );
     Task DeleteAsync(string engineId, CancellationToken cancellationToken = default);

diff --git a/src/SIL.Machine.AspNetCore/Services/NmtClearMLBuildJobFactory.cs b/src/SIL.Machine.AspNetCore/Services/NmtClearMLBuildJobFactory.cs
@@ -44,7 +44,7 @@ public async Task<string> CreateJobScriptAsync(
                 + $"    'shared_file_uri': '{baseUri}',\n"
                 + $"    'shared_file_folder': '{folder}',\n"
                 + (buildOptions is not null ? $"    'build_options': '''{buildOptions}''',\n" : "")
-                + (engine.IsModelRetrievable ? $"    'save_model': '{engineId}_{engine.BuildRevision + 1}',\n" : "")
+                + (engine.IsModelPersisted ? $"    'save_model': '{engineId}_{engine.BuildRevision + 1}',\n" : "")
                 + $"    'clearml': True\n"
                 + "}\n"
                 + "run(args)\n";

diff --git a/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs b/src/SIL.Machine.AspNetCore/Services/NmtEngineService.cs
@@ -36,7 +36,7 @@ public async Task CreateAsync(
         string? engineName,
         string sourceLanguage,
         string targetLanguage,
-        bool isModelRetrievable = false,
+        bool isModelPersisted = false,
         CancellationToken cancellationToken = default
     )
     {
@@ -47,7 +47,7 @@ await _engines.InsertAsync(
                 EngineId = engineId,
                 SourceLanguage = sourceLanguage,
                 TargetLanguage = targetLanguage,
-                IsModelRetrievable = isModelRetrievable
+                IsModelPersisted = isModelPersisted
             },
             cancellationToken
         );
@@ -120,10 +120,10 @@ public async Task<ModelDownloadUrl> GetModelDownloadUrlAsync(
     )
     {
         TranslationEngine engine = await GetEngineAsync(engineId, cancellationToken);
-        if (!engine.IsModelRetrievable)
+        if (!engine.IsModelPersisted)
             throw new InvalidOperationException(
                 "The model cannot be downloaded. "
-                    + "To enable downloading the model, recreate the engine with IsModelRetrievable property to true."
+                    + "To enable downloading the model, recreate the engine with IsModelPersisted property to true."
             );
         if (engine.BuildRevision == 0)
             throw new InvalidOperationException("The engine has not been built yet.");

diff --git a/src/SIL.Machine.AspNetCore/Services/NmtTrainBuildJob.cs b/src/SIL.Machine.AspNetCore/Services/NmtTrainBuildJob.cs
@@ -69,7 +69,7 @@ await PipInstallModuleAsync(
                         + $"    'shared_file_uri': '{_sharedFileService.GetBaseUri()}',\n"
                         + (buildOptions is not null ? $"    'build_options': '''{buildOptions}''',\n" : "")
                         + (
-                            engine.IsModelRetrievable
+                            engine.IsModelPersisted
                                 ? $"    'save_model': '{engine.Id}_{engine.BuildRevision + 1}',\n"
                                 : ""
                         )

diff --git a/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs b/src/SIL.Machine.AspNetCore/Services/SmtTransferEngineService.cs
@@ -32,7 +32,7 @@ public async Task CreateAsync(
         string? engineName,
         string sourceLanguage,
         string targetLanguage,
-        bool isModelRetrievable = false,
+        bool isModelPersisted = false,
         CancellationToken cancellationToken = default
     )
     {
@@ -43,7 +43,7 @@ await _engines.InsertAsync(
                 EngineId = engineId,
                 SourceLanguage = sourceLanguage,
                 TargetLanguage = targetLanguage,
-                IsModelRetrievable = isModelRetrievable
+                IsModelPersisted = isModelPersisted
             },
             cancellationToken
         );

diff --git a/src/SIL.Machine/Translation/ModelDownloadUrl.cs b/src/SIL.Machine/Translation/ModelDownloadUrl.cs
diff --git a/tests/SIL.Machine.AspNetCore.Tests/Services/CleanupJobTests.cs b/tests/SIL.Machine.AspNetCore.Tests/Services/CleanupJobTests.cs
@@ -26,7 +26,7 @@ private async Task SetUpAsync()
                 SourceLanguage = "es",
                 TargetLanguage = "en",
                 BuildRevision = 1,
-                IsModelRetrievable = true
+                IsModelPersisted = true
             }
         );
         _engines.Add(
@@ -37,7 +37,7 @@ private async Task SetUpAsync()
                 SourceLanguage = "es",
                 TargetLanguage = "en",
                 BuildRevision = 2,
-                IsModelRetrievable = true
+                IsModelPersisted = true
             }
         );
         async Task WriteFileStub(string path, string content)