Quick Answers: Prioritize translation intent

The current annotation model does not work well with non-English words.
Prioritize translation to solve the issue.

Also increase the translation text length threshold.

Bug: b/158509369
Test: Run existing tests
Change-Id: I7316a55f934f570f5c035ced35b03369717a160f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2487540Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Yue Li <updowndota@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819652}

chromeos/components/quick_answers/understanding/intent_generator.cc

@@ -26,7 +26,7 @@ using machine_learning::mojom::TextClassifier;
 
 // TODO(llin): Finalize on the threshold based on user feedback.
 constexpr int kUnitConversionIntentAndSelectionLengthDiffThreshold = 5;
-constexpr int kTranslationTextLengthThreshold = 50;
+constexpr int kTranslationTextLengthThreshold = 100;
 constexpr int kDefinitionIntentAndSelectionLengthDiffThreshold = 2;
 
 // TODO(b/169370175): Remove the temporary invalid set after we ramp up to v2
@@ -144,20 +144,11 @@ void IntentGenerator::LoadModelCallback(const QuickAnswersRequest& request,
   }
 
   if (text_classifier_) {
-    TextAnnotationRequestPtr text_annotation_request =
-        machine_learning::mojom::TextAnnotationRequest::New();
-
-    // TODO(b/159664194): There is a issue with text classifier that some
-    // capitalized words are not annotated properly. Convert the text to lower
-    // case for now. Clean up after the issue is fixed.
-    text_annotation_request->text = base::UTF16ToUTF8(
-        base::i18n::ToLower(base::UTF8ToUTF16(request.selected_text)));
-    text_annotation_request->default_locales =
-        request.context.device_properties.language;
-
-    text_classifier_->Annotate(
-        std::move(text_annotation_request),
-        base::BindOnce(&IntentGenerator::AnnotationCallback,
+    text_classifier_->FindLanguages(
+        !request.context.surrounding_text.empty()
+            ? request.context.surrounding_text
+            : request.selected_text,
+        base::BindOnce(&IntentGenerator::FindLanguagesCallback,
                        weak_factory_.GetWeakPtr(), request));
   }
 }
@@ -175,8 +166,8 @@ void IntentGenerator::AnnotationCallback(
       // Skip the entity for definition annonation.
       if (it->second == IntentType::kDictionary &&
           ShouldSkipDefinition(request.selected_text)) {
-        // Fallback to language detection for generating translation intent.
-        MaybeGenerateTranslationIntent(request);
+        std::move(complete_callback_)
+            .Run(IntentInfo(request.selected_text, IntentType::kUnknown));
         return;
       }
       std::move(complete_callback_)
@@ -185,30 +176,41 @@ void IntentGenerator::AnnotationCallback(
       return;
     }
   }
-  // Fallback to language detection for generating translation intent.
-  MaybeGenerateTranslationIntent(request);
+  std::move(complete_callback_)
+      .Run(IntentInfo(request.selected_text, IntentType::kUnknown));
 }
 
 void IntentGenerator::FindLanguagesCallback(
     const QuickAnswersRequest& request,
     std::vector<machine_learning::mojom::TextLanguagePtr> languages) {
-  auto intent_type = IntentType::kUnknown;
   // TODO(b/150034512): Take confidence level into consideration.
-  if (languages.empty() ||
-      languages.front()->locale == request.context.device_properties.language) {
-    std::move(complete_callback_)
-        .Run(IntentInfo(request.selected_text, IntentType::kUnknown));
+  if (!languages.empty() &&
+      !request.context.device_properties.language.empty() &&
+      languages.front()->locale != request.context.device_properties.language) {
+    MaybeGenerateTranslationIntent(request, languages.front()->locale);
     return;
   }
-  intent_type = IntentType::kTranslation;
-  std::move(complete_callback_)
-      .Run(IntentInfo(request.selected_text, intent_type,
-                      languages.front()->locale,
-                      request.context.device_properties.language));
+
+  TextAnnotationRequestPtr text_annotation_request =
+      machine_learning::mojom::TextAnnotationRequest::New();
+
+  // TODO(b/159664194): There is a issue with text classifier that some
+  // capitalized words are not annotated properly. Convert the text to lower
+  // case for now. Clean up after the issue is fixed.
+  text_annotation_request->text = base::UTF16ToUTF8(
+      base::i18n::ToLower(base::UTF8ToUTF16(request.selected_text)));
+  text_annotation_request->default_locales =
+      request.context.device_properties.language;
+
+  text_classifier_->Annotate(
+      std::move(text_annotation_request),
+      base::BindOnce(&IntentGenerator::AnnotationCallback,
+                     weak_factory_.GetWeakPtr(), request));
 }
 
 void IntentGenerator::MaybeGenerateTranslationIntent(
-    const QuickAnswersRequest& request) {
+    const QuickAnswersRequest& request,
+    const std::string& detected_locale) {
   DCHECK(complete_callback_);
 
   if (!features::IsQuickAnswersTranslationEnabled()) {
@@ -226,14 +228,10 @@ void IntentGenerator::MaybeGenerateTranslationIntent(
     return;
   }
 
-  if (text_classifier_) {
-    text_classifier_->FindLanguages(
-        !request.context.surrounding_text.empty()
-            ? request.context.surrounding_text
-            : request.selected_text,
-        base::BindOnce(&IntentGenerator::FindLanguagesCallback,
-                       weak_factory_.GetWeakPtr(), request));
-  }
+  std::move(complete_callback_)
+      .Run(IntentInfo(request.selected_text, IntentType::kTranslation,
+                      detected_locale,
+                      request.context.device_properties.language));
 }
 
 }  // namespace quick_answers

chromeos/components/quick_answers/understanding/intent_generator.h

@@ -54,7 +54,8 @@ class IntentGenerator {
       const QuickAnswersRequest& request,
       std::vector<machine_learning::mojom::TextLanguagePtr> languages);
 
-  void MaybeGenerateTranslationIntent(const QuickAnswersRequest& request);
+  void MaybeGenerateTranslationIntent(const QuickAnswersRequest& request,
+                                      const std::string& detected_locale);
 
   IntentGeneratorCallback complete_callback_;
   mojo::Remote<::chromeos::machine_learning::mojom::TextClassifier>

chromeos/components/quick_answers/understanding/intent_generator_unittest.cc

@@ -124,7 +124,8 @@ TEST_F(IntentGeneratorTest, TranslationIntentTextLengthAboveThreshold) {
   QuickAnswersRequest request;
   request.selected_text =
       "Search the world's information, including webpages, images, videos and "
-      "more.";
+      "more. Google has many special features to help you find exactly what "
+      "you're looking ...";
   request.context.device_properties.language = "es";
   intent_generator_->GenerateIntent(request);
 
@@ -133,10 +134,43 @@ TEST_F(IntentGeneratorTest, TranslationIntentTextLengthAboveThreshold) {
   EXPECT_EQ(IntentType::kUnknown, intent_info_.intent_type);
   EXPECT_EQ(
       "Search the world's information, including webpages, images, videos and "
-      "more.",
+      "more. Google has many special features to help you find exactly what "
+      "you're looking ...",
       intent_info_.intent_text);
 }
 
+TEST_F(IntentGeneratorTest, TranslationIntentWithAnnotation) {
+  QuickAnswersRequest request;
+  request.selected_text = "unfathomable";
+  request.context.device_properties.language = "es";
+
+  // Create the test annotations.
+  std::vector<TextEntityPtr> entities;
+  entities.emplace_back(
+      TextEntity::New("dictionary",             // Entity name.
+                      1.0,                      // Confidence score.
+                      TextEntityData::New()));  // Data extracted.
+
+  auto dictionary_annotation = TextAnnotation::New(0,   // Start offset.
+                                                   12,  // End offset.
+                                                   std::move(entities));
+
+  std::vector<TextAnnotationPtr> annotations;
+  annotations.push_back(dictionary_annotation->Clone());
+  std::vector<TextLanguagePtr> languages;
+  languages.push_back(DefaultLanguage());
+  UseFakeServiceConnection(annotations, languages);
+
+  intent_generator_->GenerateIntent(request);
+
+  task_environment_.RunUntilIdle();
+
+  EXPECT_EQ(IntentType::kTranslation, intent_info_.intent_type);
+  EXPECT_EQ("unfathomable", intent_info_.intent_text);
+  EXPECT_EQ("en", intent_info_.source_language);
+  EXPECT_EQ("es", intent_info_.target_language);
+}
+
 TEST_F(IntentGeneratorTest, TranslationIntentNotEnabled) {
   base::test::ScopedFeatureList scoped_feature_list;
   scoped_feature_list.InitWithFeatures(