Blame view

search/es_query_builder.py 41.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
  """
  
7bc756c5   tangwang   优化 ES 查询构建
11
  from typing import Dict, Any, List, Optional, Union, 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
  
6823fe3e   tangwang   feat(search): 混合语...
16
17
18
  # (Elasticsearch field path, boost before formatting as "path^boost")
  MatchFieldSpec = Tuple[str, float]
  
be52af70   tangwang   first commit
19
20
21
22
23
24
  
  class ESQueryBuilder:
      """Builds Elasticsearch DSL queries."""
  
      def __init__(
          self,
be52af70   tangwang   first commit
25
          match_fields: List[str],
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
26
27
28
29
          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
30
          text_embedding_field: Optional[str] = None,
13377199   tangwang   接口优化
31
          image_embedding_field: Optional[str] = None,
9f96d6f3   tangwang   短query不用语义搜索
32
          source_fields: Optional[List[str]] = None,
7bc756c5   tangwang   优化 ES 查询构建
33
          function_score_config: Optional[FunctionScoreConfig] = None,
2739b281   tangwang   多语言索引调整
34
          default_language: str = "en",
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
35
          knn_boost: float = 0.25,
272aeabe   tangwang   调参
36
37
          base_minimum_should_match: str = "70%",
          translation_minimum_should_match: str = "70%",
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
38
          translation_boost: float = 0.4,
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
39
          tie_breaker_base_query: float = 0.9,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
40
41
          best_fields_boosts: Optional[Dict[str, float]] = None,
          best_fields_clause_boost: float = 2.0,
6823fe3e   tangwang   feat(search): 混合语...
42
          mixed_script_merged_field_boost_scale: float = 0.6,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
43
          phrase_field_boosts: Optional[Dict[str, float]] = None,
69881ecb   tangwang   相关性调参、enrich内容解析优化
44
          phrase_match_base_fields: Optional[Tuple[str, ...]] = None,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
45
46
          phrase_match_slop: int = 0,
          phrase_match_tie_breaker: float = 0.0,
69881ecb   tangwang   相关性调参、enrich内容解析优化
47
          phrase_match_boost: float = 3.0,
be52af70   tangwang   first commit
48
49
50
51
      ):
          """
          Initialize query builder.
  
24e92141   tangwang   delete enable_mul...
52
          Multi-language search (translation-based cross-language recall) is always enabled:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
53
          queries are matched against detected-language and translated target-language clauses.
24e92141   tangwang   delete enable_mul...
54
  
be52af70   tangwang   first commit
55
          Args:
be52af70   tangwang   first commit
56
57
58
              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   接口优化
59
              source_fields: Fields to return in search results (_source includes)
9f96d6f3   tangwang   短query不用语义搜索
60
              function_score_config: Function score configuration
a5a6bab8   tangwang   多语言查询优化
61
              default_language: Default language to use when detection fails or returns "unknown"
70dab99f   tangwang   add logs
62
              knn_boost: Boost value for KNN (embedding recall)
6823fe3e   tangwang   feat(search): 混合语...
63
              mixed_script_merged_field_boost_scale: Multiply per-field ^boost for cross-script merged fields
