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
|
be52af70
tangwang
first commit
|
8
|
import time
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
9
|
import logging
|
be52af70
tangwang
first commit
|
10
|
|
9cb7528e
tangwang
店匠体系数据的搜索:mock da...
|
11
|
from config import SearchConfig
|
be52af70
tangwang
first commit
|
12
13
14
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
from indexer import MappingGenerator
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
15
|
from embeddings import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
16
17
|
from .boolean_parser import BooleanParser, QueryNode
from .es_query_builder import ESQueryBuilder
|
b926f678
tangwang
多语言查询
|
18
|
from .multilang_query_builder import MultiLanguageQueryBuilder
|
43f1139f
tangwang
refactor: ES查询结构重...
|
19
|
from .rerank_engine import RerankEngine
|
16c42787
tangwang
feat: implement r...
|
20
|
from context.request_context import RequestContext, RequestContextStage, create_request_context
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
21
|
from api.models import FacetResult, FacetValue
|
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,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
32
|
results: List[Any], # List[ProductResult]
|
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,
|
9cb7528e
tangwang
店匠体系数据的搜索:mock da...
|
82
|
config: SearchConfig,
|
be52af70
tangwang
first commit
|
83
84
85
86
87
88
89
|
es_client: ESClient,
query_parser: Optional[QueryParser] = None
):
"""
Initialize searcher.
Args:
|
9cb7528e
tangwang
店匠体系数据的搜索:mock da...
|
90
|
config: Search configuration
|
be52af70
tangwang
first commit
|
91
92
93
94
95
96
97
98
99
|
es_client: Elasticsearch client
query_parser: Query parser (created if not provided)
"""
self.config = config
self.es_client = es_client
self.query_parser = query_parser or QueryParser(config)
# Initialize components
self.boolean_parser = BooleanParser()
|
43f1139f
tangwang
refactor: ES查询结构重...
|
100
|
self.rerank_engine = RerankEngine(config.ranking.expression, enabled=False)
|
be52af70
tangwang
first commit
|
101
102
103
104
105
106
107
|
# Get mapping info
mapping_gen = MappingGenerator(config)
self.match_fields = mapping_gen.get_match_fields_for_domain("default")
self.text_embedding_field = mapping_gen.get_text_embedding_field()
self.image_embedding_field = mapping_gen.get_image_embedding_field()
|
b926f678
tangwang
多语言查询
|
108
109
110
|
# Query builder - use multi-language version
self.query_builder = MultiLanguageQueryBuilder(
config=config,
|
be52af70
tangwang
first commit
|
111
|
index_name=config.es_index_name,
|
be52af70
tangwang
first commit
|
112
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
113
114
|
image_embedding_field=self.image_embedding_field,
source_fields=config.query_config.source_fields
|
be52af70
tangwang
first commit
|
115
116
117
118
119
|
)
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
120
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
121
122
123
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
124
125
|
range_filters: Optional[Dict[str, Any]] = None,
facets: Optional[List[Any]] = None,
|
16c42787
tangwang
feat: implement r...
|
126
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
127
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
128
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
129
130
|
sort_order: Optional[str] = "desc",
debug: bool = False
|
be52af70
tangwang
first commit
|
131
132
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
133
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
134
135
136
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
137
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
138
139
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
140
141
142
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
143
|
min_score: Minimum score threshold
|
16c42787
tangwang
feat: implement r...
|
144
|
context: Request context for tracking (created if not provided)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
145
146
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
147
|
debug: Enable debug information output
|
be52af70
tangwang
first commit
|
148
149
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
150
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
151
|
"""
|
16c42787
tangwang
feat: implement r...
|
152
153
154
155
156
157
158
|
# Create context if not provided (backward compatibility)
if context is None:
context = create_request_context()
# Always use config defaults (these are backend configuration, not user parameters)
enable_translation = self.config.query_config.enable_translation
enable_embedding = self.config.query_config.enable_text_embedding
|
3bb1af6b
tangwang
tenant1和tenant2 m...
|
159
|
enable_rerank = False # Temporarily disabled
|
16c42787
tangwang
feat: implement r...
|
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
# 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 应该能自动...
|
176
177
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
178
179
180
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
'enable_rerank': enable_rerank,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
181
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
182
183
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
184
|
}
|
be52af70
tangwang
first commit
|
185
|
|
16c42787
tangwang
feat: implement r...
|
186
187
188
189
190
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
'rerank_enabled': enable_rerank
}
|
be52af70
tangwang
first commit
|
191
192
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
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
|
211
|
|
16c42787
tangwang
feat: implement r...
|
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
|
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级别索引、统一索引架构...
|
264
265
266
267
268
|
# Add tenant_id to filters (required)
if filters is None:
filters = {}
filters['tenant_id'] = tenant_id
|
16c42787
tangwang
feat: implement r...
|
269
270
271
272
273
|
es_query = self.query_builder.build_multilang_query(
parsed_query=parsed_query,
query_vector=parsed_query.query_vector if enable_embedding else None,
query_node=query_node,
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
274
|
range_filters=range_filters,
|
16c42787
tangwang
feat: implement r...
|
275
276
277
278
279
|
size=size,
from_=from_,
enable_knn=enable_embedding and parsed_query.query_vector is not None,
min_score=min_score
)
|
be52af70
tangwang
first commit
|
280
|
|
16c42787
tangwang
feat: implement r...
|
281
282
283
284
285
286
287
288
|
# Add SPU collapse if configured
if self.config.spu_config.enabled:
es_query = self.query_builder.add_spu_collapse(
es_query,
self.config.spu_config.spu_field,
self.config.spu_config.inner_hits_size
)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
289
290
291
292
293
294
295
|
# 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...
|
296
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
297
298
299
300
|
# 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...
|
301
302
303
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)
context.logger.info(
f"ES查询构建完成 | 大小: {len(str(es_query))}字符 | "
f"KNN: {'是' if enable_embedding and parsed_query.query_vector is not None else '否'} | "
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
311
|
f"分面: {'是' if facets else '否'}",
|
16c42787
tangwang
feat: implement r...
|
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
context.logger.debug(
f"ES查询详情: {es_query}",
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(
index_name=self.config.es_index_name,
body=body_for_es,
size=size,
from_=from_
|
be52af70
tangwang
first commit
|
336
337
|
)
|
16c42787
tangwang
feat: implement r...
|
338
339
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
be52af70
tangwang
first commit
|
340
|
|
16c42787
tangwang
feat: implement r...
|
341
342
343
344
345
|
# 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
|
346
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
|
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级别索引、统一索引架构...
|
362
363
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
364
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
365
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
366
|
|
16c42787
tangwang
feat: implement r...
|
367
368
369
370
371
372
|
# 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
|
373
|
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
374
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
375
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
|
# Format results using ResultFormatter
formatted_results = ResultFormatter.format_search_results(es_hits, max_score)
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
facets
)
# 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
|
391
|
|
16c42787
tangwang
feat: implement r...
|
392
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
393
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
394
395
396
397
398
399
400
401
402
403
404
405
|
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
|
406
|
|
16c42787
tangwang
feat: implement r...
|
407
408
409
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
410
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
|
# 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
|
440
441
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
442
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
443
444
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
445
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
446
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
447
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
448
449
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
450
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
451
452
|
)
|
16c42787
tangwang
feat: implement r...
|
453
454
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
455
456
457
458
459
460
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
461
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
462
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
463
464
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
465
466
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
467
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
468
469
470
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
471
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
472
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
473
474
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
475
476
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
477
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
478
479
480
481
482
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
be52af70
tangwang
first commit
|
483
484
485
486
487
488
|
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级别索引、统一索引架构...
|
489
490
491
492
493
|
# Add tenant_id to filters (required)
if filters is None:
filters = {}
filters['tenant_id'] = tenant_id
|
be52af70
tangwang
first commit
|
494
495
496
497
498
499
500
501
502
503
504
|
# 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
接口优化
|
505
506
507
508
509
510
|
# Add _source filtering if source_fields are configured
if self.config.query_config.source_fields:
es_query["_source"] = {
"includes": self.config.query_config.source_fields
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
511
512
513
514
515
516
517
|
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
|
518
|
}
|
be52af70
tangwang
first commit
|
519
520
521
522
523
524
525
526
|
# Execute search
es_response = self.es_client.search(
index_name=self.config.es_index_name,
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
527
528
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
529
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
530
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
531
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
532
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
533
534
535
536
537
538
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
539
540
541
542
543
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
formatted_results = ResultFormatter.format_search_results(es_hits, max_score)
|
be52af70
tangwang
first commit
|
544
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
545
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
546
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
547
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
548
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
549
550
551
552
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
553
554
|
)
|
b926f678
tangwang
多语言查询
|
555
556
557
558
559
560
561
562
563
|
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
|
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
|
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(
index=self.config.es_index_name,
id=doc_id
)
return response.get('_source')
except Exception as e:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
581
|
logger.error(f"Failed to get document {doc_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
582
|
return None
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
583
584
585
586
|
def _standardize_facets(
self,
es_aggregations: Dict[str, Any],
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
587
|
facet_configs: Optional[List[Union[str, Any]]],
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
588
589
590
591
592
593
594
|
current_filters: Optional[Dict[str, Any]]
) -> Optional[List[FacetResult]]:
"""
将 ES 聚合结果转换为标准化的分面格式(返回 Pydantic 模型)。
Args:
es_aggregations: ES 原始聚合结果
|
ff5325fa
tangwang
修复:直接在 Searcher 层...
|
595
|
facet_configs: 分面配置列表(str 或 FacetConfig)
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
|
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 层...
|
612
613
614
|
# FacetConfig 对象
field = config.field
facet_type = config.type
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
615
616
617
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
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
|
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,
label=self._get_field_label(field),
type=facet_type,
values=facet_values
)
standardized_facets.append(facet_result)
return standardized_facets if standardized_facets else None
def _get_field_label(self, field: str) -> str:
"""获取字段的显示标签"""
# 从配置中获取字段标签
for field_config in self.config.fields:
if field_config.name == field:
# 尝试获取 label 属性
return getattr(field_config, 'label', field)
# 如果没有配置,返回字段名
return field
|