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
|
99bea633
tangwang
add logs
|
8
|
import time, json
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
9
|
import logging
|
be52af70
tangwang
first commit
|
10
|
|
be52af70
tangwang
first commit
|
11
12
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
13
|
from embeddings import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
14
15
|
from .boolean_parser import BooleanParser, QueryNode
from .es_query_builder import ESQueryBuilder
|
43f1139f
tangwang
refactor: ES查询结构重...
|
16
|
from .rerank_engine import RerankEngine
|
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
|
16c42787
tangwang
feat: implement r...
|
20
|
from context.request_context import RequestContext, RequestContextStage, create_request_context
|
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
85
|
config: SearchConfig,
query_parser: Optional[QueryParser] = None
|
be52af70
tangwang
first commit
|
86
87
88
89
90
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
91
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
92
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
93
|
query_parser: Query parser (created if not provided)
|
be52af70
tangwang
first commit
|
94
|
"""
|
be52af70
tangwang
first commit
|
95
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
96
|
self.config = config
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
97
|
# Index name is now generated dynamically per tenant, no longer stored here
|
9f96d6f3
tangwang
短query不用语义搜索
|
98
|
self.query_parser = query_parser or QueryParser(config)
|
be52af70
tangwang
first commit
|
99
100
101
|
# Initialize components
self.boolean_parser = BooleanParser()
|
9f96d6f3
tangwang
短query不用语义搜索
|
102
|
self.rerank_engine = RerankEngine(config.ranking.expression, enabled=False)
|
be52af70
tangwang
first commit
|
103
|
|
9f96d6f3
tangwang
短query不用语义搜索
|
104
105
106
107
108
|
# 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"
self.image_embedding_field = config.query_config.image_embedding_field or "image_embedding"
self.source_fields = config.query_config.source_fields or []
|
be52af70
tangwang
first commit
|
109
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
110
|
# Query builder - simplified single-layer architecture
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
111
|
# index_name is no longer needed in query builder since we use tenant-specific indices
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
112
|
self.query_builder = ESQueryBuilder(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
113
|
index_name="", # Not used, kept for backward compatibility
|
bf89b597
tangwang
feat(search): ada...
|
114
|
match_fields=self.match_fields,
|
be52af70
tangwang
first commit
|
115
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
116
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
117
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
118
|
function_score_config=self.config.function_score,
|
a5a6bab8
tangwang
多语言查询优化
|
119
|
enable_multilang_search=self.config.query_config.enable_multilang_search,
|
70dab99f
tangwang
add logs
|
120
121
|
default_language=self.config.query_config.default_language,
knn_boost=self.config.query_config.knn_boost
|
be52af70
tangwang
first commit
|
122
123
124
125
126
|
)
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
127
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
128
129
130
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
131
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
132
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
133
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
134
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
135
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
136
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
137
138
|
debug: bool = False,
language: str = "zh",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
139
|
sku_filter_dimension: Optional[List[str]] = None,
|
be52af70
tangwang
first commit
|
140
141
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
142
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
143
144
145
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
146
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
147
148
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
149
150
151
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
152
|
min_score: Minimum score threshold
|
16c42787
tangwang
feat: implement r...
|
153
|
context: Request context for tracking (created if not provided)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
154
155
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
156
|
debug: Enable debug information output
|
be52af70
tangwang
first commit
|
157
158
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
159
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
160
|
"""
|
16c42787
tangwang
feat: implement r...
|
161
162
163
164
|
# Create context if not provided (backward compatibility)
if context is None:
context = create_request_context()
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
165
166
167
168
|
# 根据租户配置决定翻译开关(离线/在线统一)
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id)
enable_translation = bool(tenant_cfg.get("translate_to_en") or tenant_cfg.get("translate_to_zh"))
|
9f96d6f3
tangwang
短query不用语义搜索
|
169
|
enable_embedding = self.config.query_config.enable_text_embedding
|
3bb1af6b
tangwang
tenant1和tenant2 m...
|
170
|
enable_rerank = False # Temporarily disabled
|
16c42787
tangwang
feat: implement r...
|
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
# Start timing
context.start_stage(RequestContextStage.TOTAL)
context.logger.info(
f"开始搜索请求 | 查询: '{query}' | 参数: size={size}, from_={from_}, "
f"enable_translation={enable_translation}, enable_embedding={enable_embedding}, "
f"enable_rerank={enable_rerank}, min_score={min_score}",
extra={'reqid': context.reqid, 'uid': context.uid}
)
# Store search parameters in context
context.metadata['search_params'] = {
'size': size,
'from_': from_,
'filters': filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
187
188
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
189
190
191
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
'enable_rerank': enable_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
192
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
193
194
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
195
|
}
|
be52af70
tangwang
first commit
|
196
|
|
16c42787
tangwang
feat: implement r...
|
197
198
199
200
201
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
'rerank_enabled': enable_rerank
}
|
be52af70
tangwang
first commit
|
202
203
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
204
205
206
207
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
208
|
tenant_id=tenant_id,
|
16c42787
tangwang
feat: implement r...
|
209
210
211
212
213
214
215
216
217
218
219
220
221
222
|
generate_vector=enable_embedding,
context=context
)
# Store query analysis results in context
context.store_query_analysis(
original_query=parsed_query.original_query,
normalized_query=parsed_query.normalized_query,
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
|
223
|
|
16c42787
tangwang
feat: implement r...
|
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
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...
|
276
277
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
|
768ad710
tangwang
MySQL到ES字段映射说明-业务...
|
278
|
index_name = "search_products"
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
279
280
|
# No longer need to add tenant_id to filters since each tenant has its own index
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
281
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
282
283
|
es_query = self.query_builder.build_query(
query_text=parsed_query.rewritten_query or parsed_query.normalized_query,
|
16c42787
tangwang
feat: implement r...
|
284
285
286
|
query_vector=parsed_query.query_vector if enable_embedding else None,
query_node=query_node,
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
287
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
288
|
facet_configs=facets,
|
16c42787
tangwang
feat: implement r...
|
289
290
291
|
size=size,
from_=from_,
enable_knn=enable_embedding and parsed_query.query_vector is not None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
292
293
|
min_score=min_score,
parsed_query=parsed_query
|
16c42787
tangwang
feat: implement r...
|
294
|
)
|
be52af70
tangwang
first commit
|
295
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
296
297
298
299
300
301
302
|
# 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...
|
303
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
304
305
306
307
|
# 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...
|
308
309
310
311
312
313
314
|
# 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
|
315
316
317
|
# 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...
|
318
|
context.logger.info(
|
99bea633
tangwang
add logs
|
319
320
321
322
|
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...
|
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
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:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
338
|
# Use tenant-specific index name
|
16c42787
tangwang
feat: implement r...
|
339
|
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
340
|
index_name=index_name,
|
16c42787
tangwang
feat: implement r...
|
341
342
343
|
body=body_for_es,
size=size,
from_=from_
|
be52af70
tangwang
first commit
|
344
345
|
)
|
16c42787
tangwang
feat: implement r...
|
346
347
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
be52af70
tangwang
first commit
|
348
|
|
16c42787
tangwang
feat: implement r...
|
349
350
351
352
353
|
# 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
|
354
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
|
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)
# Step 5: Result processing
context.start_stage(RequestContextStage.RESULT_PROCESSING)
try:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
370
371
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
372
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
373
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
374
|
|
16c42787
tangwang
feat: implement r...
|
375
376
377
378
379
380
|
# 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
|
be52af70
tangwang
first commit
|
381
|
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
382
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
383
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
384
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
385
386
387
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
388
389
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
390
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
391
392
393
394
395
396
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
397
398
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
399
400
401
402
403
404
|
)
# 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
|
405
|
|
16c42787
tangwang
feat: implement r...
|
406
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
407
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
408
409
410
411
412
413
414
415
416
417
418
419
|
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
|
420
|
|
16c42787
tangwang
feat: implement r...
|
421
422
423
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
424
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
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
|
# Collect debug information if requested
debug_info = None
if debug:
debug_info = {
"query_analysis": {
"original_query": context.query_analysis.original_query,
"normalized_query": context.query_analysis.normalized_query,
"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
|
454
455
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
456
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
457
458
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
459
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
460
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
461
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
462
463
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
464
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
465
466
|
)
|
16c42787
tangwang
feat: implement r...
|
467
468
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
469
470
471
472
473
474
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
475
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
476
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
477
478
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
479
480
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
481
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
482
483
484
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
485
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
486
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
487
488
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
489
490
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
491
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
492
493
494
495
496
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
be52af70
tangwang
first commit
|
497
498
499
500
501
502
|
image_encoder = CLIPImageEncoder()
image_vector = image_encoder.encode_image_from_url(image_url)
if image_vector is None:
raise ValueError(f"Failed to encode image: {image_url}")
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
503
504
505
506
|
# 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级别索引、统一索引架构...
|
507
|
|
be52af70
tangwang
first commit
|
508
509
510
511
512
513
514
515
516
517
518
|
# Build KNN query
es_query = {
"size": size,
"knn": {
"field": self.image_embedding_field,
"query_vector": image_vector.tolist(),
"k": size,
"num_candidates": size * 10
}
}
|
13377199
tangwang
接口优化
|
519
|
# Add _source filtering if source_fields are configured
|
9f96d6f3
tangwang
短query不用语义搜索
|
520
|
if self.source_fields:
|
13377199
tangwang
接口优化
|
521
|
es_query["_source"] = {
|
9f96d6f3
tangwang
短query不用语义搜索
|
522
|
"includes": self.source_fields
|
13377199
tangwang
接口优化
|
523
524
|
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
525
526
527
528
529
530
531
|
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
|
532
|
}
|
be52af70
tangwang
first commit
|
533
534
535
|
# Execute search
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
536
|
index_name=index_name,
|
be52af70
tangwang
first commit
|
537
538
539
540
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
541
542
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
543
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
544
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
545
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
546
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
547
548
549
550
551
552
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
553
554
555
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
556
557
558
559
560
561
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
language="zh", # Default language for image search
sku_filter_dimension=None # Image search doesn't support SKU filtering
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
562
|
|
be52af70
tangwang
first commit
|
563
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
564
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
565
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
566
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
567
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
568
569
570
571
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
572
573
|
)
|
b926f678
tangwang
多语言查询
|
574
575
576
577
578
579
580
581
582
|
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...
|
583
|
def get_document(self, tenant_id: str, doc_id: str) -> Optional[Dict[str, Any]]:
|
be52af70
tangwang
first commit
|
584
585
586
587
|
"""
Get single document by ID.
Args:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
588
|
tenant_id: Tenant ID (required to determine which index to query)
|
be52af70
tangwang
first commit
|
589
590
591
592
593
594
|
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
595
|
index_name = get_tenant_index_name(tenant_id)
|
be52af70
tangwang
first commit
|
596
|
response = self.es_client.client.get(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
597
|
index=index_name,
|
be52af70
tangwang
first commit
|
598
599
600
601
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
602
|
logger.error(f"Failed to get document {doc_id} from tenant {tenant_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
603
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
604
605
606
607
|
def _standardize_facets(
self,
es_aggregations: Dict[str, Any],
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
608
|
facet_configs: Optional[List[Union[str, Any]]],
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
609
610
611
612
613
614
615
|
current_filters: Optional[Dict[str, Any]]
) -> Optional[List[FacetResult]]:
"""
将 ES 聚合结果转换为标准化的分面格式(返回 Pydantic 模型)。
Args:
es_aggregations: ES 原始聚合结果
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
616
|
facet_configs: 分面配置列表(str 或 FacetConfig)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
|
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 层...
|
633
634
635
|
# FacetConfig 对象
field = config.field
facet_type = config.type
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
|
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
测试页面分页配置
|
670
|
label=field,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
671
672
673
674
675
676
677
|
type=facet_type,
values=facet_values
)
standardized_facets.append(facet_result)
return standardized_facets if standardized_facets else None
|