be52af70   tangwang   first commit
64
          """
be52af70   tangwang   first commit
65
          self.match_fields = match_fields
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
66
67
          self.field_boosts = field_boosts or {}
          self.multilingual_fields = multilingual_fields or [
a8261ece   tangwang   检索效果优化
68
              "title", "brief", "description", "qanchors", "vendor", "category_path", "category_name_text"
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
69
70
71
          ]
          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
72
73
          self.text_embedding_field = text_embedding_field
          self.image_embedding_field = image_embedding_field
13377199   tangwang   接口优化
74
          self.source_fields = source_fields
9f96d6f3   tangwang   短query不用语义搜索
75
          self.function_score_config = function_score_config
a5a6bab8   tangwang   多语言查询优化
76
          self.default_language = default_language
70dab99f   tangwang   add logs
77
          self.knn_boost = knn_boost
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
78
79
80
          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. 动态多语言字段与统一策略配置
81
          self.tie_breaker_base_query = float(tie_breaker_base_query)
6823fe3e   tangwang   feat(search): 混合语...
82
          self.mixed_script_merged_field_boost_scale = float(mixed_script_merged_field_boost_scale)
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
          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内容解析优化
103
104
105
          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
106
  
26b910bd   tangwang   refactor service ...
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
      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...
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
      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
141
              facet_configs: Facet configurations with disjunctive flags
c581becd   tangwang   feat: 实现 Multi-Se...
142
143
144
145
146
147
148
149
150
151
              
          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
152
              if getattr(fc, 'disjunctive', False):
c581becd   tangwang   feat: 实现 Multi-Se...
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
                  # 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
171
172
173
174
      def build_query(
          self,
          query_text: str,
          query_vector: Optional[np.ndarray] = None,
be52af70   tangwang   first commit
175
          filters: Optional[Dict[str, Any]] = None,
6aa246be   tangwang   问题:Pydantic 应该能自动...
176
          range_filters: Optional[Dict[str, Any]] = None,
c581becd   tangwang   feat: 实现 Multi-Se...
177
          facet_configs: Optional[List[Any]] = None,
be52af70   tangwang   first commit
178
179
180
181
182
          size: int = 10,
          from_: int = 0,
          enable_knn: bool = True,
          knn_k: int = 50,
          knn_num_candidates: int = 200,
7bc756c5   tangwang   优化 ES 查询构建
183
          min_score: Optional[float] = None,
ef5baa86   tangwang   混杂语言处理
184
185
          parsed_query: Optional[Any] = None,
          index_languages: Optional[List[str]] = None,
be52af70   tangwang   first commit
186
187
      ) -> Dict[str, Any]:
          """
c581becd   tangwang   feat: 实现 Multi-Se...
188
          Build complete ES query with post_filter support for multi-select faceting.
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
189
  
c581becd   tangwang   feat: 实现 Multi-Se...
190
191
192
          结构:filters and (text_recall or embedding_recall) + post_filter
          - conjunctive_filters: 应用在 query.bool.filter(影响结果和聚合)
          - disjunctive_filters: 应用在 post_filter(只影响结果,不影响聚合)
0536222c   tangwang   query parser优化
193
          - text_recall: 文本相关性召回(按实际 clause 语言动态字段)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
