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
|
"""
|
814e352b
tangwang
乘法公式配置化
|
7
8
|
from typing import Dict, Any, List, Optional
import json
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
9
|
import logging
|
28e57bb1
tangwang
日志体系优化
|
10
|
import hashlib
|
5f7d7f09
tangwang
性能测试报告.md
|
11
|
from string import Formatter
|
be52af70
tangwang
first commit
|
12
|
|
be52af70
tangwang
first commit
|
13
14
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
|
cda1cd62
tangwang
意图分析&应用 baseline
|
15
|
from query.style_intent import StyleIntentRegistry
|
07cf5a93
tangwang
START_EMBEDDING=...
|
16
|
from embeddings.image_encoder import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
17
|
from .es_query_builder import ESQueryBuilder
|
cda1cd62
tangwang
意图分析&应用 baseline
|
18
|
from .sku_intent_selector import SkuSelectionDecision, StyleSkuSelector
|
9f96d6f3
tangwang
短query不用语义搜索
|
19
|
from config import SearchConfig
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
20
|
from config.tenant_config_loader import get_tenant_config_loader
|
ed948666
tangwang
tidy
|
21
|
from context.request_context import RequestContext, RequestContextStage
|
814e352b
tangwang
乘法公式配置化
|
22
|
from api.models import FacetResult, FacetConfig
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
23
|
from api.result_formatter import ResultFormatter
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
24
|
from indexer.mapping_generator import get_tenant_index_name
|
be52af70
tangwang
first commit
|
25
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
26
|
logger = logging.getLogger(__name__)
|
28e57bb1
tangwang
日志体系优化
|
27
28
29
30
31
32
33
34
35
|
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. 日志、配置基础设施,使用优化
|
36
|
|
be52af70
tangwang
first commit
|
37
38
|
class SearchResult:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
39
|
"""Container for search results (外部友好格式)."""
|
be52af70
tangwang
first commit
|
40
41
42
|
def __init__(
self,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
43
|
results: List[Any], # List[SpuResult]
|
be52af70
tangwang
first commit
|
44
45
46
|
total: int,
max_score: float,
took_ms: int,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
47
|
facets: Optional[List[FacetResult]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
48
|
query_info: Optional[Dict[str, Any]] = None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
49
50
|
suggestions: Optional[List[str]] = None,
related_searches: Optional[List[str]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
51
|
debug_info: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
52
|
):
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
53
|
self.results = results
|
be52af70
tangwang
first commit
|
54
55
56
|
self.total = total
self.max_score = max_score
self.took_ms = took_ms
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
57
|
self.facets = facets
|
be52af70
tangwang
first commit
|
58
|
self.query_info = query_info or {}
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
59
60
|
self.suggestions = suggestions or []
self.related_searches = related_searches or []
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
61
|
self.debug_info = debug_info
|
43f1139f
tangwang
refactor: ES查询结构重...
|
62
|
|
be52af70
tangwang
first commit
|
63
64
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
65
|
result = {
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
66
|
"results": [r.model_dump() if hasattr(r, 'model_dump') else r for r in self.results],
|
be52af70
tangwang
first commit
|
67
68
69
|
"total": self.total,
"max_score": self.max_score,
"took_ms": self.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
70
|
"facets": [f.model_dump() for f in self.facets] if self.facets else None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
71
72
73
|
"query_info": self.query_info,
"suggestions": self.suggestions,
"related_searches": self.related_searches
|
be52af70
tangwang
first commit
|
74
|
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
75
76
77
|
if self.debug_info is not None:
result["debug_info"] = self.debug_info
return result
|
be52af70
tangwang
first commit
|
78
79
80
81
82
83
84
85
|
class Searcher:
"""
Main search engine class.
Handles:
- Query parsing and translation
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
86
|
- Dynamic multi-language text recall planning
|
be52af70
tangwang
first commit
|
87
88
89
90
91
92
|
- ES query building
- Result ranking and formatting
"""
def __init__(
self,
|
be52af70
tangwang
first commit
|
93
|
es_client: ESClient,
|
9f96d6f3
tangwang
短query不用语义搜索
|
94
|
config: SearchConfig,
|
26b910bd
tangwang
refactor service ...
|
95
96
|
query_parser: Optional[QueryParser] = None,
image_encoder: Optional[CLIPImageEncoder] = None,
|
be52af70
tangwang
first commit
|
97
98
99
100
101
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
102
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
103
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
104
|
query_parser: Query parser (created if not provided)
|
26b910bd
tangwang
refactor service ...
|
105
|
image_encoder: Optional pre-initialized image encoder
|
be52af70
tangwang
first commit
|
106
|
"""
|
be52af70
tangwang
first commit
|
107
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
108
|
self.config = config
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
109
|
# Index name is now generated dynamically per tenant, no longer stored here
|
9f96d6f3
tangwang
短query不用语义搜索
|
110
|
self.query_parser = query_parser or QueryParser(config)
|
9f96d6f3
tangwang
短query不用语义搜索
|
111
|
self.text_embedding_field = config.query_config.text_embedding_field or "title_embedding"
|
26b910bd
tangwang
refactor service ...
|
112
113
114
115
116
117
|
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
|
118
119
120
121
122
123
|
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
|
124
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
125
|
# Query builder - simplified single-layer architecture
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
126
|
self.query_builder = ESQueryBuilder(
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
127
128
129
130
131
|
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
|
132
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
133
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
134
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
135
|
function_score_config=self.config.function_score,
|
70dab99f
tangwang
add logs
|
136
|
default_language=self.config.query_config.default_language,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
137
138
139
140
|
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. 动态多语言字段与统一策略配置
|
141
|
tie_breaker_base_query=self.config.query_config.tie_breaker_base_query,
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
142
143
144
145
|
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
|
146
147
|
)
|
26b910bd
tangwang
refactor service ...
|
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
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
|
164
165
166
167
168
|
def _resolve_rerank_source_filter(
self,
doc_template: str,
parsed_query: Optional[ParsedQuery] = None,
) -> Dict[str, Any]:
|
5f7d7f09
tangwang
性能测试报告.md
|
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
|
"""
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
|
195
196
197
198
199
200
201
202
203
204
|
if self._has_style_intent(parsed_query):
includes.update(
{
"skus",
"option1_name",
"option2_name",
"option3_name",
}
)
|
5f7d7f09
tangwang
性能测试报告.md
|
205
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
|
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...
|
247
|
@staticmethod
|
cda1cd62
tangwang
意图分析&应用 baseline
|
248
249
250
|
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...
|
251
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
252
|
def _apply_style_intent_to_hits(
|
deccd68a
tangwang
Added the SKU pre...
|
253
254
255
256
|
self,
es_hits: List[Dict[str, Any]],
parsed_query: ParsedQuery,
context: Optional[RequestContext] = None,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
257
|
) -> Dict[str, SkuSelectionDecision]:
|
8ae95af0
tangwang
1. Stage Timings:...
|
258
259
260
|
if context is not None:
context.start_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
try:
|
814e352b
tangwang
乘法公式配置化
|
261
|
return self.style_sku_selector.prepare_hits(es_hits, parsed_query)
|
8ae95af0
tangwang
1. Stage Timings:...
|
262
263
264
|
finally:
if context is not None:
context.end_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
|
deccd68a
tangwang
Added the SKU pre...
|
265
|
|
be52af70
tangwang
first commit
|
266
267
268
|
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
269
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
270
271
272
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
273
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
274
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
275
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
276
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
277
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
278
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
279
|
debug: bool = False,
|
2739b281
tangwang
多语言索引调整
|
280
|
language: str = "en",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
281
|
sku_filter_dimension: Optional[List[str]] = None,
|
5f7d7f09
tangwang
性能测试报告.md
|
282
|
enable_rerank: Optional[bool] = None,
|
ff32d894
tangwang
rerank
|
283
284
|
rerank_query_template: Optional[str] = None,
rerank_doc_template: Optional[str] = None,
|
be52af70
tangwang
first commit
|
285
286
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
287
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
288
289
290
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
291
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
292
293
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
294
295
296
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
297
|
min_score: Minimum score threshold
|
ef5baa86
tangwang
混杂语言处理
|
298
|
context: Request context for tracking (required)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
299
300
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
301
|
debug: Enable debug information output
|
ef5baa86
tangwang
混杂语言处理
|
302
303
304
305
306
307
308
309
310
|
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
|
311
312
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
313
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
314
|
"""
|
16c42787
tangwang
feat: implement r...
|
315
|
if context is None:
|
ed948666
tangwang
tidy
|
316
|
raise ValueError("context is required")
|
16c42787
tangwang
feat: implement r...
|
317
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
318
319
320
|
# 根据租户配置决定翻译开关(离线/在线统一)
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id)
|
038e4e2f
tangwang
refactor(i18n): t...
|
321
322
|
index_langs = tenant_cfg.get("index_languages") or []
enable_translation = len(index_langs) > 0
|
9f96d6f3
tangwang
短query不用语义搜索
|
323
|
enable_embedding = self.config.query_config.enable_text_embedding
|
5f7d7f09
tangwang
性能测试报告.md
|
324
325
326
327
328
329
|
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
性能测试
|
330
|
rerank_window = rc.rerank_window
|
506c39b7
tangwang
feat(search): 统一重...
|
331
|
# 若开启重排且请求范围在窗口内:从 ES 取前 rerank_window 条、重排后再按 from/size 分页;否则不重排,按原 from/size 查 ES
|
ff32d894
tangwang
rerank
|
332
|
in_rerank_window = do_rerank and (from_ + size) <= rerank_window
|
506c39b7
tangwang
feat(search): 统一重...
|
333
334
|
es_fetch_from = 0 if in_rerank_window else from_
es_fetch_size = rerank_window if in_rerank_window else size
|
814e352b
tangwang
乘法公式配置化
|
335
336
337
|
es_score_normalization_factor: Optional[float] = None
initial_ranks_by_doc: Dict[str, int] = {}
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
338
|
rerank_debug_info: Optional[Dict[str, Any]] = None
|
16c42787
tangwang
feat: implement r...
|
339
340
341
342
343
344
|
# Start timing
context.start_stage(RequestContextStage.TOTAL)
context.logger.info(
f"开始搜索请求 | 查询: '{query}' | 参数: size={size}, from_={from_}, "
|
5f7d7f09
tangwang
性能测试报告.md
|
345
346
347
|
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工具,每条结果的打分中间...
|
348
|
f"index_languages={index_langs} | "
|
506c39b7
tangwang
feat(search): 统一重...
|
349
|
f"enable_translation={enable_translation}, enable_embedding={enable_embedding}, min_score={min_score}",
|
16c42787
tangwang
feat: implement r...
|
350
351
352
353
354
355
356
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
# Store search parameters in context
context.metadata['search_params'] = {
'size': size,
'from_': from_,
|
506c39b7
tangwang
feat(search): 统一重...
|
357
358
359
|
'es_fetch_from': es_fetch_from,
'es_fetch_size': es_fetch_size,
'in_rerank_window': in_rerank_window,
|
5f7d7f09
tangwang
性能测试报告.md
|
360
361
362
363
|
'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...
|
364
|
'filters': filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
365
366
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
367
368
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
|
ff32d894
tangwang
rerank
|
369
|
'enable_rerank': do_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
370
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
371
372
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
373
|
}
|
be52af70
tangwang
first commit
|
374
|
|
16c42787
tangwang
feat: implement r...
|
375
376
377
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
378
379
|
'rerank_enabled': do_rerank,
'style_intent_enabled': bool(self.style_intent_registry.enabled),
|
16c42787
tangwang
feat: implement r...
|
380
|
}
|
be52af70
tangwang
first commit
|
381
382
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
383
384
385
386
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
16c42787
tangwang
feat: implement r...
|
387
|
generate_vector=enable_embedding,
|
814e352b
tangwang
乘法公式配置化
|
388
|
tenant_id=tenant_id,
|
ef5baa86
tangwang
混杂语言处理
|
389
390
|
context=context,
target_languages=index_langs if enable_translation else [],
|
16c42787
tangwang
feat: implement r...
|
391
392
393
394
|
)
# Store query analysis results in context
context.store_query_analysis(
original_query=parsed_query.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
395
|
query_normalized=parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
396
397
398
399
|
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
混杂语言处理
|
400
|
domain="default",
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
401
|
is_simple_query=True
|
16c42787
tangwang
feat: implement r...
|
402
|
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
403
|
context.metadata["feature_flags"]["style_intent_active"] = self._has_style_intent(parsed_query)
|
be52af70
tangwang
first commit
|
404
|
|
16c42787
tangwang
feat: implement r...
|
405
406
407
408
|
context.logger.info(
f"查询解析完成 | 原查询: '{parsed_query.original_query}' | "
f"重写后: '{parsed_query.rewritten_query}' | "
f"语言: {parsed_query.detected_language} | "
|
16c42787
tangwang
feat: implement r...
|
409
410
411
412
413
414
415
416
417
418
419
420
421
|
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. 动态多语言字段与统一策略配置
|
422
|
# Step 2: Query building
|
16c42787
tangwang
feat: implement r...
|
423
424
|
context.start_stage(RequestContextStage.QUERY_BUILDING)
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
425
426
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
|
2739b281
tangwang
多语言索引调整
|
427
|
# index_name = "search_products"
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
428
429
|
# No longer need to add tenant_id to filters since each tenant has its own index
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
430
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
431
|
es_query = self.query_builder.build_query(
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
432
|
query_text=parsed_query.rewritten_query or parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
433
|
query_vector=parsed_query.query_vector if enable_embedding else None,
|
16c42787
tangwang
feat: implement r...
|
434
|
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
435
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
436
|
facet_configs=facets,
|
506c39b7
tangwang
feat(search): 统一重...
|
437
438
|
size=es_fetch_size,
from_=es_fetch_from,
|
16c42787
tangwang
feat: implement r...
|
439
|
enable_knn=enable_embedding and parsed_query.query_vector is not None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
440
|
min_score=min_score,
|
ef5baa86
tangwang
混杂语言处理
|
441
|
parsed_query=parsed_query,
|
16c42787
tangwang
feat: implement r...
|
442
|
)
|
be52af70
tangwang
first commit
|
443
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
444
445
446
447
448
449
450
|
# 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...
|
451
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
452
453
454
|
# Add sorting if specified
if sort_by:
es_query = self.query_builder.add_sorting(es_query, sort_by, sort_order)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
455
|
es_query["track_scores"] = True
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
456
|
|
5f7d7f09
tangwang
性能测试报告.md
|
457
458
459
460
461
462
463
|
# 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
|
464
465
466
467
|
rerank_prefetch_source = self._resolve_rerank_source_filter(
effective_doc_template,
parsed_query=parsed_query,
)
|
5f7d7f09
tangwang
性能测试报告.md
|
468
469
470
|
es_query_for_fetch = dict(es_query)
es_query_for_fetch["_source"] = rerank_prefetch_source
|
16c42787
tangwang
feat: implement r...
|
471
|
# Extract size and from from body for ES client parameters
|
5f7d7f09
tangwang
性能测试报告.md
|
472
|
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...
|
473
474
475
|
# Store ES query in context
context.store_intermediate_result('es_query', es_query)
|
5f7d7f09
tangwang
性能测试报告.md
|
476
477
|
if in_rerank_window and rerank_prefetch_source is not None:
context.store_intermediate_result('es_query_rerank_prefetch_source', rerank_prefetch_source)
|
28e57bb1
tangwang
日志体系优化
|
478
|
# Serialize ES query to compute a compact size + stable digest for correlation
|
5f7d7f09
tangwang
性能测试报告.md
|
479
|
es_query_compact = json.dumps(es_query_for_fetch, ensure_ascii=False, separators=(",", ":"))
|
28e57bb1
tangwang
日志体系优化
|
480
481
482
|
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
|
483
|
|
16c42787
tangwang
feat: implement r...
|
484
|
context.logger.info(
|
5f7d7f09
tangwang
性能测试报告.md
|
485
|
"ES query built | size: %s chars | digest: %s | KNN: %s | vector_dims: %s | facets: %s | rerank_prefetch_source: %s",
|
28e57bb1
tangwang
日志体系优化
|
486
487
488
489
490
|
len(es_query_compact),
es_query_digest,
"yes" if knn_enabled else "no",
vector_dims,
"yes" if facets else "no",
|
5f7d7f09
tangwang
性能测试报告.md
|
491
|
rerank_prefetch_source,
|
16c42787
tangwang
feat: implement r...
|
492
493
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
28e57bb1
tangwang
日志体系优化
|
494
495
496
497
498
499
500
501
502
503
|
_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
|
504
|
"query": es_query_for_fetch,
|
28e57bb1
tangwang
日志体系优化
|
505
|
})
|
16c42787
tangwang
feat: implement r...
|
506
507
508
509
510
511
512
513
514
515
|
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
记录各阶段耗时
|
516
517
|
# Step 4: Elasticsearch search (primary recall)
context.start_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
518
|
try:
|
506c39b7
tangwang
feat(search): 统一重...
|
519
|
# Use tenant-specific index name(开启重排且在窗口内时已用 es_fetch_size/es_fetch_from)
|
16c42787
tangwang
feat: implement r...
|
520
|
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
521
|
index_name=index_name,
|
16c42787
tangwang
feat: implement r...
|
522
|
body=body_for_es,
|
506c39b7
tangwang
feat(search): 统一重...
|
523
|
size=es_fetch_size,
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
524
525
|
from_=es_fetch_from,
include_named_queries_score=bool(do_rerank and in_rerank_window),
|
be52af70
tangwang
first commit
|
526
527
|
)
|
16c42787
tangwang
feat: implement r...
|
528
529
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
530
|
if debug:
|
814e352b
tangwang
乘法公式配置化
|
531
|
initial_hits = es_response.get("hits", {}).get("hits") or []
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
532
533
534
|
for rank, hit in enumerate(initial_hits, 1):
doc_id = hit.get("_id")
if doc_id is not None:
|
814e352b
tangwang
乘法公式配置化
|
535
536
|
initial_ranks_by_doc[str(doc_id)] = rank
raw_initial_max_score = es_response.get("hits", {}).get("max_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
537
|
try:
|
814e352b
tangwang
乘法公式配置化
|
538
|
es_score_normalization_factor = float(raw_initial_max_score) if raw_initial_max_score is not None else None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
539
|
except (TypeError, ValueError):
|
814e352b
tangwang
乘法公式配置化
|
540
541
542
543
544
545
546
|
es_score_normalization_factor = None
if es_score_normalization_factor is None and initial_hits:
first_score = initial_hits[0].get("_score")
try:
es_score_normalization_factor = float(first_score) if first_score is not None else None
except (TypeError, ValueError):
es_score_normalization_factor = None
|
be52af70
tangwang
first commit
|
547
|
|
16c42787
tangwang
feat: implement r...
|
548
549
550
551
552
|
# 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)} | "
|
814e352b
tangwang
乘法公式配置化
|
553
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
554
555
556
557
558
559
560
561
562
563
|
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
记录各阶段耗时
|
564
|
context.end_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
565
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
566
567
568
569
570
571
572
573
574
575
576
577
578
579
|
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): 统一重...
|
580
|
# Optional Step 4.5: AI reranking(仅当请求范围在重排窗口内时执行)
|
ff32d894
tangwang
rerank
|
581
|
if do_rerank and in_rerank_window:
|
506c39b7
tangwang
feat(search): 统一重...
|
582
583
584
585
586
|
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): 统一重...
|
587
588
589
590
|
es_response, rerank_meta, fused_debug = run_rerank(
query=rerank_query,
es_response=es_response,
language=language,
|
506c39b7
tangwang
feat(search): 统一重...
|
591
592
593
|
timeout_sec=rc.timeout_sec,
weight_es=rc.weight_es,
weight_ai=rc.weight_ai,
|
ff32d894
tangwang
rerank
|
594
595
|
rerank_query_template=effective_query_template,
rerank_doc_template=effective_doc_template,
|
d31c7f65
tangwang
补充云服务reranker
|
596
|
top_n=(from_ + size),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
597
|
debug=debug,
|
814e352b
tangwang
乘法公式配置化
|
598
|
fusion=rc.fusion,
|
506c39b7
tangwang
feat(search): 统一重...
|
599
600
601
|
)
if rerank_meta is not None:
|
814e352b
tangwang
乘法公式配置化
|
602
603
604
605
606
607
608
|
if debug:
from dataclasses import asdict
from config.services_config import get_rerank_service_url
rerank_debug_info = {
"service_url": get_rerank_service_url(),
"query_template": effective_query_template,
"doc_template": effective_doc_template,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
609
610
|
"query_text": str(effective_query_template).format_map({"query": rerank_query}),
"docs": len(es_response.get("hits", {}).get("hits") or []),
|
814e352b
tangwang
乘法公式配置化
|
611
|
"top_n": from_ + size,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
612
|
"meta": rerank_meta,
|
814e352b
tangwang
乘法公式配置化
|
613
614
|
"fusion": asdict(rc.fusion),
}
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
615
|
context.store_intermediate_result("rerank_scores", fused_debug)
|
506c39b7
tangwang
feat(search): 统一重...
|
616
|
context.logger.info(
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
617
|
f"重排完成 | docs={len(es_response.get('hits', {}).get('hits') or [])} | "
|
814e352b
tangwang
乘法公式配置化
|
618
|
f"top_n={from_ + size} | meta={rerank_meta}",
|
506c39b7
tangwang
feat(search): 统一重...
|
619
620
621
622
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.add_warning(f"Rerank failed: {e}")
|
506c39b7
tangwang
feat(search): 统一重...
|
623
624
625
626
627
628
629
630
631
632
633
634
635
636
|
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
|
637
638
639
640
641
|
# 对于启用重排的结果,优先使用 _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): 统一重...
|
642
643
644
645
646
647
|
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
|
648
649
650
651
652
653
654
655
656
657
658
|
# 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
记录各阶段耗时
|
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
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
|
678
679
680
681
682
|
if style_intent_decisions:
self.style_sku_selector.apply_precomputed_decisions(
sliced,
style_intent_decisions,
)
|
a99e62ba
tangwang
记录各阶段耗时
|
683
684
|
if fill_took:
es_response["took"] = int((es_response.get("took", 0) or 0) + fill_took)
|
a99e62ba
tangwang
记录各阶段耗时
|
685
686
687
688
689
690
|
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
|
691
|
|
506c39b7
tangwang
feat(search): 统一重...
|
692
693
694
695
696
|
context.logger.info(
f"重排分页切片 | from={from_}, size={size}, 返回={len(sliced)}条",
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
8ae95af0
tangwang
1. Stage Timings:...
|
697
698
699
700
701
702
703
704
705
|
# 非重排窗口:款式意图在 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...
|
706
707
708
|
# Step 5: Result processing
context.start_stage(RequestContextStage.RESULT_PROCESSING)
try:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
709
710
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
711
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
712
|
es_hits = es_response['hits']['hits']
|
16c42787
tangwang
feat: implement r...
|
713
714
715
716
717
718
|
# 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): 统一重...
|
719
|
# max_score 会在启用 AI 搜索时被更新为融合分数的最大值
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
720
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
721
|
|
af827ce9
tangwang
rerank
|
722
723
724
725
726
727
728
729
730
731
732
733
|
# 从上下文中取出重排调试信息(若有)
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
|
734
735
736
737
738
739
|
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...
|
740
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
741
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
742
743
744
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
745
746
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
747
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
748
|
|
985752f5
tangwang
1. 前端调试功能
|
749
750
751
|
# Build per-result debug info (per SPU) when debug mode is enabled
per_result_debug = []
if debug and es_hits and formatted_results:
|
814e352b
tangwang
乘法公式配置化
|
752
753
|
final_ranks_by_doc = {
str(hit.get("_id")): from_ + rank
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
754
755
756
|
for rank, hit in enumerate(es_hits, 1)
if hit.get("_id") is not None
}
|
985752f5
tangwang
1. 前端调试功能
|
757
758
|
for hit, spu in zip(es_hits, formatted_results):
source = hit.get("_source", {}) or {}
|
af827ce9
tangwang
rerank
|
759
760
761
762
|
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
|
763
764
765
766
767
|
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
|
768
|
|
985752f5
tangwang
1. 前端调试功能
|
769
770
771
772
773
774
|
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工具,每条结果的打分中间...
|
775
|
normalized = (
|
814e352b
tangwang
乘法公式配置化
|
776
777
|
float(es_score) / float(es_score_normalization_factor)
if es_score_normalization_factor else None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
778
|
)
|
985752f5
tangwang
1. 前端调试功能
|
779
780
|
except (TypeError, ValueError, ZeroDivisionError):
normalized = None
|
985752f5
tangwang
1. 前端调试功能
|
781
782
783
784
785
|
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
|
786
787
788
789
|
debug_entry: Dict[str, Any] = {
"spu_id": spu.spu_id,
"es_score": es_score,
"es_score_normalized": normalized,
|
814e352b
tangwang
乘法公式配置化
|
790
791
|
"initial_rank": initial_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None,
"final_rank": final_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None,
|
af827ce9
tangwang
rerank
|
792
793
794
795
796
797
798
799
800
|
"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
|
801
|
debug_entry["rerank_score"] = rerank_debug.get("rerank_score")
|
a8261ece
tangwang
检索效果优化
|
802
|
debug_entry["text_score"] = rerank_debug.get("text_score")
|
c90f80ed
tangwang
相关性优化
|
803
804
|
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工具,每条结果的打分中间...
|
805
806
|
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
相关性优化
|
807
808
|
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工具,每条结果的打分中间...
|
809
|
debug_entry["text_score_fallback_to_es"] = rerank_debug.get("text_score_fallback_to_es")
|
a8261ece
tangwang
检索效果优化
|
810
|
debug_entry["knn_score"] = rerank_debug.get("knn_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
811
812
813
|
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
|
814
|
debug_entry["fused_score"] = rerank_debug.get("fused_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
815
|
debug_entry["rerank_input"] = rerank_debug.get("rerank_input")
|
a8261ece
tangwang
检索效果优化
|
816
|
debug_entry["matched_queries"] = rerank_debug.get("matched_queries")
|
af827ce9
tangwang
rerank
|
817
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
818
819
820
|
if style_intent_debug:
debug_entry["style_intent_sku"] = style_intent_debug
|
af827ce9
tangwang
rerank
|
821
|
per_result_debug.append(debug_entry)
|
985752f5
tangwang
1. 前端调试功能
|
822
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
823
824
825
826
827
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
828
829
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
830
831
832
833
834
835
|
)
# 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
|
836
|
|
16c42787
tangwang
feat: implement r...
|
837
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
838
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
839
840
841
842
843
844
845
846
847
848
849
850
|
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
|
851
|
|
16c42787
tangwang
feat: implement r...
|
852
853
854
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
855
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
856
857
858
|
# Collect debug information if requested
debug_info = None
if debug:
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
859
860
861
|
debug_info = {
"query_analysis": {
"original_query": context.query_analysis.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
862
|
"query_normalized": context.query_analysis.query_normalized,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
863
864
|
"rewritten_query": context.query_analysis.rewritten_query,
"detected_language": context.query_analysis.detected_language,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
865
|
"index_languages": index_langs,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
866
|
"translations": context.query_analysis.translations,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
867
|
"has_vector": context.query_analysis.query_vector is not None,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
868
|
"query_tokens": getattr(parsed_query, "query_tokens", []),
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
869
|
"is_simple_query": context.query_analysis.is_simple_query,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
870
871
|
"domain": context.query_analysis.domain,
"style_intent_profile": context.get_intermediate_result("style_intent_profile"),
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
872
873
|
},
"es_query": context.get_intermediate_result('es_query', {}),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
874
|
"es_query_context": {
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
875
876
877
878
879
880
|
"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
补充调试信息,记录包括各个阶段的 ...
|
881
882
883
884
|
"es_response": {
"took_ms": es_response.get('took', 0),
"total_hits": total_value,
"max_score": max_score,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
885
|
"shards": es_response.get('_shards', {}),
|
814e352b
tangwang
乘法公式配置化
|
886
|
"es_score_normalization_factor": es_score_normalization_factor,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
887
|
},
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
888
|
"rerank": rerank_debug_info,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
889
890
891
892
|
"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:...
|
893
894
895
896
897
898
|
"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
补充调试信息,记录包括各个阶段的 ...
|
899
900
|
"search_params": context.metadata.get('search_params', {})
}
|
985752f5
tangwang
1. 前端调试功能
|
901
902
|
if per_result_debug:
debug_info["per_result"] = per_result_debug
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
903
|
|
be52af70
tangwang
first commit
|
904
905
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
906
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
907
908
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
909
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
910
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
911
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
912
913
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
914
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
915
916
|
)
|
16c42787
tangwang
feat: implement r...
|
917
918
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
919
920
921
922
923
924
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
925
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
926
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
927
928
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
929
930
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
931
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
932
933
934
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
935
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
936
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
937
938
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
939
940
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
941
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
942
943
944
945
946
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
26b910bd
tangwang
refactor service ...
|
947
948
|
if self.image_encoder is None:
raise RuntimeError("Image encoder is not initialized at startup")
|
b754fd41
tangwang
图片向量化支持优先级参数
|
949
|
image_vector = self.image_encoder.encode_image_from_url(image_url, priority=1)
|
be52af70
tangwang
first commit
|
950
951
952
953
|
if image_vector is None:
raise ValueError(f"Failed to encode image: {image_url}")
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
954
955
956
957
|
# 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级别索引、统一索引架构...
|
958
|
|
be52af70
tangwang
first commit
|
959
960
961
962
963
964
965
966
967
968
969
|
# 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 ...
|
970
971
|
# Apply source filtering semantics (None / [] / list)
self._apply_source_filter(es_query)
|
13377199
tangwang
接口优化
|
972
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
973
974
975
|
if filters or range_filters:
filter_clauses = self.query_builder._build_filters(filters, range_filters)
if filter_clauses:
|
7fbca0d7
tangwang
启动脚本优化
|
976
977
978
979
980
981
982
|
if len(filter_clauses) == 1:
es_query["knn"]["filter"] = filter_clauses[0]
else:
es_query["knn"]["filter"] = {
"bool": {
"filter": filter_clauses
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
983
|
}
|
be52af70
tangwang
first commit
|
984
985
986
|
# Execute search
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
987
|
index_name=index_name,
|
be52af70
tangwang
first commit
|
988
989
990
991
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
992
993
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
994
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
995
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
996
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
997
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
998
999
1000
1001
1002
1003
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1004
1005
1006
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
1007
1008
1009
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
2739b281
tangwang
多语言索引调整
|
1010
|
language="en", # Default language for image search
|
ca91352a
tangwang
更新文档
|
1011
1012
|
sku_filter_dimension=None # Image search doesn't support SKU filtering
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1013
|
|
be52af70
tangwang
first commit
|
1014
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1015
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
1016
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1017
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
1018
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1019
1020
1021
1022
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
1023
1024
|
)
|
b926f678
tangwang
多语言查询
|
1025
1026
|
def get_domain_summary(self) -> Dict[str, Any]:
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1027
|
Get summary of dynamic text retrieval configuration.
|
b926f678
tangwang
多语言查询
|
1028
1029
|
Returns:
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1030
|
Dictionary with language-aware field information
|
b926f678
tangwang
多语言查询
|
1031
|
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1032
1033
1034
1035
1036
1037
1038
|
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
多语言查询
|
1039
|
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1040
|
def get_document(self, tenant_id: str, doc_id: str) -> Optional[Dict[str, Any]]:
|
be52af70
tangwang
first commit
|
1041
1042
1043
1044
|
"""
Get single document by ID.
Args:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1045
|
tenant_id: Tenant ID (required to determine which index to query)
|
be52af70
tangwang
first commit
|
1046
1047
1048
1049
1050
1051
|
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1052
|
index_name = get_tenant_index_name(tenant_id)
|
be52af70
tangwang
first commit
|
1053
|
response = self.es_client.client.get(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1054
|
index=index_name,
|
be52af70
tangwang
first commit
|
1055
1056
1057
1058
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1059
|
logger.error(f"Failed to get document {doc_id} from tenant {tenant_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
1060
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
|
|