Blame view

search/es_query_builder.py 38.6 KB
be52af70   tangwang   first commit
1
2
3
4
  """
  Elasticsearch query builder.
  
  Converts parsed queries and search parameters into ES DSL queries.
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
5
6
7
8
  
  Simplified architecture:
  - filters and (text_recall or embedding_recall)
  - function_score wrapper for boosting fields
be52af70   tangwang   first commit
9
10
  """
  
35da3813   tangwang   中英混写query的优化逻辑,不适...
11
  from typing import Dict, Any, List, Optional, Tuple
6823fe3e   tangwang   feat(search): 混合语...
12
  
be52af70   tangwang   first commit
13
  import numpy as np
9f96d6f3   tangwang   短query不用语义搜索
14
  from config import FunctionScoreConfig
be52af70   tangwang   first commit
15
  
be52af70   tangwang   first commit
16
17
18
19
20
21
  
  class ESQueryBuilder:
      """Builds Elasticsearch DSL queries."""
  
      def __init__(
          self,
be52af70   tangwang   first commit
22
          match_fields: List[str],
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
23
24
25
26
          field_boosts: Optional[Dict[str, float]] = None,
          multilingual_fields: Optional[List[str]] = None,
          shared_fields: Optional[List[str]] = None,
          core_multilingual_fields: Optional[List[str]] = None,
be52af70   tangwang   first commit
27
          text_embedding_field: Optional[str] = None,
13377199   tangwang   接口优化
28
          image_embedding_field: Optional[str] = None,
9f96d6f3   tangwang   短query不用语义搜索
29
          source_fields: Optional[List[str]] = None,
7bc756c5   tangwang   优化 ES 查询构建
30
          function_score_config: Optional[FunctionScoreConfig] = None,
2739b281   tangwang   多语言索引调整
31
          default_language: str = "en",
ed13851c   tangwang   图片文本两个knn召回相关参数配置
32
33
34
35
36
37
38
39
          knn_text_boost: float = 20.0,
          knn_image_boost: float = 20.0,
          knn_text_k: int = 120,
          knn_text_num_candidates: int = 400,
          knn_text_k_long: int = 160,
          knn_text_num_candidates_long: int = 500,
          knn_image_k: int = 120,
          knn_image_num_candidates: int = 400,
272aeabe   tangwang   调参
40
41
          base_minimum_should_match: str = "70%",
          translation_minimum_should_match: str = "70%",
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
42
          translation_boost: float = 0.4,
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
43
          tie_breaker_base_query: float = 0.9,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
44
45
          best_fields_boosts: Optional[Dict[str, float]] = None,
          best_fields_clause_boost: float = 2.0,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
46
          phrase_field_boosts: Optional[Dict[str, float]] = None,
69881ecb   tangwang   相关性调参、enrich内容解析优化
47
          phrase_match_base_fields: Optional[Tuple[str, ...]] = None,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
48
49
          phrase_match_slop: int = 0,
          phrase_match_tie_breaker: float = 0.0,
69881ecb   tangwang   相关性调参、enrich内容解析优化
50
          phrase_match_boost: float = 3.0,
be52af70   tangwang   first commit
51
52
53
54
      ):
          """
          Initialize query builder.
  
24e92141   tangwang   delete enable_mul...
55
          Multi-language search (translation-based cross-language recall) is always enabled:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
56
          queries are matched against detected-language and translated target-language clauses.
24e92141   tangwang   delete enable_mul...
57
  
be52af70   tangwang   first commit
58
          Args:
be52af70   tangwang   first commit
59
60
61
              match_fields: Fields to search for text matching
              text_embedding_field: Field name for text embeddings
              image_embedding_field: Field name for image embeddings
13377199   tangwang   接口优化
62
              source_fields: Fields to return in search results (_source includes)
9f96d6f3   tangwang   短query不用语义搜索
63
              function_score_config: Function score configuration
a5a6bab8   tangwang   多语言查询优化
64
              default_language: Default language to use when detection fails or returns "unknown"
ed13851c   tangwang   图片文本两个knn召回相关参数配置
65
66
              knn_text_boost: Boost for text-embedding KNN clause
              knn_image_boost: Boost for image-embedding KNN clause
be52af70   tangwang   first commit
67
          """
be52af70   tangwang   first commit
68
          self.match_fields = match_fields
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
69
          self.field_boosts = field_boosts or {}
445496cd   tangwang   fix last up: 每个翻译...
70
71
72
          self.multilingual_fields = multilingual_fields or []
          self.shared_fields = shared_fields or []
          self.core_multilingual_fields = core_multilingual_fields or []
be52af70   tangwang   first commit
73
74
          self.text_embedding_field = text_embedding_field
          self.image_embedding_field = image_embedding_field
13377199   tangwang   接口优化
75
          self.source_fields = source_fields
9f96d6f3   tangwang   短query不用语义搜索
76
          self.function_score_config = function_score_config
a5a6bab8   tangwang   多语言查询优化
77
          self.default_language = default_language
