Skip to content

Commit

Permalink
Add a CLI and service to bulk review translations in a repository
Browse files Browse the repository at this point in the history
- Refactor the current code that reviews a single string to read from the database if a review for a translation already exists.
- Query translations that have not yet been reviewed, perform the bulk review, and save the result in AiReviewProto as a JSON blob that will be processed using MySQL JSON queries instead of separate columns. An option to remove an existing review can be added later, but for now this can be done directly in the database.
  • Loading branch information
ja-openai committed Feb 18, 2025
1 parent e47c7e7 commit 2f4ef92
Show file tree
Hide file tree
Showing 11 changed files with 432 additions and 426 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package com.box.l10n.mojito.cli.command;

import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.box.l10n.mojito.cli.command.param.Param;
import com.box.l10n.mojito.cli.console.ConsoleWriter;
import com.box.l10n.mojito.rest.client.RepositoryAiReviewClient;
import com.box.l10n.mojito.rest.entity.PollableTask;
import java.util.List;
import java.util.stream.Collectors;
import org.fusesource.jansi.Ansi.Color;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

/**
* Command to machine review strings in a repository.
*
* @author jaurambault
*/
@Component
@Scope("prototype")
@Parameters(
commandNames = {"repository-ai-review"},
commandDescription = "Ai review translated strings in a repository")
public class RepositoryAiReviewCommand extends Command {

/** logger */
static Logger logger = LoggerFactory.getLogger(RepositoryAiReviewCommand.class);

@Autowired ConsoleWriter consoleWriter;

@Parameter(
names = {Param.REPOSITORY_LONG, Param.REPOSITORY_SHORT},
arity = 1,
required = true,
description = Param.REPOSITORY_DESCRIPTION)
String repositoryParam;

@Parameter(
names = {Param.REPOSITORY_LOCALES_LONG, Param.REPOSITORY_LOCALES_SHORT},
variableArity = true,
description =
"List of locales (bcp47 tags) to translate, if not provided translate all locales in the repository")
List<String> locales;

@Parameter(
names = {"--source-text-max-count"},
arity = 1,
description =
"Source text max count per locale sent to MT (this param is used to avoid "
+ "sending too many strings to MT)")
int sourceTextMaxCount = 100;

@Parameter(
names = {"--text-unit-ids"},
arity = 1,
description = "The list of TmTextUnitIds to translate")
List<Long> textUnitIds;

@Parameter(
names = {"--use-batch"},
arity = 1,
description = "To use the batch API or not")
boolean useBatch = false;

@Autowired CommandHelper commandHelper;

@Autowired RepositoryAiReviewClient repositoryAiReviewClient;

@Override
public boolean shouldShowInCommandList() {
return false;
}

@Override
public void execute() throws CommandException {

consoleWriter
.newLine()
.a("Ai review repository: ")
.fg(Color.CYAN)
.a(repositoryParam)
.reset()
.a(" for locales: ")
.fg(Color.CYAN)
.a(locales == null ? "<all>" : locales.stream().collect(Collectors.joining(", ", "[", "]")))
.println(2);

RepositoryAiReviewClient.ProtoAiReviewResponse protoAiTranslateResponse =
repositoryAiReviewClient.reviewRepository(
new RepositoryAiReviewClient.ProtoAiReviewRequest(
repositoryParam, locales, sourceTextMaxCount, textUnitIds, useBatch));

PollableTask pollableTask = protoAiTranslateResponse.pollableTask();
commandHelper.waitForPollableTask(pollableTask.getId());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.box.l10n.mojito.rest.client;

import com.box.l10n.mojito.rest.entity.PollableTask;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

/**
* @author jaurambault
*/
@Component
public class RepositoryAiReviewClient extends BaseClient {

/** logger */
static Logger logger = LoggerFactory.getLogger(RepositoryAiReviewClient.class);

@Override
public String getEntityName() {
return "proto-ai-review";
}

/** Ai review strings in a repository for a given list of locales */
public ProtoAiReviewResponse reviewRepository(ProtoAiReviewRequest protoAiReviewRequest) {

return authenticatedRestTemplate.postForObject(
getBasePathForEntity(), protoAiReviewRequest, ProtoAiReviewResponse.class);
}

public record ProtoAiReviewRequest(
String repositoryName,
List<String> targetBcp47tags,
int sourceTextMaxCountPerLocale,
List<Long> tmTextUnitIds,
boolean useBatch) {}

public record ProtoAiReviewResponse(PollableTask pollableTask) {}
}
53 changes: 53 additions & 0 deletions webapp/src/main/java/com/box/l10n/mojito/entity/AiReviewProto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.box.l10n.mojito.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.Index;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.OneToOne;
import jakarta.persistence.Table;

/**
* We keep a single review per text unit variant for now. Meaning it has to be updated / cleaned up
* to re-review. The review is stored a JSON blob defined in the {@link
* com.box.l10n.mojito.service.oaireview.AiReviewService.AiReviewSingleTextUnitOutput} but that
* format could change any time.
*/
@Entity
@Table(
name = "ai_review_proto",
indexes = {
@Index(
name = "UK__AI_REVIEW_PROTO__TM_TEXT_UNIT_VARIANT_ID",
columnList = "tm_text_unit_variant_id",
unique = true)
})
public class AiReviewProto extends AuditableEntity {

@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(
name = "tm_text_unit_variant_id",
foreignKey = @ForeignKey(name = "FK__AI_REVIEW_PROTO__TM_TEXT_UNIT_VARIANT__ID"))
TMTextUnitVariant tmTextUnitVariant;

@Column(name = "json_review", length = Integer.MAX_VALUE)
String jsonReview;

public TMTextUnitVariant getTmTextUnitVariant() {
return tmTextUnitVariant;
}

public void setTmTextUnitVariant(TMTextUnitVariant tmTextUnitVariant) {
this.tmTextUnitVariant = tmTextUnitVariant;
}

public String getJsonReview() {
return jsonReview;
}

public void setJsonReview(String jsonReview) {
this.jsonReview = jsonReview;
}
}
102 changes: 84 additions & 18 deletions webapp/src/main/java/com/box/l10n/mojito/rest/textunit/AiReviewWS.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
package com.box.l10n.mojito.rest.textunit;

import com.box.l10n.mojito.entity.AiReviewProto;
import com.box.l10n.mojito.entity.PollableTask;
import com.box.l10n.mojito.json.ObjectMapper;
import com.box.l10n.mojito.service.oaireview.AiReviewService;
import com.box.l10n.mojito.service.pollableTask.PollableFuture;
import com.box.l10n.mojito.service.tm.AiReviewProtoRepository;
import com.box.l10n.mojito.service.tm.search.TextUnitDTO;
import com.box.l10n.mojito.service.tm.search.TextUnitSearcher;
import com.box.l10n.mojito.service.tm.search.TextUnitSearcherParameters;

import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseStatus;
Expand All @@ -21,24 +26,62 @@ public class AiReviewWS {
/** logger */
static Logger logger = LoggerFactory.getLogger(AiReviewWS.class);

private final AiReviewProtoRepository aiReviewProtoRepository;
private final ObjectMapper objectMapper;

TextUnitSearcher textUnitSearcher;

@Autowired
AiReviewService aiReviewService;

AiReviewProtoRepository AiReviewProtoRepository;

public AiReviewWS(
TextUnitSearcher textUnitSearcher,
AiReviewService aiReviewService) {
AiReviewService aiReviewService,
AiReviewProtoRepository AiReviewProtoRepository,
AiReviewProtoRepository aiReviewProtoRepository,
@Qualifier("AiTranslate") ObjectMapper objectMapper) {
this.textUnitSearcher = textUnitSearcher;
this.aiReviewService = aiReviewService;
this.AiReviewProtoRepository = AiReviewProtoRepository;
this.aiReviewProtoRepository = aiReviewProtoRepository;
this.objectMapper = objectMapper;
}

@RequestMapping(method = RequestMethod.POST, value = "/api/proto-ai-review")
@ResponseStatus(HttpStatus.OK)
public ProtoAiReviewResponse aiReview(@RequestBody ProtoAiReviewRequest protoAiReviewRequest) {

PollableFuture<Void> pollableFuture =
aiReviewService.aiReviewAsync(
new AiReviewService.AiReviewInput(
protoAiReviewRequest.repositoryName(),
protoAiReviewRequest.targetBcp47tags(),
protoAiReviewRequest.sourceTextMaxCountPerLocale(),
protoAiReviewRequest.tmTextUnitIds(),
protoAiReviewRequest.useBatch()));

return new ProtoAiReviewResponse(pollableFuture.getPollableTask());
}

@RequestMapping(method = RequestMethod.GET, value = "/api/proto-ai-review")
public record ProtoAiReviewRequest(
String repositoryName,
List<String> targetBcp47tags,
int sourceTextMaxCountPerLocale,
boolean useBatch,
List<Long> tmTextUnitIds,
boolean allLocales) {}

public record ProtoAiReviewResponse(PollableTask pollableTask) {}

@RequestMapping(method = RequestMethod.GET, value = "/api/proto-ai-review-single-text-unit")
@ResponseStatus(HttpStatus.OK)
public ProtoAiReviewResponse getTextUnitsWithGet(ProtoAiReviewRequest protoAiReviewRequest) {
public ProtoAiReviewSingleTextUnitResponse getTextUnitsWithGet(
ProtoAiReviewSingleTextUnitRequest protoAiReviewSingleTextUnitRequest) {

TextUnitSearcherParameters textUnitSearcherParameters = new TextUnitSearcherParameters();
textUnitSearcherParameters.setTmTextUnitVariantId(protoAiReviewRequest.tmTextUnitVariantId);
textUnitSearcherParameters.setTmTextUnitVariantId(
protoAiReviewSingleTextUnitRequest.tmTextUnitVariantId);

List<TextUnitDTO> search = textUnitSearcher.search(textUnitSearcherParameters);
if (search.isEmpty()) {
Expand All @@ -47,20 +90,43 @@ public ProtoAiReviewResponse getTextUnitsWithGet(ProtoAiReviewRequest protoAiRev

TextUnitDTO textUnit = search.getFirst();

AiReviewService.AiReviewSingleTextUnitInput input =
new AiReviewService.AiReviewSingleTextUnitInput(
textUnit.getTargetLocale(),
textUnit.getSource(),
textUnit.getComment(),
new AiReviewService.AiReviewSingleTextUnitInput.ExistingTarget(
textUnit.getTarget(), !textUnit.isIncludedInLocalizedFile()));
logger.info("Check for pre-computed review");

AiReviewService.AiReviewSingleTextUnitOutput aiReviewSingleTextUnitOutput = aiReviewService.getAiReviewSingleTextUnit(input, textUnit);
AiReviewProto alreadyReviewed =
aiReviewProtoRepository.findByTmTextUnitVariantId(
protoAiReviewSingleTextUnitRequest.tmTextUnitVariantId());

AiReviewService.AiReviewSingleTextUnitOutput aiReviewSingleTextUnitOutput = null;

if (alreadyReviewed != null) {
try {
aiReviewSingleTextUnitOutput =
objectMapper.readValueUnchecked(
alreadyReviewed.getJsonReview(),
AiReviewService.AiReviewSingleTextUnitOutput.class);
} catch (RuntimeException e) {
logger.warn("Can't deserialize the existing review, we will recompute");
}
}

if (aiReviewSingleTextUnitOutput == null) {

AiReviewService.AiReviewSingleTextUnitInput input =
new AiReviewService.AiReviewSingleTextUnitInput(
textUnit.getTargetLocale(),
textUnit.getSource(),
textUnit.getComment(),
new AiReviewService.AiReviewSingleTextUnitInput.ExistingTarget(
textUnit.getTarget(), !textUnit.isIncludedInLocalizedFile()));

aiReviewSingleTextUnitOutput = aiReviewService.getAiReviewSingleTextUnit(input);
}

return new ProtoAiReviewResponse(textUnit, aiReviewSingleTextUnitOutput);
return new ProtoAiReviewSingleTextUnitResponse(textUnit, aiReviewSingleTextUnitOutput);
}

public record ProtoAiReviewRequest(long tmTextUnitVariantId) {}
public record ProtoAiReviewSingleTextUnitRequest(long tmTextUnitVariantId) {}

public record ProtoAiReviewResponse(TextUnitDTO textUnitDTO, AiReviewService.AiReviewSingleTextUnitOutput aiReviewOutput) {}
public record ProtoAiReviewSingleTextUnitResponse(
TextUnitDTO textUnitDTO, AiReviewService.AiReviewSingleTextUnitOutput aiReviewOutput) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,12 @@
import com.box.l10n.mojito.json.ObjectMapper;
import com.box.l10n.mojito.openai.OpenAIClient;
import com.box.l10n.mojito.openai.OpenAIClientPool;
import com.box.l10n.mojito.quartz.QuartzPollableTaskScheduler;
import com.box.l10n.mojito.service.blobstorage.StructuredBlobStorage;
import com.box.l10n.mojito.service.repository.RepositoryRepository;
import com.box.l10n.mojito.service.repository.RepositoryService;
import com.box.l10n.mojito.service.tm.importer.TextUnitBatchImporterService;
import com.box.l10n.mojito.service.tm.search.TextUnitSearcher;
import java.time.Duration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import reactor.util.retry.Retry;
import reactor.util.retry.RetryBackoffSpec;

import java.time.Duration;

@Configuration
public class AiReviewConfig {

Expand All @@ -25,28 +18,6 @@ public AiReviewConfig(AiReviewConfigurationProperties aiReviewConfigurationPrope
this.aiReviewConfigurationProperties = aiReviewConfigurationProperties;
}

// TextUnitSearcher textUnitSearcher;
// RepositoryRepository repositoryRepository;
// RepositoryService repositoryService;
// TextUnitBatchImporterService textUnitBatchImporterService;
// StructuredBlobStorage structuredBlobStorage;
// QuartzPollableTaskScheduler quartzPollableTaskScheduler;
//
// public AiReviewConfig(AiReviewConfigurationProperties aiReviewConfigurationProperties, TextUnitSearcher textUnitSearcher, RepositoryRepository repositoryRepository, RepositoryService repositoryService, TextUnitBatchImporterService textUnitBatchImporterService, StructuredBlobStorage structuredBlobStorage, QuartzPollableTaskScheduler quartzPollableTaskScheduler) {
// this.aiReviewConfigurationProperties = aiReviewConfigurationProperties;
// this.textUnitSearcher = textUnitSearcher;
// this.repositoryRepository = repositoryRepository;
// this.repositoryService = repositoryService;
// this.textUnitBatchImporterService = textUnitBatchImporterService;
// this.structuredBlobStorage = structuredBlobStorage;
// this.quartzPollableTaskScheduler = quartzPollableTaskScheduler;
// }
//
// @Bean
// AiReviewService aiReviewService() {
// return new AiReviewService(textUnitSearcher, repositoryRepository, repositoryService, textUnitBatchImporterService, structuredBlobStorage, aiReviewConfigurationProperties, openAIClient(), openAIClientPool(), objectMapper(), retryBackoffSpec(), quartzPollableTaskScheduler);
// }

@Bean("openAIClientReview")
OpenAIClient openAIClient() {
String openaiClientToken = aiReviewConfigurationProperties.getOpenaiClientToken();
Expand All @@ -62,8 +33,7 @@ OpenAIClientPool openAIClientPool() {
if (openaiClientToken == null) {
return null;
}
return new OpenAIClientPool(
10, 50, 5, aiReviewConfigurationProperties.getOpenaiClientToken());
return new OpenAIClientPool(10, 50, 5, aiReviewConfigurationProperties.getOpenaiClientToken());
}

@Bean("objectMapperReview")
Expand Down
Loading

0 comments on commit 2f4ef92

Please sign in to comment.