Blame view

search/es_query_builder.py 37.3 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
  """
  
7bc756c5   tangwang   优化 ES 查询构建
11
  from typing import Dict, Any, List, Optional, Union, Tuple
be52af70   tangwang   first commit
12
  import numpy as np
9f96d6f3   tangwang   短query不用语义搜索
13
  from config import FunctionScoreConfig
be52af70   tangwang   first commit
14
15
16
17
18
19
20
  
  
  class ESQueryBuilder:
      """Builds Elasticsearch DSL queries."""
  
      def __init__(
          self,
be52af70   tangwang   first commit
21
          match_fields: List[str],
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
22
23
24
25
          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
26
          text_embedding_field: Optional[str] = None,
13377199   tangwang   接口优化
27
          image_embedding_field: Optional[str] = None,
9f96d6f3   tangwang   短query不用语义搜索
28
          source_fields: Optional[List[str]] = None,
7bc756c5   tangwang   优化 ES 查询构建
29
          function_score_config: Optional[FunctionScoreConfig] = None,
2739b281   tangwang   多语言索引调整
30
          default_language: str = "en",
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
31
32
33
34
35
36
          knn_boost: float = 0.25,
          base_minimum_should_match: str = "75%",
          translation_minimum_should_match: str = "75%",
          translation_boost: float = 0.4,
          translation_boost_when_source_missing: float = 1.0,
          source_boost_when_missing: float = 0.6,
bcada818   tangwang   last
37
          original_query_fallback_boost_when_translation_missing: float = 0.2,
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
38
          tie_breaker_base_query: float = 0.9,
be52af70   tangwang   first commit
39
40
41
42
      ):
          """
          Initialize query builder.
  
24e92141   tangwang   delete enable_mul...
43
          Multi-language search (translation-based cross-language recall) is always enabled:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
44
          queries are matched against detected-language and translated target-language clauses.
24e92141   tangwang   delete enable_mul...
45
  
be52af70   tangwang   first commit
46
          Args:
be52af70   tangwang   first commit
47
48
49
              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   接口优化
50
              source_fields: Fields to return in search results (_source includes)
9f96d6f3   tangwang   短query不用语义搜索
51
              function_score_config: Function score configuration
a5a6bab8   tangwang   多语言查询优化
52
              default_language: Default language to use when detection fails or returns "unknown"
70dab99f   tangwang   add logs
53
              knn_boost: Boost value for KNN (embedding recall)
be52af70   tangwang   first commit
54
          """
be52af70   tangwang   first commit
55
          self.match_fields = match_fields
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
56
57
          self.field_boosts = field_boosts or {}
          self.multilingual_fields = multilingual_fields or [
a8261ece   tangwang   检索效果优化
58
              "title", "brief", "description", "qanchors", "vendor", "category_path", "category_name_text"
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
59
60
61
          ]
          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"]
be52af70   tangwang   first commit
62
63
          self.text_embedding_field = text_embedding_field
          self.image_embedding_field = image_embedding_field
13377199   tangwang   接口优化
64
          self.source_fields = source_fields
9f96d6f3   tangwang   短query不用语义搜索
65
          self.function_score_config = function_score_config
a5a6bab8   tangwang   多语言查询优化
66
          self.default_language = default_language
70dab99f   tangwang   add logs
67
          self.knn_boost = knn_boost
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
68
69
70
71
72
          self.base_minimum_should_match = base_minimum_should_match
          self.translation_minimum_should_match = translation_minimum_should_match
          self.translation_boost = float(translation_boost)
          self.translation_boost_when_source_missing = float(translation_boost_when_source_missing)
          self.source_boost_when_missing = float(source_boost_when_missing)
bcada818   tangwang   last
73
74
75
          self.original_query_fallback_boost_when_translation_missing = float(
              original_query_fallback_boost_when_translation_missing
          )
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
76
          self.tie_breaker_base_query = float(tie_breaker_base_query)
be52af70   tangwang   first commit
77
  
26b910bd   tangwang   refactor service ...
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
      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...
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
      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
112
              facet_configs: Facet configurations with disjunctive flags
c581becd   tangwang   feat: 实现 Multi-Se...
113
114
115
116
117
118
119
120
121
122
              
          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
123
              if getattr(fc, 'disjunctive', False):
c581becd   tangwang   feat: 实现 Multi-Se...
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
                  # 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
142
143
144
145
      def build_query(
          self,
          query_text: str,
          query_vector: Optional[np.ndarray] = None,
be52af70   tangwang   first commit
146
          filters: Optional[Dict[str, Any]] = None,
6aa246be   tangwang   问题:Pydantic 应该能自动...
147
          range_filters: Optional[Dict[str, Any]] = None,
c581becd   tangwang   feat: 实现 Multi-Se...
148
          facet_configs: Optional[List[Any]] = None,
be52af70   tangwang   first commit
149
150
151
152
153
          size: int = 10,
          from_: int = 0,
          enable_knn: bool = True,
          knn_k: int = 50,
          knn_num_candidates: int = 200,
7bc756c5   tangwang   优化 ES 查询构建
154
155
          min_score: Optional[float] = None,
          parsed_query: Optional[Any] = None
be52af70   tangwang   first commit
156
157
      ) -> Dict[str, Any]:
          """