ed13851c   tangwang   图片文本两个knn召回相关参数配置
78
79
80
81
82
83
84
85
          self.knn_text_boost = float(knn_text_boost)
          self.knn_image_boost = float(knn_image_boost)
          self.knn_text_k = int(knn_text_k)
          self.knn_text_num_candidates = int(knn_text_num_candidates)
          self.knn_text_k_long = int(knn_text_k_long)
          self.knn_text_num_candidates_long = int(knn_text_num_candidates_long)
          self.knn_image_k = int(knn_image_k)
          self.knn_image_num_candidates = int(knn_image_num_candidates)
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
86
87
88
          self.base_minimum_should_match = base_minimum_should_match
          self.translation_minimum_should_match = translation_minimum_should_match
          self.translation_boost = float(translation_boost)
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
89
          self.tie_breaker_base_query = float(tie_breaker_base_query)
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
          default_best_fields = {
              base: self._get_field_boost(base)
              for base in self.core_multilingual_fields
              if base in self.multilingual_fields
          }
          self.best_fields_boosts = {
              str(base): float(boost)
              for base, boost in (best_fields_boosts or default_best_fields).items()
          }
          self.best_fields_clause_boost = float(best_fields_clause_boost)
          default_phrase_base_fields = tuple(phrase_match_base_fields or ("title", "qanchors"))
          default_phrase_fields = {
              base: self._get_field_boost(base)
              for base in default_phrase_base_fields
              if base in self.multilingual_fields
          }
          self.phrase_field_boosts = {
              str(base): float(boost)
              for base, boost in (phrase_field_boosts or default_phrase_fields).items()
          }
69881ecb   tangwang   相关性调参、enrich内容解析优化
110
111
112
          self.phrase_match_slop = int(phrase_match_slop)
          self.phrase_match_tie_breaker = float(phrase_match_tie_breaker)
          self.phrase_match_boost = float(phrase_match_boost)
be52af70   tangwang   first commit
113
  
26b910bd   tangwang   refactor service ...
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
      def _apply_source_filter(self, es_query: Dict[str, Any]) -> None:
          """
          Apply tri-state _source semantics:
          - None: do not set _source (return all source fields)
          - []: _source=false
          - [..]: _source.includes=[..]
          """
          if self.source_fields is None:
              return
          if not isinstance(self.source_fields, list):
              raise ValueError("query_config.source_fields must be null or list[str]")
          if len(self.source_fields) == 0:
              es_query["_source"] = False
              return
          es_query["_source"] = {"includes": self.source_fields}
  
c581becd   tangwang   feat: 实现 Multi-Se...
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
      def _split_filters_for_faceting(
          self,
          filters: Optional[Dict[str, Any]],
          facet_configs: Optional[List[Any]]
      ) -> tuple:
          """
          Split filters into conjunctive (query) and disjunctive (post_filter) based on facet configs.
          
          Disjunctive filters (multi-select facets):
          - Applied via post_filter (affects results but not aggregations)
          - Allows showing other options in the same facet even when filtered
          
          Conjunctive filters (standard facets):
          - Applied in query.bool.filter (affects both results and aggregations)
          - Standard drill-down behavior
          
          Args:
              filters: All filters from request
9a9b9ec5   tangwang   1. facet disjunctive
148
              facet_configs: Facet configurations with disjunctive flags
c581becd   tangwang   feat: 实现 Multi-Se...
149
150
151
152
153
154
155
156
157
158
              
          Returns:
              (conjunctive_filters, disjunctive_filters)
          """
          if not filters or not facet_configs:
              return filters or {}, {}
          
          # Get fields that support multi-select
          multi_select_fields = set()
          for fc in facet_configs:
9a9b9ec5   tangwang   1. facet disjunctive
159
              if getattr(fc, 'disjunctive', False):
c581becd   tangwang   feat: 实现 Multi-Se...
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
                  # Handle specifications.xxx format
                  if fc.field.startswith('specifications.'):
                      multi_select_fields.add('specifications')
                  else:
                      multi_select_fields.add(fc.field)
          
          # Split filters
          conjunctive = {}
          disjunctive = {}
          
          for field, value in filters.items():
              if field in multi_select_fields:
                  disjunctive[field] = value
              else:
                  conjunctive[field] = value
          
          return conjunctive, disjunctive
  
be52af70   tangwang   first commit
178
179
180
181
      def build_query(
          self,
          query_text: str,
          query_vector: Optional[np.ndarray] = None,
dc403578   tangwang   多模态搜索
182
          image_query_vector: Optional[np.ndarray] = None,
be52af70   tangwang   first commit
183
          filters: Optional[Dict[str, Any]] = None,
6aa246be   tangwang   问题:Pydantic 应该能自动...
184
          range_filters: Optional[Dict[str, Any]] = None,
c581becd   tangwang   feat: 实现 Multi-Se...
185
          facet_configs: Optional[List[Any]] = None,
be52af70   tangwang   first commit
186
187
188
          size: int = 10,
          from_: int = 0,
          enable_knn: bool = True,
7bc756c5   tangwang   优化 ES 查询构建
189
          min_score: Optional[float] = None,
ef5baa86   tangwang   混杂语言处理
190
          parsed_query: Optional[Any] = None,
be52af70   tangwang   first commit
191
192
      ) -> Dict[str, Any]:
          """
c581becd   tangwang   feat: 实现 Multi-Se...
193
          Build complete ES query with post_filter support for multi-select faceting.
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
194
  
c581becd   tangwang   feat: 实现 Multi-Se...
195
196
197
          结构:filters and (text_recall or embedding_recall) + post_filter
          - conjunctive_filters: 应用在 query.bool.filter(影响结果和聚合)
          - disjunctive_filters: 应用在 post_filter(只影响结果,不影响聚合)
0536222c   tangwang   query parser优化
198
          - text_recall: 文本相关性召回(按实际 clause 语言动态字段)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
199
200
          - embedding_recall: 向量召回(KNN
          - function_score: 包装召回部分,支持提权字段
be52af70   tangwang   first commit
201
202
203
204
  
          Args:
              query_text: Query text for BM25 matching
              query_vector: Query embedding for KNN search
c581becd   tangwang   feat: 实现 Multi-Se...
205
206
207
              filters: Exact match filters
              range_filters: Range filters for numeric fields (always applied in query)
              facet_configs: Facet configurations (used to identify multi-select facets)
be52af70   tangwang   first commit
208
209
210
              size: Number of results
              from_: Offset for pagination
              enable_knn: Whether to use KNN search
be52af70   tangwang   first commit
211
212
213
214
215
              min_score: Minimum score threshold
  
          Returns:
              ES query DSL dictionary
          """
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
216
          # Boolean AST path has been removed; keep a single text strategy.
