SF-2900 Mixed Source: Selecting books from each source

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.spec.ts

@@ -235,9 +235,11 @@ describe('DraftGenerationStepsComponent', () => {
       component.tryAdvanceStep();
 
       expect(component.done.emit).toHaveBeenCalledWith({
-        translationBooks,
-        trainingDataFiles,
         trainingBooks: trainingBooks.filter(book => !translationBooks.includes(book)),
+        trainingDataFiles,
+        trainingScriptureRanges: [],
+        translationBooks,
+        translationScriptureRanges: [],
         fastTraining: false
       } as DraftGenerationStepsResult);
     });
@@ -330,7 +332,9 @@ describe('DraftGenerationStepsComponent', () => {
       expect(component.done.emit).toHaveBeenCalledWith({
         trainingBooks,
         trainingDataFiles,
+        trainingScriptureRanges: [],
         translationBooks,
+        translationScriptureRanges: [],
         fastTraining: true
       } as DraftGenerationStepsResult);
     });

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation-steps/draft-generation-steps.component.ts

@@ -17,6 +17,7 @@ import { TrainingDataDoc } from '../../../core/models/training-data-doc';
 import { BookMultiSelectComponent } from '../../../shared/book-multi-select/book-multi-select.component';
 import { SharedModule } from '../../../shared/shared.module';
 import { NllbLanguageService } from '../../nllb-language.service';
+import { ProjectScriptureRange } from '../draft-generation';
 import { DraftSource, DraftSourcesService } from '../draft-sources.service';
 import { TrainingDataMultiSelectComponent } from '../training-data/training-data-multi-select.component';
 import { TrainingDataUploadDialogComponent } from '../training-data/training-data-upload-dialog.component';
@@ -26,8 +27,10 @@ export interface DraftGenerationStepsResult {
   trainingBooks: number[];
   trainingDataFiles: string[];
   trainingScriptureRange?: string;
+  trainingScriptureRanges: ProjectScriptureRange[];
   translationBooks: number[];
   translationScriptureRange?: string;
+  translationScriptureRanges: ProjectScriptureRange[];
   fastTraining: boolean;
 }
 
@@ -248,8 +251,10 @@ export class DraftGenerationStepsComponent extends SubscriptionDisposable implem
     } else {
       this.done.emit({
         trainingBooks: this.userSelectedTrainingBooks,
+        trainingScriptureRanges: [],
         trainingDataFiles: this.selectedTrainingDataIds,
         translationBooks: this.userSelectedTranslateBooks,
+        translationScriptureRanges: [],
         fastTraining: this.fastTraining
       });
     }

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.spec.ts

@@ -1749,15 +1749,19 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
       expect(mockDraftGenerationService.startBuildOrGetActiveBuild).toHaveBeenCalledWith({
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
     });