c581becd   tangwang   feat: 实现 Multi-Se...
158
          Build complete ES query with post_filter support for multi-select faceting.
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
159
  
c581becd   tangwang   feat: 实现 Multi-Se...
160
161
162
          结构:filters and (text_recall or embedding_recall) + post_filter
          - conjunctive_filters: 应用在 query.bool.filter(影响结果和聚合)
          - disjunctive_filters: 应用在 post_filter(只影响结果,不影响聚合)
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
163
          - text_recall: 文本相关性召回(按 search_langs 动态语言字段)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
164
165
          - embedding_recall: 向量召回(KNN
          - function_score: 包装召回部分,支持提权字段
be52af70   tangwang   first commit
166
167
168
169
  
          Args:
              query_text: Query text for BM25 matching
              query_vector: Query embedding for KNN search
c581becd   tangwang   feat: 实现 Multi-Se...
170
171
172
              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
173
174
175
176
177
178
179
180
181
182
              size: Number of results
              from_: Offset for pagination
              enable_knn: Whether to use KNN search
              knn_k: K value for KNN
              knn_num_candidates: Number of candidates for KNN
              min_score: Minimum score threshold
  
          Returns:
              ES query DSL dictionary
          """
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
183
          # Boolean AST path has been removed; keep a single text strategy.
be52af70   tangwang   first commit
184
185
186
187
188
          es_query = {
              "size": size,
              "from": from_
          }
  
26b910bd   tangwang   refactor service ...
189
190
          # Add _source filtering with explicit tri-state semantics.
          self._apply_source_filter(es_query)
13377199   tangwang   接口优化
191
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
192
193
194
195
196
          # 1. Build recall queries (text or embedding)
          recall_clauses = []
          
          # Text recall (always include if query_text exists)
          if query_text:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
197
198
              # Unified text query strategy
              text_query = self._build_advanced_text_query(query_text, parsed_query)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
199
200
201
202
203
              recall_clauses.append(text_query)
          
          # Embedding recall (KNN - separate from query, handled below)
          has_embedding = enable_knn and query_vector is not None and self.text_embedding_field
          
c581becd   tangwang   feat: 实现 Multi-Se...
204
205
206
207
208
209
210
          # 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)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
          
          # 3. Build main query structure: filters and recall
          if recall_clauses:
              # Combine text recalls with OR logic (if multiple)
              if len(recall_clauses) == 1:
                  recall_query = recall_clauses[0]
              else:
                  recall_query = {
                      "bool": {
                          "should": recall_clauses,
                          "minimum_should_match": 1
                      }
                  }
              
              # Wrap recall with function_score for boosting
              recall_query = self._wrap_with_function_score(recall_query)
              
              # Combine filters and recall
6aa246be   tangwang   问题:Pydantic 应该能自动...
229
230
231
              if filter_clauses:
                  es_query["query"] = {
                      "bool": {
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
232
                          "must": [recall_query],
6aa246be   tangwang   问题:Pydantic 应该能自动...
233
234
                          "filter": filter_clauses
                      }
be52af70   tangwang   first commit
235
                  }
6aa246be   tangwang   问题:Pydantic 应该能自动...
236
              else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
237
                  es_query["query"] = recall_query
be52af70   tangwang   first commit
238
          else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
239
240
241
242
243
244
245
246
247
248
              # No recall queries, only filters (match_all filtered)
              if filter_clauses:
                  es_query["query"] = {
                      "bool": {
                          "must": [{"match_all": {}}],
                          "filter": filter_clauses
                      }
                  }
              else:
                  es_query["query"] = {"match_all": {}}
be52af70   tangwang   first commit
249
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
250
          # 4. Add KNN search if enabled (separate from query, ES will combine)
ea118f2b   tangwang   build_query:根据 qu...
251
          # Adjust KNN k, num_candidates, boost by query_tokens (short query: less KNN; long: more)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
252
          if has_embedding:
ea118f2b   tangwang   build_query:根据 qu...
253
254
255
256
257
258
259
260
261
262
263
264
265
266
              knn_boost = self.knn_boost
              if parsed_query:
                  query_tokens = getattr(parsed_query, 'query_tokens', None) or []
                  token_count = len(query_tokens)
                  if token_count <= 2:
                      knn_k, knn_num_candidates = 30, 100
                      knn_boost = self.knn_boost * 0.6  # Lower weight for short queries
                  elif token_count >= 5:
                      knn_k, knn_num_candidates = 80, 300
                      knn_boost = self.knn_boost * 1.4  # Higher weight for long queries
                  else:
                      knn_k, knn_num_candidates = 50, 200
              else:
                  knn_k, knn_num_candidates = 50, 200
be52af70   tangwang   first commit
267
268
269
270
              knn_clause = {
                  "field": self.text_embedding_field,
                  "query_vector": query_vector.tolist(),
                  "k": knn_k,
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
271
                  "num_candidates": knn_num_candidates,
a47416ec   tangwang   把融合逻辑改成乘法公式,并把 ES...
272
                  "boost": knn_boost,
a8261ece   tangwang   检索效果优化
273
                  "_name": "knn_query",
be52af70   tangwang   first commit
274
              }
7fbca0d7   tangwang   启动脚本优化
275
276
277
278
279
280
281
282
283
284
285
              # Top-level knn does not inherit query.bool.filter automatically.
              # Apply conjunctive + range filters here so vector recall respects hard filters.
              if filter_clauses:
                  if len(filter_clauses) == 1:
                      knn_clause["filter"] = filter_clauses[0]
                  else:
                      knn_clause["filter"] = {
                          "bool": {
                              "filter": filter_clauses
                          }
                      }
be52af70   tangwang   first commit
286
287
              es_query["knn"] = knn_clause
  
c581becd   tangwang   feat: 实现 Multi-Se...
288
289
290
291
292
293
294
295
296
297
298
299
          # 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
300
301
302
303
          if min_score is not None:
              es_query["min_score"] = min_score
  
          return es_query
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
      
      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不用语义搜索
322
323
324
          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...
325
326
327
328
          function_score_query = {
              "function_score": {
                  "query": query,
                  "functions": functions,
9f96d6f3   tangwang   短query不用语义搜索
329
330
                  "score_mode": score_mode,
                  "boost_mode": boost_mode
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
331
332
333
334
335
336
337
338
339
340
341
342
343
              }
          }
          
          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不用语义搜索
344
345
346
347
          if not self.function_score_config:
              return functions
          
          config_functions = self.function_score_config.functions or []
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
          
          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
392
393
394
395
  
      def _build_text_query(self, query_text: str) -> Dict[str, Any]:
          """
          Build simple text matching query (BM25).
be52af70   tangwang   first commit
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
  
          Args:
              query_text: Query text
  
          Returns:
              ES query clause
          """
          return {
              "multi_match": {
                  "query": query_text,
                  "fields": self.match_fields,
                  "minimum_should_match": "67%",
                  "tie_breaker": 0.9,
                  "boost": 1.0,
                  "_name": "base_query"
              }
          }
7bc756c5   tangwang   优化 ES 查询构建
413
      
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
      def _format_field_with_boost(self, field_name: str, boost: float) -> str:
          if abs(float(boost) - 1.0) < 1e-9:
              return field_name
          return f"{field_name}^{boost}"
  
      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
  
7bc756c5   tangwang   优化 ES 查询构建
429
430
      def _get_match_fields(self, language: str) -> Tuple[List[str], List[str]]:
          """
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
431
          Build dynamic match fields for one language.
7bc756c5   tangwang   优化 ES 查询构建
432
433
          
          Args:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
434
              language: Language code (e.g. zh/en/de/fr/...)
7bc756c5   tangwang   优化 ES 查询构建
435
436
437
438
              
          Returns:
              (all_fields, core_fields) - core_fields are for phrase/keyword queries
          """
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
          lang = (language or "").strip().lower()
          all_fields: List[str] = []
          core_fields: List[str] = []
  
          for base in self.multilingual_fields:
              field = f"{base}.{lang}"
              boost = self._get_field_boost(base, lang)
              all_fields.append(self._format_field_with_boost(field, boost))
  
          for shared in self.shared_fields:
              boost = self._get_field_boost(shared, None)
              all_fields.append(self._format_field_with_boost(shared, boost))
  
          for base in self.core_multilingual_fields:
              field = f"{base}.{lang}"
              boost = self._get_field_boost(base, lang)
              core_fields.append(self._format_field_with_boost(field, boost))
  
7bc756c5   tangwang   优化 ES 查询构建
457
458
459
460
461
462
463
464
465
          return all_fields, core_fields
      
      def _get_embedding_field(self, language: str) -> str:
          """Get embedding field name for a language."""
          # Currently using unified embedding field
          return self.text_embedding_field or "title_embedding"
      
      def _build_advanced_text_query(self, query_text: str, parsed_query: Optional[Any] = None) -> Dict[str, Any]:
          """
c90f80ed   tangwang   相关性优化
466
467
          Build advanced text query using should clauses with primary and fallback lexical strategies.
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
468
469
470
          Unified implementation:
          - base_query: source-language clause
          - translation queries: target-language clauses from search_langs/query_text_by_lang
7bc756c5   tangwang   优化 ES 查询构建
471
472
473
474
475
476
477
478
479
480
481
482
          - KNN query: added separately in build_query
          
          Args:
              query_text: Query text
              parsed_query: ParsedQuery object with analysis results
              
          Returns:
              ES bool query with should clauses
          """
          should_clauses = []
          
          # Get query analysis from parsed_query
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
483
484
485
486
          query_text_by_lang: Dict[str, str] = {}
          search_langs: List[str] = []
          source_lang = self.default_language
          source_in_index_languages = True
bcada818   tangwang   last
487
          index_languages: List[str] = []
c90f80ed   tangwang   相关性优化
488
  
7bc756c5   tangwang   优化 ES 查询构建
489
          if parsed_query:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
490
491
492
493
494
495
496
              query_text_by_lang = getattr(parsed_query, "query_text_by_lang", None) or {}
              search_langs = getattr(parsed_query, "search_langs", None) or []
              detected_lang = getattr(parsed_query, "detected_language", None)
              source_lang = detected_lang if detected_lang and detected_lang != "unknown" else self.default_language
              source_in_index_languages = bool(
                  getattr(parsed_query, "source_in_index_languages", True)
              )
bcada818   tangwang   last
497
              index_languages = getattr(parsed_query, "index_languages", None) or []
c90f80ed   tangwang   相关性优化
498
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
499
500
501
502
503
504
          if not query_text_by_lang:
              query_text_by_lang = {source_lang: query_text}
          if source_lang not in query_text_by_lang and query_text:
              query_text_by_lang[source_lang] = query_text
          if not search_langs:
              search_langs = list(query_text_by_lang.keys())
c90f80ed   tangwang   相关性优化
505
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
          # Base + translated clauses based on language plan.
          for lang in search_langs:
              lang_query = query_text_by_lang.get(lang)
              if not lang_query:
                  continue
              match_fields, _ = self._get_match_fields(lang)
              if not match_fields:
                  continue
  
              is_source = (lang == source_lang)
              clause_boost = 1.0
              clause_name = "base_query" if is_source else f"base_query_trans_{lang}"
              minimum_should_match = (
                  self.base_minimum_should_match if is_source else self.translation_minimum_should_match
              )
              if is_source and not source_in_index_languages:
                  clause_boost = self.source_boost_when_missing
              elif not is_source:
                  clause_boost = (
                      self.translation_boost
                      if source_in_index_languages
                      else self.translation_boost_when_source_missing
                  )
  
              clause = {
7bc756c5   tangwang   优化 ES 查询构建
531
                  "multi_match": {
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
532
                      "_name": clause_name,
7bc756c5   tangwang   优化 ES 查询构建
533
534
                      "fields": match_fields,
                      "minimum_should_match": minimum_should_match,
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
535
536
                      "query": lang_query,
                      "tie_breaker": self.tie_breaker_base_query,
7bc756c5   tangwang   优化 ES 查询构建
537
                  }
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
538
539
540
541
542
              }
              if abs(clause_boost - 1.0) > 1e-9:
                  clause["multi_match"]["boost"] = clause_boost
              should_clauses.append({
                  "multi_match": clause["multi_match"]
7bc756c5   tangwang   优化 ES 查询构建
543
              })
ea118f2b   tangwang   build_query:根据 qu...
544
  
bcada818   tangwang   last
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
          # Fallback: source language is not indexed and translation for some index languages is missing.
          # Use original query text on missing index-language fields with a low boost.
          if not source_in_index_languages and query_text and index_languages:
              normalized_index_langs: List[str] = []
              seen_langs = set()
              for lang in index_languages:
                  norm_lang = str(lang or "").strip().lower()
                  if not norm_lang or norm_lang in seen_langs:
                      continue
                  seen_langs.add(norm_lang)
                  normalized_index_langs.append(norm_lang)
  
              for lang in normalized_index_langs:
                  if lang == source_lang:
                      continue
                  if lang in query_text_by_lang:
                      continue
                  match_fields, _ = self._get_match_fields(lang)
                  if not match_fields:
                      continue
                  should_clauses.append({
                      "multi_match": {
                          "_name": f"fallback_original_query_{lang}",
                          "query": query_text,
                          "fields": match_fields,
                          "minimum_should_match": self.translation_minimum_should_match,
                          "tie_breaker": self.tie_breaker_base_query,
                          "boost": self.original_query_fallback_boost_when_translation_missing,
                      }
                  })
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
576
577
578
579
580
581
582
583
584
585
586
587
588
          # 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"]
              return {
                  "multi_match": {
                      "_name": "base_query_fallback",
                      "query": query_text,
                      "fields": fallback_fields,
                      "minimum_should_match": self.base_minimum_should_match,
                      "tie_breaker": self.tie_breaker_base_query,
                  }
              }
  
7bc756c5   tangwang   优化 ES 查询构建
589
590
591
592
593
594
595
596
597
598
          # Return bool query with should clauses
          if len(should_clauses) == 1:
              return should_clauses[0]
          
          return {
              "bool": {
                  "should": should_clauses,
                  "minimum_should_match": 1
              }
          }
be52af70   tangwang   first commit
599
  
6aa246be   tangwang   问题:Pydantic 应该能自动...
600
601
602
      def _build_filters(
          self, 
          filters: Optional[Dict[str, Any]] = None,
43f1139f   tangwang   refactor: ES查询结构重...
603
          range_filters: Optional[Dict[str, 'RangeFilter']] = None
6aa246be   tangwang   问题:Pydantic 应该能自动...
604
      ) -> List[Dict[str, Any]]:
be52af70   tangwang   first commit
605
          """
43f1139f   tangwang   refactor: ES查询结构重...
606
          构建过滤子句。
6aa246be   tangwang   问题:Pydantic 应该能自动...
607
          
be52af70   tangwang   first commit
608
          Args:
6aa246be   tangwang   问题:Pydantic 应该能自动...
609
              filters: 精确匹配过滤器字典
43f1139f   tangwang   refactor: ES查询结构重...
610
              range_filters: 范围过滤器(Dict[str, RangeFilter]RangeFilter  Pydantic 模型)
6aa246be   tangwang   问题:Pydantic 应该能自动...
611
          
be52af70   tangwang   first commit
612
          Returns:
43f1139f   tangwang   refactor: ES查询结构重...
613
              ES filter 子句列表
be52af70   tangwang   first commit
614
615
          """
          filter_clauses = []
6aa246be   tangwang   问题:Pydantic 应该能自动...
616
617
618
619
          
          # 1. 处理精确匹配过滤
          if filters:
              for field, value in filters.items():
f7d3cf70   tangwang   更新文档
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
                  # 特殊处理: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   过滤逻辑
641
642
643
644
645
                          # 多个规格过滤:按 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   更新文档
646
647
648
649
650
                          for spec in value:
                              if isinstance(spec, dict):
                                  name = spec.get("name")
                                  spec_value = spec.get("value")
                                  if name and spec_value:
85f08823   tangwang   过滤逻辑
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
                                      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   更新文档
666
667
                                              }
                                          }
85f08823   tangwang   过滤逻辑
668
669
670
671
672
673
674
675
676
677
678
679
680
                                      }
                                  })
                              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   更新文档
681
                                      })
85f08823   tangwang   过滤逻辑
682
683
684
685
686
687
688
689
690
691
692
                                  filter_clauses.append({
                                      "nested": {
                                          "path": "specifications",
                                          "query": {
                                              "bool": {
                                                  "should": should_clauses,
                                                  "minimum_should_match": 1
                                              }
                                          }
                                      }
                                  })
f7d3cf70   tangwang   更新文档
693
694
                      continue
                  
985d7fe3   tangwang   为 filters 中所有字段加上...
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
                  # *_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   支持聚合。过滤项补充了逻辑,但是有问题
735
                  if isinstance(value, list):
6aa246be   tangwang   问题:Pydantic 应该能自动...
736
                      # 多值匹配(OR)
be52af70   tangwang   first commit
737
                      filter_clauses.append({
6aa246be   tangwang   问题:Pydantic 应该能自动...
738
                          "terms": {field: value}
be52af70   tangwang   first commit
739
                      })
6aa246be   tangwang   问题:Pydantic 应该能自动...
740
741
742
743
744
745
                  else:
                      # 单值精确匹配
                      filter_clauses.append({
                          "term": {field: value}
                      })
          
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
746
          # 2. 处理范围过滤(支持 RangeFilter Pydantic 模型或字典)
6aa246be   tangwang   问题:Pydantic 应该能自动...
747
          if range_filters:
43f1139f   tangwang   refactor: ES查询结构重...
748
              for field, range_filter in range_filters.items():
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
749
750
751
752
753
754
755
756
757
758
                  # 支持 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 应该能自动...
759
                  
43f1139f   tangwang   refactor: ES查询结构重...
760
                  if range_dict:
6aa246be   tangwang   问题:Pydantic 应该能自动...
761
                      filter_clauses.append({
43f1139f   tangwang   refactor: ES查询结构重...
762
                          "range": {field: range_dict}
6aa246be   tangwang   问题:Pydantic 应该能自动...
763
764
                      })
          
be52af70   tangwang   first commit
765
766
          return filter_clauses
  
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
767
768
769
770
771
772
773
774
775
776
777
      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   分面接口修改:
778
              sort_by: Field name for sorting (支持 'price' 自动映射)
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
779
780
781
782
783
784
785
786
787
788
789
              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   分面接口修改:
790
791
792
793
794
795
796
          # 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   支持聚合。过滤项补充了逻辑,但是有问题
797
798
799
800
801
802
803
804
805
806
807
808
809
          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 应该能自动...
810
      def build_facets(
be52af70   tangwang   first commit
811
          self,
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
812
813
          facet_configs: Optional[List['FacetConfig']] = None,
          use_reverse_nested: bool = True
be52af70   tangwang   first commit
814
815
      ) -> Dict[str, Any]:
          """
ff5325fa   tangwang   修复:直接在 Searcher 层...
816
          构建分面聚合。
6aa246be   tangwang   问题:Pydantic 应该能自动...
817
          
be52af70   tangwang   first commit
818
          Args:
13320ac6   tangwang   分面接口修改:
819
              facet_configs: 分面配置对象列表
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
820
821
              use_reverse_nested: 是否使用 reverse_nested 统计产品数量(默认 True
                                 如果为 False,将统计嵌套文档数量(性能更好但计数可能不准确)
13320ac6   tangwang   分面接口修改:
822
823
824
825
826
              
              支持的字段类型:
                  - 普通字段:  "category1_name"terms  range 类型)
                  - specifications: "specifications"(返回所有规格名称及其值)
                  - specifications.{name}:  "specifications.color"(返回指定规格名称的值)
6aa246be   tangwang   问题:Pydantic 应该能自动...
827
          
be52af70   tangwang   first commit
828
          Returns:
ff5325fa   tangwang   修复:直接在 Searcher 层...
829
              ES aggregations 字典
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
830
831
832
833
          
          性能说明:
              - use_reverse_nested=True: 统计产品数量,准确性高但性能略差(通常影响 < 20%
              - use_reverse_nested=False: 统计嵌套文档数量,性能更好但计数可能不准确
be52af70   tangwang   first commit
834
          """
6aa246be   tangwang   问题:Pydantic 应该能自动...
835
836
837
838
839
840
          if not facet_configs:
              return {}
          
          aggs = {}
          
          for config in facet_configs:
13320ac6   tangwang   分面接口修改:
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
              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...
862
863
864
865
866
                                      }
                                  }
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
867
868
869
870
871
872
873
                  }
                  continue
              
              # 处理 specifications.{name}(指定规格名称)
              if field.startswith("specifications."):
                  name = field[len("specifications."):]
                  agg_name = f"specifications_{name}_facet"
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
                  # 使用 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   分面接口修改:
892
893
894
895
896
897
                  aggs[agg_name] = {
                      "nested": {"path": "specifications"},
                      "aggs": {
                          "filter_by_name": {
                              "filter": {"term": {"specifications.name": name}},
                              "aggs": {
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
898
                                  "value_counts": base_value_counts
f7d3cf70   tangwang   更新文档
899
900
901
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
902
903
904
905
906
                  }
                  continue
              
              # 处理普通字段
              agg_name = f"{field}_facet"
bf89b597   tangwang   feat(search): ada...
907
              
13320ac6   tangwang   分面接口修改:
908
              if facet_type == 'terms':
6aa246be   tangwang   问题:Pydantic 应该能自动...
909
910
911
                  aggs[agg_name] = {
                      "terms": {
                          "field": field,
13320ac6   tangwang   分面接口修改:
912
                          "size": size,
6aa246be   tangwang   问题:Pydantic 应该能自动...
913
914
                          "order": {"_count": "desc"}
                      }
be52af70   tangwang   first commit
915
                  }
13320ac6   tangwang   分面接口修改:
916
917
              elif facet_type == 'range':
                  if config.ranges:
6aa246be   tangwang   问题:Pydantic 应该能自动...
918
                      aggs[agg_name] = {
13320ac6   tangwang   分面接口修改:
919
                          "range": {
6aa246be   tangwang   问题:Pydantic 应该能自动...
920
                              "field": field,
13320ac6   tangwang   分面接口修改:
921
                              "ranges": config.ranges
6aa246be   tangwang   问题:Pydantic 应该能自动...
922
923
                          }
                      }
6aa246be   tangwang   问题:Pydantic 应该能自动...
924
925
          
          return aggs