be52af70   tangwang   first commit
217
218
219
220
221
          es_query = {
              "size": size,
              "from": from_
          }
  
26b910bd   tangwang   refactor service ...
222
223
          # Add _source filtering with explicit tri-state semantics.
          self._apply_source_filter(es_query)
13377199   tangwang   接口优化
224
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
225
226
          # 1. Build recall queries (text or embedding)
          recall_clauses = []
dc403578   tangwang   多模态搜索
227
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
228
229
          # Text recall (always include if query_text exists)
          if query_text:
dc403578   tangwang   多模态搜索
230
231
232
              recall_clauses.extend(self._build_advanced_text_query(query_text, parsed_query))
  
          # Embedding recall
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
233
          has_embedding = enable_knn and query_vector is not None and self.text_embedding_field
dc403578   tangwang   多模态搜索
234
          has_image_embedding = enable_knn and image_query_vector is not None and self.image_embedding_field
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
235
          
c581becd   tangwang   feat: 实现 Multi-Se...
236
237
238
239
240
241
242
          # 2. Split filters for multi-select faceting
          conjunctive_filters, disjunctive_filters = self._split_filters_for_faceting(
              filters, facet_configs
          )
          
          # Build filter clauses for query (conjunctive filters + range filters)
          filter_clauses = self._build_filters(conjunctive_filters, range_filters)
74fdf9bd   tangwang   1.
243
244
245
246
          product_title_exclusion_filter = self._build_product_title_exclusion_filter(parsed_query)
          if product_title_exclusion_filter:
              filter_clauses.append(product_title_exclusion_filter)
  
dc403578   tangwang   多模态搜索
247
          # 3. Add KNN search clauses alongside lexical clauses under the same bool.should
ed13851c   tangwang   图片文本两个knn召回相关参数配置
248
          # Text KNN: k / num_candidates from config; long queries use *_long and higher boost
dc403578   tangwang   多模态搜索
249
          if has_embedding:
ed13851c   tangwang   图片文本两个knn召回相关参数配置
250
251
252
              text_knn_boost = self.knn_text_boost
              final_knn_k = self.knn_text_k
              final_knn_num_candidates = self.knn_text_num_candidates
dc403578   tangwang   多模态搜索
253
254
255
256
              if parsed_query:
                  query_tokens = getattr(parsed_query, 'query_tokens', None) or []
                  token_count = len(query_tokens)
                  if token_count >= 5:
ed13851c   tangwang   图片文本两个knn召回相关参数配置
257
258
259
                      final_knn_k = self.knn_text_k_long
                      final_knn_num_candidates = self.knn_text_num_candidates_long
                      text_knn_boost = self.knn_text_boost * 1.4
dc403578   tangwang   多模态搜索
260
261
262
263
264
265
              recall_clauses.append({
                  "knn": {
                      "field": self.text_embedding_field,
                      "query_vector": query_vector.tolist(),
                      "k": final_knn_k,
                      "num_candidates": final_knn_num_candidates,
ed13851c   tangwang   图片文本两个knn召回相关参数配置
266
                      "boost": text_knn_boost,
dc403578   tangwang   多模态搜索
267
268
269
270
271
                      "_name": "knn_query",
                  }
              })
  
          if has_image_embedding:
dc403578   tangwang   多模态搜索
272
273
274
275
              recall_clauses.append({
                  "knn": {
                      "field": self.image_embedding_field,
                      "query_vector": image_query_vector.tolist(),
ed13851c   tangwang   图片文本两个knn召回相关参数配置
276
277
278
                      "k": self.knn_image_k,
                      "num_candidates": self.knn_image_num_candidates,
                      "boost": self.knn_image_boost,
dc403578   tangwang   多模态搜索
279
280
281
282
283
                      "_name": "image_knn_query",
                  }
              })
  
          # 4. Build main query structure: filters and recall
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
284
          if recall_clauses:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
285
286
287
288
289
290
291
292
293
              if len(recall_clauses) == 1:
                  recall_query = recall_clauses[0]
              else:
                  recall_query = {
                      "bool": {
                          "should": recall_clauses,
                          "minimum_should_match": 1
                      }
                  }
dc403578   tangwang   多模态搜索
294
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
295
              recall_query = self._wrap_with_function_score(recall_query)
dc403578   tangwang   多模态搜索
296
  
6aa246be   tangwang   问题:Pydantic 应该能自动...
297
298
299
              if filter_clauses:
                  es_query["query"] = {
                      "bool": {
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
300
                          "must": [recall_query],
6aa246be   tangwang   问题:Pydantic 应该能自动...
301
302
                          "filter": filter_clauses
                      }
be52af70   tangwang   first commit
303
                  }
6aa246be   tangwang   问题:Pydantic 应该能自动...
304
              else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
305
                  es_query["query"] = recall_query
be52af70   tangwang   first commit
306
          else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