194
195
          - embedding_recall: 向量召回(KNN
          - function_score: 包装召回部分,支持提权字段
be52af70   tangwang   first commit
196
197
198
199
  
          Args:
              query_text: Query text for BM25 matching
              query_vector: Query embedding for KNN search
c581becd   tangwang   feat: 实现 Multi-Se...
200
201
202
              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
203
204
205
206
207
208
209
210
211
212
              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. 动态多语言字段与统一策略配置
213
          # Boolean AST path has been removed; keep a single text strategy.
be52af70   tangwang   first commit
214
215
216
217
218
          es_query = {
              "size": size,
              "from": from_
          }
  
26b910bd   tangwang   refactor service ...
219
220
          # Add _source filtering with explicit tri-state semantics.
          self._apply_source_filter(es_query)
13377199   tangwang   接口优化
221
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
222
223
224
225
226
          # 1. Build recall queries (text or embedding)
          recall_clauses = []
          
          # Text recall (always include if query_text exists)
          if query_text:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
227
              # Unified text query strategy
ef5baa86   tangwang   混杂语言处理
228
229
230
231
232
              text_query = self._build_advanced_text_query(
                  query_text,
                  parsed_query,
                  index_languages=index_languages,
              )
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
233
234
235
236
237
              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...
238
239
240
241
242
243
244
          # 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...
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
          
          # 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 应该能自动...
263
264
265
              if filter_clauses:
                  es_query["query"] = {
                      "bool": {
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
266
                          "must": [recall_query],
6aa246be   tangwang   问题:Pydantic 应该能自动...
267
268
                          "filter": filter_clauses
                      }
be52af70   tangwang   first commit
269
                  }
6aa246be   tangwang   问题:Pydantic 应该能自动...
270
              else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
271
                  es_query["query"] = recall_query
be52af70   tangwang   first commit
272
          else:
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
273
274
275
276
277
278
279
280
281
282
              # 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
283
  
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
284
          # 4. Add KNN search if enabled (separate from query, ES will combine)
ea118f2b   tangwang   build_query:根据 qu...
285
          # Adjust KNN k, num_candidates, boost by query_tokens (short query: less KNN; long: more)
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
286
          if has_embedding:
ea118f2b   tangwang   build_query:根据 qu...
287
288
289
290
              knn_boost = self.knn_boost
              if parsed_query:
                  query_tokens = getattr(parsed_query, 'query_tokens', None) or []
                  token_count = len(query_tokens)
272aeabe   tangwang   调参
291
292
                  if token_count >= 5:
                      knn_k, knn_num_candidates = 160, 500
ea118f2b   tangwang   build_query:根据 qu...
293
294
                      knn_boost = self.knn_boost * 1.4  # Higher weight for long queries
                  else:
272aeabe   tangwang   调参
295
                      knn_k, knn_num_candidates = 120, 400
ea118f2b   tangwang   build_query:根据 qu...
296
              else:
272aeabe   tangwang   调参
297
                  knn_k, knn_num_candidates = 120, 400
be52af70   tangwang   first commit
298
299
300
301
              knn_clause = {
                  "field": self.text_embedding_field,
                  "query_vector": query_vector.tolist(),
                  "k": knn_k,
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
302
                  "num_candidates": knn_num_candidates,
a47416ec   tangwang   把融合逻辑改成乘法公式,并把 ES...
303
                  "boost": knn_boost,
a8261ece   tangwang   检索效果优化
304
                  "_name": "knn_query",
be52af70   tangwang   first commit
305
              }
7fbca0d7   tangwang   启动脚本优化
306
307
308
309
310
311
312
313
314
315
316
              # 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
317
318
              es_query["knn"] = knn_clause
  
c581becd   tangwang   feat: 实现 Multi-Se...
319
320
321
322
323
324
325
326
327
328
329
330
          # 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
331
332
333
334
          if min_score is not None:
              es_query["min_score"] = min_score
  
          return es_query
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
      
      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不用语义搜索
353
354
355
          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...
356
357
358
359
          function_score_query = {
              "function_score": {
                  "query": query,
                  "functions": functions,
9f96d6f3   tangwang   短query不用语义搜索
360
361
                  "score_mode": score_mode,
                  "boost_mode": boost_mode
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
362
363
364
365
366
367
368
369
370
371
372
373
374
              }
          }
          
          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不用语义搜索
375
376
377
378
          if not self.function_score_config:
              return functions
          
          config_functions = self.function_score_config.functions or []
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
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
421
422
          
          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
423
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
424
425
426
      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): 混合语...
427
          return f"{field_name}^{round(boost, 2)}"
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
428
429
430
431
432
433
434
435
436
437
438
  
      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
  
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
439
440
441
442
443
444
445
446
      def _build_match_field_specs(
          self,
          language: str,
          *,
          multilingual_fields: Optional[List[str]] = None,
          shared_fields: Optional[List[str]] = None,
          boost_overrides: Optional[Dict[str, float]] = None,
      ) -> List[MatchFieldSpec]:
7bc756c5   tangwang   优化 ES 查询构建
447
          """
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
448
449
          Per-language match targets as (field_path, boost). Single source of truth before
          formatting as Elasticsearch ``fields`` strings.
7bc756c5   tangwang   优化 ES 查询构建
450
          """
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
451
          lang = (language or "").strip().lower()
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
452
453
454
455
          specs: List[MatchFieldSpec] = []
          text_fields = multilingual_fields if multilingual_fields is not None else self.multilingual_fields
          term_fields = shared_fields if shared_fields is not None else self.shared_fields
          overrides = boost_overrides or {}
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
456
  
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
457
          for base in text_fields:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
458
              field = f"{base}.{lang}"
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
459
460
              boost = float(overrides.get(base, self._get_field_boost(base, lang)))
              specs.append((field, boost))
6823fe3e   tangwang   feat(search): 混合语...
461
  
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
462
463
464
465
          for shared in term_fields:
              boost = float(overrides.get(shared, self._get_field_boost(shared, None)))
              specs.append((shared, boost))
          return specs
