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