307
308
309
310
311
312
313
314
315
              if filter_clauses:
                  es_query["query"] = {
                      "bool": {
                          "must": [{"match_all": {}}],
                          "filter": filter_clauses
                      }
                  }
              else:
                  es_query["query"] = {"match_all": {}}
be52af70   tangwang   first commit
316
  
c581becd   tangwang   feat: 实现 Multi-Se...
317
318
319
320
321
322
323
324
325
326
327
328
          # 5. Add post_filter for disjunctive (multi-select) filters
          if disjunctive_filters:
              post_filter_clauses = self._build_filters(disjunctive_filters, None)
              if post_filter_clauses:
                  if len(post_filter_clauses) == 1:
                      es_query["post_filter"] = post_filter_clauses[0]
                  else:
                      es_query["post_filter"] = {
                          "bool": {"filter": post_filter_clauses}
                      }
  
          # 6. Add minimum score filter
be52af70   tangwang   first commit
329
330
331
332
          if min_score is not None:
              es_query["min_score"] = min_score
  
          return es_query
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
      
      def _wrap_with_function_score(self, query: Dict[str, Any]) -> Dict[str, Any]:
          """
          Wrap query with function_score for boosting fields.
          
          Args:
              query: Base query to wrap
              
          Returns:
              Function score query or original query if no functions configured
          """
          functions = self._build_score_functions()
          
          # If no functions configured, return original query
          if not functions:
              return query
          
          # Build function_score query
9f96d6f3   tangwang   短query不用语义搜索
351
352
353
          score_mode = self.function_score_config.score_mode if self.function_score_config else "sum"
          boost_mode = self.function_score_config.boost_mode if self.function_score_config else "multiply"
          
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
354
355
356
357
          function_score_query = {
              "function_score": {
                  "query": query,
                  "functions": functions,
9f96d6f3   tangwang   短query不用语义搜索
358
359
                  "score_mode": score_mode,
                  "boost_mode": boost_mode
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
360
361
362
363
364
365
366
367
368
369
370
371
372
              }
          }
          
          return function_score_query
      
      def _build_score_functions(self) -> List[Dict[str, Any]]:
          """
          Build function_score functions from config.
          
          Returns:
              List of function score functions
          """
          functions = []
9f96d6f3   tangwang   短query不用语义搜索
373
374
375
376
          if not self.function_score_config:
              return functions
          
          config_functions = self.function_score_config.functions or []
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
          
          for func_config in config_functions:
              func_type = func_config.get("type")
              
              if func_type == "filter_weight":
                  # Filter + Weight
                  functions.append({
                      "filter": func_config["filter"],
                      "weight": func_config.get("weight", 1.0)
                  })
              
              elif func_type == "field_value_factor":
                  # Field Value Factor
                  functions.append({
                      "field_value_factor": {
                          "field": func_config["field"],
                          "factor": func_config.get("factor", 1.0),
                          "modifier": func_config.get("modifier", "none"),
                          "missing": func_config.get("missing", 1.0)
                      }
                  })
              
              elif func_type == "decay":
                  # Decay Function (gauss/exp/linear)
                  decay_func = func_config.get("function", "gauss")
                  field = func_config["field"]
                  
                  decay_params = {
                      "origin": func_config.get("origin", "now"),
                      "scale": func_config["scale"]
                  }
                  
                  if "offset" in func_config:
                      decay_params["offset"] = func_config["offset"]
                  if "decay" in func_config:
                      decay_params["decay"] = func_config["decay"]
                  
                  functions.append({
                      decay_func: {
                          field: decay_params
                      }
                  })
          
          return functions
be52af70   tangwang   first commit
421
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
422
423
424
      def _format_field_with_boost(self, field_name: str, boost: float) -> str:
          if abs(float(boost) - 1.0) < 1e-9:
              return field_name
6823fe3e   tangwang   feat(search): 混合语...
425
          return f"{field_name}^{round(boost, 2)}"
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
426
427
428
429
430
431
432
433
434
435
436
  
      def _get_field_boost(self, base_field: str, language: Optional[str] = None) -> float:
          # Language-specific override first (e.g. title.de), then base field (e.g. title)
          if language:
              lang_key = f"{base_field}.{language}"
              if lang_key in self.field_boosts:
                  return float(self.field_boosts[lang_key])
          if base_field in self.field_boosts:
              return float(self.field_boosts[base_field])
          return 1.0
  
35da3813   tangwang   中英混写query的优化逻辑,不适...
437
      def _match_field_strings(
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
438
439
440
441
442
443
          self,
          language: str,
          *,
          multilingual_fields: Optional[List[str]] = None,
          shared_fields: Optional[List[str]] = None,
          boost_overrides: Optional[Dict[str, float]] = None,
35da3813   tangwang   中英混写query的优化逻辑,不适...
444
445
      ) -> List[str]:
          """Build ``multi_match`` / ``combined_fields`` field entries for one language code."""
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
446
          lang = (language or "").strip().lower()
35da3813   tangwang   中英混写query的优化逻辑,不适...
447
          text_bases = multilingual_fields if multilingual_fields is not None else self.multilingual_fields
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
448
449
          term_fields = shared_fields if shared_fields is not None else self.shared_fields
          overrides = boost_overrides or {}
35da3813   tangwang   中英混写query的优化逻辑,不适...
450
451
452
          out: List[str] = []
          for base in text_bases:
              path = f"{base}.{lang}"
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
453
              boost = float(overrides.get(base, self._get_field_boost(base, lang)))
35da3813   tangwang   中英混写query的优化逻辑,不适...
454
              out.append(self._format_field_with_boost(path, boost))
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
455
456
          for shared in term_fields:
              boost = float(overrides.get(shared, self._get_field_boost(shared, None)))