6823fe3e   tangwang   feat(search): 混合语...
466
467
468
469
470
  
      def _format_match_field_specs(self, specs: List[MatchFieldSpec]) -> List[str]:
          """Format (field_path, boost) pairs for Elasticsearch multi_match ``fields``."""
          return [self._format_field_with_boost(path, boost) for path, boost in specs]
  
6823fe3e   tangwang   feat(search): 混合语...
471
472
473
474
475
476
477
      def _merge_supplemental_lang_field_specs(
          self,
          specs: List[MatchFieldSpec],
          supplemental_lang: str,
      ) -> List[MatchFieldSpec]:
          """Append supplemental-language columns; boosts multiplied by mixed_script scale."""
          scale = float(self.mixed_script_merged_field_boost_scale)
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
478
          extra_all = self._build_match_field_specs(supplemental_lang)
6823fe3e   tangwang   feat(search): 混合语...
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
          seen = {path for path, _ in specs}
          out = list(specs)
          for path, boost in extra_all:
              if path not in seen:
                  out.append((path, boost * scale))
                  seen.add(path)
          return out
  
      def _expand_match_field_specs_for_mixed_script(
          self,
          lang: str,
          specs: List[MatchFieldSpec],
          contains_chinese: bool,
          contains_english: bool,
          index_languages: List[str],
0536222c   tangwang   query parser优化
494
          is_source: bool = False
6823fe3e   tangwang   feat(search): 混合语...
495
496
497
498
499
500
501
502
503
504
505
506
507
      ) -> List[MatchFieldSpec]:
          """
          When the query mixes scripts, widen each clause to indexed fields for the other script
          (e.g. zh clause also searches title.en when the query contains an English word token).
          """
          norm = {str(x or "").strip().lower() for x in (index_languages or []) if str(x or "").strip()}
          allow = norm or {"zh", "en"}
  
          def can_use(lcode: str) -> bool:
              return lcode in allow if norm else True
  
          out = list(specs)
          lnorm = (lang or "").strip().lower()
0536222c   tangwang   query parser优化
508
509
510
511
512
          if is_source:
              if contains_english and lnorm != "en" and can_use("en"):
                  out = self._merge_supplemental_lang_field_specs(out, "en")
              if contains_chinese and lnorm != "zh" and can_use("zh"):
                  out = self._merge_supplemental_lang_field_specs(out, "zh")
6823fe3e   tangwang   feat(search): 混合语...
513
          return out
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
514
  
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
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
543
544
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
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
      def _build_best_fields_clause(self, language: str, query_text: str) -> Optional[Dict[str, Any]]:
          specs = self._build_match_field_specs(
              language,
              multilingual_fields=list(self.best_fields_boosts),
              shared_fields=[],
              boost_overrides=self.best_fields_boosts,
          )
          fields = self._format_match_field_specs(specs)
          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]]:
          specs = self._build_match_field_specs(
              language,
              multilingual_fields=list(self.phrase_field_boosts),
              shared_fields=[],
              boost_overrides=self.phrase_field_boosts,
          )
          fields = self._format_match_field_specs(specs)
          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,
          contains_chinese: bool,
          contains_english: bool,
          index_languages: List[str],
      ) -> Optional[Dict[str, Any]]:
          all_specs = self._build_match_field_specs(lang)
          expanded_specs = self._expand_match_field_specs_for_mixed_script(
              lang,
              all_specs,
              contains_chinese,
              contains_english,
              index_languages,
              is_source,
          )
          combined_fields = self._format_match_field_specs(expanded_specs)
          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
  
7bc756c5   tangwang   优化 ES 查询构建
612
613
614
615
616
      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"
      
ef5baa86   tangwang   混杂语言处理
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
      @staticmethod
      def _normalize_language_list(languages: Optional[List[str]]) -> List[str]:
          normalized: List[str] = []
          seen = set()
          for language in languages or []:
              token = str(language or "").strip().lower()
              if not token or token in seen:
                  continue
              seen.add(token)
              normalized.append(token)
          return normalized
  
      def _build_advanced_text_query(
          self,
          query_text: str,
          parsed_query: Optional[Any] = None,
          *,
          index_languages: Optional[List[str]] = None,
      ) -> Dict[str, Any]:
