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
|
be52af70
tangwang
first commit
|
23
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
24
25
|
logger = logging.getLogger(__name__)
|
be52af70
tangwang
first commit
|
26
27
|
class SearchResult:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
28
|
"""Container for search results (外部友好格式)."""
|
be52af70
tangwang
first commit
|
29
30
31
|
def __init__(
self,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
32
|
results: List[Any], # List[SpuResult]
|
be52af70
tangwang
first commit
|
33
34
35
|
total: int,
max_score: float,
took_ms: int,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
36
|
facets: Optional[List[FacetResult]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
37
|
query_info: Optional[Dict[str, Any]] = None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
38
39
|
suggestions: Optional[List[str]] = None,
related_searches: Optional[List[str]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
40
|
debug_info: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
41
|
):
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
42
|
self.results = results
|
be52af70
tangwang
first commit
|
43
44
45
|
self.total = total
self.max_score = max_score
self.took_ms = took_ms
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
46
|
self.facets = facets
|
be52af70
tangwang
first commit
|
47
|
self.query_info = query_info or {}
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
48
49
|
self.suggestions = suggestions or []
self.related_searches = related_searches or []
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
50
|
self.debug_info = debug_info
|
43f1139f
tangwang
refactor: ES查询结构重...
|
51
|
|
be52af70
tangwang
first commit
|
52
53
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
54
|
result = {
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
55
|
"results": [r.model_dump() if hasattr(r, 'model_dump') else r for r in self.results],
|
be52af70
tangwang
first commit
|
56
57
58
|
"total": self.total,
"max_score": self.max_score,
"took_ms": self.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
59
|
"facets": [f.model_dump() for f in self.facets] if self.facets else None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
60
61
62
|
"query_info": self.query_info,
"suggestions": self.suggestions,
"related_searches": self.related_searches
|
be52af70
tangwang
first commit
|
63
|
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
64
65
66
|
if self.debug_info is not None:
result["debug_info"] = self.debug_info
return result
|
be52af70
tangwang
first commit
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
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
|
82
|
es_client: ESClient,
|
9f96d6f3
tangwang
短query不用语义搜索
|
83
84
|
config: SearchConfig,
query_parser: Optional[QueryParser] = None
|
be52af70
tangwang
first commit
|
85
86
87
88
89
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
90
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
91
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
92
|
query_parser: Query parser (created if not provided)
|
be52af70
tangwang
first commit
|
93
|
"""
|
be52af70
tangwang
first commit
|
94
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
95
96
97
|
self.config = config
self.index_name = config.es_index_name
self.query_parser = query_parser or QueryParser(config)
|
be52af70
tangwang
first commit
|
98
99
100
|
# Initialize components
self.boolean_parser = BooleanParser()
|
9f96d6f3
tangwang
短query不用语义搜索
|
101
|
self.rerank_engine = RerankEngine(config.ranking.expression, enabled=False)
|
be52af70
tangwang
first commit
|
102
|
|
9f96d6f3
tangwang
短query不用语义搜索
|
103
104
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"
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
|
108
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
109
110
|
# Query builder - simplified single-layer architecture
self.query_builder = ESQueryBuilder(
|
9f96d6f3
tangwang
短query不用语义搜索
|
111
|
index_name=self.index_name,
|
bf89b597
tangwang
feat(search): ada...
|
112
|
match_fields=self.match_fields,
|
be52af70
tangwang
first commit
|
113
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
114
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
115
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
116
|
function_score_config=self.config.function_score,
|
a5a6bab8
tangwang
多语言查询优化
|
117
118
|
enable_multilang_search=self.config.query_config.enable_multilang_search,
default_language=self.config.query_config.default_language
|
be52af70
tangwang
first commit
|
119
120
121
122
123
|
)
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
124
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
125
126
127
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
128
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
129
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
130
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
131
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
132
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
133
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
134
135
|
debug: bool = False,
language: str = "zh",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
136
|
sku_filter_dimension: Optional[List[str]] = None,
|
be52af70
tangwang
first commit
|
137
138
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
139
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
140
141
142
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
143
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
144
145
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
146
147
148
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
149
|
min_score: Minimum score threshold
|
16c42787
tangwang
feat: implement r...
|
150
|
context: Request context for tracking (created if not provided)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
151
152
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
153
|
debug: Enable debug information output
|
be52af70
tangwang
first commit
|
154
155
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
156
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
157
|
"""
|
16c42787
tangwang
feat: implement r...
|
158
159
160
161
|
# Create context if not provided (backward compatibility)
if context is None:
context = create_request_context()
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
162
163
164
165
|
# 根据租户配置决定翻译开关(离线/在线统一)
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不用语义搜索
|
166
|
enable_embedding = self.config.query_config.enable_text_embedding
|
3bb1af6b
tangwang
tenant1和tenant2 m...
|
167
|
enable_rerank = False # Temporarily disabled
|
16c42787
tangwang
feat: implement r...
|
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
|
# 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 应该能自动...
|
184
185
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
186
187
188
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
'enable_rerank': enable_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
189
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
190
191
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
192
|
}
|
be52af70
tangwang
first commit
|
193
|
|
16c42787
tangwang
feat: implement r...
|
194
195
196
197
198
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
'rerank_enabled': enable_rerank
}
|
be52af70
tangwang
first commit
|
199
200
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
201
202
203
204
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
205
|
tenant_id=tenant_id,
|
16c42787
tangwang
feat: implement r...
|
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
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
|
220
|
|
16c42787
tangwang
feat: implement r...
|
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
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
|
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:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
273
274
275
276
277
|
# Add tenant_id to filters (required)
if filters is None:
filters = {}
filters['tenant_id'] = tenant_id
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
278
279
|
es_query = self.query_builder.build_query(
query_text=parsed_query.rewritten_query or parsed_query.normalized_query,
|
16c42787
tangwang
feat: implement r...
|
280
281
282
|
query_vector=parsed_query.query_vector if enable_embedding else None,
query_node=query_node,
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
283
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
284
|
facet_configs=facets,
|
16c42787
tangwang
feat: implement r...
|
285
286
287
|
size=size,
from_=from_,
enable_knn=enable_embedding and parsed_query.query_vector is not None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
288
289
|
min_score=min_score,
parsed_query=parsed_query
|
16c42787
tangwang
feat: implement r...
|
290
|
)
|
be52af70
tangwang
first commit
|
291
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
292
293
294
295
296
297
298
|
# 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...
|
299
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
300
301
302
303
|
# 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...
|
304
305
306
307
308
309
310
|
# 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
|
311
312
313
|
# 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...
|
314
|
context.logger.info(
|
99bea633
tangwang
add logs
|
315
316
317
318
|
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...
|
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
|
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:
es_response = self.es_client.search(
|
bf89b597
tangwang
feat(search): ada...
|
335
|
index_name=self.index_name,
|
16c42787
tangwang
feat: implement r...
|
336
337
338
|
body=body_for_es,
size=size,
from_=from_
|
be52af70
tangwang
first commit
|
339
340
|
)
|
16c42787
tangwang
feat: implement r...
|
341
342
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
be52af70
tangwang
first commit
|
343
|
|
16c42787
tangwang
feat: implement r...
|
344
345
346
347
348
|
# 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
|
349
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
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级别索引、统一索引架构...
|
365
366
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
367
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
368
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
369
|
|
16c42787
tangwang
feat: implement r...
|
370
371
372
373
374
375
|
# 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
|
376
|
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
377
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
378
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
379
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
380
381
382
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
383
384
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
385
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
386
387
388
389
390
391
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
392
393
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
394
395
396
397
398
399
|
)
# 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
|
400
|
|
16c42787
tangwang
feat: implement r...
|
401
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
402
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
403
404
405
406
407
408
409
410
411
412
413
414
|
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
|
415
|
|
16c42787
tangwang
feat: implement r...
|
416
417
418
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
419
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
420
421
422
423
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
|
# 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
|
449
450
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
451
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
452
453
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
454
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
455
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
456
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
457
458
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
459
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
460
461
|
)
|
16c42787
tangwang
feat: implement r...
|
462
463
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
464
465
466
467
468
469
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
470
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
471
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
472
473
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
474
475
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
476
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
477
478
479
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
480
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
481
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
482
483
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
484
485
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
486
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
487
488
489
490
491
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
be52af70
tangwang
first commit
|
492
493
494
495
496
497
|
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}")
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
498
499
500
501
502
|
# Add tenant_id to filters (required)
if filters is None:
filters = {}
filters['tenant_id'] = tenant_id
|
be52af70
tangwang
first commit
|
503
504
505
506
507
508
509
510
511
512
513
|
# 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
接口优化
|
514
|
# Add _source filtering if source_fields are configured
|
9f96d6f3
tangwang
短query不用语义搜索
|
515
|
if self.source_fields:
|
13377199
tangwang
接口优化
|
516
|
es_query["_source"] = {
|
9f96d6f3
tangwang
短query不用语义搜索
|
517
|
"includes": self.source_fields
|
13377199
tangwang
接口优化
|
518
519
|
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
520
521
522
523
524
525
526
|
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
|
527
|
}
|
be52af70
tangwang
first commit
|
528
529
530
|
# Execute search
es_response = self.es_client.search(
|
bf89b597
tangwang
feat(search): ada...
|
531
|
index_name=self.index_name,
|
be52af70
tangwang
first commit
|
532
533
534
535
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
536
537
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
538
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
539
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
540
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
541
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
542
543
544
545
546
547
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
548
549
550
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
551
552
553
554
555
556
|
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级别索引、统一索引架构...
|
557
|
|
be52af70
tangwang
first commit
|
558
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
559
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
560
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
561
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
562
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
563
564
565
566
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
567
568
|
)
|
b926f678
tangwang
多语言查询
|
569
570
571
572
573
574
575
576
577
|
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()
|
be52af70
tangwang
first commit
|
578
579
580
581
582
583
584
585
586
587
588
589
|
def get_document(self, doc_id: str) -> Optional[Dict[str, Any]]:
"""
Get single document by ID.
Args:
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
response = self.es_client.client.get(
|
bf89b597
tangwang
feat(search): ada...
|
590
|
index=self.index_name,
|
be52af70
tangwang
first commit
|
591
592
593
594
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
595
|
logger.error(f"Failed to get document {doc_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
596
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
597
598
599
600
|
def _standardize_facets(
self,
es_aggregations: Dict[str, Any],
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
601
|
facet_configs: Optional[List[Union[str, Any]]],
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
602
603
604
605
606
607
608
|
current_filters: Optional[Dict[str, Any]]
) -> Optional[List[FacetResult]]:
"""
将 ES 聚合结果转换为标准化的分面格式(返回 Pydantic 模型)。
Args:
es_aggregations: ES 原始聚合结果
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
609
|
facet_configs: 分面配置列表(str 或 FacetConfig)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
|
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 层...
|
626
627
628
|
# FacetConfig 对象
field = config.field
facet_type = config.type
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
629
630
631
632
633
634
635
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
|
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
测试页面分页配置
|
663
|
label=field,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
664
665
666
667
668
669
670
|
type=facet_type,
values=facet_values
)
standardized_facets.append(facet_result)
return standardized_facets if standardized_facets else None
|