35da3813   tangwang   中英混写query的优化逻辑,不适...
457
              out.append(self._format_field_with_boost(shared, boost))
6823fe3e   tangwang   feat(search): 混合语...
458
          return out
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
459
  
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
460
      def _build_best_fields_clause(self, language: str, query_text: str) -> Optional[Dict[str, Any]]:
35da3813   tangwang   中英混写query的优化逻辑,不适...
461
          fields = self._match_field_strings(
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
462
463
464
465
466
              language,
              multilingual_fields=list(self.best_fields_boosts),
              shared_fields=[],
              boost_overrides=self.best_fields_boosts,
          )
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
467
468
469
470
471
472
473
474
475
476
477
478
          if not fields:
              return None
          return {
              "multi_match": {
                  "query": query_text,
                  "type": "best_fields",
                  "fields": fields,
                  "boost": self.best_fields_clause_boost,
              }
          }
  
      def _build_phrase_clause(self, language: str, query_text: str) -> Optional[Dict[str, Any]]:
35da3813   tangwang   中英混写query的优化逻辑,不适...
479
          fields = self._match_field_strings(
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
480
481
482
483
484
              language,
              multilingual_fields=list(self.phrase_field_boosts),
              shared_fields=[],
              boost_overrides=self.phrase_field_boosts,
          )
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
          if not fields:
              return None
          clause: Dict[str, Any] = {
              "multi_match": {
                  "query": query_text,
                  "type": "phrase",
                  "fields": fields,
                  "boost": self.phrase_match_boost,
              }
          }
          if self.phrase_match_slop > 0:
              clause["multi_match"]["slop"] = self.phrase_match_slop
          if self.phrase_match_tie_breaker > 0:
              clause["multi_match"]["tie_breaker"] = self.phrase_match_tie_breaker
          return clause
  
      def _build_lexical_language_clause(
          self,
          lang: str,
          lang_query: str,
          clause_name: str,
          *,
          is_source: bool,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
508
      ) -> Optional[Dict[str, Any]]:
35da3813   tangwang   中英混写query的优化逻辑,不适...
509
          combined_fields = self._match_field_strings(lang)
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
          if not combined_fields:
              return None
          minimum_should_match = (
              self.base_minimum_should_match if is_source else self.translation_minimum_should_match
          )
          should_clauses = [
              clause
              for clause in (
                  self._build_best_fields_clause(lang, lang_query),
                  self._build_phrase_clause(lang, lang_query),
              )
              if clause
          ]
          clause: Dict[str, Any] = {
              "bool": {
                  "_name": clause_name,
                  "must": [
                      {
                          "combined_fields": {
                              "query": lang_query,
                              "fields": combined_fields,
                              "minimum_should_match": minimum_should_match,
                          }
                      }
                  ],
              }
          }
          if should_clauses:
              clause["bool"]["should"] = should_clauses
          if not is_source:
              clause["bool"]["boost"] = float(self.translation_boost)
          return clause
  
ef5baa86   tangwang   混杂语言处理
543
544
545
546
      def _build_advanced_text_query(
          self,
          query_text: str,
          parsed_query: Optional[Any] = None,
dc403578   tangwang   多模态搜索
547
      ) -> List[Dict[str, Any]]:
7bc756c5   tangwang   优化 ES 查询构建
548
          """
ef5baa86   tangwang   混杂语言处理
549
          Build advanced text query using base and translated lexical clauses.
c90f80ed   tangwang   相关性优化
550
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
551
552
          Unified implementation:
          - base_query: source-language clause
ef5baa86   tangwang   混杂语言处理
553
          - translation queries: target-language clauses from translations
dc403578   tangwang   多模态搜索
554
  
7bc756c5   tangwang   优化 ES 查询构建
555
556
557
558
559
          Args:
              query_text: Query text
              parsed_query: ParsedQuery object with analysis results
              
          Returns:
dc403578   tangwang   多模态搜索
560
              Flat recall clauses to be merged with KNN clauses under query.bool.should
7bc756c5   tangwang   优化 ES 查询构建
561
562
          """
          should_clauses = []
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
563
          source_lang = self.default_language
ef5baa86   tangwang   混杂语言处理
564
          translations: Dict[str, str] = {}
ef5baa86   tangwang   混杂语言处理
565
  
7bc756c5   tangwang   优化 ES 查询构建
566
          if parsed_query:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
567
568
              detected_lang = getattr(parsed_query, "detected_language", None)
              source_lang = detected_lang if detected_lang and detected_lang != "unknown" else self.default_language
ef5baa86   tangwang   混杂语言处理
569
              translations = getattr(parsed_query, "translations", None) or {}
c90f80ed   tangwang   相关性优化
570
  
ef5baa86   tangwang   混杂语言处理
571
          source_lang = str(source_lang or self.default_language).strip().lower() or self.default_language
ef5baa86   tangwang   混杂语言处理
572
573
574
575
          base_query_text = (
              getattr(parsed_query, "rewritten_query", None) if parsed_query else None
          ) or query_text
  
ef5baa86   tangwang   混杂语言处理
576
          if base_query_text:
35da3813   tangwang   中英混写query的优化逻辑,不适...
577
578
579
580
581
582
583
584
              base_clause = self._build_lexical_language_clause(
                  source_lang,
                  base_query_text,
                  "base_query",
                  is_source=True,
              )
              if base_clause:
                  should_clauses.append(base_clause)
