Tests pass

src/Serval/src/Serval.Shared/Models/CorpusFile.cs

@@ -8,7 +8,7 @@ public record CorpusFile
 
     private string? _filename;
 
-    public async Task<string> PopulateFilenameAsync(
+    public async Task PopulateFilenameAsync(
         IRequestClient<GetDataFile> getDataFileClient,
         string owner,
         CancellationToken cancellationToken
@@ -22,7 +22,10 @@ CancellationToken cancellationToken
         {
             _filename = result.Message.Filename;
         }
-        throw new InvalidOperationException($"The data file {Id} cannot be found.");
+        else
+        {
+            throw new InvalidOperationException($"The data file {Id} cannot be found.");
+        }
     }
 
     public void SetFilename(string filename)

src/Serval/src/Serval.Translation/Controllers/TranslationEnginesController.cs

@@ -852,7 +852,6 @@ CancellationToken cancellationToken
     /// <param name="corpusId">The corpus id or parallel corpus id</param>
     /// <param name="textId">The text id</param>
     /// <param name="textOrigin">The source[s] of the data to populate the USFM file with.</param>
-    /// <param name="getDataFileClient">The data file client</param>
     /// <param name="cancellationToken"></param>
     /// <response code="200">The book in USFM format</response>
     /// <response code="204">The specified book does not exist in the source or target corpus.</response>
@@ -879,13 +878,11 @@ public async Task<IActionResult> GetPretranslatedUsfmAsync(
         [NotNull] string textId,
         [FromQuery(Name = "text-origin")] PretranslationUsfmTextOrigin? textOrigin,
         [FromQuery] PretranslationUsfmTemplate? template,
-        [FromServices] IRequestClient<GetDataFile> getDataFileClient,
         CancellationToken cancellationToken
     )
     {
         Engine engine = await _engineService.GetAsync(id, cancellationToken);
         await AuthorizeAsync(engine);
-        await engine.PopulateFilenamesAsync(getDataFileClient, cancellationToken);
         if (!engine.Corpora.Any(c => c.Id == corpusId) && !engine.ParallelCorpora.Any(c => c.Id == corpusId))
             return NotFound();
         if (engine.ModelRevision == 0)
@@ -1034,7 +1031,6 @@ CancellationToken cancellationToken
     /// </remarks>
     /// <param name="id">The translation engine id</param>
     /// <param name="buildConfig">The build config (see remarks)</param>
-    /// <param name="getDataFileClient">The data file client</param>
     /// <param name="cancellationToken"></param>
     /// <response code="201">The new build job</response>
     /// <response code="400">The build configuration was invalid.</response>
@@ -1055,15 +1051,13 @@ CancellationToken cancellationToken
     public async Task<ActionResult<TranslationBuildDto>> StartBuildAsync(
         [NotNull] string id,
         [FromBody] TranslationBuildConfigDto buildConfig,
-        [FromServices] IRequestClient<GetDataFile> getDataFileClient,
         CancellationToken cancellationToken
     )
     {
         string deploymentVersion = _configuration.GetValue<string>("deploymentVersion") ?? "Unknown";
 
         Engine engine = await _engineService.GetAsync(id, cancellationToken);
         await AuthorizeAsync(engine);
-        await engine.PopulateFilenamesAsync(getDataFileClient, cancellationToken);
         Build build = Map(engine, buildConfig, deploymentVersion);
 
         await _engineService.StartBuildAsync(build, cancellationToken);

src/Serval/src/Serval.Translation/Models/ParallelCorpus.cs

@@ -15,5 +15,8 @@ CancellationToken cancellationToken
         await Task.WhenAll(
             SourceCorpora.Select(corpus => corpus.PopulateFilenamesAsync(getDataFileClient, owner, cancellationToken))
         );
+        await Task.WhenAll(
+            TargetCorpora.Select(corpus => corpus.PopulateFilenamesAsync(getDataFileClient, owner, cancellationToken))
+        );
     }
 }

src/Serval/src/Serval.Translation/Services/EngineService.cs

@@ -12,7 +12,8 @@ public class EngineService(
     IOptionsMonitor<DataFileOptions> dataFileOptions,
     IDataAccessContext dataAccessContext,
     ILoggerFactory loggerFactory,
-    IScriptureDataFileService scriptureDataFileService
+    IScriptureDataFileService scriptureDataFileService,
+    IRequestClient<GetDataFile> getDataFileClient
 ) : OwnedEntityServiceBase<Engine>(engines), IEngineService
 {
     private readonly IRepository<Build> _builds = builds;
@@ -23,6 +24,7 @@ IScriptureDataFileService scriptureDataFileService
     private readonly IDataAccessContext _dataAccessContext = dataAccessContext;
     private readonly ILogger<EngineService> _logger = loggerFactory.CreateLogger<EngineService>();
     private readonly IScriptureDataFileService _scriptureDataFileService = scriptureDataFileService;
+    private readonly IRequestClient<GetDataFile> _getDataFileClient = getDataFileClient;
 
     public async Task<Models.TranslationResult> TranslateAsync(
         string engineId,
@@ -217,6 +219,7 @@ private Dictionary<string, List<int>> GetChapters(string fileLocation, string sc
     public async Task StartBuildAsync(Build build, CancellationToken cancellationToken = default)
     {
         Engine engine = await GetAsync(build.EngineRef, cancellationToken);
+        await engine.PopulateFilenamesAsync(_getDataFileClient, cancellationToken);
         await _builds.InsertAsync(build, cancellationToken);
 
         TranslationEngineApi.TranslationEngineApiClient client =

src/Serval/src/Serval.Translation/Services/PretranslationService.cs

@@ -5,11 +5,13 @@ namespace Serval.Translation.Services;
 public class PretranslationService(
     IRepository<Pretranslation> pretranslations,
     IRepository<Engine> engines,
-    IScriptureDataFileService scriptureDataFileService
+    IScriptureDataFileService scriptureDataFileService,
+    IRequestClient<GetDataFile> getDataFileClient
 ) : EntityServiceBase<Pretranslation>(pretranslations), IPretranslationService
 {
     private readonly IRepository<Engine> _engines = engines;
     private readonly IScriptureDataFileService _scriptureDataFileService = scriptureDataFileService;
+    private readonly IRequestClient<GetDataFile> _getDataFileClient = getDataFileClient;
 
     public async Task<IEnumerable<Pretranslation>> GetAllAsync(
         string engineId,
@@ -40,6 +42,7 @@ public async Task<string> GetUsfmAsync(
     )
     {
         Engine? engine = await _engines.GetAsync(engineId, cancellationToken);
+        await engine!.PopulateFilenamesAsync(_getDataFileClient, cancellationToken);
         Corpus? corpus = engine?.Corpora.SingleOrDefault(c => c.Id == corpusId);
         ParallelCorpus? parallelCorpus = engine?.ParallelCorpora.SingleOrDefault(c => c.Id == corpusId);