be52af70
tangwang
first commit
|
1
2
3
4
5
6
|
"""
Main Searcher module - executes search queries against Elasticsearch.
Handles query parsing, boolean expressions, ranking, and result formatting.
"""
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
7
|
from typing import Dict, Any, List, Optional, Union
|
d1d356f8
tangwang
脚本优化
|
8
|
import os
|
99bea633
tangwang
add logs
|
9
|
import time, json
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
10
|
import logging
|
be52af70
tangwang
first commit
|
11
|
|
be52af70
tangwang
first commit
|
12
13
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
|
07cf5a93
tangwang
START_EMBEDDING=...
|
14
|
from embeddings.image_encoder import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
15
16
|
from .boolean_parser import BooleanParser, QueryNode
from .es_query_builder import ESQueryBuilder
|
9f96d6f3
tangwang
短query不用语义搜索
|
17
|
from config import SearchConfig
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
18
|
from config.tenant_config_loader import get_tenant_config_loader
|
9f96d6f3
tangwang
短query不用语义搜索
|
19
|
from config.utils import get_match_fields_for_index
|
ed948666
tangwang
tidy
|
20
|
from context.request_context import RequestContext, RequestContextStage
|
13320ac6
tangwang
分面接口修改:
|
21
|
from api.models import FacetResult, FacetValue, FacetConfig
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
22
|
from api.result_formatter import ResultFormatter
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
23
|
from indexer.mapping_generator import get_tenant_index_name
|
be52af70
tangwang
first commit
|
24
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
25
26
|
logger = logging.getLogger(__name__)
|
be52af70
tangwang
first commit
|
27
28
|
class SearchResult:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
29
|
"""Container for search results (外部友好格式)."""
|
be52af70
tangwang
first commit
|
30
31
32
|
def __init__(
self,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
33
|
results: List[Any], # List[SpuResult]
|
be52af70
tangwang
first commit
|
34
35
36
|
total: int,
max_score: float,
took_ms: int,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
37
|
facets: Optional[List[FacetResult]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
38
|
query_info: Optional[Dict[str, Any]] = None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
39
40
|
suggestions: Optional[List[str]] = None,
related_searches: Optional[List[str]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
41
|
debug_info: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
42
|
):
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
43
|
self.results = results
|
be52af70
tangwang
first commit
|
44
45
46
|
self.total = total
self.max_score = max_score
self.took_ms = took_ms
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
47
|
self.facets = facets
|
be52af70
tangwang
first commit
|
48
|
self.query_info = query_info or {}
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
49
50
|
self.suggestions = suggestions or []
self.related_searches = related_searches or []
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
51
|
self.debug_info = debug_info
|
43f1139f
tangwang
refactor: ES查询结构重...
|
52
|
|
be52af70
tangwang
first commit
|
53
54
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
55
|
result = {
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
56
|
"results": [r.model_dump() if hasattr(r, 'model_dump') else r for r in self.results],
|
be52af70
tangwang
first commit
|
57
58
59
|
"total": self.total,
"max_score": self.max_score,
"took_ms": self.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
60
|
"facets": [f.model_dump() for f in self.facets] if self.facets else None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
61
62
63
|
"query_info": self.query_info,
"suggestions": self.suggestions,
"related_searches": self.related_searches
|
be52af70
tangwang
first commit
|
64
|
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
65
66
67
|
if self.debug_info is not None:
result["debug_info"] = self.debug_info
return result
|
be52af70
tangwang
first commit
|
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
class Searcher:
"""
Main search engine class.
Handles:
- Query parsing and translation
- Boolean expression parsing
- ES query building
- Result ranking and formatting
"""
def __init__(
self,
|
be52af70
tangwang
first commit
|
83
|
es_client: ESClient,
|
9f96d6f3
tangwang
短query不用语义搜索
|
84
|
config: SearchConfig,
|
26b910bd
tangwang
refactor service ...
|
85
86
|
query_parser: Optional[QueryParser] = None,
image_encoder: Optional[CLIPImageEncoder] = None,
|
be52af70
tangwang
first commit
|
87
88
89
90
91
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
92
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
93
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
94
|
query_parser: Query parser (created if not provided)
|
26b910bd
tangwang
refactor service ...
|
95
|
image_encoder: Optional pre-initialized image encoder
|
be52af70
tangwang
first commit
|
96
|
"""
|
be52af70
tangwang
first commit
|
97
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
98
|
self.config = config
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
99
|
# Index name is now generated dynamically per tenant, no longer stored here
|
9f96d6f3
tangwang
短query不用语义搜索
|
100
|
self.query_parser = query_parser or QueryParser(config)
|
be52af70
tangwang
first commit
|
101
102
103
|
# Initialize components
self.boolean_parser = BooleanParser()
|
be52af70
tangwang
first commit
|
104
|
|
9f96d6f3
tangwang
短query不用语义搜索
|
105
106
107
|
# Get match fields from config
self.match_fields = get_match_fields_for_index(config, "default")
self.text_embedding_field = config.query_config.text_embedding_field or "title_embedding"
|
26b910bd
tangwang
refactor service ...
|
108
109
110
111
112
113
|
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
|
be52af70
tangwang
first commit
|
114
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
115
|
# Query builder - simplified single-layer architecture
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
116
|
self.query_builder = ESQueryBuilder(
|
bf89b597
tangwang
feat(search): ada...
|
117
|
match_fields=self.match_fields,
|
be52af70
tangwang
first commit
|
118
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
119
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
120
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
121
|
function_score_config=self.config.function_score,
|
a5a6bab8
tangwang
多语言查询优化
|
122
|
enable_multilang_search=self.config.query_config.enable_multilang_search,
|
70dab99f
tangwang
add logs
|
123
124
|
default_language=self.config.query_config.default_language,
knn_boost=self.config.query_config.knn_boost
|
be52af70
tangwang
first commit
|
125
126
|
)
|
26b910bd
tangwang
refactor service ...
|
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
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}
|
be52af70
tangwang
first commit
|
143
144
145
|
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
146
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
147
148
149
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
150
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
151
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
152
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
153
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
154
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
155
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
156
|
debug: bool = False,
|
2739b281
tangwang
多语言索引调整
|
157
|
language: str = "en",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
158
|
sku_filter_dimension: Optional[List[str]] = None,
|
ff32d894
tangwang
rerank
|
159
160
161
|
enable_rerank: bool = False,
rerank_query_template: Optional[str] = None,
rerank_doc_template: Optional[str] = None,
|
be52af70
tangwang
first commit
|
162
163
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
164
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
165
166
167
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
168
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
169
170
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
171
172
173
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
174
|
min_score: Minimum score threshold
|
16c42787
tangwang
feat: implement r...
|
175
|
context: Request context for tracking (created if not provided)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
176
177
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
178
|
debug: Enable debug information output
|
be52af70
tangwang
first commit
|
179
180
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
181
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
182
|
"""
|
16c42787
tangwang
feat: implement r...
|
183
|
if context is None:
|
ed948666
tangwang
tidy
|
184
|
raise ValueError("context is required")
|
16c42787
tangwang
feat: implement r...
|
185
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
186
187
188
|
# 根据租户配置决定翻译开关(离线/在线统一)
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id)
|
038e4e2f
tangwang
refactor(i18n): t...
|
189
190
|
index_langs = tenant_cfg.get("index_languages") or []
enable_translation = len(index_langs) > 0
|
9f96d6f3
tangwang
短query不用语义搜索
|
191
|
enable_embedding = self.config.query_config.enable_text_embedding
|
ff32d894
tangwang
rerank
|
192
193
|
# 重排仅由请求参数 enable_rerank 控制,唯一实现为调用外部 BGE 重排服务
do_rerank = bool(enable_rerank)
|
506c39b7
tangwang
feat(search): 统一重...
|
194
195
|
rerank_window = self.config.rerank.rerank_window or 1000
# 若开启重排且请求范围在窗口内:从 ES 取前 rerank_window 条、重排后再按 from/size 分页;否则不重排,按原 from/size 查 ES
|
ff32d894
tangwang
rerank
|
196
|
in_rerank_window = do_rerank and (from_ + size) <= rerank_window
|
506c39b7
tangwang
feat(search): 统一重...
|
197
198
|
es_fetch_from = 0 if in_rerank_window else from_
es_fetch_size = rerank_window if in_rerank_window else size
|
16c42787
tangwang
feat: implement r...
|
199
200
201
202
203
204
|
# Start timing
context.start_stage(RequestContextStage.TOTAL)
context.logger.info(
f"开始搜索请求 | 查询: '{query}' | 参数: size={size}, from_={from_}, "
|
ff32d894
tangwang
rerank
|
205
|
f"enable_rerank={do_rerank}, in_rerank_window={in_rerank_window}, es_fetch=({es_fetch_from},{es_fetch_size}) | "
|
506c39b7
tangwang
feat(search): 统一重...
|
206
|
f"enable_translation={enable_translation}, enable_embedding={enable_embedding}, min_score={min_score}",
|
16c42787
tangwang
feat: implement r...
|
207
208
209
210
211
212
213
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
# Store search parameters in context
context.metadata['search_params'] = {
'size': size,
'from_': from_,
|
506c39b7
tangwang
feat(search): 统一重...
|
214
215
216
|
'es_fetch_from': es_fetch_from,
'es_fetch_size': es_fetch_size,
'in_rerank_window': in_rerank_window,
|
ff32d894
tangwang
rerank
|
217
218
|
'rerank_query_template': rerank_query_template,
'rerank_doc_template': rerank_doc_template,
|
16c42787
tangwang
feat: implement r...
|
219
|
'filters': filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
220
221
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
222
223
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
|
ff32d894
tangwang
rerank
|
224
|
'enable_rerank': do_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
225
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
226
227
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
228
|
}
|
be52af70
tangwang
first commit
|
229
|
|
16c42787
tangwang
feat: implement r...
|
230
231
232
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
|
ff32d894
tangwang
rerank
|
233
|
'rerank_enabled': do_rerank
|
16c42787
tangwang
feat: implement r...
|
234
|
}
|
be52af70
tangwang
first commit
|
235
236
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
237
238
239
240
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
241
|
tenant_id=tenant_id,
|
16c42787
tangwang
feat: implement r...
|
242
243
244
245
246
247
|
generate_vector=enable_embedding,
context=context
)
# Store query analysis results in context
context.store_query_analysis(
original_query=parsed_query.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
248
|
query_normalized=parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
249
250
251
252
253
254
255
|
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,
domain=parsed_query.domain,
is_simple_query=self.boolean_parser.is_simple_query(parsed_query.rewritten_query)
)
|
be52af70
tangwang
first commit
|
256
|
|
16c42787
tangwang
feat: implement r...
|
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
context.logger.info(
f"查询解析完成 | 原查询: '{parsed_query.original_query}' | "
f"重写后: '{parsed_query.rewritten_query}' | "
f"语言: {parsed_query.detected_language} | "
f"域: {parsed_query.domain} | "
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)
# Step 2: Boolean parsing
context.start_stage(RequestContextStage.BOOLEAN_PARSING)
try:
query_node = None
if self.boolean_parser.is_simple_query(parsed_query.rewritten_query):
# Simple query
query_text = parsed_query.rewritten_query
context.logger.debug(
f"简单查询 | 无布尔表达式",
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
# Complex boolean query
query_node = self.boolean_parser.parse(parsed_query.rewritten_query)
query_text = parsed_query.rewritten_query
context.store_intermediate_result('query_node', query_node)
context.store_intermediate_result('boolean_ast', str(query_node))
context.logger.info(
f"布尔表达式解析 | AST: {query_node}",
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.BOOLEAN_PARSING)
# Step 3: Query building
context.start_stage(RequestContextStage.QUERY_BUILDING)
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
309
310
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
|
2739b281
tangwang
多语言索引调整
|
311
|
# index_name = "search_products"
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
312
313
|
# No longer need to add tenant_id to filters since each tenant has its own index
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
314
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
315
|
es_query = self.query_builder.build_query(
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
316
|
query_text=parsed_query.rewritten_query or parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
317
318
319
|
query_vector=parsed_query.query_vector if enable_embedding else None,
query_node=query_node,
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
320
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
321
|
facet_configs=facets,
|
506c39b7
tangwang
feat(search): 统一重...
|
322
323
|
size=es_fetch_size,
from_=es_fetch_from,
|
16c42787
tangwang
feat: implement r...
|
324
|
enable_knn=enable_embedding and parsed_query.query_vector is not None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
325
326
|
min_score=min_score,
parsed_query=parsed_query
|
16c42787
tangwang
feat: implement r...
|
327
|
)
|
be52af70
tangwang
first commit
|
328
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
329
330
331
332
333
334
335
|
# 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...
|
336
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
337
338
339
340
|
# Add sorting if specified
if sort_by:
es_query = self.query_builder.add_sorting(es_query, sort_by, sort_order)
|
16c42787
tangwang
feat: implement r...
|
341
342
343
344
345
346
347
|
# Extract size and from from body for ES client parameters
body_for_es = {k: v for k, v in es_query.items() if k not in ['size', 'from']}
# Store ES query in context
context.store_intermediate_result('es_query', es_query)
context.store_intermediate_result('es_body_for_search', body_for_es)
|
99bea633
tangwang
add logs
|
348
349
350
|
# Serialize ES query as a compact JSON string (no spaces or newlines)
es_query_compact = json.dumps(es_query, ensure_ascii=False, separators=(',', ':'))
|
16c42787
tangwang
feat: implement r...
|
351
|
context.logger.info(
|
99bea633
tangwang
add logs
|
352
353
354
355
|
f"ES query built | size: {len(es_query_compact)} chars | "
f"KNN: {'yes' if enable_embedding and parsed_query.query_vector is not None else 'no'} | "
f"facets: {'yes' if facets else 'no'} | "
f"query: {es_query_compact}",
|
16c42787
tangwang
feat: implement r...
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
|
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:
context.end_stage(RequestContextStage.QUERY_BUILDING)
# Step 4: Elasticsearch search
context.start_stage(RequestContextStage.ELASTICSEARCH_SEARCH)
try:
|
506c39b7
tangwang
feat(search): 统一重...
|
371
|
# Use tenant-specific index name(开启重排且在窗口内时已用 es_fetch_size/es_fetch_from)
|
16c42787
tangwang
feat: implement r...
|
372
|
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
373
|
index_name=index_name,
|
16c42787
tangwang
feat: implement r...
|
374
|
body=body_for_es,
|
506c39b7
tangwang
feat(search): 统一重...
|
375
376
|
size=es_fetch_size,
from_=es_fetch_from
|
be52af70
tangwang
first commit
|
377
378
|
)
|
16c42787
tangwang
feat: implement r...
|
379
380
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
be52af70
tangwang
first commit
|
381
|
|
16c42787
tangwang
feat: implement r...
|
382
383
384
385
386
|
# 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)} | "
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
387
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
388
389
390
391
392
393
394
395
396
397
398
399
|
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:
context.end_stage(RequestContextStage.ELASTICSEARCH_SEARCH)
|
506c39b7
tangwang
feat(search): 统一重...
|
400
|
# Optional Step 4.5: AI reranking(仅当请求范围在重排窗口内时执行)
|
ff32d894
tangwang
rerank
|
401
|
if do_rerank and in_rerank_window:
|
506c39b7
tangwang
feat(search): 统一重...
|
402
403
404
405
406
407
|
context.start_stage(RequestContextStage.RERANKING)
try:
from .rerank_client import run_rerank
rerank_query = parsed_query.original_query if parsed_query else query
rc = self.config.rerank
|
ff32d894
tangwang
rerank
|
408
409
|
effective_query_template = rerank_query_template or rc.rerank_query_template
effective_doc_template = rerank_doc_template or rc.rerank_doc_template
|
506c39b7
tangwang
feat(search): 统一重...
|
410
411
412
413
|
es_response, rerank_meta, fused_debug = run_rerank(
query=rerank_query,
es_response=es_response,
language=language,
|
506c39b7
tangwang
feat(search): 统一重...
|
414
415
416
|
timeout_sec=rc.timeout_sec,
weight_es=rc.weight_es,
weight_ai=rc.weight_ai,
|
ff32d894
tangwang
rerank
|
417
418
|
rerank_query_template=effective_query_template,
rerank_doc_template=effective_doc_template,
|
506c39b7
tangwang
feat(search): 统一重...
|
419
420
421
|
)
if rerank_meta is not None:
|
42e3aea6
tangwang
tidy
|
422
423
|
from config.services_config import get_rerank_service_url
rerank_url = get_rerank_service_url()
|
506c39b7
tangwang
feat(search): 统一重...
|
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
|
context.metadata.setdefault("rerank_info", {})
context.metadata["rerank_info"].update({
"service_url": rerank_url,
"docs": len(es_response.get("hits", {}).get("hits") or []),
"meta": rerank_meta,
})
context.store_intermediate_result("rerank_scores", fused_debug)
context.logger.info(
f"重排完成 | docs={len(fused_debug)} | meta={rerank_meta}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
except Exception as e:
context.add_warning(f"Rerank failed: {e}")
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:
slice_max = max((h.get("_score") for h in sliced), default=0.0)
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
context.logger.info(
f"重排分页切片 | from={from_}, size={size}, 返回={len(sliced)}条",
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
16c42787
tangwang
feat: implement r...
|
463
464
465
|
# Step 5: Result processing
context.start_stage(RequestContextStage.RESULT_PROCESSING)
try:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
466
467
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
468
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
469
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
470
|
|
16c42787
tangwang
feat: implement r...
|
471
472
473
474
475
476
|
# 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): 统一重...
|
477
|
# max_score 会在启用 AI 搜索时被更新为融合分数的最大值
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
478
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
479
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
480
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
481
482
483
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
484
485
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
486
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
487
488
489
490
491
492
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
493
494
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
495
496
497
498
499
500
|
)
# 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
|
501
|
|
16c42787
tangwang
feat: implement r...
|
502
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
503
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
504
505
506
507
508
509
510
511
512
513
514
515
|
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
|
516
|
|
16c42787
tangwang
feat: implement r...
|
517
518
519
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
520
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
521
522
523
524
525
526
|
# Collect debug information if requested
debug_info = None
if debug:
debug_info = {
"query_analysis": {
"original_query": context.query_analysis.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
527
|
"query_normalized": context.query_analysis.query_normalized,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
|
"rewritten_query": context.query_analysis.rewritten_query,
"detected_language": context.query_analysis.detected_language,
"translations": context.query_analysis.translations,
"has_vector": context.query_analysis.query_vector is not None,
"is_simple_query": context.query_analysis.is_simple_query,
"boolean_ast": context.get_intermediate_result('boolean_ast'),
"domain": context.query_analysis.domain
},
"es_query": context.get_intermediate_result('es_query', {}),
"es_response": {
"took_ms": es_response.get('took', 0),
"total_hits": total_value,
"max_score": max_score,
"shards": es_response.get('_shards', {})
},
"feature_flags": context.metadata.get('feature_flags', {}),
"stage_timings": {
k: round(v, 2) for k, v in context.performance_metrics.stage_timings.items()
},
"search_params": context.metadata.get('search_params', {})
}
|
be52af70
tangwang
first commit
|
550
551
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
552
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
553
554
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
555
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
556
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
557
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
558
559
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
560
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
561
562
|
)
|
16c42787
tangwang
feat: implement r...
|
563
564
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
565
566
567
568
569
570
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
571
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
572
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
573
574
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
575
576
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
577
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
578
579
580
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
581
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
582
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
583
584
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
585
586
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
587
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
588
589
590
591
592
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
26b910bd
tangwang
refactor service ...
|
593
594
595
|
if self.image_encoder is None:
raise RuntimeError("Image encoder is not initialized at startup")
image_vector = self.image_encoder.encode_image_from_url(image_url)
|
be52af70
tangwang
first commit
|
596
597
598
599
|
if image_vector is None:
raise ValueError(f"Failed to encode image: {image_url}")
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
600
601
602
603
|
# 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级别索引、统一索引架构...
|
604
|
|
be52af70
tangwang
first commit
|
605
606
607
608
609
610
611
612
613
614
615
|
# 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 ...
|
616
617
|
# Apply source filtering semantics (None / [] / list)
self._apply_source_filter(es_query)
|
13377199
tangwang
接口优化
|
618
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
619
620
621
622
623
624
625
|
if filters or range_filters:
filter_clauses = self.query_builder._build_filters(filters, range_filters)
if filter_clauses:
es_query["query"] = {
"bool": {
"filter": filter_clauses
}
|
be52af70
tangwang
first commit
|
626
|
}
|
be52af70
tangwang
first commit
|
627
628
629
|
# Execute search
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
630
|
index_name=index_name,
|
be52af70
tangwang
first commit
|
631
632
633
634
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
635
636
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
637
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
638
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
639
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
640
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
641
642
643
644
645
646
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
647
648
649
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
650
651
652
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
2739b281
tangwang
多语言索引调整
|
653
|
language="en", # Default language for image search
|
ca91352a
tangwang
更新文档
|
654
655
|
sku_filter_dimension=None # Image search doesn't support SKU filtering
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
656
|
|
be52af70
tangwang
first commit
|
657
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
658
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
659
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
660
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
661
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
662
663
664
665
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
666
667
|
)
|
b926f678
tangwang
多语言查询
|
668
669
670
671
672
673
674
675
676
|
def get_domain_summary(self) -> Dict[str, Any]:
"""
Get summary of all configured domains.
Returns:
Dictionary with domain information
"""
return self.query_builder.get_domain_summary()
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
677
|
def get_document(self, tenant_id: str, doc_id: str) -> Optional[Dict[str, Any]]:
|
be52af70
tangwang
first commit
|
678
679
680
681
|
"""
Get single document by ID.
Args:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
682
|
tenant_id: Tenant ID (required to determine which index to query)
|
be52af70
tangwang
first commit
|
683
684
685
686
687
688
|
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
689
|
index_name = get_tenant_index_name(tenant_id)
|
be52af70
tangwang
first commit
|
690
|
response = self.es_client.client.get(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
691
|
index=index_name,
|
be52af70
tangwang
first commit
|
692
693
694
695
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
696
|
logger.error(f"Failed to get document {doc_id} from tenant {tenant_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
697
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
698
699
700
701
|
def _standardize_facets(
self,
es_aggregations: Dict[str, Any],
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
702
|
facet_configs: Optional[List[Union[str, Any]]],
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
703
704
705
706
707
708
709
|
current_filters: Optional[Dict[str, Any]]
) -> Optional[List[FacetResult]]:
"""
将 ES 聚合结果转换为标准化的分面格式(返回 Pydantic 模型)。
Args:
es_aggregations: ES 原始聚合结果
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
710
|
facet_configs: 分面配置列表(str 或 FacetConfig)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
|
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 层...
|
727
728
729
|
# FacetConfig 对象
field = config.field
facet_type = config.type
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
|
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
测试页面分页配置
|
764
|
label=field,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
765
766
767
768
769
770
771
|
type=facet_type,
values=facet_values
)
standardized_facets.append(facet_result)
return standardized_facets if standardized_facets else None
|