ef5baa86   tangwang   混杂语言处理
585
586
587
588
589
590
591
592
  
          for lang, translated_text in translations.items():
              normalized_lang = str(lang or "").strip().lower()
              normalized_text = str(translated_text or "").strip()
              if not normalized_lang or not normalized_text:
                  continue
              if normalized_lang == source_lang and normalized_text == base_query_text:
                  continue
35da3813   tangwang   中英混写query的优化逻辑,不适...
593
594
595
596
597
598
599
600
              trans_clause = self._build_lexical_language_clause(
                  normalized_lang,
                  normalized_text,
                  f"base_query_trans_{normalized_lang}",
                  is_source=False,
              )
              if trans_clause:
                  should_clauses.append(trans_clause)
bcada818   tangwang   last
601
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
602
603
604
          # Fallback to a simple query when language fields cannot be resolved.
          if not should_clauses:
              fallback_fields = self.match_fields or ["title.en^1.0"]
69881ecb   tangwang   相关性调参、enrich内容解析优化
605
              fallback_lexical = {
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
606
607
608
609
610
                  "multi_match": {
                      "_name": "base_query_fallback",
                      "query": query_text,
                      "fields": fallback_fields,
                      "minimum_should_match": self.base_minimum_should_match,
69881ecb   tangwang   相关性调参、enrich内容解析优化
611
612
                  }
              }
dc403578   tangwang   多模态搜索
613
              return [fallback_lexical]
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
614
  
dc403578   tangwang   多模态搜索
615
          return should_clauses
be52af70   tangwang   first commit
616
  
6aa246be   tangwang   问题:Pydantic 应该能自动...
617
618
619
      def _build_filters(
          self, 
          filters: Optional[Dict[str, Any]] = None,
43f1139f   tangwang   refactor: ES查询结构重...
620
          range_filters: Optional[Dict[str, 'RangeFilter']] = None
6aa246be   tangwang   问题:Pydantic 应该能自动...
621
      ) -> List[Dict[str, Any]]:
be52af70   tangwang   first commit
622
          """
43f1139f   tangwang   refactor: ES查询结构重...
623
          构建过滤子句。
6aa246be   tangwang   问题:Pydantic 应该能自动...
624
          
be52af70   tangwang   first commit
625
          Args:
6aa246be   tangwang   问题:Pydantic 应该能自动...
626
              filters: 精确匹配过滤器字典
43f1139f   tangwang   refactor: ES查询结构重...
627
              range_filters: 范围过滤器(Dict[str, RangeFilter]RangeFilter  Pydantic 模型)
6aa246be   tangwang   问题:Pydantic 应该能自动...
628
          
be52af70   tangwang   first commit
629
          Returns:
43f1139f   tangwang   refactor: ES查询结构重...
630
              ES filter 子句列表
be52af70   tangwang   first commit
631
632
          """
          filter_clauses = []
6aa246be   tangwang   问题:Pydantic 应该能自动...
633
634
635
636
          
          # 1. 处理精确匹配过滤
          if filters:
              for field, value in filters.items():
f7d3cf70   tangwang   更新文档
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
                  # 特殊处理:specifications 嵌套过滤
                  if field == "specifications":
                      if isinstance(value, dict):
                          # 单个规格过滤:{"name": "color", "value": "green"}
                          name = value.get("name")
                          spec_value = value.get("value")
                          if name and spec_value:
                              filter_clauses.append({
                                  "nested": {
                                      "path": "specifications",
                                      "query": {
                                          "bool": {
                                              "must": [
                                                  {"term": {"specifications.name": name}},
                                                  {"term": {"specifications.value": spec_value}}
                                              ]
                                          }
                                      }
                                  }
                              })
                      elif isinstance(value, list):
85f08823   tangwang   过滤逻辑
658
659
660
661
662
                          # 多个规格过滤:按 name 分组,相同维度 OR,不同维度 AND
                          # 例如:[{"name": "size", "value": "3"}, {"name": "size", "value": "4"}, {"name": "color", "value": "green"}]
                          # 应该生成:(size=3 OR size=4) AND color=green
                          from collections import defaultdict
                          specs_by_name = defaultdict(list)
f7d3cf70   tangwang   更新文档
663
664
665
666
667
                          for spec in value:
                              if isinstance(spec, dict):
                                  name = spec.get("name")
                                  spec_value = spec.get("value")
                                  if name and spec_value:
85f08823   tangwang   过滤逻辑
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
                                      specs_by_name[name].append(spec_value)
                          
                          # 为每个 name 维度生成一个过滤子句
                          for name, values in specs_by_name.items():
                              if len(values) == 1:
                                  # 单个值,直接生成 term 查询
                                  filter_clauses.append({
                                      "nested": {
                                          "path": "specifications",
                                          "query": {
                                              "bool": {
                                                  "must": [
                                                      {"term": {"specifications.name": name}},
                                                      {"term": {"specifications.value": values[0]}}
                                                  ]
f7d3cf70   tangwang   更新文档
683
684
                                              }
                                          }
85f08823   tangwang   过滤逻辑
685
686
687
688
689
690
691
692
693
694
695
696
697
                                      }
                                  })
                              else:
                                  # 多个值,使用 should (OR) 连接
                                  should_clauses = []
                                  for spec_value in values:
                                      should_clauses.append({
                                          "bool": {
                                              "must": [
                                                  {"term": {"specifications.name": name}},
                                                  {"term": {"specifications.value": spec_value}}
                                              ]
                                          }
f7d3cf70   tangwang   更新文档
698
                                      })
