feat(i18n): 언어 감지와 번역에 AWS를 우선 사용한다
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package kr.co.vividnext.sodalive.i18n.translation
|
||||
|
||||
object LanguageProviderOrder {
|
||||
val detectionOrder = listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS)
|
||||
val translationOrder = listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS)
|
||||
val detectionOrder = listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO)
|
||||
val translationOrder = listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO)
|
||||
}
|
||||
|
||||
+29
@@ -18,6 +18,35 @@ class LanguageDetectionProviderTest {
|
||||
private val query = "original source"
|
||||
private val hash = SourceTextNormalizer.hash(query)
|
||||
|
||||
@Test
|
||||
@DisplayName("기본 감지 순서에서 AWS 예외와 빈 결과는 Papago로 전환한다")
|
||||
fun shouldFallbackToPapagoWithDefaultDetectionOrder() {
|
||||
val failures: List<() -> String?> = listOf({ throw IllegalStateException("unavailable") }, { null }, { " " })
|
||||
failures.forEach { failure ->
|
||||
val aws = RecordingDetectionProvider(AWS, failure)
|
||||
val papago = RecordingDetectionProvider(PAPAGO) { "ko" }
|
||||
Mockito.`when`(repository.findDetectedLanguageForUpdate(hash, "papago", "v1")).thenReturn("ko")
|
||||
val detector = LanguageDetectionCacheService(repository, listOf(papago, aws), LanguageProviderProperties())
|
||||
|
||||
assertEquals(DetectedLanguage("ko", PAPAGO), detector.detectWithCache(query))
|
||||
assertEquals(listOf(query), aws.queries)
|
||||
assertEquals(listOf(query), papago.queries)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("AWS 우선 기본 설정도 기존 Papago 감지 캐시는 외부 호출 없이 재사용한다")
|
||||
fun shouldReusePapagoCacheWithDefaultDetectionOrder() {
|
||||
val aws = RecordingDetectionProvider(AWS) { "en" }
|
||||
val papago = RecordingDetectionProvider(PAPAGO) { "ko" }
|
||||
Mockito.`when`(repository.findBySourceHashAndProviderAndNormalizationVersion(hash, "papago", "v1"))
|
||||
.thenReturn(LanguageDetectionResult(hash, "sample", "ja", "papago", null, "v1"))
|
||||
val detector = LanguageDetectionCacheService(repository, listOf(papago, aws), LanguageProviderProperties())
|
||||
|
||||
assertEquals(DetectedLanguage("ja", PAPAGO), detector.detectWithCache(query))
|
||||
assertEquals(emptyList<String>(), aws.queries + papago.queries)
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("감지 예외와 빈 결과는 다음 공급자로 넘기고 실제 공급자의 저장 승자를 반환한다")
|
||||
fun shouldFallbackAndReturnCanonicalWinnerWithActualProvider() {
|
||||
|
||||
+2
-3
@@ -138,7 +138,7 @@ class LanguageProviderCacheEndToEndTest @Autowired constructor(
|
||||
assertEquals("v1", it.normalizationVersion)
|
||||
assertNotEquals(SourceTextNormalizer.hash(prefix), it.sourceHash)
|
||||
}
|
||||
assertEquals(sources, papagoDetection.queries)
|
||||
assertEquals(emptyList<String>(), papagoDetection.queries)
|
||||
assertDetectionRequests(prefix, prefix)
|
||||
}
|
||||
|
||||
@@ -203,8 +203,7 @@ class LanguageProviderCacheEndToEndTest @Autowired constructor(
|
||||
assertTrue(materializer.materialize(LanguageTranslationTargetType.CREATOR_COMMUNITY, postId, "en"))
|
||||
schedule(postId, source)
|
||||
assertTrue(worker.processNextGroup())
|
||||
assertEquals(1, papagoTranslation.requests.size)
|
||||
assertEquals(listOf(source), papagoTranslation.requests.single().texts)
|
||||
assertEquals(emptyList<TranslateRequest>(), papagoTranslation.requests)
|
||||
assertTranslationRequests(first, tail)
|
||||
assertEquals(1L, transaction.execute { memoryRepository.count() })
|
||||
assertEquals(
|
||||
|
||||
@@ -42,20 +42,20 @@ class LanguageProviderIdTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("production 기본 순서는 PAPAGO 다음 AWS이며 실제 Papago adapter 식별자는 유지한다")
|
||||
fun shouldUsePapagoEnumForProductionDefaultsAndAdapters() {
|
||||
@DisplayName("production 감지와 번역은 AWS 다음 PAPAGO이며 Papago adapter 식별자는 유지한다")
|
||||
fun shouldUseCapabilityDefaultsAndPreservePapagoAdapterIdentity() {
|
||||
assertAll(
|
||||
{ assertEquals(listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS), LanguageProviderOrder.detectionOrder) },
|
||||
{ assertEquals(listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS), LanguageProviderOrder.translationOrder) },
|
||||
{ assertEquals(listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO), LanguageProviderOrder.detectionOrder) },
|
||||
{ assertEquals(listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO), LanguageProviderOrder.translationOrder) },
|
||||
{
|
||||
assertEquals(
|
||||
listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS),
|
||||
listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO),
|
||||
LanguageProviderProperties().detectionOrder
|
||||
)
|
||||
},
|
||||
{
|
||||
assertEquals(
|
||||
listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS),
|
||||
listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO),
|
||||
LanguageProviderProperties().translationOrder
|
||||
)
|
||||
}
|
||||
|
||||
+52
-41
@@ -41,17 +41,17 @@ class LanguageProviderSpringConfigurationTest {
|
||||
assertNull(context.startupFailure)
|
||||
val properties = context.getBean(LanguageProviderProperties::class.java)
|
||||
assertAll(
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.translationOrder) }
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(PAPAGO, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
assertEquals(AWS, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
assertEquals(
|
||||
PAPAGO,
|
||||
AWS,
|
||||
context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en")).providerId
|
||||
)
|
||||
assertEquals(0, context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries.size)
|
||||
assertEquals(0, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(1, context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries.size)
|
||||
assertEquals(1, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,17 +77,17 @@ class LanguageProviderSpringConfigurationTest {
|
||||
assertEquals("secondary,papago", context.environment.getProperty("sodalive.language-providers.translation-order"))
|
||||
val properties = context.getBean(LanguageProviderProperties::class.java)
|
||||
assertAll(
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.translationOrder) }
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(PAPAGO, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
assertEquals(AWS, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
assertEquals(
|
||||
PAPAGO,
|
||||
AWS,
|
||||
context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en")).providerId
|
||||
)
|
||||
assertEquals(0, context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries.size)
|
||||
assertEquals(0, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(1, context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries.size)
|
||||
assertEquals(1, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,36 +133,47 @@ class LanguageProviderSpringConfigurationTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("Spring 기본 생성자는 두 기능 모두 PAPAGO 다음 AWS를 등록하고 첫 PAPAGO 성공 뒤 멈춘다")
|
||||
fun shouldDefaultToPapago() {
|
||||
@DisplayName("Spring 기본 설정은 감지와 번역에 AWS를 먼저 사용하고 첫 성공 뒤 멈춘다")
|
||||
fun shouldDefaultToAwsForDetectionAndTranslation() {
|
||||
defaultRunner.run { context ->
|
||||
assertNull(context.startupFailure)
|
||||
val properties = context.getBean(LanguageProviderProperties::class.java)
|
||||
assertAll(
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(
|
||||
PAPAGO,
|
||||
AWS,
|
||||
context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId
|
||||
)
|
||||
assertEquals(
|
||||
PAPAGO,
|
||||
context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en")).providerId
|
||||
val result = context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en"))
|
||||
assertEquals(AWS, result.providerId)
|
||||
assertEquals("AWS-v1", result.providerVersion)
|
||||
assertEquals(listOf("AWS:0"), result.result.translatedText)
|
||||
val properties = context.getBean(LanguageProviderProperties::class.java)
|
||||
assertAll(
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(listOf("source"), context.getBean("papagoDetection", RecordingDetectionProvider::class.java).queries)
|
||||
assertEquals(1, context.getBean("papagoTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(0, context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries.size)
|
||||
assertEquals(0, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(emptyList<String>(), context.getBean("papagoDetection", RecordingDetectionProvider::class.java).queries)
|
||||
assertEquals(0, context.getBean("papagoTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(listOf("source"), context.getBean("secondaryDetection", RecordingDetectionProvider::class.java).queries)
|
||||
assertEquals(1, context.getBean("secondaryTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("실제 AWS adapter와 SDK client만 등록한 context도 기본 순서에서 PAPAGO 첫 성공 뒤 SDK를 호출하지 않는다")
|
||||
@DisplayName("실제 AWS adapter를 등록한 기본 context는 감지와 번역에 AWS SDK를 사용한다")
|
||||
fun shouldWireActualAwsAdaptersWithoutDuplicateIds() {
|
||||
actualRunner.withUserConfiguration(LanguageProviderProperties::class.java).run { context ->
|
||||
assertNull(context.startupFailure)
|
||||
val translationRequest = TranslateTextRequest.builder()
|
||||
.text("source").sourceLanguageCode("ko").targetLanguageCode("en").build()
|
||||
val client = context.getBean(TranslateClient::class.java)
|
||||
val detectionRequest = DetectDominantLanguageRequest.builder().text("source").build()
|
||||
val detector = context.getBean(ComprehendClient::class.java)
|
||||
Mockito.`when`(detector.detectDominantLanguage(detectionRequest)).thenReturn(
|
||||
DetectDominantLanguageResponse.builder()
|
||||
.languages(DominantLanguage.builder().languageCode("ko").build()).build()
|
||||
)
|
||||
Mockito.`when`(client.translateText(translationRequest))
|
||||
.thenReturn(TranslateTextResponse.builder().translatedText("translated").build())
|
||||
assertEquals(2, context.getBeansOfType(LanguageDetectionProvider::class.java).size)
|
||||
assertEquals(2, context.getBeansOfType(TranslationProvider::class.java).size)
|
||||
assertEquals(AWS, context.getBean(AwsLanguageDetectionProvider::class.java).providerId)
|
||||
@@ -171,19 +182,19 @@ class LanguageProviderSpringConfigurationTest {
|
||||
assertEquals("translate-2017-07-01", translator.providerVersion)
|
||||
val properties = context.getBean(LanguageProviderProperties::class.java)
|
||||
assertAll(
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(PAPAGO, AWS), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(PAPAGO, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
assertEquals(
|
||||
PAPAGO,
|
||||
context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en")).providerId
|
||||
)
|
||||
Mockito.verifyNoInteractions(
|
||||
context.getBean(ComprehendClient::class.java),
|
||||
context.getBean(TranslateClient::class.java)
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.detectionOrder) },
|
||||
{ assertEquals(listOf(AWS, PAPAGO), properties.translationOrder) }
|
||||
)
|
||||
assertEquals(AWS, context.getBean(LanguageDetectionCacheService::class.java).detectWithCache("source")?.providerId)
|
||||
val result = context.getBean(TranslationCoordinator::class.java)
|
||||
.translate(TranslateRequest(listOf("source"), "ko", "en"))
|
||||
assertEquals(AWS, result.providerId)
|
||||
assertEquals("translate-2017-07-01", result.providerVersion)
|
||||
assertEquals(listOf("translated"), result.result.translatedText)
|
||||
assertEquals(0, context.getBean("papagoTranslation", RecordingTranslationProvider::class.java).requests.size)
|
||||
assertEquals(emptyList<String>(), context.getBean("papagoDetection", RecordingDetectionProvider::class.java).queries)
|
||||
Mockito.verify(detector).detectDominantLanguage(detectionRequest)
|
||||
Mockito.verify(client).translateText(translationRequest)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+34
@@ -30,6 +30,22 @@ class TranslationCoordinatorTest {
|
||||
assertEquals(emptyList<TranslateRequest>(), first.requests)
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("기본 순서에서 AWS 번역 실패 뒤 전체 요청을 PAPAGO로 넘겨 성공 결과를 반환한다")
|
||||
fun shouldFallbackToPapagoAfterAwsFailureWithDefaultOrder() {
|
||||
val papago = RecordingTranslationProvider(PAPAGO)
|
||||
val aws = RecordingTranslationProvider(AWS) { throw IllegalStateException("provider unavailable") }
|
||||
val coordinator = TranslationCoordinator(listOf(papago, aws), LanguageProviderProperties(), repository)
|
||||
|
||||
val result = coordinator.translate(request)
|
||||
|
||||
assertEquals(PAPAGO, result.providerId)
|
||||
assertEquals("PAPAGO-v1", result.providerVersion)
|
||||
assertEquals(listOf("PAPAGO:0", "PAPAGO:1"), result.result.translatedText)
|
||||
assertEquals(listOf(request), aws.requests)
|
||||
assertEquals(listOf(request), papago.requests)
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("예외와 부분 결과와 공백 결과 뒤에는 전체 요청을 다음 공급자로 넘긴다")
|
||||
fun shouldFallbackWholeRequestAfterExceptionsOrInvalidResults() {
|
||||
@@ -102,6 +118,24 @@ class TranslationCoordinatorTest {
|
||||
assertEquals(emptyList<TranslateRequest>(), first.requests + second.requests)
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("기본 순서는 기존 PAPAGO 캐시를 재사용하고 두 캐시가 유효하면 AWS 캐시를 먼저 선택한다")
|
||||
fun shouldReusePapagoCacheAndPreferValidAwsCacheWithDefaultOrder() {
|
||||
val papago = RecordingTranslationProvider(PAPAGO)
|
||||
val aws = RecordingTranslationProvider(AWS)
|
||||
val coordinator = TranslationCoordinator(listOf(papago, aws), LanguageProviderProperties(), repository)
|
||||
val papagoMemory = memory("papago", "cached papago")
|
||||
givenMemory("papago", papagoMemory)
|
||||
|
||||
assertSame(papagoMemory, coordinator.findCached("hash", "ko", "en"))
|
||||
givenMemory("aws", memory("aws", " "))
|
||||
assertSame(papagoMemory, coordinator.findCached("hash", "ko", "en"))
|
||||
val awsMemory = memory("aws", "cached aws")
|
||||
givenMemory("aws", awsMemory)
|
||||
assertSame(awsMemory, coordinator.findCached("hash", "ko", "en"))
|
||||
assertEquals(emptyList<TranslateRequest>(), papago.requests + aws.requests)
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("캐시 저장소 오류는 공급자 실패로 숨기지 않는다")
|
||||
fun shouldPropagateCacheRepositoryFailure() {
|
||||
|
||||
Reference in New Issue
Block a user