optimal

hoanganhtuan95ptit · Jan 27, 2023 · 35dcbd4 · 35dcbd4
1 parent 2bf7a14
commit 35dcbd4
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 24 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/detect-mlkit/src/main/java/com/one/detect/mlkit/MlkitDetectTask.kt b/detect-mlkit/src/main/java/com/one/detect/mlkit/MlkitDetectTask.kt
@@ -117,7 +117,6 @@ abstract class MlkitDetectTask : DetectTask {
 
         state.toSuccess()?.data?.forEach { paragraph ->
 
-            if (paragraph.languageCode !in listOf("", "und")) return@forEach
 
             paragraph.languageCode = identifyLanguage(paragraph.text)
 
@@ -142,7 +141,7 @@ abstract class MlkitDetectTask : DetectTask {
 
         LanguageIdentification.getClient(LanguageIdentificationOptions.Builder().setConfidenceThreshold(0.34f).build()).identifyLanguage(text).addOnSuccessListener { languageCode ->
 
-            a.resumeActive(languageCode.takeIf { !it.equals("und", true) } ?: "")
+            a.resumeActive(languageCode.lowercase().replace("-latn", "").replace("und", ""))
         }.addOnFailureListener {
 
             a.resumeActive("")

diff --git a/translate-mlkit/src/main/java/com/one/translate/mlkit/MlkitTranslateTask.kt b/translate-mlkit/src/main/java/com/one/translate/mlkit/MlkitTranslateTask.kt
@@ -40,6 +40,10 @@ class MlkitTranslateTask : TranslateTask {
             return@withContext ResultState.Failed(java.lang.RuntimeException("not support inputCode:$inputCode outputCode:$outputCode"))
         }
 
+
+        log("mlkit translate task step 1 inputCode:$inputCode outputCode:$outputCode", "")
+
+
         val downloadInputCodeStateDeferred = async {
 
             Lock.withLock(inputCode) { downloadModelIfNeededTimeout(inputCode) }
@@ -76,7 +80,8 @@ class MlkitTranslateTask : TranslateTask {
         val translator = Translation.getClient(options)
 
 
-        log("Mlkit Translate Task", "$inputCode $outputCode")
+        log("mlkit translate task step 2 inputCode:$inputCode outputCode:$outputCode", "")
+
 
         val translateStateList = param.text.map {
 
@@ -105,10 +110,7 @@ class MlkitTranslateTask : TranslateTask {
 
     private suspend fun downloadModelIfNeededTimeout(languageCode: String) = kotlin.runCatching {
 
-        if (isModelDownloaded(languageCode)) {
-
-            return@runCatching ResultState.Success(emptyList())
-        } else withTimeout(2 * 60 * 1000) {
+        withTimeout(2 * 60 * 1000) {
 
             downloadModelIfNeeded(languageCode)
         }
@@ -126,35 +128,20 @@ class MlkitTranslateTask : TranslateTask {
             continuation.resumeActive(ResultState.Success(emptyList()))
         }.addOnFailureListener {
 
-            logException(RuntimeException("Mlkit Translate Task download Model If Needed $languageCode", it))
+            logException(RuntimeException("mlkit translate task download model if needed $languageCode", it))
 
             continuation.resumeActive(ResultState.Failed(it))
         }
     }
 
-    private suspend fun isModelDownloaded(languageCode: String) = suspendCancellableCoroutine<Boolean> { continuation ->
-
-        val remoteModel = TranslateRemoteModel.Builder(languageCode).build()
-
-        modelManager.isModelDownloaded(remoteModel).addOnSuccessListener {
-
-            continuation.resumeActive(it)
-        }.addOnFailureListener {
-
-            logException(RuntimeException("IS MODEL DOWNLOADED $languageCode", it))
-
-            continuation.resumeActive(false)
-        }
-    }
-
     private suspend fun translate(translator: Translator, text: String): ResultState<String> = suspendCancellableCoroutine { continuation ->
 
         translator.translate(text).addOnSuccessListener { translatedText ->
 
             continuation.resumeActive(ResultState.Success(translatedText))
         }.addOnFailureListener {
 
-            logException(RuntimeException("Mlkit Translate Task translate", it))
+            logException(RuntimeException("mlkit translate task translate", it))
 
             continuation.resumeActive(ResultState.Failed(it))
         }