7bc756c5   tangwang   优化 ES 查询构建
636
          """
ef5baa86   tangwang   混杂语言处理
637
          Build advanced text query using base and translated lexical clauses.
c90f80ed   tangwang   相关性优化
638
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
639
640
          Unified implementation:
          - base_query: source-language clause
ef5baa86   tangwang   混杂语言处理
641
          - translation queries: target-language clauses from translations
7bc756c5   tangwang   优化 ES 查询构建
642
643
644
645
646
647
648
649
650
651
          - 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 = []
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
652
          source_lang = self.default_language
ef5baa86   tangwang   混杂语言处理
653
          translations: Dict[str, str] = {}
6823fe3e   tangwang   feat(search): 混合语...
654
655
          contains_chinese = False
          contains_english = False
ef5baa86   tangwang   混杂语言处理
656
657
          normalized_index_languages = self._normalize_language_list(index_languages)
  
7bc756c5   tangwang   优化 ES 查询构建
658
          if parsed_query:
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
659
660
              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   混杂语言处理
661
              translations = getattr(parsed_query, "translations", None) or {}
6823fe3e   tangwang   feat(search): 混合语...
662
663
              contains_chinese = bool(getattr(parsed_query, "contains_chinese", False))
              contains_english = bool(getattr(parsed_query, "contains_english", False))
c90f80ed   tangwang   相关性优化
664
  
ef5baa86   tangwang   混杂语言处理
665
          source_lang = str(source_lang or self.default_language).strip().lower() or self.default_language
ef5baa86   tangwang   混杂语言处理
666
667
668
669
670
671
          base_query_text = (
              getattr(parsed_query, "rewritten_query", None) if parsed_query else None
          ) or query_text
  
          def append_clause(lang: str, lang_query: str, clause_name: str, is_source: bool) -> None:
              nonlocal should_clauses
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
672
              clause = self._build_lexical_language_clause(
6823fe3e   tangwang   feat(search): 混合语...
673
                  lang,
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
674
675
676
677
678
679
                  lang_query,
                  clause_name,
                  is_source=is_source,
                  contains_chinese=contains_chinese,
                  contains_english=contains_english,
                  index_languages=normalized_index_languages,
6823fe3e   tangwang   feat(search): 混合语...
680
              )
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
681
              if not clause:
ef5baa86   tangwang   混杂语言处理
682
                  return
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
683
              should_clauses.append(clause)
ea118f2b   tangwang   build_query:根据 qu...
684
  
ef5baa86   tangwang   混杂语言处理
685
686
687
688
689
690
691
692
693
694
695
          if base_query_text:
              append_clause(source_lang, base_query_text, "base_query", True)
  
          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
              append_clause(normalized_lang, normalized_text, f"base_query_trans_{normalized_lang}", False)
bcada818   tangwang   last
696
  
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
697
698
699
          # 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内容解析优化
700
              fallback_lexical = {
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
701
702
703
704
705
                  "multi_match": {
                      "_name": "base_query_fallback",
                      "query": query_text,
                      "fields": fallback_fields,
                      "minimum_should_match": self.base_minimum_should_match,
69881ecb   tangwang   相关性调参、enrich内容解析优化
706
707
                  }
              }
e756b18e   tangwang   重构了文本召回构建器,现在每个 b...
708
              return fallback_lexical
bd96cead   tangwang   1. 动态多语言字段与统一策略配置
709
  
7bc756c5   tangwang   优化 ES 查询构建
710
711
712
713
714
715
716
717
718
719
          # 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
720
  
6aa246be   tangwang   问题:Pydantic 应该能自动...
721
722
723
      def _build_filters(
          self, 
          filters: Optional[Dict[str, Any]] = None,
43f1139f   tangwang   refactor: ES查询结构重...
724
          range_filters: Optional[Dict[str, 'RangeFilter']] = None
6aa246be   tangwang   问题:Pydantic 应该能自动...
725
      ) -> List[Dict[str, Any]]:
be52af70   tangwang   first commit
726
          """
43f1139f   tangwang   refactor: ES查询结构重...
727
          构建过滤子句。
