be52af70
tangwang
first commit
|
1
2
3
|
"""
Main Searcher module - executes search queries against Elasticsearch.
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
4
|
Handles query parsing, ranking, and result formatting.
|
be52af70
tangwang
first commit
|
5
6
|
"""
|
deccd68a
tangwang
Added the SKU pre...
|
7
|
from typing import Dict, Any, List, Optional, Union, Tuple
|
d1d356f8
tangwang
脚本优化
|
8
|
import os
|
99bea633
tangwang
add logs
|
9
|
import time, json
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
10
|
import logging
|
28e57bb1
tangwang
日志体系优化
|
11
|
import hashlib
|
5f7d7f09
tangwang
性能测试报告.md
|
12
|
from string import Formatter
|
be52af70
tangwang
first commit
|
13
|
|
be52af70
tangwang
first commit
|
14
15
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
|
cda1cd62
tangwang
意图分析&应用 baseline
|
16
|
from query.style_intent import StyleIntentRegistry
|
07cf5a93
tangwang
START_EMBEDDING=...
|
17
|
from embeddings.image_encoder import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
18
|
from .es_query_builder import ESQueryBuilder
|
cda1cd62
tangwang
意图分析&应用 baseline
|
19
|
from .sku_intent_selector import SkuSelectionDecision, StyleSkuSelector
|
9f96d6f3
tangwang
短query不用语义搜索
|
20
|
from config import SearchConfig
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
21
|
from config.tenant_config_loader import get_tenant_config_loader
|
ed948666
tangwang
tidy
|
22
|
from context.request_context import RequestContext, RequestContextStage
|
13320ac6
tangwang
分面接口修改:
|
23
|
from api.models import FacetResult, FacetValue, FacetConfig
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
24
|
from api.result_formatter import ResultFormatter
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
25
|
from indexer.mapping_generator import get_tenant_index_name
|
be52af70
tangwang
first commit
|
26
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
27
|
logger = logging.getLogger(__name__)
|
28e57bb1
tangwang
日志体系优化
|
28
29
30
31
32
33
34
35
36
|
backend_verbose_logger = logging.getLogger("backend.verbose")
def _log_backend_verbose(payload: Dict[str, Any]) -> None:
if not backend_verbose_logger.handlers:
return
backend_verbose_logger.info(
json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
)
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
37
|
|
be52af70
tangwang
first commit
|
38
39
|
class SearchResult:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
40
|
"""Container for search results (外部友好格式)."""
|
be52af70
tangwang
first commit
|
41
42
43
|
def __init__(
self,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
44
|
results: List[Any], # List[SpuResult]
|
be52af70
tangwang
first commit
|
45
46
47
|
total: int,
max_score: float,
took_ms: int,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
48
|
facets: Optional[List[FacetResult]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
49
|
query_info: Optional[Dict[str, Any]] = None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
50
51
|
suggestions: Optional[List[str]] = None,
related_searches: Optional[List[str]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
52
|
debug_info: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
53
|
):
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
54
|
self.results = results
|
be52af70
tangwang
first commit
|
55
56
57
|
self.total = total
self.max_score = max_score
self.took_ms = took_ms
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
58
|
self.facets = facets
|
be52af70
tangwang
first commit
|
59
|
self.query_info = query_info or {}
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
60
61
|
self.suggestions = suggestions or []
self.related_searches = related_searches or []
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
62
|
self.debug_info = debug_info
|
43f1139f
tangwang
refactor: ES查询结构重...
|
63
|
|
be52af70
tangwang
first commit
|
64
65
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
66
|
result = {
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
67
|
"results": [r.model_dump() if hasattr(r, 'model_dump') else r for r in self.results],
|
be52af70
tangwang
first commit
|
68
69
70
|
"total": self.total,
"max_score": self.max_score,
"took_ms": self.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
71
|
"facets": [f.model_dump() for f in self.facets] if self.facets else None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
72
73
74
|
"query_info": self.query_info,
"suggestions": self.suggestions,
"related_searches": self.related_searches
|
be52af70
tangwang
first commit
|
75
|
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
76
77
78
|
if self.debug_info is not None:
result["debug_info"] = self.debug_info
return result
|
be52af70
tangwang
first commit
|
79
80
81
82
83
84
85
86
|
class Searcher:
"""
Main search engine class.
Handles:
- Query parsing and translation
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
87
|
- Dynamic multi-language text recall planning
|
be52af70
tangwang
first commit
|
88
89
90
91
92
93
|
- ES query building
- Result ranking and formatting
"""
def __init__(
self,
|
be52af70
tangwang
first commit
|
94
|
es_client: ESClient,
|
9f96d6f3
tangwang
短query不用语义搜索
|
95
|
config: SearchConfig,
|
26b910bd
tangwang
refactor service ...
|
96
97
|
query_parser: Optional[QueryParser] = None,
image_encoder: Optional[CLIPImageEncoder] = None,
|
be52af70
tangwang
first commit
|
98
99
100
101
102
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
103
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
104
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
105
|
query_parser: Query parser (created if not provided)
|
26b910bd
tangwang
refactor service ...
|
106
|
image_encoder: Optional pre-initialized image encoder
|
be52af70
tangwang
first commit
|
107
|
"""
|
be52af70
tangwang
first commit
|
108
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
109
|
self.config = config
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
110
|
# Index name is now generated dynamically per tenant, no longer stored here
|
9f96d6f3
tangwang
短query不用语义搜索
|
111
|
self.query_parser = query_parser or QueryParser(config)
|
9f96d6f3
tangwang
短query不用语义搜索
|
112
|
self.text_embedding_field = config.query_config.text_embedding_field or "title_embedding"
|
26b910bd
tangwang
refactor service ...
|
113
114
115
116
117
118
|
self.image_embedding_field = config.query_config.image_embedding_field
if self.image_embedding_field and image_encoder is None:
self.image_encoder = CLIPImageEncoder()
else:
self.image_encoder = image_encoder
self.source_fields = config.query_config.source_fields
|
cda1cd62
tangwang
意图分析&应用 baseline
|
119
120
121
122
123
124
|
self.style_intent_registry = StyleIntentRegistry.from_query_config(self.config.query_config)
self.style_sku_selector = StyleSkuSelector(
self.style_intent_registry,
text_encoder_getter=lambda: getattr(self.query_parser, "text_encoder", None),
tokenizer_getter=lambda: getattr(self.query_parser, "_tokenizer", None),
)
|
be52af70
tangwang
first commit
|
125
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
126
|
# Query builder - simplified single-layer architecture
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
127
|
self.query_builder = ESQueryBuilder(
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
128
129
130
131
132
|
match_fields=[],
field_boosts=self.config.field_boosts,
multilingual_fields=self.config.query_config.multilingual_fields,
shared_fields=self.config.query_config.shared_fields,
core_multilingual_fields=self.config.query_config.core_multilingual_fields,
|
be52af70
tangwang
first commit
|
133
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
134
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
135
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
136
|
function_score_config=self.config.function_score,
|
70dab99f
tangwang
add logs
|
137
|
default_language=self.config.query_config.default_language,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
138
139
140
141
|
knn_boost=self.config.query_config.knn_boost,
base_minimum_should_match=self.config.query_config.base_minimum_should_match,
translation_minimum_should_match=self.config.query_config.translation_minimum_should_match,
translation_boost=self.config.query_config.translation_boost,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
142
|
tie_breaker_base_query=self.config.query_config.tie_breaker_base_query,
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
143
144
145
146
|
best_fields_boosts=self.config.query_config.best_fields,
best_fields_clause_boost=self.config.query_config.best_fields_boost,
phrase_field_boosts=self.config.query_config.phrase_fields,
phrase_match_boost=self.config.query_config.phrase_match_boost,
|
be52af70
tangwang
first commit
|
147
148
|
)
|
26b910bd
tangwang
refactor service ...
|
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
def _apply_source_filter(self, es_query: Dict[str, Any]) -> None:
"""
Apply tri-state _source semantics:
- None: do not set _source (return full source)
- []: _source=false (return no source fields)
- [..]: _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}
|
cda1cd62
tangwang
意图分析&应用 baseline
|
165
166
167
168
169
|
def _resolve_rerank_source_filter(
self,
doc_template: str,
parsed_query: Optional[ParsedQuery] = None,
) -> Dict[str, Any]:
|
5f7d7f09
tangwang
性能测试报告.md
|
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
|
"""
Build a lightweight _source filter for rerank prefetch.
Only fetch fields required by rerank doc template to reduce ES payload.
"""
field_map = {
"title": "title",
"brief": "brief",
"vendor": "vendor",
"description": "description",
"category_path": "category_path",
}
includes: set[str] = set()
template = str(doc_template or "{title}")
for _, field_name, _, _ in Formatter().parse(template):
if not field_name:
continue
key = field_name.split(".", 1)[0].split("!", 1)[0].split(":", 1)[0]
mapped = field_map.get(key)
if mapped:
includes.add(mapped)
# Fallback to title-only to keep rerank docs usable.
if not includes:
includes.add("title")
|
cda1cd62
tangwang
意图分析&应用 baseline
|
196
197
198
199
200
201
202
203
204
205
|
if self._has_style_intent(parsed_query):
includes.update(
{
"skus",
"option1_name",
"option2_name",
"option3_name",
}
)
|
5f7d7f09
tangwang
性能测试报告.md
|
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
|
return {"includes": sorted(includes)}
def _fetch_hits_by_ids(
self,
index_name: str,
doc_ids: List[str],
source_spec: Optional[Any],
) -> tuple[Dict[str, Dict[str, Any]], int]:
"""
Fetch page documents by IDs for final response fill.
Returns:
(hits_by_id, es_took_ms)
"""
if not doc_ids:
return {}, 0
body: Dict[str, Any] = {
"query": {
"ids": {
"values": doc_ids,
}
}
}
if source_spec is not None:
body["_source"] = source_spec
resp = self.es_client.search(
index_name=index_name,
body=body,
size=len(doc_ids),
from_=0,
)
hits = resp.get("hits", {}).get("hits") or []
hits_by_id: Dict[str, Dict[str, Any]] = {}
for hit in hits:
hid = hit.get("_id")
if hid is None:
continue
hits_by_id[str(hid)] = hit
return hits_by_id, int(resp.get("took", 0) or 0)
|
deccd68a
tangwang
Added the SKU pre...
|
248
|
@staticmethod
|
cda1cd62
tangwang
意图分析&应用 baseline
|
249
250
251
|
def _has_style_intent(parsed_query: Optional[ParsedQuery]) -> bool:
profile = getattr(parsed_query, "style_intent_profile", None)
return bool(getattr(profile, "is_active", False))
|
deccd68a
tangwang
Added the SKU pre...
|
252
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
253
|
def _apply_style_intent_to_hits(
|
deccd68a
tangwang
Added the SKU pre...
|
254
255
256
257
|
self,
es_hits: List[Dict[str, Any]],
parsed_query: ParsedQuery,
context: Optional[RequestContext] = None,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
258
|
) -> Dict[str, SkuSelectionDecision]:
|
8ae95af0
tangwang
1. Stage Timings:...
|
259
260
261
262
263
264
265
266
267
268
269
270
271
|
if context is not None:
context.start_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
try:
decisions = self.style_sku_selector.prepare_hits(es_hits, parsed_query)
if decisions and context is not None:
context.store_intermediate_result(
"style_intent_sku_decisions",
{doc_id: decision.to_dict() for doc_id, decision in decisions.items()},
)
return decisions
finally:
if context is not None:
context.end_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
|
deccd68a
tangwang
Added the SKU pre...
|
272
|
|
be52af70
tangwang
first commit
|
273
274
275
|
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
276
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
277
278
279
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
280
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
281
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
282
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
283
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
284
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
285
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
286
|
debug: bool = False,
|
2739b281
tangwang
多语言索引调整
|
287
|
language: str = "en",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
288
|
sku_filter_dimension: Optional[List[str]] = None,
|
5f7d7f09
tangwang
性能测试报告.md
|
289
|
enable_rerank: Optional[bool] = None,
|
ff32d894
tangwang
rerank
|
290
291
|
rerank_query_template: Optional[str] = None,
rerank_doc_template: Optional[str] = None,
|
be52af70
tangwang
first commit
|
292
293
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
294
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
295
296
297
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
298
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
299
300
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
301
302
303
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
304
|
min_score: Minimum score threshold
|
ef5baa86
tangwang
混杂语言处理
|
305
|
context: Request context for tracking (required)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
306
307
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
308
|
debug: Enable debug information output
|
ef5baa86
tangwang
混杂语言处理
|
309
310
311
312
313
314
315
316
317
|
language: Response / field selection language hint (e.g. zh, en)
sku_filter_dimension: SKU grouping dimensions for per-SPU variant pick
enable_rerank: If None, use ``config.rerank.enabled``; if set, overrides
whether the rerank provider is invoked (subject to rerank window).
rerank_query_template: Override for rerank query text template; None uses
``config.rerank.rerank_query_template`` (e.g. ``"{query}"``).
rerank_doc_template: Override for per-hit document text passed to rerank;
None uses ``config.rerank.rerank_doc_template``. Placeholders are
resolved in ``search/rerank_client.py``.
|
be52af70
tangwang
first commit
|
318
319
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
320
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
321
|
"""
|
16c42787
tangwang
feat: implement r...
|
322
|
if context is None:
|
ed948666
tangwang
tidy
|
323
|
raise ValueError("context is required")
|
16c42787
tangwang
feat: implement r...
|
324
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
325
326
327
|
# 根据租户配置决定翻译开关(离线/在线统一)
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id)
|
038e4e2f
tangwang
refactor(i18n): t...
|
328
329
|
index_langs = tenant_cfg.get("index_languages") or []
enable_translation = len(index_langs) > 0
|
9f96d6f3
tangwang
短query不用语义搜索
|
330
|
enable_embedding = self.config.query_config.enable_text_embedding
|
5f7d7f09
tangwang
性能测试报告.md
|
331
332
333
334
335
336
|
rc = self.config.rerank
effective_query_template = rerank_query_template or rc.rerank_query_template
effective_doc_template = rerank_doc_template or rc.rerank_doc_template
# 重排开关优先级:请求参数显式传值 > 服务端配置(默认开启)
rerank_enabled_by_config = bool(rc.enabled)
do_rerank = rerank_enabled_by_config if enable_rerank is None else bool(enable_rerank)
|
c51d254f
tangwang
性能测试
|
337
|
rerank_window = rc.rerank_window
|
506c39b7
tangwang
feat(search): 统一重...
|
338
|
# 若开启重排且请求范围在窗口内:从 ES 取前 rerank_window 条、重排后再按 from/size 分页;否则不重排,按原 from/size 查 ES
|
ff32d894
tangwang
rerank
|
339
|
in_rerank_window = do_rerank and (from_ + size) <= rerank_window
|
506c39b7
tangwang
feat(search): 统一重...
|
340
341
|
es_fetch_from = 0 if in_rerank_window else from_
es_fetch_size = rerank_window if in_rerank_window else size
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
|
initial_es_positions: Dict[str, int] = {}
initial_es_min_score: Optional[float] = None
initial_es_max_score: Optional[float] = None
page_fill_debug: Optional[Dict[str, Any]] = None
rerank_debug_info: Optional[Dict[str, Any]] = None
if debug:
rerank_debug_info = {
"requested": do_rerank,
"executed": False,
"in_rerank_window": in_rerank_window,
"rerank_window": rerank_window,
"top_n": from_ + size,
"query_template": effective_query_template,
"doc_template": effective_doc_template,
}
|
16c42787
tangwang
feat: implement r...
|
357
358
359
360
361
362
|
# Start timing
context.start_stage(RequestContextStage.TOTAL)
context.logger.info(
f"开始搜索请求 | 查询: '{query}' | 参数: size={size}, from_={from_}, "
|
5f7d7f09
tangwang
性能测试报告.md
|
363
364
365
|
f"enable_rerank(request)={enable_rerank}, enable_rerank(config)={rerank_enabled_by_config}, "
f"enable_rerank(effective)={do_rerank}, in_rerank_window={in_rerank_window}, "
f"es_fetch=({es_fetch_from},{es_fetch_size}) | "
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
366
|
f"index_languages={index_langs} | "
|
506c39b7
tangwang
feat(search): 统一重...
|
367
|
f"enable_translation={enable_translation}, enable_embedding={enable_embedding}, min_score={min_score}",
|
16c42787
tangwang
feat: implement r...
|
368
369
370
371
372
373
374
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
# Store search parameters in context
context.metadata['search_params'] = {
'size': size,
'from_': from_,
|
506c39b7
tangwang
feat(search): 统一重...
|
375
376
377
|
'es_fetch_from': es_fetch_from,
'es_fetch_size': es_fetch_size,
'in_rerank_window': in_rerank_window,
|
5f7d7f09
tangwang
性能测试报告.md
|
378
379
380
381
|
'rerank_enabled_by_config': rerank_enabled_by_config,
'enable_rerank_request': enable_rerank,
'rerank_query_template': effective_query_template,
'rerank_doc_template': effective_doc_template,
|
16c42787
tangwang
feat: implement r...
|
382
|
'filters': filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
383
384
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
385
386
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
|
ff32d894
tangwang
rerank
|
387
|
'enable_rerank': do_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
388
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
389
390
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
391
|
}
|
be52af70
tangwang
first commit
|
392
|
|
16c42787
tangwang
feat: implement r...
|
393
394
395
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
396
397
|
'rerank_enabled': do_rerank,
'style_intent_enabled': bool(self.style_intent_registry.enabled),
|
16c42787
tangwang
feat: implement r...
|
398
|
}
|
be52af70
tangwang
first commit
|
399
400
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
401
402
403
404
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
405
|
tenant_id=tenant_id,
|
16c42787
tangwang
feat: implement r...
|
406
|
generate_vector=enable_embedding,
|
ef5baa86
tangwang
混杂语言处理
|
407
408
|
context=context,
target_languages=index_langs if enable_translation else [],
|
16c42787
tangwang
feat: implement r...
|
409
410
411
412
|
)
# Store query analysis results in context
context.store_query_analysis(
original_query=parsed_query.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
413
|
query_normalized=parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
414
415
416
417
|
rewritten_query=parsed_query.rewritten_query,
detected_language=parsed_query.detected_language,
translations=parsed_query.translations,
query_vector=parsed_query.query_vector.tolist() if parsed_query.query_vector is not None else None,
|
ef5baa86
tangwang
混杂语言处理
|
418
|
domain="default",
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
419
|
is_simple_query=True
|
16c42787
tangwang
feat: implement r...
|
420
|
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
421
|
context.metadata["feature_flags"]["style_intent_active"] = self._has_style_intent(parsed_query)
|
be52af70
tangwang
first commit
|
422
|
|
16c42787
tangwang
feat: implement r...
|
423
424
425
426
|
context.logger.info(
f"查询解析完成 | 原查询: '{parsed_query.original_query}' | "
f"重写后: '{parsed_query.rewritten_query}' | "
f"语言: {parsed_query.detected_language} | "
|
16c42787
tangwang
feat: implement r...
|
427
428
429
430
431
432
433
434
435
436
437
438
439
|
f"向量: {'是' if parsed_query.query_vector is not None else '否'}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.set_error(e)
context.logger.error(
f"查询解析失败 | 错误: {str(e)}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
raise
finally:
context.end_stage(RequestContextStage.QUERY_PARSING)
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
440
|
# Step 2: Query building
|
16c42787
tangwang
feat: implement r...
|
441
442
|
context.start_stage(RequestContextStage.QUERY_BUILDING)
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
443
444
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
|
2739b281
tangwang
多语言索引调整
|
445
|
# index_name = "search_products"
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
446
447
|
# No longer need to add tenant_id to filters since each tenant has its own index
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
448
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
449
|
es_query = self.query_builder.build_query(
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
450
|
query_text=parsed_query.rewritten_query or parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
451
|
query_vector=parsed_query.query_vector if enable_embedding else None,
|
16c42787
tangwang
feat: implement r...
|
452
|
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
453
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
454
|
facet_configs=facets,
|
506c39b7
tangwang
feat(search): 统一重...
|
455
456
|
size=es_fetch_size,
from_=es_fetch_from,
|
16c42787
tangwang
feat: implement r...
|
457
|
enable_knn=enable_embedding and parsed_query.query_vector is not None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
458
|
min_score=min_score,
|
ef5baa86
tangwang
混杂语言处理
|
459
|
parsed_query=parsed_query,
|
16c42787
tangwang
feat: implement r...
|
460
|
)
|
be52af70
tangwang
first commit
|
461
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
462
463
464
465
466
467
468
|
# Add facets for faceted search
if facets:
facet_aggs = self.query_builder.build_facets(facets)
if facet_aggs:
if "aggs" not in es_query:
es_query["aggs"] = {}
es_query["aggs"].update(facet_aggs)
|
16c42787
tangwang
feat: implement r...
|
469
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
470
471
472
|
# Add sorting if specified
if sort_by:
es_query = self.query_builder.add_sorting(es_query, sort_by, sort_order)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
473
|
es_query["track_scores"] = True
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
474
|
|
5f7d7f09
tangwang
性能测试报告.md
|
475
476
477
478
479
480
481
|
# Keep requested response _source semantics for the final response fill.
response_source_spec = es_query.get("_source")
# In rerank window, first pass only fetches minimal fields required by rerank template.
es_query_for_fetch = es_query
rerank_prefetch_source = None
if in_rerank_window:
|
cda1cd62
tangwang
意图分析&应用 baseline
|
482
483
484
485
|
rerank_prefetch_source = self._resolve_rerank_source_filter(
effective_doc_template,
parsed_query=parsed_query,
)
|
5f7d7f09
tangwang
性能测试报告.md
|
486
487
488
|
es_query_for_fetch = dict(es_query)
es_query_for_fetch["_source"] = rerank_prefetch_source
|
16c42787
tangwang
feat: implement r...
|
489
|
# Extract size and from from body for ES client parameters
|
5f7d7f09
tangwang
性能测试报告.md
|
490
|
body_for_es = {k: v for k, v in es_query_for_fetch.items() if k not in ['size', 'from']}
|
16c42787
tangwang
feat: implement r...
|
491
492
493
|
# Store ES query in context
context.store_intermediate_result('es_query', es_query)
|
5f7d7f09
tangwang
性能测试报告.md
|
494
495
|
if in_rerank_window and rerank_prefetch_source is not None:
context.store_intermediate_result('es_query_rerank_prefetch_source', rerank_prefetch_source)
|
16c42787
tangwang
feat: implement r...
|
496
497
|
context.store_intermediate_result('es_body_for_search', body_for_es)
|
28e57bb1
tangwang
日志体系优化
|
498
|
# Serialize ES query to compute a compact size + stable digest for correlation
|
5f7d7f09
tangwang
性能测试报告.md
|
499
|
es_query_compact = json.dumps(es_query_for_fetch, ensure_ascii=False, separators=(",", ":"))
|
28e57bb1
tangwang
日志体系优化
|
500
501
502
|
es_query_digest = hashlib.sha256(es_query_compact.encode("utf-8")).hexdigest()[:16]
knn_enabled = bool(enable_embedding and parsed_query.query_vector is not None)
vector_dims = int(len(parsed_query.query_vector)) if parsed_query.query_vector is not None else 0
|
99bea633
tangwang
add logs
|
503
|
|
16c42787
tangwang
feat: implement r...
|
504
|
context.logger.info(
|
5f7d7f09
tangwang
性能测试报告.md
|
505
|
"ES query built | size: %s chars | digest: %s | KNN: %s | vector_dims: %s | facets: %s | rerank_prefetch_source: %s",
|
28e57bb1
tangwang
日志体系优化
|
506
507
508
509
510
|
len(es_query_compact),
es_query_digest,
"yes" if knn_enabled else "no",
vector_dims,
"yes" if facets else "no",
|
5f7d7f09
tangwang
性能测试报告.md
|
511
|
rerank_prefetch_source,
|
16c42787
tangwang
feat: implement r...
|
512
513
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
28e57bb1
tangwang
日志体系优化
|
514
515
516
517
518
519
520
521
522
523
|
_log_backend_verbose({
"event": "es_query_built",
"reqid": context.reqid,
"uid": context.uid,
"tenant_id": tenant_id,
"size_chars": len(es_query_compact),
"sha256_16": es_query_digest,
"knn_enabled": knn_enabled,
"vector_dims": vector_dims,
"has_facets": bool(facets),
|
5f7d7f09
tangwang
性能测试报告.md
|
524
|
"query": es_query_for_fetch,
|
28e57bb1
tangwang
日志体系优化
|
525
|
})
|
16c42787
tangwang
feat: implement r...
|
526
527
528
529
530
531
532
533
534
535
|
except Exception as e:
context.set_error(e)
context.logger.error(
f"ES查询构建失败 | 错误: {str(e)}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
raise
finally:
context.end_stage(RequestContextStage.QUERY_BUILDING)
|
a99e62ba
tangwang
记录各阶段耗时
|
536
537
|
# Step 4: Elasticsearch search (primary recall)
context.start_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
538
|
try:
|
506c39b7
tangwang
feat(search): 统一重...
|
539
|
# Use tenant-specific index name(开启重排且在窗口内时已用 es_fetch_size/es_fetch_from)
|
16c42787
tangwang
feat: implement r...
|
540
|
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
541
|
index_name=index_name,
|
16c42787
tangwang
feat: implement r...
|
542
|
body=body_for_es,
|
506c39b7
tangwang
feat(search): 统一重...
|
543
|
size=es_fetch_size,
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
544
545
|
from_=es_fetch_from,
include_named_queries_score=bool(do_rerank and in_rerank_window),
|
be52af70
tangwang
first commit
|
546
547
|
)
|
16c42787
tangwang
feat: implement r...
|
548
549
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
|
if debug:
initial_hits = es_response.get('hits', {}).get('hits') or []
initial_scores: List[float] = []
for rank, hit in enumerate(initial_hits, 1):
doc_id = hit.get("_id")
if doc_id is not None:
initial_es_positions[str(doc_id)] = rank
raw_score = hit.get("_score")
try:
if raw_score is not None:
initial_scores.append(float(raw_score))
except (TypeError, ValueError):
pass
raw_max_score = es_response.get('hits', {}).get('max_score')
try:
initial_es_max_score = float(raw_max_score) if raw_max_score is not None else None
except (TypeError, ValueError):
initial_es_max_score = None
if initial_es_max_score is None and initial_scores:
initial_es_max_score = max(initial_scores)
initial_es_min_score = min(initial_scores) if initial_scores else None
|
be52af70
tangwang
first commit
|
571
|
|
16c42787
tangwang
feat: implement r...
|
572
573
574
575
576
|
# Extract timing from ES response
es_took = es_response.get('took', 0)
context.logger.info(
f"ES搜索完成 | 耗时: {es_took}ms | "
f"命中数: {es_response.get('hits', {}).get('total', {}).get('value', 0)} | "
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
577
578
579
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f} | "
f"detected_language={parsed_query.detected_language} | "
f"translations={list((parsed_query.translations or {}).keys())}",
|
16c42787
tangwang
feat: implement r...
|
580
581
582
583
584
585
586
587
588
589
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.set_error(e)
context.logger.error(
f"ES搜索执行失败 | 错误: {str(e)}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
raise
finally:
|
a99e62ba
tangwang
记录各阶段耗时
|
590
|
context.end_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
591
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
592
593
594
595
596
597
598
599
600
601
602
603
604
605
|
style_intent_decisions: Dict[str, SkuSelectionDecision] = {}
if self._has_style_intent(parsed_query) and in_rerank_window:
style_intent_decisions = self._apply_style_intent_to_hits(
es_response.get("hits", {}).get("hits") or [],
parsed_query,
context=context,
)
if style_intent_decisions:
context.logger.info(
"款式意图 SKU 预筛选完成 | hits=%s",
len(style_intent_decisions),
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
506c39b7
tangwang
feat(search): 统一重...
|
606
|
# Optional Step 4.5: AI reranking(仅当请求范围在重排窗口内时执行)
|
ff32d894
tangwang
rerank
|
607
|
if do_rerank and in_rerank_window:
|
506c39b7
tangwang
feat(search): 统一重...
|
608
609
610
611
612
|
context.start_stage(RequestContextStage.RERANKING)
try:
from .rerank_client import run_rerank
rerank_query = parsed_query.original_query if parsed_query else query
|
506c39b7
tangwang
feat(search): 统一重...
|
613
614
615
616
|
es_response, rerank_meta, fused_debug = run_rerank(
query=rerank_query,
es_response=es_response,
language=language,
|
506c39b7
tangwang
feat(search): 统一重...
|
617
618
619
|
timeout_sec=rc.timeout_sec,
weight_es=rc.weight_es,
weight_ai=rc.weight_ai,
|
ff32d894
tangwang
rerank
|
620
621
|
rerank_query_template=effective_query_template,
rerank_doc_template=effective_doc_template,
|
d31c7f65
tangwang
补充云服务reranker
|
622
|
top_n=(from_ + size),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
623
|
debug=debug,
|
506c39b7
tangwang
feat(search): 统一重...
|
624
625
626
|
)
if rerank_meta is not None:
|
42e3aea6
tangwang
tidy
|
627
628
|
from config.services_config import get_rerank_service_url
rerank_url = get_rerank_service_url()
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
629
630
631
632
633
634
635
636
637
|
if debug and rerank_debug_info is not None:
rerank_debug_info.update({
"executed": True,
"service_url": rerank_url,
"query_text": str(effective_query_template).format_map({"query": rerank_query}),
"docs": len(es_response.get("hits", {}).get("hits") or []),
"meta": rerank_meta,
})
context.store_intermediate_result("rerank_scores", fused_debug)
|
506c39b7
tangwang
feat(search): 统一重...
|
638
|
context.logger.info(
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
639
640
641
|
f"重排完成 | docs={len(es_response.get('hits', {}).get('hits') or [])} | "
f"top_n={from_ + size} | query_template={effective_query_template} | "
f"doc_template={effective_doc_template} | meta={rerank_meta}",
|
506c39b7
tangwang
feat(search): 统一重...
|
642
643
644
645
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.add_warning(f"Rerank failed: {e}")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
646
647
|
if debug and rerank_debug_info is not None:
rerank_debug_info["error"] = str(e)
|
506c39b7
tangwang
feat(search): 统一重...
|
648
649
650
651
652
653
654
655
656
657
658
659
660
661
|
context.logger.warning(
f"调用重排服务失败 | error: {e}",
extra={'reqid': context.reqid, 'uid': context.uid},
exc_info=True,
)
finally:
context.end_stage(RequestContextStage.RERANKING)
# 当本次请求在重排窗口内时:已从 ES 取了 rerank_window 条并可能已重排,需按请求的 from/size 做分页切片
if in_rerank_window:
hits = es_response.get("hits", {}).get("hits") or []
sliced = hits[from_ : from_ + size]
es_response.setdefault("hits", {})["hits"] = sliced
if sliced:
|
af827ce9
tangwang
rerank
|
662
663
664
665
666
|
# 对于启用重排的结果,优先使用 _fused_score 计算 max_score;否则退回原始 _score
slice_max = max(
(h.get("_fused_score", h.get("_score", 0.0)) for h in sliced),
default=0.0,
)
|
506c39b7
tangwang
feat(search): 统一重...
|
667
668
669
670
671
672
|
try:
es_response["hits"]["max_score"] = float(slice_max)
except (TypeError, ValueError):
es_response["hits"]["max_score"] = 0.0
else:
es_response["hits"]["max_score"] = 0.0
|
5f7d7f09
tangwang
性能测试报告.md
|
673
674
675
676
677
678
679
680
681
682
683
|
# Page fill: fetch detailed fields only for final page hits.
if sliced:
if response_source_spec is False:
for hit in sliced:
hit.pop("_source", None)
context.logger.info(
"分页详情回填跳过 | 原查询 _source=false",
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
|
a99e62ba
tangwang
记录各阶段耗时
|
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
|
context.start_stage(RequestContextStage.ELASTICSEARCH_PAGE_FILL)
try:
page_ids = [str(h.get("_id")) for h in sliced if h.get("_id") is not None]
details_by_id, fill_took = self._fetch_hits_by_ids(
index_name=index_name,
doc_ids=page_ids,
source_spec=response_source_spec,
)
filled = 0
for hit in sliced:
hid = hit.get("_id")
if hid is None:
continue
detail_hit = details_by_id.get(str(hid))
if detail_hit is None:
continue
if "_source" in detail_hit:
hit["_source"] = detail_hit.get("_source") or {}
filled += 1
|
cda1cd62
tangwang
意图分析&应用 baseline
|
703
704
705
706
707
|
if style_intent_decisions:
self.style_sku_selector.apply_precomputed_decisions(
sliced,
style_intent_decisions,
)
|
a99e62ba
tangwang
记录各阶段耗时
|
708
709
|
if fill_took:
es_response["took"] = int((es_response.get("took", 0) or 0) + fill_took)
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
710
711
712
713
714
715
716
|
if debug:
page_fill_debug = {
"requested_ids": page_ids,
"filled": filled,
"fill_took_ms": fill_took,
"response_source_spec": response_source_spec,
}
|
a99e62ba
tangwang
记录各阶段耗时
|
717
718
719
720
721
722
|
context.logger.info(
f"分页详情回填 | ids={len(page_ids)} | filled={filled} | took={fill_took}ms",
extra={'reqid': context.reqid, 'uid': context.uid}
)
finally:
context.end_stage(RequestContextStage.ELASTICSEARCH_PAGE_FILL)
|
5f7d7f09
tangwang
性能测试报告.md
|
723
|
|
506c39b7
tangwang
feat(search): 统一重...
|
724
725
726
727
728
|
context.logger.info(
f"重排分页切片 | from={from_}, size={size}, 返回={len(sliced)}条",
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
8ae95af0
tangwang
1. Stage Timings:...
|
729
730
731
732
733
734
735
736
737
|
# 非重排窗口:款式意图在 result_processing 之前执行,便于单独计时且与 ES 召回阶段衔接
if self._has_style_intent(parsed_query) and not in_rerank_window:
es_hits_pre = es_response.get("hits", {}).get("hits") or []
style_intent_decisions = self._apply_style_intent_to_hits(
es_hits_pre,
parsed_query,
context=context,
)
|
16c42787
tangwang
feat: implement r...
|
738
739
740
|
# Step 5: Result processing
context.start_stage(RequestContextStage.RESULT_PROCESSING)
try:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
741
742
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
743
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
744
|
es_hits = es_response['hits']['hits']
|
16c42787
tangwang
feat: implement r...
|
745
746
747
748
749
750
|
# Extract total and max_score
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
506c39b7
tangwang
feat(search): 统一重...
|
751
|
# max_score 会在启用 AI 搜索时被更新为融合分数的最大值
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
752
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
753
|
|
af827ce9
tangwang
rerank
|
754
755
756
757
758
759
760
761
762
763
764
765
|
# 从上下文中取出重排调试信息(若有)
rerank_debug_raw = context.get_intermediate_result('rerank_scores', None)
rerank_debug_by_doc: Dict[str, Dict[str, Any]] = {}
if isinstance(rerank_debug_raw, list):
for item in rerank_debug_raw:
if not isinstance(item, dict):
continue
doc_id = item.get("doc_id")
if doc_id is None:
continue
rerank_debug_by_doc[str(doc_id)] = item
|
cda1cd62
tangwang
意图分析&应用 baseline
|
766
767
768
769
770
771
|
if self._has_style_intent(parsed_query):
if in_rerank_window and style_intent_decisions:
self.style_sku_selector.apply_precomputed_decisions(
es_hits,
style_intent_decisions,
)
|
deccd68a
tangwang
Added the SKU pre...
|
772
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
773
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
774
775
776
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
777
778
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
779
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
780
|
|
985752f5
tangwang
1. 前端调试功能
|
781
782
783
|
# Build per-result debug info (per SPU) when debug mode is enabled
per_result_debug = []
if debug and es_hits and formatted_results:
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
784
785
786
787
788
|
final_positions_by_doc = {
str(hit.get("_id")): (from_ + rank)
for rank, hit in enumerate(es_hits, 1)
if hit.get("_id") is not None
}
|
985752f5
tangwang
1. 前端调试功能
|
789
790
|
for hit, spu in zip(es_hits, formatted_results):
source = hit.get("_source", {}) or {}
|
af827ce9
tangwang
rerank
|
791
792
793
794
|
doc_id = hit.get("_id")
rerank_debug = None
if doc_id is not None:
rerank_debug = rerank_debug_by_doc.get(str(doc_id))
|
cda1cd62
tangwang
意图分析&应用 baseline
|
795
796
797
798
799
|
style_intent_debug = None
if doc_id is not None and style_intent_decisions:
decision = style_intent_decisions.get(str(doc_id))
if decision is not None:
style_intent_debug = decision.to_dict()
|
af827ce9
tangwang
rerank
|
800
|
|
985752f5
tangwang
1. 前端调试功能
|
801
802
803
804
805
806
|
raw_score = hit.get("_score")
try:
es_score = float(raw_score) if raw_score is not None else 0.0
except (TypeError, ValueError):
es_score = 0.0
try:
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
807
808
809
810
811
|
normalized = (
float(es_score) / float(initial_es_max_score)
if initial_es_max_score
else None
)
|
985752f5
tangwang
1. 前端调试功能
|
812
813
|
except (TypeError, ValueError, ZeroDivisionError):
normalized = None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
|
try:
es_score_norm = (
(float(es_score) - float(initial_es_min_score))
/ (float(initial_es_max_score) - float(initial_es_min_score))
if initial_es_min_score is not None
and initial_es_max_score is not None
and float(initial_es_max_score) > float(initial_es_min_score)
else (
1.0
if initial_es_min_score is not None
and initial_es_max_score is not None
else None
)
)
except (TypeError, ValueError, ZeroDivisionError):
es_score_norm = None
|
985752f5
tangwang
1. 前端调试功能
|
830
831
832
833
834
|
title_multilingual = source.get("title") if isinstance(source.get("title"), dict) else None
brief_multilingual = source.get("brief") if isinstance(source.get("brief"), dict) else None
vendor_multilingual = source.get("vendor") if isinstance(source.get("vendor"), dict) else None
|
af827ce9
tangwang
rerank
|
835
836
837
838
|
debug_entry: Dict[str, Any] = {
"spu_id": spu.spu_id,
"es_score": es_score,
"es_score_normalized": normalized,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
839
840
841
842
843
|
"es_score_norm": es_score_norm,
"es_score_min": initial_es_min_score,
"es_score_max": initial_es_max_score,
"initial_rank": initial_es_positions.get(str(doc_id)) if doc_id is not None else None,
"final_rank": final_positions_by_doc.get(str(doc_id)) if doc_id is not None else None,
|
af827ce9
tangwang
rerank
|
844
845
846
847
848
849
850
851
852
|
"title_multilingual": title_multilingual,
"brief_multilingual": brief_multilingual,
"vendor_multilingual": vendor_multilingual,
}
# 若存在重排调试信息,则补充 doc 级别的融合分数信息
if rerank_debug:
debug_entry["doc_id"] = rerank_debug.get("doc_id")
# 与 rerank_client 中字段保持一致,便于前端直接使用
|
af827ce9
tangwang
rerank
|
853
|
debug_entry["rerank_score"] = rerank_debug.get("rerank_score")
|
a8261ece
tangwang
检索效果优化
|
854
|
debug_entry["text_score"] = rerank_debug.get("text_score")
|
c90f80ed
tangwang
相关性优化
|
855
856
|
debug_entry["text_source_score"] = rerank_debug.get("text_source_score")
debug_entry["text_translation_score"] = rerank_debug.get("text_translation_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
857
858
|
debug_entry["text_weighted_source_score"] = rerank_debug.get("text_weighted_source_score")
debug_entry["text_weighted_translation_score"] = rerank_debug.get("text_weighted_translation_score")
|
c90f80ed
tangwang
相关性优化
|
859
860
|
debug_entry["text_primary_score"] = rerank_debug.get("text_primary_score")
debug_entry["text_support_score"] = rerank_debug.get("text_support_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
861
|
debug_entry["text_score_fallback_to_es"] = rerank_debug.get("text_score_fallback_to_es")
|
a8261ece
tangwang
检索效果优化
|
862
|
debug_entry["knn_score"] = rerank_debug.get("knn_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
863
864
865
|
debug_entry["rerank_factor"] = rerank_debug.get("rerank_factor")
debug_entry["text_factor"] = rerank_debug.get("text_factor")
debug_entry["knn_factor"] = rerank_debug.get("knn_factor")
|
af827ce9
tangwang
rerank
|
866
|
debug_entry["fused_score"] = rerank_debug.get("fused_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
867
|
debug_entry["rerank_input"] = rerank_debug.get("rerank_input")
|
a8261ece
tangwang
检索效果优化
|
868
|
debug_entry["matched_queries"] = rerank_debug.get("matched_queries")
|
af827ce9
tangwang
rerank
|
869
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
870
871
872
|
if style_intent_debug:
debug_entry["style_intent_sku"] = style_intent_debug
|
af827ce9
tangwang
rerank
|
873
|
per_result_debug.append(debug_entry)
|
985752f5
tangwang
1. 前端调试功能
|
874
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
875
876
877
878
879
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
880
881
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
882
883
884
885
886
887
|
)
# Generate suggestions and related searches
query_text = parsed_query.original_query if parsed_query else query
suggestions = ResultFormatter.generate_suggestions(query_text, formatted_results)
related_searches = ResultFormatter.generate_related_searches(query_text, formatted_results)
|
be52af70
tangwang
first commit
|
888
|
|
16c42787
tangwang
feat: implement r...
|
889
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
890
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
891
892
893
894
895
896
897
898
899
900
901
902
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.set_error(e)
context.logger.error(
f"结果处理失败 | 错误: {str(e)}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
raise
finally:
context.end_stage(RequestContextStage.RESULT_PROCESSING)
|
be52af70
tangwang
first commit
|
903
|
|
16c42787
tangwang
feat: implement r...
|
904
905
906
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
907
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
908
909
910
|
# Collect debug information if requested
debug_info = None
if debug:
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
911
912
913
914
915
916
|
query_vector_summary = None
if parsed_query.query_vector is not None:
query_vector_summary = {
"dims": int(len(parsed_query.query_vector)),
"preview": [round(float(v), 6) for v in parsed_query.query_vector[:8].tolist()],
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
917
918
919
|
debug_info = {
"query_analysis": {
"original_query": context.query_analysis.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
920
|
"query_normalized": context.query_analysis.query_normalized,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
921
922
|
"rewritten_query": context.query_analysis.rewritten_query,
"detected_language": context.query_analysis.detected_language,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
923
|
"index_languages": index_langs,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
924
|
"translations": context.query_analysis.translations,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
925
|
"has_vector": context.query_analysis.query_vector is not None,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
926
927
|
"query_vector_summary": query_vector_summary,
"query_tokens": getattr(parsed_query, "query_tokens", []),
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
928
|
"is_simple_query": context.query_analysis.is_simple_query,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
929
930
|
"domain": context.query_analysis.domain,
"style_intent_profile": context.get_intermediate_result("style_intent_profile"),
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
931
932
|
},
"es_query": context.get_intermediate_result('es_query', {}),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
933
934
935
936
937
938
939
940
941
942
943
944
945
|
"es_query_context": {
"filters": filters,
"range_filters": range_filters,
"facets": [getattr(facet, "field", str(facet)) for facet in facets] if facets else [],
"sort_by": sort_by,
"sort_order": sort_order,
"min_score": min_score,
"es_fetch_from": es_fetch_from,
"es_fetch_size": es_fetch_size,
"in_rerank_window": in_rerank_window,
"rerank_prefetch_source": context.get_intermediate_result('es_query_rerank_prefetch_source'),
"include_named_queries_score": bool(do_rerank and in_rerank_window),
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
946
947
948
949
|
"es_response": {
"took_ms": es_response.get('took', 0),
"total_hits": total_value,
"max_score": max_score,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
950
951
952
|
"shards": es_response.get('_shards', {}),
"initial_es_max_score": initial_es_max_score,
"initial_es_min_score": initial_es_min_score,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
953
|
},
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
954
955
|
"rerank": rerank_debug_info,
"page_fill": page_fill_debug,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
956
957
958
959
|
"feature_flags": context.metadata.get('feature_flags', {}),
"stage_timings": {
k: round(v, 2) for k, v in context.performance_metrics.stage_timings.items()
},
|
8ae95af0
tangwang
1. Stage Timings:...
|
960
961
962
963
964
965
|
"stage_time_bounds_ms": {
stage: {
kk: round(vv, 3) for kk, vv in bounds.items()
}
for stage, bounds in context.performance_metrics.stage_time_bounds_ms.items()
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
966
967
|
"search_params": context.metadata.get('search_params', {})
}
|
985752f5
tangwang
1. 前端调试功能
|
968
969
|
if per_result_debug:
debug_info["per_result"] = per_result_debug
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
970
|
|
be52af70
tangwang
first commit
|
971
972
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
973
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
974
975
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
976
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
977
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
978
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
979
980
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
981
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
982
983
|
)
|
16c42787
tangwang
feat: implement r...
|
984
985
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
986
987
988
989
990
991
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
992
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
993
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
994
995
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
996
997
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
998
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
999
1000
1001
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1002
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
1003
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1004
1005
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
1006
1007
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1008
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
1009
1010
1011
1012
1013
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
26b910bd
tangwang
refactor service ...
|
1014
1015
|
if self.image_encoder is None:
raise RuntimeError("Image encoder is not initialized at startup")
|
b754fd41
tangwang
图片向量化支持优先级参数
|
1016
|
image_vector = self.image_encoder.encode_image_from_url(image_url, priority=1)
|
be52af70
tangwang
first commit
|
1017
1018
1019
1020
|
if image_vector is None:
raise ValueError(f"Failed to encode image: {image_url}")
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1021
1022
1023
1024
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
# No longer need to add tenant_id to filters since each tenant has its own index
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1025
|
|
be52af70
tangwang
first commit
|
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
|
# Build KNN query
es_query = {
"size": size,
"knn": {
"field": self.image_embedding_field,
"query_vector": image_vector.tolist(),
"k": size,
"num_candidates": size * 10
}
}
|
26b910bd
tangwang
refactor service ...
|
1037
1038
|
# Apply source filtering semantics (None / [] / list)
self._apply_source_filter(es_query)
|
13377199
tangwang
接口优化
|
1039
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1040
1041
1042
|
if filters or range_filters:
filter_clauses = self.query_builder._build_filters(filters, range_filters)
if filter_clauses:
|
7fbca0d7
tangwang
启动脚本优化
|
1043
1044
1045
1046
1047
1048
1049
|
if len(filter_clauses) == 1:
es_query["knn"]["filter"] = filter_clauses[0]
else:
es_query["knn"]["filter"] = {
"bool": {
"filter": filter_clauses
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1050
|
}
|
be52af70
tangwang
first commit
|
1051
1052
1053
|
# Execute search
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1054
|
index_name=index_name,
|
be52af70
tangwang
first commit
|
1055
1056
1057
1058
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1059
1060
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
1061
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1062
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
1063
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1064
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
1065
1066
1067
1068
1069
1070
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1071
1072
1073
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
1074
1075
1076
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
2739b281
tangwang
多语言索引调整
|
1077
|
language="en", # Default language for image search
|
ca91352a
tangwang
更新文档
|
1078
1079
|
sku_filter_dimension=None # Image search doesn't support SKU filtering
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1080
|
|
be52af70
tangwang
first commit
|
1081
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1082
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
1083
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1084
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
1085
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1086
1087
1088
1089
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
1090
1091
|
)
|
b926f678
tangwang
多语言查询
|
1092
1093
|
def get_domain_summary(self) -> Dict[str, Any]:
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1094
|
Get summary of dynamic text retrieval configuration.
|
b926f678
tangwang
多语言查询
|
1095
1096
|
Returns:
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1097
|
Dictionary with language-aware field information
|
b926f678
tangwang
多语言查询
|
1098
|
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1099
1100
1101
1102
1103
1104
1105
|
return {
"mode": "dynamic_language_fields",
"multilingual_fields": self.config.query_config.multilingual_fields,
"shared_fields": self.config.query_config.shared_fields,
"core_multilingual_fields": self.config.query_config.core_multilingual_fields,
"field_boosts": self.config.field_boosts,
}
|
b926f678
tangwang
多语言查询
|
1106
|
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1107
|
def get_document(self, tenant_id: str, doc_id: str) -> Optional[Dict[str, Any]]:
|
be52af70
tangwang
first commit
|
1108
1109
1110
1111
|
"""
Get single document by ID.
Args:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1112
|
tenant_id: Tenant ID (required to determine which index to query)
|
be52af70
tangwang
first commit
|
1113
1114
1115
1116
1117
1118
|
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1119
|
index_name = get_tenant_index_name(tenant_id)
|
be52af70
tangwang
first commit
|
1120
|
response = self.es_client.client.get(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1121
|
index=index_name,
|
be52af70
tangwang
first commit
|
1122
1123
1124
1125
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1126
|
logger.error(f"Failed to get document {doc_id} from tenant {tenant_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
1127
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1128
1129
1130
1131
|
def _standardize_facets(
self,
es_aggregations: Dict[str, Any],
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
1132
|
facet_configs: Optional[List[Union[str, Any]]],
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1133
1134
1135
1136
1137
1138
1139
|
current_filters: Optional[Dict[str, Any]]
) -> Optional[List[FacetResult]]:
"""
将 ES 聚合结果转换为标准化的分面格式(返回 Pydantic 模型)。
Args:
es_aggregations: ES 原始聚合结果
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
1140
|
facet_configs: 分面配置列表(str 或 FacetConfig)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
|
current_filters: 当前应用的过滤器
Returns:
标准化的分面结果列表(FacetResult 对象)
"""
if not es_aggregations or not facet_configs:
return None
standardized_facets: List[FacetResult] = []
for config in facet_configs:
# 解析配置
if isinstance(config, str):
field = config
facet_type = "terms"
else:
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
1157
1158
1159
|
# FacetConfig 对象
field = config.field
facet_type = config.type
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
|
agg_name = f"{field}_facet"
if agg_name not in es_aggregations:
continue
agg_result = es_aggregations[agg_name]
# 获取当前字段的选中值
selected_values = set()
if current_filters and field in current_filters:
filter_value = current_filters[field]
if isinstance(filter_value, list):
selected_values = set(filter_value)
else:
selected_values = {filter_value}
# 转换 buckets 为 FacetValue 对象
facet_values: List[FacetValue] = []
if 'buckets' in agg_result:
for bucket in agg_result['buckets']:
value = bucket.get('key')
count = bucket.get('doc_count', 0)
facet_values.append(FacetValue(
value=value,
label=str(value),
count=count,
selected=value in selected_values
))
# 构建 FacetResult 对象
facet_result = FacetResult(
field=field,
|
e7ad2b4a
tangwang
测试页面分页配置
|
1194
|
label=field,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1195
1196
1197
1198
1199
1200
1201
|
type=facet_type,
values=facet_values
)
standardized_facets.append(facet_result)
return standardized_facets if standardized_facets else None
|