Put "TrainOnAll" and "PretranslateAll" back in

Don't do https redirection
sillsdev · Oct 10, 2024 · 70a8282 · 70a8282
1 parent 93ca485
commit 70a8282
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/src/Echo/src/EchoTranslationEngine/Program.cs b/src/Echo/src/EchoTranslationEngine/Program.cs
@@ -17,9 +17,6 @@
 
 WebApplication app = builder.Build();
 
-// Configure the HTTP request pipeline.
-app.UseHttpsRedirection();
-
 app.MapGrpcService<TranslationEngineServiceV1>();
 app.MapGrpcService<HealthServiceV1>();
 

diff --git a/src/Machine/src/Serval.Machine.EngineServer/Program.cs b/src/Machine/src/Serval.Machine.EngineServer/Program.cs
@@ -35,8 +35,6 @@
 
 var app = builder.Build();
 
-app.UseHttpsRedirection();
-
 app.MapServalTranslationEngineService();
 app.MapHangfireDashboard();
 

diff --git a/src/Machine/src/Serval.Machine.Shared/Services/ServalTranslationEngineServiceV1.cs b/src/Machine/src/Serval.Machine.Shared/Services/ServalTranslationEngineServiceV1.cs
@@ -295,7 +295,7 @@ private static Models.MonolingualCorpus Map(Translation.V1.MonolingualCorpus sou
         var pretranslateTextIds = source.PretranslateTextIds.ToHashSet();
         FilterChoice pretranslateFilter = GetFilterChoice(pretranslateChapters, pretranslateTextIds);
 
-        return new Models.MonolingualCorpus
+        var corpus = new Models.MonolingualCorpus
         {
             Id = source.Id,
             Language = source.Language,
@@ -305,6 +305,17 @@ private static Models.MonolingualCorpus Map(Translation.V1.MonolingualCorpus sou
             PretranslateChapters = pretranslateFilter == FilterChoice.Chapters ? pretranslateChapters : null,
             PretranslateTextIds = pretranslateFilter == FilterChoice.TextIds ? pretranslateTextIds : null
         };
+        if (source.PretranslateAll)
+        {
+            corpus.PretranslateChapters = null;
+            corpus.PretranslateTextIds = null;
+        }
+        if (source.TrainOnAll)
+        {
+            corpus.TrainOnChapters = null;
+            corpus.TrainOnTextIds = null;
+        }
+        return corpus;
     }
 
     private static Models.CorpusFile Map(Translation.V1.CorpusFile source)

diff --git a/src/Serval/src/Serval.Grpc/Protos/serval/translation/v1/engine.proto b/src/Serval/src/Serval.Grpc/Protos/serval/translation/v1/engine.proto
@@ -161,6 +161,8 @@ message ParallelCorpus {
 message MonolingualCorpus {
     string id = 1;
     string language = 2;
+    bool train_on_all = 3;
+    bool pretranslate_all = 4;
     map<string, ScriptureChapters> train_on_chapters = 5;
     map<string, ScriptureChapters> pretranslate_chapters = 6;
     repeated string train_on_text_ids = 7;

diff --git a/src/Serval/src/Serval.Translation/Services/EngineService.cs b/src/Serval/src/Serval.Translation/Services/EngineService.cs
@@ -601,7 +601,12 @@ private V1.ParallelCorpus Map(Corpus source, TrainingCorpus? trainingCorpus, Pre
         V1.MonolingualCorpus targetCorpus =
             new() { Language = source.TargetLanguage, Files = { source.TargetFiles.Select(Map) } };
 
-        if (trainingCorpus != null)
+        if (trainingCorpus == null)
+        {
+            sourceCorpus.TrainOnAll = true;
+            targetCorpus.TrainOnAll = true;
+        }
+        else
         {
             if (trainingCorpus.TextIds is not null && trainingCorpus.ScriptureRange is not null)
             {
@@ -636,7 +641,12 @@ private V1.ParallelCorpus Map(Corpus source, TrainingCorpus? trainingCorpus, Pre
                 targetCorpus.TrainOnChapters.Add(chapters);
             }
         }
-        if (pretranslateCorpus != null)
+        if (pretranslateCorpus == null)
+        {
+            sourceCorpus.PretranslateAll = true;
+            targetCorpus.PretranslateAll = true;
+        }
+        else
         {
             if (pretranslateCorpus.TextIds is not null && pretranslateCorpus.ScriptureRange is not null)
             {