6aa246be   tangwang   问题:Pydantic 应该能自动...
728
          
be52af70   tangwang   first commit
729
          Args:
6aa246be   tangwang   问题:Pydantic 应该能自动...
730
              filters: 精确匹配过滤器字典
43f1139f   tangwang   refactor: ES查询结构重...
731
              range_filters: 范围过滤器(Dict[str, RangeFilter]RangeFilter  Pydantic 模型)
6aa246be   tangwang   问题:Pydantic 应该能自动...
732
          
be52af70   tangwang   first commit
733
          Returns:
43f1139f   tangwang   refactor: ES查询结构重...
734
              ES filter 子句列表
be52af70   tangwang   first commit
735
736
          """
          filter_clauses = []
6aa246be   tangwang   问题:Pydantic 应该能自动...
737
738
739
740
          
          # 1. 处理精确匹配过滤
          if filters:
              for field, value in filters.items():
f7d3cf70   tangwang   更新文档
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
                  # 特殊处理: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   过滤逻辑
762
763
764
765
766
                          # 多个规格过滤:按 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   更新文档
767
768
769
770
771
                          for spec in value:
                              if isinstance(spec, dict):
                                  name = spec.get("name")
                                  spec_value = spec.get("value")
                                  if name and spec_value:
85f08823   tangwang   过滤逻辑
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
                                      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   更新文档
787
788
                                              }
                                          }
85f08823   tangwang   过滤逻辑
789
790
791
792
793
794
795
796
797
798
799
800
801
                                      }
                                  })
                              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   更新文档
802
                                      })
85f08823   tangwang   过滤逻辑
803
804
805
806
807
808
809
810
811
812
813
                                  filter_clauses.append({
                                      "nested": {
                                          "path": "specifications",
                                          "query": {
                                              "bool": {
                                                  "should": should_clauses,
                                                  "minimum_should_match": 1
                                              }
                                          }
                                      }
                                  })
f7d3cf70   tangwang   更新文档
814
815
                      continue
                  
985d7fe3   tangwang   为 filters 中所有字段加上...
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
                  # *_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   支持聚合。过滤项补充了逻辑,但是有问题
856
                  if isinstance(value, list):
6aa246be   tangwang   问题:Pydantic 应该能自动...
857
                      # 多值匹配(OR)
be52af70   tangwang   first commit
858
                      filter_clauses.append({
6aa246be   tangwang   问题:Pydantic 应该能自动...
859
                          "terms": {field: value}
be52af70   tangwang   first commit
860
                      })
6aa246be   tangwang   问题:Pydantic 应该能自动...
861
862
863
864
865
866
                  else:
                      # 单值精确匹配
                      filter_clauses.append({
                          "term": {field: value}
                      })
          
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
867
          # 2. 处理范围过滤(支持 RangeFilter Pydantic 模型或字典)
6aa246be   tangwang   问题:Pydantic 应该能自动...
868
          if range_filters:
43f1139f   tangwang   refactor: ES查询结构重...
869
              for field, range_filter in range_filters.items():
f0d020c3   tangwang   多语言查询改为只支持中英文两种,f...
870
871
872
873
874
875
876
877
878
879
                  # 支持 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 应该能自动...
880
                  
43f1139f   tangwang   refactor: ES查询结构重...
881
                  if range_dict:
6aa246be   tangwang   问题:Pydantic 应该能自动...
882
                      filter_clauses.append({
43f1139f   tangwang   refactor: ES查询结构重...
883
                          "range": {field: range_dict}
6aa246be   tangwang   问题:Pydantic 应该能自动...
884
885
                      })
          
be52af70   tangwang   first commit
886
887
          return filter_clauses
  
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
888
889
890
891
892
893
894
895
896
897
898
      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   分面接口修改:
899
              sort_by: Field name for sorting (支持 'price' 自动映射)
c86c8237   tangwang   支持聚合。过滤项补充了逻辑,但是有问题
900
901
902
903
904
905
906
907
908
909
910
              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   分面接口修改:
911
912
913
914
915
916
917
          # 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   支持聚合。过滤项补充了逻辑,但是有问题
918
919
920
921
922
923
924
925
926
927
928
929
930
          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 应该能自动...
931
      def build_facets(
be52af70   tangwang   first commit
932
          self,
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
933
934
          facet_configs: Optional[List['FacetConfig']] = None,
          use_reverse_nested: bool = True
be52af70   tangwang   first commit
935
936
      ) -> Dict[str, Any]:
          """
