fix last up: 每个翻译结果的检索表达式，单个multimatch ->

combined_fields+best_field+phrase_boost

fix last up: 每个翻译结果的检索表达式，单个multimatch ->
combined_fields+best_field+phrase_boost
tangwang
1 parent e756b18e
Showing 4 changed files with 14 additions and 24 deletions Show diff stats
config/config.yaml
config/loader.py
config/schema.py
search/es_query_builder.py
@@ -129,10 +129,10 @@ query_config:
       - "description"
       - "vendor"
     shared_fields:
-      - "tags"
-      - "option1_values"
-      - "option2_values"
-      - "option3_values"
+      # - "tags"
+      # - "option1_values"
+      # - "option2_values"
+      # - "option3_values"
     core_multilingual_fields:
       - "title"
       - "qanchors"
@@ -266,19 +266,19 @@ class AppConfigLoader:
             multilingual_fields=list(
                 search_fields.get(
                     "multilingual_fields",
-                    ["title", "brief", "description", "vendor", "category_path", "category_name_text"],
+                    [],
                 )
             ),
             shared_fields=list(
                 search_fields.get(
                     "shared_fields",
-                    ["tags", "option1_values", "option2_values", "option3_values"],
-                )
+                    [],
+                ) or []
             ),
             core_multilingual_fields=list(
                 search_fields.get(
                     "core_multilingual_fields",
-                    ["title", "brief", "vendor", "category_name_text"],
+                    [],
                 )
             ),
             base_minimum_should_match=str(text_strategy.get("base_minimum_should_match", "70%")),
@@ -536,7 +536,6 @@ class AppConfigLoader:
             errors.append("query_config.default_language must be included in supported_languages")
         for name, values in (
             ("multilingual_fields", query_config.multilingual_fields),
-            ("shared_fields", query_config.shared_fields),
             ("core_multilingual_fields", query_config.core_multilingual_fields),
         ):
             if not values:
@@ -36,20 +36,13 @@ class QueryConfig:
     source_fields: Optional[List[str]] = None
     knn_boost: float = 0.25
     multilingual_fields: List[str] = field(
-        default_factory=lambda: [
-            "title",
-            "brief",
-            "description",
-            "vendor",
-            "category_path",
-            "category_name_text",
-        ]
+        default_factory=lambda: []
     )
     shared_fields: List[str] = field(
-        default_factory=lambda: ["tags", "option1_values", "option2_values", "option3_values"]
+        default_factory=lambda: []
     )
     core_multilingual_fields: List[str] = field(
-        default_factory=lambda: ["title", "brief", "vendor", "category_name_text"]
+        default_factory=lambda: []
     )
     base_minimum_should_match: str = "70%"
     translation_minimum_should_match: str = "70%"
@@ -64,11 +64,9 @@ class ESQueryBuilder:
         """
         self.match_fields = match_fields
         self.field_boosts = field_boosts or {}
-        self.multilingual_fields = multilingual_fields or [
-            "title", "brief", "description", "qanchors", "vendor", "category_path", "category_name_text"
-        ]
-        self.shared_fields = shared_fields or ["tags", "option1_values", "option2_values", "option3_values"]
-        self.core_multilingual_fields = core_multilingual_fields or ["title", "brief", "vendor", "category_name_text"]
+        self.multilingual_fields = multilingual_fields or []
+        self.shared_fields = shared_fields or []
+        self.core_multilingual_fields = core_multilingual_fields or []
         self.text_embedding_field = text_embedding_field
         self.image_embedding_field = image_embedding_field
         self.source_fields = source_fields