@@ -1775,15 +1779,19 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
       expect(mockDraftGenerationService.startBuildOrGetActiveBuild).toHaveBeenCalledWith({
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
       verify(mockDialogRef.getState()).never();
@@ -1803,15 +1811,19 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
       expect(mockDraftGenerationService.startBuildOrGetActiveBuild).toHaveBeenCalledWith({
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
       verify(mockDialogRef.getState()).never();
@@ -1831,15 +1843,19 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
       expect(mockDraftGenerationService.startBuildOrGetActiveBuild).toHaveBeenCalledWith({
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
       verify(mockDialogRef.getState()).never();
@@ -1860,15 +1876,19 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
       expect(mockDraftGenerationService.startBuildOrGetActiveBuild).toHaveBeenCalledWith({
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
       verify(mockDialogRef.close()).once();
@@ -1884,7 +1904,9 @@ describe('DraftGenerationComponent', () => {
       env.component.startBuild({
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false,
         projectId: projectId
       });
@@ -1894,7 +1916,9 @@ describe('DraftGenerationComponent', () => {
         projectId: projectId,
         trainingBooks: [],
         trainingDataFiles: [],
+        trainingScriptureRanges: [],
         translationBooks: [],
+        translationScriptureRanges: [],
         fastTraining: false
       });
       expect(mockAuthService.requestParatextCredentialUpdate).toHaveBeenCalled();

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.ts

@@ -443,8 +443,10 @@ export class DraftGenerationComponent extends DataLoadingComponent implements On
       trainingBooks: result.trainingBooks,
       trainingDataFiles: result.trainingDataFiles,
       trainingScriptureRange: result.trainingScriptureRange,
+      trainingScriptureRanges: result.trainingScriptureRanges,
       translationBooks: result.translationBooks,
       translationScriptureRange: result.translationScriptureRange,
+      translationScriptureRanges: result.trainingScriptureRanges,
       fastTraining: result.fastTraining
     });
   }

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.service.spec.ts

@@ -43,7 +43,9 @@ describe('DraftGenerationService', () => {
     projectId,
     trainingBooks: [],
     trainingDataFiles: [],
+    translationScriptureRanges: [],
     translationBooks: [],
+    trainingScriptureRanges: [],
     fastTraining: false
   };
   const buildDto: BuildDto = {

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.ts

@@ -1,19 +1,29 @@
 import { InjectionToken } from '@angular/core';
 import { BuildStates } from '../../machine-api/build-states';
 
-/*
+/**
  * The build configuration for a pre-translation build.
  */
 export interface BuildConfig {
   projectId: string;
   trainingBooks: number[];
   trainingDataFiles: string[];
   trainingScriptureRange?: string;
+  trainingScriptureRanges: ProjectScriptureRange[];
   translationBooks: number[];
   translationScriptureRange?: string;
+  translationScriptureRanges: ProjectScriptureRange[];
   fastTraining: boolean;
 }
 
+/**
+ * A per-project scripture range.
+ */
+export interface ProjectScriptureRange {
+  projectId: string;
+  scriptureRange: string;
+}
+
 /**
  * Dictionary of 'segmentRef -> segment text'.
  */

src/SIL.XForge.Scripture/Models/BuildConfig.cs

@@ -19,6 +19,7 @@ public class BuildConfig
     /// </summary>
     /// <value>The numbers of the books to use as the source texts for training.</value>
     /// <remarks>
+    /// This property is for legacy client use.
     /// You should not set this property and <see cref="TrainingScriptureRange"/> at the same time.
     /// </remarks>
     public HashSet<int> TrainingBooks { get; set; } = [];
@@ -34,16 +35,26 @@ public class BuildConfig
     /// </summary>
     /// <value>The book ids and chapter numbers separated by semicolons.</value>
     /// <remarks>
+    /// This property is for legacy client use.
     /// See https://github.com/sillsdev/serval/wiki/Filtering-Paratext-Project-Data-with-a-Scripture-Range for syntax.
     /// You should not set this property and <see cref="TrainingBooks"/> at the same time.
     /// </remarks>
     public string? TrainingScriptureRange { get; set; }
 
+    /// <summary>
+    /// Gets or sets the per-project books and chapters to use for training.
+    /// </summary>
+    /// <value>
+    /// A list containing the project identifiers and scripture ranges.
+    /// </value>
+    public HashSet<ProjectScriptureRange> TrainingScriptureRanges { get; set; } = [];
+
     /// <summary>
     /// Gets or sets the books to use for translation.
     /// </summary>
     /// <value>The numbers of the books to use as the source texts for training.</value>
     /// <remarks>
+    /// This property is for legacy client use.
     /// You should not set this property and <see cref="TranslationScriptureRange"/> at the same time.
     /// </remarks>
     public HashSet<int> TranslationBooks { get; set; } = [];
@@ -53,11 +64,20 @@ public class BuildConfig
     /// </summary>
     /// <value>The book ids and chapter numbers separated by semicolons.</value>
     /// <remarks>
+    /// This property is for legacy client use.
     /// See https://github.com/sillsdev/serval/wiki/Filtering-Paratext-Project-Data-with-a-Scripture-Range for syntax.
     /// You should not set this property and <see cref="TranslationBooks"/> at the same time.
     /// </remarks>
     public string? TranslationScriptureRange { get; set; }
 
+    /// <summary>
+    /// Gets or sets the per-project books and chapters to use for training.
+    /// </summary>
+    /// <value>
+    /// A list containing the project identifiers and scripture ranges.
+    /// </value>
+    public HashSet<ProjectScriptureRange> TranslationScriptureRanges { get; set; } = [];
+
     /// <summary>
     /// Gets or sets the project identifier.
     /// </summary>

src/SIL.XForge.Scripture/Models/DraftConfig.cs

@@ -13,8 +13,10 @@ public class DraftConfig
     public TranslateSource? AlternateTrainingSource { get; set; }
     public IList<int> LastSelectedTrainingBooks { get; set; } = [];
     public string? LastSelectedTrainingScriptureRange { get; set; }
+    public IList<ProjectScriptureRange> LastSelectedTrainingScriptureRanges { get; set; } = [];
     public IList<string> LastSelectedTrainingDataFiles { get; set; } = [];
     public IList<int> LastSelectedTranslationBooks { get; set; } = [];
     public string? LastSelectedTranslationScriptureRange { get; set; }
+    public IList<ProjectScriptureRange> LastSelectedTranslationScriptureRanges { get; set; } = [];
     public string? ServalConfig { get; set; }
 }

src/SIL.XForge.Scripture/Models/ProjectScriptureRange.cs

@@ -0,0 +1,22 @@
+namespace SIL.XForge.Scripture.Models;
+
+/// <summary>
+/// A scripture range for a specific project.
+/// This is used by <see cref="BuildConfig"/>.
+/// </summary>
+public record ProjectScriptureRange
+{
+    /// <summary>
+    /// The project identifier.
+    /// </summary>
+    public string ProjectId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The scripture range.
+    /// </summary>
+    /// <value>The book ids and chapter numbers separated by semicolons.</value>
+    /// <remarks>
+    /// See https://github.com/sillsdev/serval/wiki/Filtering-Paratext-Project-Data-with-a-Scripture-Range for syntax.
+    /// </remarks>
+    public string ScriptureRange { get; set; } = string.Empty;
+}

src/SIL.XForge.Scripture/Models/ServalAdditionalTrainingData.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace SIL.XForge.Scripture.Models;
+
+/// <summary>
+/// Configuration for uploading Additional Training Data to Serval.
+/// </summary>
+public class ServalAdditionalTrainingData
+{
+    /// <summary>
+    /// Gets or sets the Parallel Corpus identifier.
+    /// </summary>
+    public string ParallelCorpusId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the identifier of the corpus to be used as the source in the Parallel Corpus.
+    /// </summary>
+    public string SourceCorpusId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the identifier of the corpus to be used as the target in the Parallel Corpus.
+    /// </summary>
+    public string TargetCorpusId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the corpus files uploaded to Serval.
+    /// </summary>
+    /// <value>
+    /// The files in both the source and target corpora.
+    /// </value>
+    public List<ServalCorpusFile> CorpusFiles { get; set; } = [];
+}

src/SIL.XForge.Scripture/Models/ServalCorpus.cs

@@ -50,13 +50,13 @@ public class ServalCorpus
     /// <value>
     /// The source corpus files.
     /// </value>
-    public List<ServalCorpusFile> SourceFiles { get; set; } = new List<ServalCorpusFile>();
+    public List<ServalCorpusFile> SourceFiles { get; set; } = [];
 
     /// <summary>
     /// Gets or sets the target files uploaded to Serval.
     /// </summary>
     /// <value>
     /// The target corpus files.
     /// </value>
-    public List<ServalCorpusFile> TargetFiles { get; set; } = new List<ServalCorpusFile>();
+    public List<ServalCorpusFile> TargetFiles { get; set; } = [];
 }