diff --git a/docs/20261109_감지번역공급자공통화/provider-guide.md b/docs/20261109_감지번역공급자공통화/provider-guide.md index c5d5a67d..1e768cd3 100644 --- a/docs/20261109_감지번역공급자공통화/provider-guide.md +++ b/docs/20261109_감지번역공급자공통화/provider-guide.md @@ -4,7 +4,7 @@ 감지 구현체는 `PapagoLanguageDetectionProvider`와 `AwsLanguageDetectionProvider`, 번역 구현체는 `PapagoTranslationService`와 `AwsTranslationService`다. -두 기능의 production 기본 순서는 모두 `PAPAGO → AWS`다. AWS는 기존 자격 증명과 리전 설정을 재사용한다. +production 기본 순서는 감지와 번역 모두 `AWS → PAPAGO`다. AWS는 기존 자격 증명과 리전 설정을 재사용한다. 감지와 번역은 별도 capability다. 감지만 또는 번역만 제공하는 공급자도 등록할 수 있다. 두 capability에서 같은 `providerId`를 쓰는 것은 가능하지만, 한 capability 안의 ID 중복은 시작 시 거부한다. @@ -47,12 +47,12 @@ ko/en/ja 서비스 정책은 `TranslationLanguages`에 있으며 공급자를 production 순서의 유일한 편집 지점은 `src/main/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderOrder.kt`다. -목록의 왼쪽부터 사용하며 기본값은 두 기능 모두 `listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS)`다. +목록의 왼쪽부터 사용하며 감지와 번역의 기본 순서는 다음과 같다. ```kotlin 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) } ``` @@ -61,11 +61,11 @@ Spring은 `@Autowired` 기본 생성자로 위 목록을 읽는다. 문자열 테스트에서는 전역 목록을 변경하지 않고 `LanguageProviderProperties(List, List)`로 만든 테스트 bean을 주입한다. -다음은 감지만 AWS 우선으로 바꾸는 예시다. 현재 기본 순서를 뜻하지 않는다. +다음은 감지만 Papago 우선으로 바꾸는 예시다. 현재 기본 순서를 뜻하지 않는다. ```kotlin -val detectionOrder = listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO) -val translationOrder = listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS) +val detectionOrder = listOf(LanguageProviderId.PAPAGO, LanguageProviderId.AWS) +val translationOrder = listOf(LanguageProviderId.AWS, LanguageProviderId.PAPAGO) ``` 감지만 순서를 바꾸어도 번역 순서는 바뀌지 않는다. 반대로 번역만 바꿀 수도 있다. @@ -123,7 +123,7 @@ adapter 예외·null 감지·빈 감지·번역 결과 개수 불일치·blank | 테스트 | 검증 내용 | |---|---| -| `LanguageProviderSpringConfigurationTest` | production 기본 생성자와 PAPAGO 우선 성공, 과거 property/env 무시, 독립 순서와 잘못된 목록의 시작 실패; fake AWS context와 실제 adapter + SDK mock context 분리 | +| `LanguageProviderSpringConfigurationTest` | production 기본 생성자와 AWS 우선 성공, 과거 property/env 무시, 독립 순서와 잘못된 목록의 시작 실패; fake AWS context와 실제 adapter + SDK mock context 분리 | | `LanguageProviderIdTest` | 런타임 enum getter 계약, 안정적인 papago/aws code, production 기본값과 실제 adapter ID | | `LanguageProviderPropertiesTest` | 순서 검증 및 선택되지 않은 bean을 포함한 capability 내 중복 ID 거부 | | `LanguageDetectionProviderTest` / `TranslationCoordinatorTest` | 전체 요청 폴백, 첫 성공 중단, cache-first, 안전한 전체 실패, DB 오류 전파 | diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderOrder.kt b/src/main/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderOrder.kt index 2c89e06c..f9f792f9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderOrder.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderOrder.kt @@ -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) } diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageDetectionProviderTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageDetectionProviderTest.kt index 0e889ae1..2d79ff4d 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageDetectionProviderTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageDetectionProviderTest.kt @@ -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(), aws.queries + papago.queries) + } + @Test @DisplayName("감지 예외와 빈 결과는 다음 공급자로 넘기고 실제 공급자의 저장 승자를 반환한다") fun shouldFallbackAndReturnCanonicalWinnerWithActualProvider() { diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderCacheEndToEndTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderCacheEndToEndTest.kt index 14be1f68..c575d2b9 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderCacheEndToEndTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderCacheEndToEndTest.kt @@ -138,7 +138,7 @@ class LanguageProviderCacheEndToEndTest @Autowired constructor( assertEquals("v1", it.normalizationVersion) assertNotEquals(SourceTextNormalizer.hash(prefix), it.sourceHash) } - assertEquals(sources, papagoDetection.queries) + assertEquals(emptyList(), 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(), papagoTranslation.requests) assertTranslationRequests(first, tail) assertEquals(1L, transaction.execute { memoryRepository.count() }) assertEquals( diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderIdTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderIdTest.kt index e10110af..0eeae41f 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderIdTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderIdTest.kt @@ -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 ) } diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderSpringConfigurationTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderSpringConfigurationTest.kt index c652ac43..dc99b260 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderSpringConfigurationTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/LanguageProviderSpringConfigurationTest.kt @@ -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(), 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(), context.getBean("papagoDetection", RecordingDetectionProvider::class.java).queries) + Mockito.verify(detector).detectDominantLanguage(detectionRequest) + Mockito.verify(client).translateText(translationRequest) } } diff --git a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/TranslationCoordinatorTest.kt b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/TranslationCoordinatorTest.kt index b23dc76c..b1eb2679 100644 --- a/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/TranslationCoordinatorTest.kt +++ b/src/test/kotlin/kr/co/vividnext/sodalive/i18n/translation/TranslationCoordinatorTest.kt @@ -30,6 +30,22 @@ class TranslationCoordinatorTest { assertEquals(emptyList(), 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(), 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(), papago.requests + aws.requests) + } + @Test @DisplayName("캐시 저장소 오류는 공급자 실패로 숨기지 않는다") fun shouldPropagateCacheRepositoryFailure() {