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 = []
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
30
31
|
lang = (language or "en").lower().replace("-", "_")
lang_base = lang.split("_")[0] if lang else "en"
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
32
33
|
def pick_lang_field(src: Dict[str, Any], base: str) -> Optional[str]:
|
2739b281
tangwang
多语言索引调整
|
34
|
"""从多语言对象字段中按语言选择一个值:{base: {"zh": "...", "en": "...", ...}}"""
|
d7d48f52
tangwang
改动(mapping + 灌入结构)
|
35
|
obj = src.get(base)
|
2739b281
tangwang
多语言索引调整
|
36
37
|
if not isinstance(obj, dict):
return None
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
candidates = [
lang,
lang_base,
"en",
"zh",
]
seen = set()
for cand in candidates:
if not cand or cand in seen:
continue
seen.add(cand)
value = obj.get(cand)
if value:
return value
for value in obj.values():
if value:
return value
return None
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
56
57
58
|
for hit in es_hits:
source = hit.get('_source', {})
|
cd3799c6
tangwang
tenant2 1w测试数据 mo...
|
59
|
score = hit.get('_score')
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
60
|
|
f0577ce4
tangwang
fix last up
|
61
|
# Use original ES score directly (no normalization)
|
cd3799c6
tangwang
tenant2 1w测试数据 mo...
|
62
63
64
65
66
67
68
69
|
# 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级别索引、统一索引架构...
|
70
|
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
71
72
73
74
75
76
|
# 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 + 灌入结构)
|
77
|
category_name = pick_lang_field(source, "category_name_text") or source.get("category_name")
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
78
|
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
79
80
81
82
83
84
85
86
87
88
89
|
# 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
更新文档
|
90
|
sku_code=sku_entry.get('sku_code'),
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
91
|
stock=sku_entry.get('stock', 0),
|
ca91352a
tangwang
更新文档
|
92
93
94
95
96
|
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'),
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
97
|
image_src=sku_entry.get('image_src') or sku_entry.get('imageSrc'),
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
98
|
options=sku_entry.get('options')
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
99
|
)
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
100
|
skus.append(sku)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
101
|
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
102
|
# Apply SKU filtering if dimension list is specified
|
ca91352a
tangwang
更新文档
|
103
|
if sku_filter_dimension and skus:
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
104
105
|
skus = ResultFormatter._filter_skus_by_dimensions(
skus,
|
ca91352a
tangwang
更新文档
|
106
107
108
109
110
111
112
|
sku_filter_dimension,
source.get('option1_name'),
source.get('option2_name'),
source.get('option3_name'),
source.get('specifications', [])
)
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
113
114
|
# 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级别索引、统一索引架构...
|
115
|
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
116
117
118
|
# Build SpuResult
spu = SpuResult(
spu_id=str(source.get('spu_id', '')),
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
119
120
|
title=title,
brief=brief,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
121
|
handle=source.get('handle'),
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
122
123
124
125
126
127
128
129
130
131
|
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级别索引、统一索引架构...
|
132
133
134
135
136
137
|
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
返回给前端的字段、格式适配。主要包...
|
138
139
140
141
142
143
144
145
|
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数据结构...
|
146
|
skus=skus,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
147
148
149
|
relevance_score=relevance_score
)
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
150
|
results.append(spu)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
151
152
153
154
|
return results
@staticmethod
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
155
|
def _filter_skus_by_dimensions(
|
ca91352a
tangwang
更新文档
|
156
|
skus: List[SkuResult],
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
157
|
dimensions: List[str],
|
ca91352a
tangwang
更新文档
|
158
159
160
161
162
163
|
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...
|
164
|
Filter SKUs by one or more dimensions, keeping only one SKU per dimension value combination.
|
ca91352a
tangwang
更新文档
|
165
166
167
|
Args:
skus: List of SKU results to filter
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
168
|
dimensions: Filter dimensions, each dimension can be:
|
ca91352a
tangwang
更新文档
|
169
|
- 'option1', 'option2', 'option3': Direct option field
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
170
|
- A specification/option name (e.g., 'color', 'size'): Match by option name
|
ca91352a
tangwang
更新文档
|
171
172
173
174
175
176
177
178
|
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...
|
179
|
if not skus or not dimensions:
|
ca91352a
tangwang
更新文档
|
180
|
return skus
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
# 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
更新文档
|
217
|
for sku in skus:
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
218
219
220
221
222
223
224
225
226
227
|
# 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
更新文档
|
228
229
|
if key not in dimension_groups:
dimension_groups[key] = sku
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
230
231
|
# Return filtered SKUs (one per dimension combination)
|
ca91352a
tangwang
更新文档
|
232
233
234
|
return list(dimension_groups.values())
@staticmethod
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
235
236
|
def format_facets(
es_aggregations: Dict[str, Any],
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
237
238
|
facet_configs: Optional[List[Any]] = None,
current_filters: Optional[Dict[str, Any]] = None
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
239
240
|
) -> List[FacetResult]:
"""
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
241
|
Format ES aggregations to FacetResult list with selected state.
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
242
|
|
bf89b597
tangwang
feat(search): ada...
|
243
244
245
246
|
支持:
1. 普通terms聚合
2. range聚合
3. specifications嵌套聚合(按name分组,然后按value聚合)
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
247
|
4. 标记selected状态(基于current_filters)
|
bf89b597
tangwang
feat(search): ada...
|
248
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
249
250
251
|
Args:
es_aggregations: ES aggregations response
facet_configs: Facet configurations (optional)
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
252
|
current_filters: Current applied filters (used to mark selected values)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
253
254
|
Returns:
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
255
|
List of FacetResult objects with selected states
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
256
257
|
"""
facets = []
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
258
259
260
261
262
263
264
265
266
267
268
269
270
|
# 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级别索引、统一索引架构...
|
271
272
|
for field_name, agg_data in es_aggregations.items():
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
273
|
display_field = field_name[:-6] if field_name.endswith("_facet") else field_name
|
bf89b597
tangwang
feat(search): ada...
|
274
|
|
f7d3cf70
tangwang
更新文档
|
275
|
# 处理specifications嵌套分面(所有name)
|
bf89b597
tangwang
feat(search): ada...
|
276
277
278
279
280
281
282
283
284
285
286
|
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...
|
287
288
|
# Check if this spec value is selected
is_selected = (name, value_bucket['key']) in selected_specs
|
bf89b597
tangwang
feat(search): ada...
|
289
290
291
292
|
value = FacetValue(
value=value_bucket['key'],
label=str(value_bucket['key']),
count=value_bucket['doc_count'],
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
293
|
selected=is_selected
|
bf89b597
tangwang
feat(search): ada...
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
|
)
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
构造测试数据用于测试分类 和 三种...
|
308
309
310
|
# 处理specifications嵌套分面(指定name,如 specifications.color)
if field_name.startswith("specifications_") and field_name.endswith("_facet"):
# 提取name(从 "specifications_color_facet" 提取 "color")
|
f7d3cf70
tangwang
更新文档
|
311
|
name = field_name[len("specifications_"):-len("_facet")]
|
f7d3cf70
tangwang
更新文档
|
312
|
|
a10a89a3
tangwang
构造测试数据用于测试分类 和 三种...
|
313
314
315
|
# 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
更新文档
|
316
|
|
a10a89a3
tangwang
构造测试数据用于测试分类 和 三种...
|
317
318
319
320
321
322
|
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...
|
323
324
|
# Check if this spec value is selected
is_selected = (name, value_bucket['key']) in selected_specs
|
d8ca3b13
tangwang
修复 分面结果 各个选项结果数 和...
|
325
326
|
# 使用 reverse_nested 的 product_count 统计产品数量(而不是规格条目数量)
|
d8ca3b13
tangwang
修复 分面结果 各个选项结果数 和...
|
327
328
329
330
|
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
修复 分面结果 各个选项结果数 和...
|
331
332
|
count = value_bucket.get('doc_count', 0)
|
a10a89a3
tangwang
构造测试数据用于测试分类 和 三种...
|
333
334
335
|
value = FacetValue(
value=value_bucket['key'],
label=str(value_bucket['key']),
|
d8ca3b13
tangwang
修复 分面结果 各个选项结果数 和...
|
336
|
count=count,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
337
|
selected=is_selected
|
a10a89a3
tangwang
构造测试数据用于测试分类 和 三种...
|
338
339
340
341
342
343
344
345
346
347
348
349
|
)
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
更新文档
|
350
351
|
continue
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
352
353
354
355
|
# Handle terms aggregation
if 'buckets' in agg_data:
values = []
for bucket in agg_data['buckets']:
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
356
357
358
359
360
361
362
363
364
|
# 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级别索引、统一索引架构...
|
365
366
367
368
|
value = FacetValue(
value=bucket['key'],
label=bucket.get('key_as_string', str(bucket['key'])),
count=bucket['doc_count'],
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
369
|
selected=is_selected
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
370
371
372
373
|
)
values.append(value)
facet = FacetResult(
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
374
375
|
field=display_field,
label=display_field, # Can be enhanced with field labels
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
376
377
378
379
380
381
382
383
384
385
386
|
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...
|
387
388
389
390
391
392
393
394
395
|
# 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级别索引、统一索引架构...
|
396
397
398
399
|
value = FacetValue(
value=range_key,
label=range_key,
count=bucket['doc_count'],
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
400
|
selected=is_selected
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
401
402
403
404
|
)
values.append(value)
facet = FacetResult(
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
405
406
|
field=display_field,
label=display_field,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
407
408
409
410
411
412
413
414
415
416
|
type="range",
values=values
)
facets.append(facet)
return facets
@staticmethod
def generate_suggestions(
query: str,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
417
|
results: List[SpuResult]
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
|
) -> 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数据结构...
|
435
|
results: List[SpuResult]
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
436
437
438
439
440
441
442
443
444
445
446
447
448
|
) -> 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 []
|