ff5325fa   tangwang   修复:直接在 Searcher 层...
937
          构建分面聚合。
6aa246be   tangwang   问题:Pydantic 应该能自动...
938
          
be52af70   tangwang   first commit
939
          Args:
13320ac6   tangwang   分面接口修改:
940
              facet_configs: 分面配置对象列表
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
941
942
              use_reverse_nested: 是否使用 reverse_nested 统计产品数量(默认 True
                                 如果为 False,将统计嵌套文档数量(性能更好但计数可能不准确)
13320ac6   tangwang   分面接口修改:
943
944
945
946
947
              
              支持的字段类型:
                  - 普通字段:  "category1_name"terms  range 类型)
                  - specifications: "specifications"(返回所有规格名称及其值)
                  - specifications.{name}:  "specifications.color"(返回指定规格名称的值)
6aa246be   tangwang   问题:Pydantic 应该能自动...
948
          
be52af70   tangwang   first commit
949
          Returns:
ff5325fa   tangwang   修复:直接在 Searcher 层...
950
              ES aggregations 字典
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
951
952
953
954
          
          性能说明:
              - use_reverse_nested=True: 统计产品数量,准确性高但性能略差(通常影响 < 20%
              - use_reverse_nested=False: 统计嵌套文档数量,性能更好但计数可能不准确
be52af70   tangwang   first commit
955
          """
6aa246be   tangwang   问题:Pydantic 应该能自动...
956
957
958
959
960
961
          if not facet_configs:
              return {}
          
          aggs = {}
          
          for config in facet_configs:
13320ac6   tangwang   分面接口修改:
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
              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...
983
984
985
986
987
                                      }
                                  }
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
988
989
990
991
992
993
994
                  }
                  continue
              
              # 处理 specifications.{name}(指定规格名称)
              if field.startswith("specifications."):
                  name = field[len("specifications."):]
                  agg_name = f"specifications_{name}_facet"
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
                  # 使用 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   分面接口修改:
1013
1014
1015
1016
1017
1018
                  aggs[agg_name] = {
                      "nested": {"path": "specifications"},
                      "aggs": {
                          "filter_by_name": {
                              "filter": {"term": {"specifications.name": name}},
                              "aggs": {
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
1019
                                  "value_counts": base_value_counts
f7d3cf70   tangwang   更新文档
1020
1021
1022
                              }
                          }
                      }
13320ac6   tangwang   分面接口修改:
1023
1024
1025
1026
1027
                  }
                  continue
              
              # 处理普通字段
              agg_name = f"{field}_facet"
bf89b597   tangwang   feat(search): ada...
1028
              
13320ac6   tangwang   分面接口修改:
1029
              if facet_type == 'terms':
6aa246be   tangwang   问题:Pydantic 应该能自动...
1030
1031
1032
                  aggs[agg_name] = {
                      "terms": {
                          "field": field,
13320ac6   tangwang   分面接口修改:
1033
                          "size": size,
6aa246be   tangwang   问题:Pydantic 应该能自动...
1034
1035
                          "order": {"_count": "desc"}
                      }
be52af70   tangwang   first commit
1036
                  }
13320ac6   tangwang   分面接口修改:
1037
1038
              elif facet_type == 'range':
                  if config.ranges:
6aa246be   tangwang   问题:Pydantic 应该能自动...
1039
                      aggs[agg_name] = {
13320ac6   tangwang   分面接口修改:
1040
                          "range": {
6aa246be   tangwang   问题:Pydantic 应该能自动...
1041
                              "field": field,
13320ac6   tangwang   分面接口修改:
1042
                              "ranges": config.ranges
6aa246be   tangwang   问题:Pydantic 应该能自动...
1043
1044
                          }
                      }
6aa246be   tangwang   问题:Pydantic 应该能自动...
1045
1046
          
          return aggs