85f08823   tangwang   过滤逻辑
699
700
701
702
703
704
705
706
707
708
709
                                  filter_clauses.append({
                                      "nested": {
                                          "path": "specifications",
                                          "query": {
                                              "bool": {
                                                  "should": should_clauses,
                                                  "minimum_should_match": 1
                                              }
                                          }
                                      }
                                  })
f7d3cf70   tangwang   更新文档
710
711
                      continue
                  
985d7fe3   tangwang   为 filters 中所有字段加上...
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
                  # *_all 语义:多值时为 AND(必须同时匹配所有值)
                  if field.endswith("_all"):
                      es_field = field[:-4]  # 去掉 _all 后缀
                      if es_field == "specifications" and isinstance(value, list):
                          # specifications_all: 列表内每个规格条件都要满足(AND)
                          must_nested = []
                          for spec in value:
                              if isinstance(spec, dict):
                                  name = spec.get("name")
                                  spec_value = spec.get("value")
                                  if name and spec_value:
                                      must_nested.append({
                                          "nested": {
                                              "path": "specifications",
                                              "query": {
                                                  "bool": {
                                                      "must": [
                                                          {"term": {"specifications.name": name}},
                                                          {"term": {"specifications.value": spec_value}}
                                                      ]
                                                  }
                                              }
                                          }
                                      })
                          if must_nested:
                              filter_clauses.append({"bool": {"must": must_nested}})
                      else:
                          # 普通字段 _all:多值用 must + 多个 term
                          if isinstance(value, list):
                              if value:
                                  filter_clauses.append({
                                      "bool": {
                                          "must": [{"term": {es_field: v}} for v in value]
                                      }
                                  })
                          else:
                              filter_clauses.append({"term": {es_field: value}})
                      continue
                  
                  # 普通字段过滤(默认多值为 OR)
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
752
                  if isinstance(value, list):
6aa246be   tangwang   问题:Pydantic 应该能自动...
753
                      # 多值匹配(OR)
be52af70   tangwang   first commit
754
                      filter_clauses.append({
6aa246be   tangwang   问题:Pydantic 应该能自动...
755
                          "terms": {field: value}
be52af70   tangwang   first commit
756
                      })
6aa246be   tangwang   问题:Pydantic 应该能自动...
757
758
759
760
761
762
                  else:
                      # 单值精确匹配
                      filter_clauses.append({
                          "term": {field: value}
                      })
          
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
763
          # 2. 处理范围过滤(支持 RangeFilter Pydantic 模型或字典)
6aa246be   tangwang   问题:Pydantic 应该能自动...
764
          if range_filters:
43f1139f   tangwang   refactor: ES查询结构重...
765
              for field, range_filter in range_filters.items():
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
766
767
768
769
770
771
772
773
774
775
                  # 支持 Pydantic 模型或字典格式
                  if hasattr(range_filter, 'model_dump'):
                      # Pydantic 模型
                      range_dict = range_filter.model_dump(exclude_none=True)
                  elif isinstance(range_filter, dict):
                      # 已经是字典格式
                      range_dict = {k: v for k, v in range_filter.items() if v is not None}
                  else:
                      # 其他格式,跳过
                      continue
6aa246be   tangwang   问题:Pydantic 应该能自动...
776
                  
43f1139f   tangwang   refactor: ES查询结构重...
777
                  if range_dict:
6aa246be   tangwang   问题:Pydantic 应该能自动...
778
                      filter_clauses.append({
43f1139f   tangwang   refactor: ES查询结构重...
779
                          "range": {field: range_dict}
6aa246be   tangwang   问题:Pydantic 应该能自动...
780
781
                      })
          
be52af70   tangwang   first commit
782
783
          return filter_clauses
  
74fdf9bd   tangwang   1.
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
      @staticmethod
      def _build_product_title_exclusion_filter(parsed_query: Optional[Any]) -> Optional[Dict[str, Any]]:
          if parsed_query is None:
              return None
  
          profile = getattr(parsed_query, "product_title_exclusion_profile", None)
          if not profile or not getattr(profile, "is_active", False):
              return None
  
          should_clauses: List[Dict[str, Any]] = []
          for term in profile.all_zh_title_exclusions():
              should_clauses.append({"match_phrase": {"title.zh": {"query": term}}})
          for term in profile.all_en_title_exclusions():
              should_clauses.append({"match_phrase": {"title.en": {"query": term}}})
  
          if not should_clauses:
              return None
  
          return {
              "bool": {
                  "must_not": [
                      {
                          "bool": {
                              "should": should_clauses,
                              "minimum_should_match": 1,
                          }
                      }
                  ]
              }
          }
  
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
815
816
817
818
819
820
821
822
823
824
825
      def add_sorting(
          self,
          es_query: Dict[str, Any],
          sort_by: str,
          sort_order: str = "desc"
      ) -> Dict[str, Any]:
          """
          Add sorting to ES query.
  
          Args:
              es_query: Existing ES query
13320ac6   tangwang   分面接口修改:
826
              sort_by: Field name for sorting (支持 'price' 自动映射)
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
827
828
829
830
831
832
833
834
835
836
837
              sort_order: Sort order: 'asc' or 'desc'
  
          Returns:
              Modified ES query
          """
          if not sort_by:
              return es_query
  
          if not sort_order:
              sort_order = "desc"
  
