Blame view

api/result_formatter.py 18 KB
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
1
2
3
4
5
  """
  Result formatter for converting ES internal format to external-friendly format.
  """
  
  from typing import List, Dict, Any, Optional
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
6
  from .models import SpuResult, SkuResult, FacetResult, FacetValue
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
7
8
9
10
11
12
13
14
  
  
  class ResultFormatter:
      """Formats ES search results to external-friendly format."""
  
      @staticmethod
      def format_search_results(
          es_hits: List[Dict[str, Any]],
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
15
          max_score: float = 1.0,
2739b281   tangwang   多语言索引调整
16
          language: str = "en",
a3a5d41b   tangwang   (sku_filter_dimen...
17
          sku_filter_dimension: Optional[List[str]] = None
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
18
      ) -> List[SpuResult]:
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
19
          """
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
20
          Convert ES hits to SpuResult list.
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
21
22
23
  
          Args:
              es_hits: List of ES hit dictionaries (with _id, _score, _source)
f0577ce4   tangwang   fix last up
24
              max_score: Maximum score (unused, kept for compatibility)
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
25
26
  
          Returns:
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
27
              List of SpuResult objects
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
28
29
          """
          results = []
2739b281   tangwang   多语言索引调整
30
          lang = (language or "en").lower()
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
31
32
33
34
          if lang not in ("zh", "en"):
              lang = "en"
  
          def pick_lang_field(src: Dict[str, Any], base: str) -> Optional[str]:
2739b281   tangwang   多语言索引调整
35
              """从多语言对象字段中按语言选择一个值:{base: {"zh": "...", "en": "...", ...}}"""
d7d48f52   tangwang   改动(mapping + 灌入结构)
36
              obj = src.get(base)
2739b281   tangwang   多语言索引调整
37
38
39
40
              if not isinstance(obj, dict):
                  return None
              zh_val = obj.get("zh")
              en_val = obj.get("en")
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
41
42
              if lang == "zh":
                  return zh_val or en_val
d7d48f52   tangwang   改动(mapping + 灌入结构)
43
              return en_val or zh_val
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
44
45
46
  
          for hit in es_hits:
              source = hit.get('_source', {})
cd3799c6   tangwang   tenant2 1w测试数据 mo...
47
              score = hit.get('_score')
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
48
              
f0577ce4   tangwang   fix last up
49
              # Use original ES score directly (no normalization)
cd3799c6   tangwang   tenant2 1w测试数据 mo...
50
51
52
53
54
55
56
57
              # Handle None score (can happen with certain query types or when score is explicitly null)
              if score is None:
                  relevance_score = 0.0
              else:
                  try:
                      relevance_score = float(score)
                  except (ValueError, TypeError):
                      relevance_score = 0.0
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
58
  
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
59
60
61
62
63
64
              # Multi-language fields
              title = pick_lang_field(source, "title")
              brief = pick_lang_field(source, "brief")
              description = pick_lang_field(source, "description")
              vendor = pick_lang_field(source, "vendor")
              category_path = pick_lang_field(source, "category_path")
d7d48f52   tangwang   改动(mapping + 灌入结构)
65
              category_name = pick_lang_field(source, "category_name_text") or source.get("category_name")
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
66
  
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
67
68
69
70
71
72
73
74
75
76
77
              # Extract SKUs
              skus = []
              skus_data = source.get('skus', [])
              if isinstance(skus_data, list):
                  for sku_entry in skus_data:
                      sku = SkuResult(
                          sku_id=str(sku_entry.get('sku_id', '')),
                          title=sku_entry.get('title'),
                          price=sku_entry.get('price'),
                          compare_at_price=sku_entry.get('compare_at_price'),
                          sku=sku_entry.get('sku'),
ca91352a   tangwang   更新文档
78
                          sku_code=sku_entry.get('sku_code'),
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
79
                          stock=sku_entry.get('stock', 0),
ca91352a   tangwang   更新文档
80
81
82
83
84
85
                          weight=sku_entry.get('weight'),
                          weight_unit=sku_entry.get('weight_unit'),
                          option1_value=sku_entry.get('option1_value'),
                          option2_value=sku_entry.get('option2_value'),
                          option3_value=sku_entry.get('option3_value'),
                          image_src=sku_entry.get('image_src'),
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
86
                          options=sku_entry.get('options')
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
87
                      )
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
88
                      skus.append(sku)
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
89
  
a3a5d41b   tangwang   (sku_filter_dimen...
90
              # Apply SKU filtering if dimension list is specified
ca91352a   tangwang   更新文档
91
              if sku_filter_dimension and skus:
a3a5d41b   tangwang   (sku_filter_dimen...
92
93
                  skus = ResultFormatter._filter_skus_by_dimensions(
                      skus,
ca91352a   tangwang   更新文档
94
95
96
97
98
99
100
                      sku_filter_dimension,
                      source.get('option1_name'),
                      source.get('option2_name'),
                      source.get('option3_name'),
                      source.get('specifications', [])
                  )
  
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
101
102
              # Determine in_stock (any sku has stock > 0)
              in_stock = any(sku.stock > 0 for sku in skus) if skus else True
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
103
  
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
104
105
106
              # Build SpuResult
              spu = SpuResult(
                  spu_id=str(source.get('spu_id', '')),
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
107
108
                  title=title,
                  brief=brief,
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
109
                  handle=source.get('handle'),
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
110
111
112
113
114
115
116
117
118
119
                  description=description,
                  vendor=vendor,
                  category=category_name,
                  category_path=category_path,
                  category_name=category_name,
                  category_id=source.get('category_id'),
                  category_level=source.get('category_level'),
                  category1_name=source.get('category1_name'),
                  category2_name=source.get('category2_name'),
                  category3_name=source.get('category3_name'),
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
120
121
122
123
124
125
                  tags=source.get('tags'),
                  price=source.get('min_price'),
                  compare_at_price=source.get('compare_at_price'),
                  currency="USD",  # Default currency
                  image_url=source.get('image_url'),
                  in_stock=in_stock,
577ec972   tangwang   返回给前端的字段、格式适配。主要包...
126
127
128
129
130
131
132
133
                  sku_prices=source.get('sku_prices'),
                  sku_weights=source.get('sku_weights'),
                  sku_weight_units=source.get('sku_weight_units'),
                  total_inventory=source.get('total_inventory'),
                  option1_name=source.get('option1_name'),
                  option2_name=source.get('option2_name'),
                  option3_name=source.get('option3_name'),
                  specifications=source.get('specifications'),
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
134
                  skus=skus,
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
135
136
137
                  relevance_score=relevance_score
              )
  
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
138
              results.append(spu)
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
139
140
141
142
  
          return results
  
      @staticmethod
a3a5d41b   tangwang   (sku_filter_dimen...
143
      def _filter_skus_by_dimensions(
ca91352a   tangwang   更新文档
144
          skus: List[SkuResult],
a3a5d41b   tangwang   (sku_filter_dimen...
145
          dimensions: List[str],
ca91352a   tangwang   更新文档
146
147
148
149
150
151
          option1_name: Optional[str] = None,
          option2_name: Optional[str] = None,
          option3_name: Optional[str] = None,
          specifications: Optional[List[Dict[str, Any]]] = None
      ) -> List[SkuResult]:
          """
a3a5d41b   tangwang   (sku_filter_dimen...
152
          Filter SKUs by one or more dimensions, keeping only one SKU per dimension value combination.
ca91352a   tangwang   更新文档
153
154
155
          
          Args:
              skus: List of SKU results to filter
a3a5d41b   tangwang   (sku_filter_dimen...
156
              dimensions: Filter dimensions, each dimension can be:
ca91352a   tangwang   更新文档
157
                  - 'option1', 'option2', 'option3': Direct option field
a3a5d41b   tangwang   (sku_filter_dimen...
158
                  - A specification/option name (e.g., 'color', 'size'): Match by option name
ca91352a   tangwang   更新文档
159
160
161
162
163
164
165
166
              option1_name: Name of option1 (e.g., 'color')
              option2_name: Name of option2 (e.g., 'size')
              option3_name: Name of option3
              specifications: List of specifications (for reference)
              
          Returns:
              Filtered list of SKUs (one per dimension value)
          """
a3a5d41b   tangwang   (sku_filter_dimen...
167
          if not skus or not dimensions:
ca91352a   tangwang   更新文档
168
              return skus
a3a5d41b   tangwang   (sku_filter_dimen...
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
  
          # Resolve each dimension to an underlying SKU field (option1_value / option2_value / option3_value)
          filter_fields: List[str] = []
  
          for dim in dimensions:
              if not dim:
                  continue
              dim_lower = dim.lower()
  
              field_name: Optional[str] = None
              # Direct option field (option1, option2, option3)
              if dim_lower == 'option1':
                  field_name = 'option1_value'
              elif dim_lower == 'option2':
                  field_name = 'option2_value'
              elif dim_lower == 'option3':
                  field_name = 'option3_value'
              else:
                  # Try to match by option name
                  if option1_name and option1_name.lower() == dim_lower:
                      field_name = 'option1_value'
                  elif option2_name and option2_name.lower() == dim_lower:
                      field_name = 'option2_value'
                  elif option3_name and option3_name.lower() == dim_lower:
                      field_name = 'option3_value'
  
              if field_name and field_name not in filter_fields:
                  filter_fields.append(field_name)
  
          # If no matching field found for all dimensions, do not return any child SKUs
          if not filter_fields:
              return []
  
          # Group SKUs by dimension value combination and select first one from each group
          dimension_groups: Dict[tuple, SkuResult] = {}
  
ca91352a   tangwang   更新文档
205
          for sku in skus:
a3a5d41b   tangwang   (sku_filter_dimen...
206
207
208
209
210
211
212
213
214
215
              # Build key as combination of all dimension values
              key_values: List[str] = []
              for field in filter_fields:
                  dimension_value = getattr(sku, field, None)
                  # Use empty string as key part for None values
                  key_values.append(str(dimension_value) if dimension_value is not None else '')
  
              key = tuple(key_values)
  
              # Keep first SKU for each dimension combination
ca91352a   tangwang   更新文档
216
217
              if key not in dimension_groups:
                  dimension_groups[key] = sku
a3a5d41b   tangwang   (sku_filter_dimen...
218
219
  
          # Return filtered SKUs (one per dimension combination)
ca91352a   tangwang   更新文档
220
221
222
          return list(dimension_groups.values())
  
      @staticmethod
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
223
224
      def format_facets(
          es_aggregations: Dict[str, Any],
c581becd   tangwang   feat: 实现 Multi-Se...
225
226
          facet_configs: Optional[List[Any]] = None,
          current_filters: Optional[Dict[str, Any]] = None
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
227
228
      ) -> List[FacetResult]:
          """
c581becd   tangwang   feat: 实现 Multi-Se...
229
          Format ES aggregations to FacetResult list with selected state.
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
230
  
bf89b597   tangwang   feat(search): ada...
231
232
233
234
          支持:
          1. 普通terms聚合
          2. range聚合
          3. specifications嵌套聚合(按name分组,然后按value聚合)
c581becd   tangwang   feat: 实现 Multi-Se...
235
          4. 标记selected状态(基于current_filters
bf89b597   tangwang   feat(search): ada...
236
  
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
237
238
239
          Args:
              es_aggregations: ES aggregations response
              facet_configs: Facet configurations (optional)
c581becd   tangwang   feat: 实现 Multi-Se...
240
              current_filters: Current applied filters (used to mark selected values)
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
241
242
  
          Returns:
c581becd   tangwang   feat: 实现 Multi-Se...
243
              List of FacetResult objects with selected states
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
244
245
          """
          facets = []
c581becd   tangwang   feat: 实现 Multi-Se...
246
247
248
249
250
251
252
253
254
255
256
257
258
          
          # Build a set of selected values for specifications
          selected_specs = set()
          if current_filters and 'specifications' in current_filters:
              specs = current_filters['specifications']
              if isinstance(specs, list):
                  # [{"name": "颜色", "value": "白色"}, ...]
                  for spec in specs:
                      if isinstance(spec, dict):
                          selected_specs.add((spec.get('name'), spec.get('value')))
              elif isinstance(specs, dict):
                  # {"name": "颜色", "value": "白色"}
                  selected_specs.add((specs.get('name'), specs.get('value')))
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
259
260
  
          for field_name, agg_data in es_aggregations.items():
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
261
              display_field = field_name[:-6] if field_name.endswith("_facet") else field_name
bf89b597   tangwang   feat(search): ada...
262
              
f7d3cf70   tangwang   更新文档
263
              # 处理specifications嵌套分面(所有name)
bf89b597   tangwang   feat(search): ada...
264
265
266
267
268
269
270
271
272
273
274
              if field_name == "specifications_facet" and 'by_name' in agg_data:
                  # specifications嵌套聚合:按name分组,每个name下有value_counts
                  by_name_agg = agg_data['by_name']
                  if 'buckets' in by_name_agg:
                      for name_bucket in by_name_agg['buckets']:
                          name = name_bucket['key']
                          value_counts = name_bucket.get('value_counts', {})
                          
                          values = []
                          if 'buckets' in value_counts:
                              for value_bucket in value_counts['buckets']:
c581becd   tangwang   feat: 实现 Multi-Se...
275
276
                                  # Check if this spec value is selected
                                  is_selected = (name, value_bucket['key']) in selected_specs
bf89b597   tangwang   feat(search): ada...
277
278
279
280
                                  value = FacetValue(
                                      value=value_bucket['key'],
                                      label=str(value_bucket['key']),
                                      count=value_bucket['doc_count'],
c581becd   tangwang   feat: 实现 Multi-Se...
281
                                      selected=is_selected
bf89b597   tangwang   feat(search): ada...
282
283
284
285
286
287
288
289
290
291
292
293
294
295
                                  )
                                  values.append(value)
                          
                          # 为每个name创建一个分面结果
                          facet = FacetResult(
                              field=f"specifications.{name}",
                              label=str(name),  # 使用name作为label,如"颜色"、"尺寸"
                              type="terms",
                              values=values,
                              total_count=name_bucket['doc_count']
                          )
                          facets.append(facet)
                  continue
              
a10a89a3   tangwang   构造测试数据用于测试分类 和 三种...
296
297
298
              # 处理specifications嵌套分面(指定name,如 specifications.color)
              if field_name.startswith("specifications_") and field_name.endswith("_facet"):
                  # 提取name(从 "specifications_color_facet" 提取 "color")
f7d3cf70   tangwang   更新文档
299
                  name = field_name[len("specifications_"):-len("_facet")]
f7d3cf70   tangwang   更新文档
300
                  
a10a89a3   tangwang   构造测试数据用于测试分类 和 三种...
301
302
303
                  # ES nested聚合返回结构: { "doc_count": N, "filter_by_name": { ... } }
                  # filter_by_name应该在agg_data的第一层
                  filter_by_name_agg = agg_data.get('filter_by_name')
f7d3cf70   tangwang   更新文档
304
                  
a10a89a3   tangwang   构造测试数据用于测试分类 和 三种...
305
306
307
308
309
310
                  if filter_by_name_agg:
                      value_counts = filter_by_name_agg.get('value_counts', {})
                      
                      values = []
                      if 'buckets' in value_counts and value_counts['buckets']:
                          for value_bucket in value_counts['buckets']:
c581becd   tangwang   feat: 实现 Multi-Se...
311
312
                              # Check if this spec value is selected
                              is_selected = (name, value_bucket['key']) in selected_specs
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
313
314
                              
                              # 使用 reverse_nested 的 product_count 统计产品数量(而不是规格条目数量)
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
315
316
317
318
                              product_count_agg = value_bucket.get('product_count', {})
                              if product_count_agg and 'doc_count' in product_count_agg:
                                  count = product_count_agg['doc_count']
                              else:
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
319
320
                                  count = value_bucket.get('doc_count', 0)
                              
a10a89a3   tangwang   构造测试数据用于测试分类 和 三种...
321
322
323
                              value = FacetValue(
                                  value=value_bucket['key'],
                                  label=str(value_bucket['key']),
d8ca3b13   tangwang   修复 分面结果 各个选项结果数 和...
324
                                  count=count,
c581becd   tangwang   feat: 实现 Multi-Se...
325
                                  selected=is_selected
a10a89a3   tangwang   构造测试数据用于测试分类 和 三种...
326
327
328
329
330
331
332
333
334
335
336
337
                              )
                              values.append(value)
                      
                      # 创建分面结果
                      facet = FacetResult(
                          field=f"specifications.{name}",
                          label=str(name),
                          type="terms",
                          values=values,
                          total_count=filter_by_name_agg.get('doc_count', 0)
                      )
                      facets.append(facet)
f7d3cf70   tangwang   更新文档
338
339
                  continue
              
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
340
341
342
343
              # Handle terms aggregation
              if 'buckets' in agg_data:
                  values = []
                  for bucket in agg_data['buckets']:
c581becd   tangwang   feat: 实现 Multi-Se...
344
345
346
347
348
349
350
351
352
                      # Check if this value is selected in current filters
                      is_selected = False
                      if current_filters and display_field in current_filters:
                          filter_value = current_filters[display_field]
                          if isinstance(filter_value, list):
                              is_selected = bucket['key'] in filter_value
                          else:
                              is_selected = bucket['key'] == filter_value
                      
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
353
354
355
356
                      value = FacetValue(
                          value=bucket['key'],
                          label=bucket.get('key_as_string', str(bucket['key'])),
                          count=bucket['doc_count'],
c581becd   tangwang   feat: 实现 Multi-Se...
357
                          selected=is_selected
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
358
359
360
361
                      )
                      values.append(value)
  
                  facet = FacetResult(
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
362
363
                      field=display_field,
                      label=display_field,  # Can be enhanced with field labels
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
364
365
366
367
368
369
370
371
372
373
374
                      type="terms",
                      values=values,
                      total_count=agg_data.get('sum_other_doc_count', 0) + len(values)
                  )
                  facets.append(facet)
  
              # Handle range aggregation
              elif 'buckets' in agg_data and any('from' in b or 'to' in b for b in agg_data['buckets']):
                  values = []
                  for bucket in agg_data['buckets']:
                      range_key = bucket.get('key', '')
c581becd   tangwang   feat: 实现 Multi-Se...
375
376
377
378
379
380
381
382
383
                      # Check if this range is selected
                      is_selected = False
                      if current_filters and display_field in current_filters:
                          filter_value = current_filters[display_field]
                          if isinstance(filter_value, list):
                              is_selected = range_key in filter_value
                          else:
                              is_selected = range_key == filter_value
                      
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
384
385
386
387
                      value = FacetValue(
                          value=range_key,
                          label=range_key,
                          count=bucket['doc_count'],
c581becd   tangwang   feat: 实现 Multi-Se...
388
                          selected=is_selected
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
389
390
391
392
                      )
                      values.append(value)
  
                  facet = FacetResult(
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
393
394
                      field=display_field,
                      label=display_field,
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
395
396
397
398
399
400
401
402
403
404
                      type="range",
                      values=values
                  )
                  facets.append(facet)
  
          return facets
  
      @staticmethod
      def generate_suggestions(
          query: str,
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
405
          results: List[SpuResult]
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
      ) -> List[str]:
          """
          Generate search suggestions.
  
          Args:
              query: Original search query
              results: Search results
  
          Returns:
              List of suggestion strings (currently returns empty list)
          """
          # TODO: Implement suggestion generation logic
          return []
  
      @staticmethod
      def generate_related_searches(
          query: str,
cadc77b6   tangwang   索引字段名、变量名、API数据结构...
423
          results: List[SpuResult]
1f6d15fa   tangwang   重构:SPU级别索引、统一索引架构...
424
425
426
427
428
429
430
431
432
433
434
435
436
      ) -> List[str]:
          """
          Generate related searches.
  
          Args:
              query: Original search query
              results: Search results
  
          Returns:
              List of related search strings (currently returns empty list)
          """
          # TODO: Implement related search generation logic
          return []