Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only allow textId or scriptureRange in a buildID. #401

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Only allow textId or scriptureRange in a buildID. #401

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36477e3
one, but not both.
johnml1135 Jun 7, 2024
a17052a
from review
johnml1135 Jun 7, 2024
0ccbf38
Merge branch 'main' into textid_or_scripturerange
johnml1135 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Serval.Translation/Services/EngineService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ Dictionary<string, List<int>> GetChapters(V1.Corpus corpus, string scriptureRang
{
corpus.PretranslateAll =
pretranslateCorpus.TextIds is null && pretranslateCorpus.ScriptureRange is null;
if (pretranslateCorpus.TextIds is not null && pretranslateCorpus.ScriptureRange is not null)
{
throw new InvalidOperationException(
$"The corpus {c.Id} cannot specify both 'textIds' and 'scriptureRange' for 'pretranslate'."
);
}
if (pretranslateCorpus.TextIds is not null)
corpus.PretranslateTextIds.Add(pretranslateCorpus.TextIds);
if (!string.IsNullOrEmpty(pretranslateCorpus.ScriptureRange))
Expand Down Expand Up @@ -262,6 +268,12 @@ Dictionary<string, List<int>> GetChapters(V1.Corpus corpus, string scriptureRang
if (trainOn?.TryGetValue(c.Id, out TrainingCorpus? trainingCorpus) ?? false)
{
corpus.TrainOnAll = trainingCorpus.TextIds is null && trainingCorpus.ScriptureRange is null;
if (trainingCorpus.TextIds is not null && trainingCorpus.ScriptureRange is not null)
{
throw new InvalidOperationException(
$"The corpus {c.Id} cannot specify both 'textIds' and 'scriptureRange' for trainOn"
);
}
if (trainingCorpus.TextIds is not null)
corpus.TrainOnTextIds.Add(trainingCorpus.TextIds);
if (!string.IsNullOrEmpty(trainingCorpus.ScriptureRange))
Expand Down
Loading