13320ac6   tangwang   分面接口修改:
838
839
840
841
842
843
844
          # Auto-map 'price' to 'min_price' or 'max_price' based on sort_order
          if sort_by == "price":
              if sort_order.lower() == "asc":
                  sort_by = "min_price"  # 价格从低到高
              else:
                  sort_by = "max_price"  # 价格从高到低
  
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
845
846
847
848
849
850
851
852
853
854
855
856
857
          if "sort" not in es_query:
              es_query["sort"] = []
  
          # Add the specified sort
          sort_field = {
              sort_by: {
                  "order": sort_order.lower()
              }
          }
          es_query["sort"].append(sort_field)
  
          return es_query
  
6aa246be   tangwang   问题:Pydantic 应该能自动...
858
      def build_facets(
be52af70   tangwang   first commit
859
          self,
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
860
861
          facet_configs: Optional[List['FacetConfig']] = None,
          use_reverse_nested: bool = True
be52af70   tangwang   first commit
862
863
      ) -> Dict[str, Any]:
          """
ff5325fa   tangwang   修复:直接在 Searcher 层...
864
          构建分面聚合。
6aa246be   tangwang   问题:Pydantic 应该能自动...
865
          
be52af70   tangwang   first commit
866
          Args:
13320ac6   tangwang   分面接口修改:
867
              facet_configs: 分面配置对象列表
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
868
869
              use_reverse_nested: 是否使用 reverse_nested 统计产品数量(默认 True
                                 如果为 False,将统计嵌套文档数量(性能更好但计数可能不准确)
13320ac6   tangwang   分面接口修改:
870
871
872
873
874
              
              支持的字段类型:
                  - 普通字段:  "category1_name"terms  range 类型)
                  - specifications: "specifications"(返回所有规格名称及其值)
                  - specifications.{name}:  "specifications.color"(返回指定规格名称的值)
6aa246be   tangwang   问题:Pydantic 应该能自动...
875
          
be52af70   tangwang   first commit
876
          Returns:
ff5325fa   tangwang   修复:直接在 Searcher 层...
877
              ES aggregations 字典
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
878
879
880
881
          
          性能说明:
              - use_reverse_nested=True: 统计产品数量,准确性高但性能略差(通常影响 < 20%
              - use_reverse_nested=False: 统计嵌套文档数量,性能更好但计数可能不准确
be52af70   tangwang   first commit
882
          """
6aa246be   tangwang   问题:Pydantic 应该能自动...
883
884
885
886
887
888
          if not facet_configs:
              return {}
          
          aggs = {}
          
          for config in facet_configs:
13320ac6   tangwang   分面接口修改:
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
              field = config.field
              size = config.size
              facet_type = config.type
              
              # 处理 specifications(所有规格名称)
              if field == "specifications":
                  aggs["specifications_facet"] = {
                      "nested": {"path": "specifications"},
                      "aggs": {
                          "by_name": {
                              "terms": {
                                  "field": "specifications.name",
                                  "size": 20,
                                  "order": {"_count": "desc"}
                              },
                              "aggs": {
                                  "value_counts": {
                                      "terms": {
                                          "field": "specifications.value",
                                          "size": size,
                                          "order": {"_count": "desc"}
bf89b597   tangwang   feat(search): ada...
910
911
912
913
914
                                      }
                                  }
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
915
916
917
918
919
920
921
                  }
                  continue
              
              # 处理 specifications.{name}(指定规格名称)
              if field.startswith("specifications."):
                  name = field[len("specifications."):]
                  agg_name = f"specifications_{name}_facet"
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
                  # 使用 reverse_nested 统计产品(父文档)数量,而不是规格条目(嵌套文档)数量
                  # 这样可以确保分面计数反映实际的产品数量,与搜索结果数量一致
                  base_value_counts = {
                      "terms": {
                          "field": "specifications.value",
                          "size": size,
                          "order": {"_count": "desc"}
                      }
                  }
                  
                  # 如果启用 reverse_nested,添加子聚合统计产品数量
                  if use_reverse_nested:
                      base_value_counts["aggs"] = {
                          "product_count": {
                              "reverse_nested": {}
                          }
                      }
                  
13320ac6   tangwang   分面接口修改:
940
941
942
943
944
945
                  aggs[agg_name] = {
                      "nested": {"path": "specifications"},
                      "aggs": {
                          "filter_by_name": {
                              "filter": {"term": {"specifications.name": name}},
                              "aggs": {
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
946
                                  "value_counts": base_value_counts
f7d3cf70   tangwang   更新文档
947
948
949
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
950
951
952
953
954
                  }
                  continue
              
              # 处理普通字段
              agg_name = f"{field}_facet"
bf89b597   tangwang   feat(search): ada...
955
              
13320ac6   tangwang   分面接口修改:
956
              if facet_type == 'terms':
6aa246be   tangwang   问题:Pydantic 应该能自动...
957
958
959
                  aggs[agg_name] = {
                      "terms": {
                          "field": field,
13320ac6   tangwang   分面接口修改:
960
                          "size": size,
6aa246be   tangwang   问题:Pydantic 应该能自动...
961
962
                          "order": {"_count": "desc"}
                      }
be52af70   tangwang   first commit
963
                  }
13320ac6   tangwang   分面接口修改:
964
965
              elif facet_type == 'range':
                  if config.ranges:
6aa246be   tangwang   问题:Pydantic 应该能自动...
966
                      aggs[agg_name] = {
13320ac6   tangwang   分面接口修改:
967
                          "range": {
6aa246be   tangwang   问题:Pydantic 应该能自动...
968
                              "field": field,
13320ac6   tangwang   分面接口修改:
969
                              "ranges": config.ranges
6aa246be   tangwang   问题:Pydantic 应该能自动...
970
971
                          }
                      }
6aa246be   tangwang   问题:Pydantic 应该能自动...
972
973
          
          return aggs