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
|
"""
|
814e352b
tangwang
乘法公式配置化
|
7
8
|
from typing import Dict, Any, List, Optional
import json
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
9
|
import logging
|
28e57bb1
tangwang
日志体系优化
|
10
|
import hashlib
|
5f7d7f09
tangwang
性能测试报告.md
|
11
|
from string import Formatter
|
be52af70
tangwang
first commit
|
12
|
|
be52af70
tangwang
first commit
|
13
14
|
from utils.es_client import ESClient
from query import QueryParser, ParsedQuery
|
cda1cd62
tangwang
意图分析&应用 baseline
|
15
|
from query.style_intent import StyleIntentRegistry
|
07cf5a93
tangwang
START_EMBEDDING=...
|
16
|
from embeddings.image_encoder import CLIPImageEncoder
|
be52af70
tangwang
first commit
|
17
|
from .es_query_builder import ESQueryBuilder
|
cda1cd62
tangwang
意图分析&应用 baseline
|
18
|
from .sku_intent_selector import SkuSelectionDecision, StyleSkuSelector
|
9f96d6f3
tangwang
短query不用语义搜索
|
19
|
from config import SearchConfig
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
20
|
from config.tenant_config_loader import get_tenant_config_loader
|
ed948666
tangwang
tidy
|
21
|
from context.request_context import RequestContext, RequestContextStage
|
814e352b
tangwang
乘法公式配置化
|
22
|
from api.models import FacetResult, FacetConfig
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
23
|
from api.result_formatter import ResultFormatter
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
24
|
from indexer.mapping_generator import get_tenant_index_name
|
be52af70
tangwang
first commit
|
25
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
26
|
logger = logging.getLogger(__name__)
|
28e57bb1
tangwang
日志体系优化
|
27
28
29
30
31
32
33
34
35
|
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. 日志、配置基础设施,使用优化
|
36
|
|
be52af70
tangwang
first commit
|
37
|
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
def _index_debug_rows_by_doc(rows: Any) -> Dict[str, Dict[str, Any]]:
indexed: Dict[str, Dict[str, Any]] = {}
if not isinstance(rows, list):
return indexed
for item in rows:
if not isinstance(item, dict):
continue
doc_id = item.get("doc_id")
if doc_id is None:
continue
indexed[str(doc_id)] = item
return indexed
|
465f90e1
tangwang
添加LTR数据收集
|
52
53
54
55
56
57
|
def _summarize_ltr_features(per_result_debug: List[Dict[str, Any]], top_n: int = 20) -> Dict[str, Any]:
rows = list(per_result_debug[:top_n])
if not rows:
return {"top_n": 0, "counts": {}, "averages": {}, "top_docs": []}
def _feature(row: Dict[str, Any], key: str) -> Any:
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
58
59
60
61
62
|
funnel = row.get("ranking_funnel", {})
for stage_name in ("rerank", "fine_rank", "coarse_rank"):
stage_features = funnel.get(stage_name, {}).get("ltr_features")
if isinstance(stage_features, dict) and key in stage_features:
return stage_features.get(key)
|
465f90e1
tangwang
添加LTR数据收集
|
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
return None
def _count(flag: str) -> int:
return sum(1 for row in rows if bool(_feature(row, flag)))
def _avg(name: str) -> float | None:
values = [float(v) for row in rows if (v := _feature(row, name)) is not None]
if not values:
return None
return round(sum(values) / len(values), 6)
top_docs = []
for row in rows[:10]:
top_docs.append(
{
"spu_id": row.get("spu_id"),
"final_rank": row.get("final_rank"),
"title_zh": row.get("title_multilingual", {}).get("zh")
if isinstance(row.get("title_multilingual"), dict)
else None,
"es_score": _feature(row, "es_score"),
"text_score": _feature(row, "text_score"),
"knn_score": _feature(row, "knn_score"),
"rerank_score": _feature(row, "rerank_score"),
"fine_score": _feature(row, "fine_score"),
"has_translation_match": _feature(row, "has_translation_match"),
"has_text_knn": _feature(row, "has_text_knn"),
"has_image_knn": _feature(row, "has_image_knn"),
"has_style_boost": _feature(row, "has_style_boost"),
}
)
return {
"top_n": len(rows),
"counts": {
"translation_match_docs": _count("has_translation_match"),
"text_knn_docs": _count("has_text_knn"),
"image_knn_docs": _count("has_image_knn"),
"style_boost_docs": _count("has_style_boost"),
"text_fallback_to_es_docs": _count("text_score_fallback_to_es"),
},
"averages": {
"es_score": _avg("es_score"),
"text_score": _avg("text_score"),
"knn_score": _avg("knn_score"),
"rerank_score": _avg("rerank_score"),
"fine_score": _avg("fine_score"),
"source_score": _avg("source_score"),
"translation_score": _avg("translation_score"),
"text_knn_score": _avg("text_knn_score"),
"image_knn_score": _avg("image_knn_score"),
},
"top_docs": top_docs,
}
|
be52af70
tangwang
first commit
|
119
|
class SearchResult:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
120
|
"""Container for search results (外部友好格式)."""
|
be52af70
tangwang
first commit
|
121
122
123
|
def __init__(
self,
|
cadc77b6
tangwang
索引字段名、变量名、API数据结构...
|
124
|
results: List[Any], # List[SpuResult]
|
be52af70
tangwang
first commit
|
125
126
127
|
total: int,
max_score: float,
took_ms: int,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
128
|
facets: Optional[List[FacetResult]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
129
|
query_info: Optional[Dict[str, Any]] = None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
130
131
|
suggestions: Optional[List[str]] = None,
related_searches: Optional[List[str]] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
132
|
debug_info: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
133
|
):
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
134
|
self.results = results
|
be52af70
tangwang
first commit
|
135
136
137
|
self.total = total
self.max_score = max_score
self.took_ms = took_ms
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
138
|
self.facets = facets
|
be52af70
tangwang
first commit
|
139
|
self.query_info = query_info or {}
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
140
141
|
self.suggestions = suggestions or []
self.related_searches = related_searches or []
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
142
|
self.debug_info = debug_info
|
43f1139f
tangwang
refactor: ES查询结构重...
|
143
|
|
be52af70
tangwang
first commit
|
144
145
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
146
|
result = {
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
147
|
"results": [r.model_dump() if hasattr(r, 'model_dump') else r for r in self.results],
|
be52af70
tangwang
first commit
|
148
149
150
|
"total": self.total,
"max_score": self.max_score,
"took_ms": self.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
151
|
"facets": [f.model_dump() for f in self.facets] if self.facets else None,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
152
153
154
|
"query_info": self.query_info,
"suggestions": self.suggestions,
"related_searches": self.related_searches
|
be52af70
tangwang
first commit
|
155
|
}
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
156
157
158
|
if self.debug_info is not None:
result["debug_info"] = self.debug_info
return result
|
be52af70
tangwang
first commit
|
159
160
161
162
163
164
165
166
|
class Searcher:
"""
Main search engine class.
Handles:
- Query parsing and translation
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
167
|
- Dynamic multi-language text recall planning
|
be52af70
tangwang
first commit
|
168
169
170
171
172
173
|
- ES query building
- Result ranking and formatting
"""
def __init__(
self,
|
be52af70
tangwang
first commit
|
174
|
es_client: ESClient,
|
9f96d6f3
tangwang
短query不用语义搜索
|
175
|
config: SearchConfig,
|
26b910bd
tangwang
refactor service ...
|
176
177
|
query_parser: Optional[QueryParser] = None,
image_encoder: Optional[CLIPImageEncoder] = None,
|
be52af70
tangwang
first commit
|
178
179
180
181
182
|
):
"""
Initialize searcher.
Args:
|
be52af70
tangwang
first commit
|
183
|
es_client: Elasticsearch client
|
9f96d6f3
tangwang
短query不用语义搜索
|
184
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
185
|
query_parser: Query parser (created if not provided)
|
26b910bd
tangwang
refactor service ...
|
186
|
image_encoder: Optional pre-initialized image encoder
|
be52af70
tangwang
first commit
|
187
|
"""
|
be52af70
tangwang
first commit
|
188
|
self.es_client = es_client
|
9f96d6f3
tangwang
短query不用语义搜索
|
189
|
self.config = config
|
9f96d6f3
tangwang
短query不用语义搜索
|
190
|
self.text_embedding_field = config.query_config.text_embedding_field or "title_embedding"
|
26b910bd
tangwang
refactor service ...
|
191
192
193
194
195
|
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
|
dc403578
tangwang
多模态搜索
|
196
197
|
# Index name is now generated dynamically per tenant, no longer stored here
self.query_parser = query_parser or QueryParser(config, image_encoder=self.image_encoder)
|
26b910bd
tangwang
refactor service ...
|
198
|
self.source_fields = config.query_config.source_fields
|
cda1cd62
tangwang
意图分析&应用 baseline
|
199
200
201
202
|
self.style_intent_registry = StyleIntentRegistry.from_query_config(self.config.query_config)
self.style_sku_selector = StyleSkuSelector(
self.style_intent_registry,
text_encoder_getter=lambda: getattr(self.query_parser, "text_encoder", None),
|
cda1cd62
tangwang
意图分析&应用 baseline
|
203
|
)
|
be52af70
tangwang
first commit
|
204
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
205
|
# Query builder - simplified single-layer architecture
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
206
|
self.query_builder = ESQueryBuilder(
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
207
208
209
210
211
|
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
|
212
|
text_embedding_field=self.text_embedding_field,
|
13377199
tangwang
接口优化
|
213
|
image_embedding_field=self.image_embedding_field,
|
9f96d6f3
tangwang
短query不用语义搜索
|
214
|
source_fields=self.source_fields,
|
7bc756c5
tangwang
优化 ES 查询构建
|
215
|
function_score_config=self.config.function_score,
|
70dab99f
tangwang
add logs
|
216
|
default_language=self.config.query_config.default_language,
|
ed13851c
tangwang
图片文本两个knn召回相关参数配置
|
217
218
219
220
221
222
223
224
|
knn_text_boost=self.config.query_config.knn_text_boost,
knn_image_boost=self.config.query_config.knn_image_boost,
knn_text_k=self.config.query_config.knn_text_k,
knn_text_num_candidates=self.config.query_config.knn_text_num_candidates,
knn_text_k_long=self.config.query_config.knn_text_k_long,
knn_text_num_candidates_long=self.config.query_config.knn_text_num_candidates_long,
knn_image_k=self.config.query_config.knn_image_k,
knn_image_num_candidates=self.config.query_config.knn_image_num_candidates,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
225
226
227
|
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,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
228
|
tie_breaker_base_query=self.config.query_config.tie_breaker_base_query,
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
229
230
231
232
|
best_fields_boosts=self.config.query_config.best_fields,
best_fields_clause_boost=self.config.query_config.best_fields_boost,
phrase_field_boosts=self.config.query_config.phrase_fields,
phrase_match_boost=self.config.query_config.phrase_match_boost,
|
be52af70
tangwang
first commit
|
233
234
|
)
|
26b910bd
tangwang
refactor service ...
|
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
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}
|
317c5d2c
tangwang
feat(search): 引入 ...
|
251
252
253
254
255
256
|
def _resolve_exact_knn_rescore_window(self) -> int:
configured = int(self.config.rerank.exact_knn_rescore_window)
if configured > 0:
return configured
return int(self.config.rerank.rerank_window)
|
317c5d2c
tangwang
feat(search): 引入 ...
|
257
258
259
260
261
|
def _build_exact_knn_rescore(
self,
*,
query_vector: Any,
image_query_vector: Any,
|
47452e1d
tangwang
feat(search): 支持可...
|
262
|
parsed_query: Optional[ParsedQuery] = None,
|
317c5d2c
tangwang
feat(search): 引入 ...
|
263
264
265
|
) -> Optional[Dict[str, Any]]:
clauses: List[Dict[str, Any]] = []
|
47452e1d
tangwang
feat(search): 支持可...
|
266
267
268
269
270
271
272
|
text_clause = self.query_builder.build_exact_text_knn_rescore_clause(
query_vector,
parsed_query=parsed_query,
query_name="exact_text_knn_query",
)
if text_clause:
clauses.append(text_clause)
|
317c5d2c
tangwang
feat(search): 引入 ...
|
273
|
|
47452e1d
tangwang
feat(search): 支持可...
|
274
275
276
277
278
279
|
image_clause = self.query_builder.build_exact_image_knn_rescore_clause(
image_query_vector,
query_name="exact_image_knn_query",
)
if image_clause:
clauses.append(image_clause)
|
317c5d2c
tangwang
feat(search): 引入 ...
|
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
if not clauses:
return None
return {
"window_size": self._resolve_exact_knn_rescore_window(),
"query": {
# Phase 1: only compute exact vector scores and expose them in matched_queries.
"score_mode": "total",
"query_weight": 1.0,
"rescore_query_weight": 0.0,
"rescore_query": {
"bool": {
"should": clauses,
"minimum_should_match": 1,
}
},
},
}
def _attach_exact_knn_rescore(
self,
es_query: Dict[str, Any],
*,
in_rank_window: bool,
query_vector: Any,
image_query_vector: Any,
|
47452e1d
tangwang
feat(search): 支持可...
|
307
|
parsed_query: Optional[ParsedQuery] = None,
|
317c5d2c
tangwang
feat(search): 引入 ...
|
308
309
310
311
312
313
|
) -> None:
if not in_rank_window or not self.config.rerank.exact_knn_rescore_enabled:
return
rescore = self._build_exact_knn_rescore(
query_vector=query_vector,
image_query_vector=image_query_vector,
|
47452e1d
tangwang
feat(search): 支持可...
|
314
|
parsed_query=parsed_query,
|
317c5d2c
tangwang
feat(search): 引入 ...
|
315
316
317
318
319
320
321
322
323
324
325
|
)
if not rescore:
return
existing = es_query.get("rescore")
if existing is None:
es_query["rescore"] = rescore
elif isinstance(existing, list):
es_query["rescore"] = [*existing, rescore]
else:
es_query["rescore"] = [existing, rescore]
|
cda1cd62
tangwang
意图分析&应用 baseline
|
326
327
328
329
330
|
def _resolve_rerank_source_filter(
self,
doc_template: str,
parsed_query: Optional[ParsedQuery] = None,
) -> Dict[str, Any]:
|
5f7d7f09
tangwang
性能测试报告.md
|
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
|
"""
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")
|
5c9baf91
tangwang
feat(search): 款式意...
|
357
358
359
|
if self._should_run_sku_selection(parsed_query):
# SKU-level fields are needed both by text matching (optionN_value) and
# by the image pick (image_src) of the unified SKU selector.
|
cda1cd62
tangwang
意图分析&应用 baseline
|
360
361
362
363
364
365
366
367
|
includes.update(
{
"skus",
"option1_name",
"option2_name",
"option3_name",
}
)
|
5c9baf91
tangwang
feat(search): 款式意...
|
368
369
370
371
|
if self._has_style_intent(parsed_query):
# Treated as an additional value source for attribute matching
# (on the same dimension as optionN).
includes.add("enriched_taxonomy_attributes")
|
cda1cd62
tangwang
意图分析&应用 baseline
|
372
|
|
99b72698
tangwang
测试回归钩子梳理
|
373
374
375
376
377
|
# Needed when inner_hits url string differs from sku.image_src but ES exposes
# _nested.offset — we re-resolve the winning url from image_embedding[offset].
if self._has_image_signal(parsed_query):
includes.add("image_embedding")
|
5f7d7f09
tangwang
性能测试报告.md
|
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
|
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)
|
deccd68a
tangwang
Added the SKU pre...
|
420
|
@staticmethod
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
|
def _restore_hits_in_doc_order(
doc_ids: List[str],
hits_by_id: Dict[str, Dict[str, Any]],
) -> List[Dict[str, Any]]:
ordered_hits: List[Dict[str, Any]] = []
for doc_id in doc_ids:
hit = hits_by_id.get(str(doc_id))
if hit is not None:
ordered_hits.append(hit)
return ordered_hits
@staticmethod
def _merge_source_specs(*source_specs: Any) -> Optional[Dict[str, Any]]:
includes: set[str] = set()
for source_spec in source_specs:
if not isinstance(source_spec, dict):
continue
for field_name in source_spec.get("includes") or []:
includes.add(str(field_name))
if not includes:
return None
return {"includes": sorted(includes)}
@staticmethod
|
cda1cd62
tangwang
意图分析&应用 baseline
|
445
446
447
|
def _has_style_intent(parsed_query: Optional[ParsedQuery]) -> bool:
profile = getattr(parsed_query, "style_intent_profile", None)
return bool(getattr(profile, "is_active", False))
|
deccd68a
tangwang
Added the SKU pre...
|
448
|
|
5c9baf91
tangwang
feat(search): 款式意...
|
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
|
def _has_image_signal(self, parsed_query: Optional[ParsedQuery]) -> bool:
"""True when the query carries an image vector that can drive an image-based SKU pick."""
if parsed_query is None:
return False
if not getattr(self.config.query_config, "image_embedding_field", None):
return False
return getattr(parsed_query, "image_query_vector", None) is not None
def _should_run_sku_selection(self, parsed_query: Optional[ParsedQuery]) -> bool:
"""Trigger unified SKU selection when either signal is present.
Text-intent alone drives attribute-value matching; image signal alone drives
image-nearest SKU promotion; together, image is a visual tie-breaker inside
the text-matched set.
"""
return self._has_style_intent(parsed_query) or self._has_image_signal(parsed_query)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
466
|
def _apply_style_intent_to_hits(
|
deccd68a
tangwang
Added the SKU pre...
|
467
468
469
470
|
self,
es_hits: List[Dict[str, Any]],
parsed_query: ParsedQuery,
context: Optional[RequestContext] = None,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
471
|
) -> Dict[str, SkuSelectionDecision]:
|
8ae95af0
tangwang
1. Stage Timings:...
|
472
473
474
|
if context is not None:
context.start_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
try:
|
814e352b
tangwang
乘法公式配置化
|
475
|
return self.style_sku_selector.prepare_hits(es_hits, parsed_query)
|
8ae95af0
tangwang
1. Stage Timings:...
|
476
477
478
|
finally:
if context is not None:
context.end_stage(RequestContextStage.STYLE_SKU_PREPARE_HITS)
|
deccd68a
tangwang
Added the SKU pre...
|
479
|
|
be52af70
tangwang
first commit
|
480
481
482
|
def search(
self,
query: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
483
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
484
485
486
|
size: int = 10,
from_: int = 0,
filters: Optional[Dict[str, Any]] = None,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
487
|
range_filters: Optional[Dict[str, Any]] = None,
|
13320ac6
tangwang
分面接口修改:
|
488
|
facets: Optional[List[FacetConfig]] = None,
|
16c42787
tangwang
feat: implement r...
|
489
|
min_score: Optional[float] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
490
|
context: Optional[RequestContext] = None,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
491
|
sort_by: Optional[str] = None,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
492
|
sort_order: Optional[str] = "desc",
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
493
|
debug: bool = False,
|
2739b281
tangwang
多语言索引调整
|
494
|
language: str = "en",
|
a3a5d41b
tangwang
(sku_filter_dimen...
|
495
|
sku_filter_dimension: Optional[List[str]] = None,
|
5f7d7f09
tangwang
性能测试报告.md
|
496
|
enable_rerank: Optional[bool] = None,
|
ff32d894
tangwang
rerank
|
497
498
|
rerank_query_template: Optional[str] = None,
rerank_doc_template: Optional[str] = None,
|
be52af70
tangwang
first commit
|
499
500
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
501
|
Execute search query (外部友好格式).
|
be52af70
tangwang
first commit
|
502
503
504
|
Args:
query: Search query string
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
505
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
506
507
|
size: Number of results to return
from_: Offset for pagination
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
508
509
510
|
filters: Exact match filters
range_filters: Range filters for numeric fields
facets: Facet configurations for faceted search
|
be52af70
tangwang
first commit
|
511
|
min_score: Minimum score threshold
|
ef5baa86
tangwang
混杂语言处理
|
512
|
context: Request context for tracking (required)
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
513
514
|
sort_by: Field name for sorting
sort_order: Sort order: 'asc' or 'desc'
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
515
|
debug: Enable debug information output
|
ef5baa86
tangwang
混杂语言处理
|
516
517
518
|
language: Response / field selection language hint (e.g. zh, en)
sku_filter_dimension: SKU grouping dimensions for per-SPU variant pick
enable_rerank: If None, use ``config.rerank.enabled``; if set, overrides
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
519
520
521
|
whether the final rerank provider is invoked (subject to rank window).
When false, the ranking pipeline still runs and rerank stage becomes
pass-through.
|
ef5baa86
tangwang
混杂语言处理
|
522
523
524
525
526
|
rerank_query_template: Override for rerank query text template; None uses
``config.rerank.rerank_query_template`` (e.g. ``"{query}"``).
rerank_doc_template: Override for per-hit document text passed to rerank;
None uses ``config.rerank.rerank_doc_template``. Placeholders are
resolved in ``search/rerank_client.py``.
|
be52af70
tangwang
first commit
|
527
528
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
529
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
530
|
"""
|
16c42787
tangwang
feat: implement r...
|
531
|
if context is None:
|
ed948666
tangwang
tidy
|
532
|
raise ValueError("context is required")
|
16c42787
tangwang
feat: implement r...
|
533
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
534
535
536
|
# 根据租户配置决定翻译开关(离线/在线统一)
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id)
|
038e4e2f
tangwang
refactor(i18n): t...
|
537
538
|
index_langs = tenant_cfg.get("index_languages") or []
enable_translation = len(index_langs) > 0
|
9f96d6f3
tangwang
短query不用语义搜索
|
539
|
enable_embedding = self.config.query_config.enable_text_embedding
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
540
541
|
coarse_cfg = self.config.coarse_rank
fine_cfg = self.config.fine_rank
|
5f7d7f09
tangwang
性能测试报告.md
|
542
543
544
|
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
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
545
546
|
fine_query_template = fine_cfg.rerank_query_template or effective_query_template
fine_doc_template = fine_cfg.rerank_doc_template or effective_doc_template
|
5f7d7f09
tangwang
性能测试报告.md
|
547
548
549
|
# 重排开关优先级:请求参数显式传值 > 服务端配置(默认开启)
rerank_enabled_by_config = bool(rc.enabled)
do_rerank = rerank_enabled_by_config if enable_rerank is None else bool(enable_rerank)
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
550
|
fine_enabled = bool(fine_cfg.enabled)
|
c51d254f
tangwang
性能测试
|
551
|
rerank_window = rc.rerank_window
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
552
553
554
555
|
coarse_input_window = max(rerank_window, int(coarse_cfg.input_window))
coarse_output_window = max(rerank_window, int(coarse_cfg.output_window))
fine_input_window = max(rerank_window, int(fine_cfg.input_window))
fine_output_window = max(rerank_window, int(fine_cfg.output_window))
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
556
557
558
559
|
# 多阶段排序窗口独立于最终 rerank 开关:即使关闭最终 rerank,也保留 coarse/fine 流程。
in_rank_window = (from_ + size) <= rerank_window
es_fetch_from = 0 if in_rank_window else from_
es_fetch_size = coarse_input_window if in_rank_window else size
|
814e352b
tangwang
乘法公式配置化
|
560
561
562
|
es_score_normalization_factor: Optional[float] = None
initial_ranks_by_doc: Dict[str, int] = {}
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
563
564
565
|
coarse_ranks_by_doc: Dict[str, int] = {}
fine_ranks_by_doc: Dict[str, int] = {}
rerank_ranks_by_doc: Dict[str, int] = {}
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
566
567
|
coarse_debug_info: Optional[Dict[str, Any]] = None
fine_debug_info: Optional[Dict[str, Any]] = None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
568
|
rerank_debug_info: Optional[Dict[str, Any]] = None
|
16c42787
tangwang
feat: implement r...
|
569
570
571
572
573
574
|
# Start timing
context.start_stage(RequestContextStage.TOTAL)
context.logger.info(
f"开始搜索请求 | 查询: '{query}' | 参数: size={size}, from_={from_}, "
|
5f7d7f09
tangwang
性能测试报告.md
|
575
|
f"enable_rerank(request)={enable_rerank}, enable_rerank(config)={rerank_enabled_by_config}, "
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
576
577
|
f"fine_enabled(config)={fine_enabled}, "
f"enable_rerank(effective)={do_rerank}, in_rank_window={in_rank_window}, "
|
5f7d7f09
tangwang
性能测试报告.md
|
578
|
f"es_fetch=({es_fetch_from},{es_fetch_size}) | "
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
579
|
f"index_languages={index_langs} | "
|
506c39b7
tangwang
feat(search): 统一重...
|
580
|
f"enable_translation={enable_translation}, enable_embedding={enable_embedding}, min_score={min_score}",
|
16c42787
tangwang
feat: implement r...
|
581
582
583
584
585
586
587
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
# Store search parameters in context
context.metadata['search_params'] = {
'size': size,
'from_': from_,
|
506c39b7
tangwang
feat(search): 统一重...
|
588
589
|
'es_fetch_from': es_fetch_from,
'es_fetch_size': es_fetch_size,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
590
|
'in_rank_window': in_rank_window,
|
5f7d7f09
tangwang
性能测试报告.md
|
591
|
'rerank_enabled_by_config': rerank_enabled_by_config,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
592
|
'fine_enabled': fine_enabled,
|
5f7d7f09
tangwang
性能测试报告.md
|
593
594
595
|
'enable_rerank_request': enable_rerank,
'rerank_query_template': effective_query_template,
'rerank_doc_template': effective_doc_template,
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
596
597
|
'fine_query_template': fine_query_template,
'fine_doc_template': fine_doc_template,
|
16c42787
tangwang
feat: implement r...
|
598
|
'filters': filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
599
600
|
'range_filters': range_filters,
'facets': facets,
|
16c42787
tangwang
feat: implement r...
|
601
602
|
'enable_translation': enable_translation,
'enable_embedding': enable_embedding,
|
ff32d894
tangwang
rerank
|
603
|
'enable_rerank': do_rerank,
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
604
605
606
607
608
|
'coarse_input_window': coarse_input_window,
'coarse_output_window': coarse_output_window,
'fine_input_window': fine_input_window,
'fine_output_window': fine_output_window,
'rerank_window': rerank_window,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
609
|
'min_score': min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
610
611
|
'sort_by': sort_by,
'sort_order': sort_order
|
16c42787
tangwang
feat: implement r...
|
612
|
}
|
be52af70
tangwang
first commit
|
613
|
|
16c42787
tangwang
feat: implement r...
|
614
615
616
|
context.metadata['feature_flags'] = {
'translation_enabled': enable_translation,
'embedding_enabled': enable_embedding,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
617
|
'fine_enabled': fine_enabled,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
618
619
|
'rerank_enabled': do_rerank,
'style_intent_enabled': bool(self.style_intent_registry.enabled),
|
16c42787
tangwang
feat: implement r...
|
620
|
}
|
be52af70
tangwang
first commit
|
621
622
|
# Step 1: Parse query
|
16c42787
tangwang
feat: implement r...
|
623
624
625
626
|
context.start_stage(RequestContextStage.QUERY_PARSING)
try:
parsed_query = self.query_parser.parse(
query,
|
16c42787
tangwang
feat: implement r...
|
627
|
generate_vector=enable_embedding,
|
814e352b
tangwang
乘法公式配置化
|
628
|
tenant_id=tenant_id,
|
ef5baa86
tangwang
混杂语言处理
|
629
630
|
context=context,
target_languages=index_langs if enable_translation else [],
|
16c42787
tangwang
feat: implement r...
|
631
632
633
634
|
)
# Store query analysis results in context
context.store_query_analysis(
original_query=parsed_query.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
635
|
query_normalized=parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
636
637
638
|
rewritten_query=parsed_query.rewritten_query,
detected_language=parsed_query.detected_language,
translations=parsed_query.translations,
|
9d0214bb
tangwang
qp性能优化
|
639
|
keywords_queries=parsed_query.keywords_queries,
|
16c42787
tangwang
feat: implement r...
|
640
|
query_vector=parsed_query.query_vector.tolist() if parsed_query.query_vector is not None else None,
|
16c42787
tangwang
feat: implement r...
|
641
|
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
642
|
context.metadata["feature_flags"]["style_intent_active"] = self._has_style_intent(parsed_query)
|
be52af70
tangwang
first commit
|
643
|
|
16c42787
tangwang
feat: implement r...
|
644
645
646
647
|
context.logger.info(
f"查询解析完成 | 原查询: '{parsed_query.original_query}' | "
f"重写后: '{parsed_query.rewritten_query}' | "
f"语言: {parsed_query.detected_language} | "
|
9d0214bb
tangwang
qp性能优化
|
648
|
f"关键词: {parsed_query.keywords_queries} | "
|
dc403578
tangwang
多模态搜索
|
649
|
f"文本向量: {'是' if parsed_query.query_vector is not None else '否'} | "
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
650
|
f"图片向量: {'是' if parsed_query.image_query_vector is not None else '否'}",
|
16c42787
tangwang
feat: implement r...
|
651
652
653
654
655
656
657
658
659
660
661
662
|
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. 动态多语言字段与统一策略配置
|
663
|
# Step 2: Query building
|
16c42787
tangwang
feat: implement r...
|
664
665
|
context.start_stage(RequestContextStage.QUERY_BUILDING)
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
666
667
|
# Generate tenant-specific index name
index_name = get_tenant_index_name(tenant_id)
|
2739b281
tangwang
多语言索引调整
|
668
|
# index_name = "search_products"
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
669
|
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
670
|
# No longer need to add tenant_id to filters since each tenant has its own index
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
671
672
673
|
image_query_vector = None
if enable_embedding:
image_query_vector = parsed_query.image_query_vector
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
674
|
|
f0d020c3
tangwang
多语言查询改为只支持中英文两种,f...
|
675
|
es_query = self.query_builder.build_query(
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
676
|
query_text=parsed_query.rewritten_query or parsed_query.query_normalized,
|
16c42787
tangwang
feat: implement r...
|
677
|
query_vector=parsed_query.query_vector if enable_embedding else None,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
678
|
image_query_vector=image_query_vector,
|
16c42787
tangwang
feat: implement r...
|
679
|
filters=filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
680
|
range_filters=range_filters,
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
681
|
facet_configs=facets,
|
506c39b7
tangwang
feat(search): 统一重...
|
682
683
|
size=es_fetch_size,
from_=es_fetch_from,
|
dc403578
tangwang
多模态搜索
|
684
685
|
enable_knn=enable_embedding and (
parsed_query.query_vector is not None
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
686
|
or image_query_vector is not None
|
dc403578
tangwang
多模态搜索
|
687
|
),
|
7bc756c5
tangwang
优化 ES 查询构建
|
688
|
min_score=min_score,
|
ef5baa86
tangwang
混杂语言处理
|
689
|
parsed_query=parsed_query,
|
16c42787
tangwang
feat: implement r...
|
690
|
)
|
317c5d2c
tangwang
feat(search): 引入 ...
|
691
692
693
694
695
|
self._attach_exact_knn_rescore(
es_query,
in_rank_window=in_rank_window,
query_vector=parsed_query.query_vector if enable_embedding else None,
image_query_vector=image_query_vector,
|
47452e1d
tangwang
feat(search): 支持可...
|
696
|
parsed_query=parsed_query,
|
317c5d2c
tangwang
feat(search): 引入 ...
|
697
|
)
|
be52af70
tangwang
first commit
|
698
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
699
700
701
702
703
704
705
|
# 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...
|
706
|
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
707
708
709
|
# Add sorting if specified
if sort_by:
es_query = self.query_builder.add_sorting(es_query, sort_by, sort_order)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
710
|
es_query["track_scores"] = True
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
711
|
|
5f7d7f09
tangwang
性能测试报告.md
|
712
713
714
|
# Keep requested response _source semantics for the final response fill.
response_source_spec = es_query.get("_source")
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
715
|
# In multi-stage rank window, first pass only needs score signals for coarse rank.
|
5f7d7f09
tangwang
性能测试报告.md
|
716
|
es_query_for_fetch = es_query
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
717
|
if in_rank_window:
|
5f7d7f09
tangwang
性能测试报告.md
|
718
|
es_query_for_fetch = dict(es_query)
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
719
|
es_query_for_fetch["_source"] = False
|
5f7d7f09
tangwang
性能测试报告.md
|
720
|
|
16c42787
tangwang
feat: implement r...
|
721
|
# Extract size and from from body for ES client parameters
|
5f7d7f09
tangwang
性能测试报告.md
|
722
|
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...
|
723
724
725
|
# Store ES query in context
context.store_intermediate_result('es_query', es_query)
|
28e57bb1
tangwang
日志体系优化
|
726
|
# Serialize ES query to compute a compact size + stable digest for correlation
|
5f7d7f09
tangwang
性能测试报告.md
|
727
|
es_query_compact = json.dumps(es_query_for_fetch, ensure_ascii=False, separators=(",", ":"))
|
28e57bb1
tangwang
日志体系优化
|
728
|
es_query_digest = hashlib.sha256(es_query_compact.encode("utf-8")).hexdigest()[:16]
|
dc403578
tangwang
多模态搜索
|
729
730
|
knn_enabled = bool(enable_embedding and (
parsed_query.query_vector is not None
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
731
|
or image_query_vector is not None
|
dc403578
tangwang
多模态搜索
|
732
|
))
|
28e57bb1
tangwang
日志体系优化
|
733
|
vector_dims = int(len(parsed_query.query_vector)) if parsed_query.query_vector is not None else 0
|
dc403578
tangwang
多模态搜索
|
734
|
image_vector_dims = (
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
735
736
|
int(len(image_query_vector))
if image_query_vector is not None
|
dc403578
tangwang
多模态搜索
|
737
738
|
else 0
)
|
99bea633
tangwang
add logs
|
739
|
|
16c42787
tangwang
feat: implement r...
|
740
|
context.logger.info(
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
741
|
"ES query built | size: %s chars | digest: %s | KNN: %s | vector_dims: %s | image_vector_dims: %s | facets: %s",
|
28e57bb1
tangwang
日志体系优化
|
742
743
744
745
|
len(es_query_compact),
es_query_digest,
"yes" if knn_enabled else "no",
vector_dims,
|
dc403578
tangwang
多模态搜索
|
746
|
image_vector_dims,
|
28e57bb1
tangwang
日志体系优化
|
747
|
"yes" if facets else "no",
|
16c42787
tangwang
feat: implement r...
|
748
749
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
28e57bb1
tangwang
日志体系优化
|
750
751
752
753
754
755
756
757
758
|
_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,
|
dc403578
tangwang
多模态搜索
|
759
|
"image_vector_dims": image_vector_dims,
|
28e57bb1
tangwang
日志体系优化
|
760
|
"has_facets": bool(facets),
|
5f7d7f09
tangwang
性能测试报告.md
|
761
|
"query": es_query_for_fetch,
|
28e57bb1
tangwang
日志体系优化
|
762
|
})
|
16c42787
tangwang
feat: implement r...
|
763
764
765
766
767
768
769
770
771
772
|
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
记录各阶段耗时
|
773
774
|
# Step 4: Elasticsearch search (primary recall)
context.start_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
775
|
try:
|
506c39b7
tangwang
feat(search): 统一重...
|
776
|
# Use tenant-specific index name(开启重排且在窗口内时已用 es_fetch_size/es_fetch_from)
|
16c42787
tangwang
feat: implement r...
|
777
|
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
778
|
index_name=index_name,
|
16c42787
tangwang
feat: implement r...
|
779
|
body=body_for_es,
|
506c39b7
tangwang
feat(search): 统一重...
|
780
|
size=es_fetch_size,
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
781
|
from_=es_fetch_from,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
782
|
include_named_queries_score=bool(in_rank_window),
|
be52af70
tangwang
first commit
|
783
784
|
)
|
16c42787
tangwang
feat: implement r...
|
785
786
|
# Store ES response in context
context.store_intermediate_result('es_response', es_response)
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
787
|
if debug:
|
814e352b
tangwang
乘法公式配置化
|
788
|
initial_hits = es_response.get("hits", {}).get("hits") or []
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
789
790
791
|
for rank, hit in enumerate(initial_hits, 1):
doc_id = hit.get("_id")
if doc_id is not None:
|
814e352b
tangwang
乘法公式配置化
|
792
793
|
initial_ranks_by_doc[str(doc_id)] = rank
raw_initial_max_score = es_response.get("hits", {}).get("max_score")
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
794
|
try:
|
814e352b
tangwang
乘法公式配置化
|
795
|
es_score_normalization_factor = float(raw_initial_max_score) if raw_initial_max_score is not None else None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
796
|
except (TypeError, ValueError):
|
814e352b
tangwang
乘法公式配置化
|
797
798
799
800
801
802
803
|
es_score_normalization_factor = None
if es_score_normalization_factor is None and initial_hits:
first_score = initial_hits[0].get("_score")
try:
es_score_normalization_factor = float(first_score) if first_score is not None else None
except (TypeError, ValueError):
es_score_normalization_factor = None
|
be52af70
tangwang
first commit
|
804
|
|
16c42787
tangwang
feat: implement r...
|
805
806
807
808
809
|
# 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)} | "
|
814e352b
tangwang
乘法公式配置化
|
810
|
f"最高分: {(es_response.get('hits', {}).get('max_score') or 0):.3f}",
|
16c42787
tangwang
feat: implement r...
|
811
812
813
814
815
816
817
818
819
820
|
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
记录各阶段耗时
|
821
|
context.end_stage(RequestContextStage.ELASTICSEARCH_SEARCH_PRIMARY)
|
16c42787
tangwang
feat: implement r...
|
822
|
|
cda1cd62
tangwang
意图分析&应用 baseline
|
823
|
style_intent_decisions: Dict[str, SkuSelectionDecision] = {}
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
824
|
if in_rank_window:
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
825
|
from dataclasses import asdict
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
826
|
from config.services_config import get_rerank_backend_config, get_rerank_service_url
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
827
|
from .rerank_client import coarse_resort_hits, run_lightweight_rerank, run_rerank
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
|
coarse_fusion_debug = asdict(coarse_cfg.fusion)
stage_fusion_debug = asdict(rc.fusion)
def _rank_map(stage_hits: List[Dict[str, Any]]) -> Dict[str, int]:
return {
str(hit.get("_id")): rank
for rank, hit in enumerate(stage_hits, 1)
if hit.get("_id") is not None
}
def _stage_debug_info(
*,
enabled: bool,
applied: bool,
skipped_reason: Optional[str],
service_profile: Optional[str],
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
844
845
|
query_template: Optional[str],
doc_template: Optional[str],
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
|
docs_in: int,
docs_out: int,
top_n: int,
meta: Optional[Dict[str, Any]] = None,
backend: Optional[str] = None,
backend_model_name: Optional[str] = None,
service_url: Optional[str] = None,
model: Optional[str] = None,
fusion: Optional[Dict[str, Any]] = None,
) -> Dict[str, Any]:
return {
"enabled": enabled,
"applied": applied,
"passthrough": not applied,
"skipped_reason": skipped_reason,
"service_profile": service_profile,
"service_url": service_url,
"backend": backend,
"model": model,
"backend_model_name": backend_model_name,
"query_template": query_template,
"doc_template": doc_template,
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
868
869
870
871
872
|
"query_text": (
str(query_template).format_map({"query": rerank_query})
if query_template is not None
else None
),
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
873
874
875
876
877
878
879
|
"docs_in": docs_in,
"docs_out": docs_out,
"top_n": top_n,
"meta": meta,
"fusion": fusion,
}
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
|
def _rank_change(previous_rank: Optional[int], current_rank: Optional[int]) -> Optional[int]:
if previous_rank is None or current_rank is None:
return None
return previous_rank - current_rank
def _build_result_stage(
*,
rank: Optional[int],
previous_rank: Optional[int],
values: Optional[Dict[str, Any]] = None,
signals: Optional[Dict[str, Any]] = None,
signal_fields: Optional[Dict[str, str]] = None,
) -> Dict[str, Any]:
stage_payload: Dict[str, Any] = {
"rank": rank,
"rank_change": _rank_change(previous_rank, rank),
}
if values:
stage_payload.update(values)
if signals:
stage_payload["signals"] = signals
stage_payload["ltr_features"] = signals.get("ltr_features")
for shared_key in ("fusion_summary", "fusion_inputs", "fusion_factors"):
if stage_payload.get(shared_key) is None:
stage_payload[shared_key] = signals.get(shared_key)
for payload_key, signal_key in (signal_fields or {}).items():
if stage_payload.get(payload_key) is None:
stage_payload[payload_key] = signals.get(signal_key)
return stage_payload
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
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
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
|
def _run_optional_stage(
*,
stage: RequestContextStage,
stage_label: str,
enabled: bool,
stage_hits: List[Dict[str, Any]],
input_limit: int,
output_limit: int,
service_profile: Optional[str],
query_template: str,
doc_template: str,
top_n: int,
debug_key: Optional[str],
runner,
) -> tuple[List[Dict[str, Any]], Dict[str, int], Optional[Dict[str, Any]]]:
context.start_stage(stage)
try:
input_hits = list(stage_hits[:input_limit])
output_hits = list(stage_hits[:output_limit])
applied = False
skip_reason: Optional[str] = None
meta: Optional[Dict[str, Any]] = None
debug_rows: Optional[List[Dict[str, Any]]] = None
if enabled and input_hits:
output_hits_candidate, applied, meta, debug_rows = runner(input_hits)
if applied:
output_hits = list((output_hits_candidate or input_hits)[:output_limit])
else:
skip_reason = "service_returned_none"
else:
skip_reason = "disabled" if not enabled else "no_hits"
ranks = _rank_map(output_hits) if debug else {}
stage_info = None
if debug:
if applied:
backend_name, backend_cfg = get_rerank_backend_config(service_profile)
stage_info = _stage_debug_info(
enabled=True,
applied=True,
skipped_reason=None,
service_profile=service_profile,
service_url=get_rerank_service_url(profile=service_profile),
backend=backend_name,
backend_model_name=backend_cfg.get("model_name"),
model=meta.get("model") if isinstance(meta, dict) else None,
query_template=query_template,
doc_template=doc_template,
docs_in=len(input_hits),
docs_out=len(output_hits),
top_n=top_n,
meta=meta,
fusion=stage_fusion_debug,
)
if debug_key is not None and debug_rows is not None:
context.store_intermediate_result(debug_key, debug_rows)
else:
stage_info = _stage_debug_info(
enabled=enabled,
applied=False,
skipped_reason=skip_reason,
service_profile=service_profile,
query_template=query_template,
doc_template=doc_template,
docs_in=len(input_hits),
docs_out=len(output_hits),
top_n=top_n,
fusion=stage_fusion_debug,
)
if applied:
context.logger.info(
"%s完成 | docs=%s | top_n=%s | meta=%s",
stage_label,
len(output_hits),
top_n,
meta,
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
context.logger.info(
"%s透传 | reason=%s | docs=%s | top_n=%s",
stage_label,
skip_reason,
len(output_hits),
top_n,
extra={'reqid': context.reqid, 'uid': context.uid}
)
return output_hits, ranks, stage_info
except Exception as e:
output_hits = list(stage_hits[:output_limit])
ranks = _rank_map(output_hits) if debug else {}
stage_info = None
if debug:
stage_info = _stage_debug_info(
enabled=enabled,
applied=False,
skipped_reason="error",
service_profile=service_profile,
query_template=query_template,
doc_template=doc_template,
docs_in=min(len(stage_hits), input_limit),
docs_out=len(output_hits),
top_n=top_n,
meta={"error": str(e)},
fusion=stage_fusion_debug,
)
context.add_warning(f"{stage_label} failed: {e}")
context.logger.warning(
"调用%s服务失败 | error: %s",
stage_label,
e,
extra={'reqid': context.reqid, 'uid': context.uid},
exc_info=True,
)
return output_hits, ranks, stage_info
finally:
context.end_stage(stage)
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
|
rerank_query = parsed_query.text_for_rerank() if parsed_query else query
hits = es_response.get("hits", {}).get("hits") or []
context.start_stage(RequestContextStage.COARSE_RANKING)
try:
coarse_debug = coarse_resort_hits(
hits,
fusion=coarse_cfg.fusion,
debug=debug,
)
hits = hits[:coarse_output_window]
es_response.setdefault("hits", {})["hits"] = hits
if debug:
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1043
|
coarse_ranks_by_doc = _rank_map(hits)
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
|
coarse_debug_info = _stage_debug_info(
enabled=True,
applied=True,
skipped_reason=None,
service_profile=None,
service_url=None,
backend="local_coarse_fusion",
backend_model_name=None,
model=None,
query_template=None,
doc_template=None,
docs_in=es_fetch_size,
docs_out=len(hits),
top_n=coarse_output_window,
meta=None,
fusion=coarse_fusion_debug,
)
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1061
|
context.store_intermediate_result("coarse_rank_scores", coarse_debug)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1062
|
context.logger.info(
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1063
1064
1065
|
"粗排完成 | docs_in=%s | docs_out=%s",
es_fetch_size,
len(hits),
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1066
1067
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
|
finally:
context.end_stage(RequestContextStage.COARSE_RANKING)
ranking_source_spec = self._merge_source_specs(
self._resolve_rerank_source_filter(
fine_doc_template,
parsed_query=parsed_query,
),
self._resolve_rerank_source_filter(
effective_doc_template,
parsed_query=parsed_query,
),
)
candidate_ids = [str(h.get("_id")) for h in hits if h.get("_id") is not None]
if candidate_ids:
details_by_id, fill_took = self._fetch_hits_by_ids(
index_name=index_name,
doc_ids=candidate_ids,
source_spec=ranking_source_spec,
)
for hit in hits:
hid = hit.get("_id")
if hid is None:
continue
detail_hit = details_by_id.get(str(hid))
if detail_hit is not None and "_source" in detail_hit:
hit["_source"] = detail_hit.get("_source") or {}
if fill_took:
es_response["took"] = int((es_response.get("took", 0) or 0) + fill_took)
|
5c9baf91
tangwang
feat(search): 款式意...
|
1098
|
if self._should_run_sku_selection(parsed_query):
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1099
1100
1101
1102
1103
1104
1105
|
style_intent_decisions = self._apply_style_intent_to_hits(
es_response.get("hits", {}).get("hits") or [],
parsed_query,
context=context,
)
if style_intent_decisions:
context.logger.info(
|
5c9baf91
tangwang
feat(search): 款式意...
|
1106
|
"SKU 选择预处理完成 | hits=%s",
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1107
1108
1109
1110
|
len(style_intent_decisions),
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
|
def _run_fine_stage(stage_input: List[Dict[str, Any]]):
fine_scores, fine_meta, fine_debug_rows = run_lightweight_rerank(
query=rerank_query,
es_hits=stage_input,
language=language,
timeout_sec=fine_cfg.timeout_sec,
rerank_query_template=fine_query_template,
rerank_doc_template=fine_doc_template,
top_n=fine_output_window,
debug=debug,
fusion=rc.fusion,
style_intent_selected_sku_boost=self.config.query_config.style_intent_selected_sku_boost,
service_profile=fine_cfg.service_profile,
)
return stage_input, fine_scores is not None, fine_meta, fine_debug_rows
hits, fine_ranks_by_doc, fine_debug_info = _run_optional_stage(
stage=RequestContextStage.FINE_RANKING,
stage_label="精排",
enabled=fine_enabled,
stage_hits=es_response.get("hits", {}).get("hits") or [],
input_limit=fine_input_window,
output_limit=fine_output_window,
service_profile=fine_cfg.service_profile,
query_template=fine_query_template,
doc_template=fine_doc_template,
top_n=fine_output_window,
debug_key="fine_rank_scores",
runner=_run_fine_stage,
)
es_response["hits"]["hits"] = hits
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1142
|
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1143
1144
1145
1146
|
def _run_rerank_stage(stage_input: List[Dict[str, Any]]):
nonlocal es_response
es_response["hits"]["hits"] = stage_input
|
506c39b7
tangwang
feat(search): 统一重...
|
1147
1148
1149
1150
|
es_response, rerank_meta, fused_debug = run_rerank(
query=rerank_query,
es_response=es_response,
language=language,
|
506c39b7
tangwang
feat(search): 统一重...
|
1151
1152
1153
|
timeout_sec=rc.timeout_sec,
weight_es=rc.weight_es,
weight_ai=rc.weight_ai,
|
ff32d894
tangwang
rerank
|
1154
1155
|
rerank_query_template=effective_query_template,
rerank_doc_template=effective_doc_template,
|
d31c7f65
tangwang
补充云服务reranker
|
1156
|
top_n=(from_ + size),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1157
|
debug=debug,
|
814e352b
tangwang
乘法公式配置化
|
1158
|
fusion=rc.fusion,
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1159
|
service_profile=rc.service_profile,
|
87cacb1b
tangwang
融合公式优化。加入意图匹配因子
|
1160
|
style_intent_selected_sku_boost=self.config.query_config.style_intent_selected_sku_boost,
|
506c39b7
tangwang
feat(search): 统一重...
|
1161
|
)
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1162
1163
1164
1165
1166
|
return (
es_response.get("hits", {}).get("hits") or [],
rerank_meta is not None,
rerank_meta,
fused_debug,
|
506c39b7
tangwang
feat(search): 统一重...
|
1167
|
)
|
506c39b7
tangwang
feat(search): 统一重...
|
1168
|
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
|
hits, rerank_ranks_by_doc, rerank_debug_info = _run_optional_stage(
stage=RequestContextStage.RERANKING,
stage_label="重排",
enabled=do_rerank,
stage_hits=es_response.get("hits", {}).get("hits") or [],
input_limit=rerank_window,
output_limit=rerank_window,
service_profile=rc.service_profile,
query_template=effective_query_template,
doc_template=effective_doc_template,
top_n=from_ + size,
debug_key="rerank_scores",
runner=_run_rerank_stage,
)
es_response["hits"]["hits"] = hits
# 当本次请求在排序窗口内时:已按多阶段排序产出前 rerank_window 条,需按请求的 from/size 做分页切片
if in_rank_window:
|
506c39b7
tangwang
feat(search): 统一重...
|
1187
1188
1189
1190
|
hits = es_response.get("hits", {}).get("hits") or []
sliced = hits[from_ : from_ + size]
es_response.setdefault("hits", {})["hits"] = sliced
if sliced:
|
af827ce9
tangwang
rerank
|
1191
|
slice_max = max(
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1192
1193
1194
1195
|
(
h.get("_fused_score", h.get("_fine_score", h.get("_coarse_score", h.get("_score", 0.0))))
for h in sliced
),
|
af827ce9
tangwang
rerank
|
1196
1197
|
default=0.0,
)
|
506c39b7
tangwang
feat(search): 统一重...
|
1198
1199
1200
1201
1202
1203
|
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
|
1204
|
|
5f7d7f09
tangwang
性能测试报告.md
|
1205
1206
1207
1208
1209
1210
1211
1212
1213
|
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
记录各阶段耗时
|
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
|
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
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1233
1234
1235
1236
1237
|
if style_intent_decisions:
self.style_sku_selector.apply_precomputed_decisions(
sliced,
style_intent_decisions,
)
|
a99e62ba
tangwang
记录各阶段耗时
|
1238
1239
|
if fill_took:
es_response["took"] = int((es_response.get("took", 0) or 0) + fill_took)
|
a99e62ba
tangwang
记录各阶段耗时
|
1240
1241
1242
1243
1244
1245
|
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
|
1246
|
|
506c39b7
tangwang
feat(search): 统一重...
|
1247
|
context.logger.info(
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1248
|
f"排序窗口分页切片 | from={from_}, size={size}, 返回={len(sliced)}条",
|
506c39b7
tangwang
feat(search): 统一重...
|
1249
1250
1251
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
5c9baf91
tangwang
feat(search): 款式意...
|
1252
1253
|
# 非重排窗口:SKU 选择(款式意图 OR 图像信号)在 result_processing 之前执行,便于单独计时
if self._should_run_sku_selection(parsed_query) and not in_rank_window:
|
8ae95af0
tangwang
1. Stage Timings:...
|
1254
1255
1256
1257
1258
1259
1260
|
es_hits_pre = es_response.get("hits", {}).get("hits") or []
style_intent_decisions = self._apply_style_intent_to_hits(
es_hits_pre,
parsed_query,
context=context,
)
|
16c42787
tangwang
feat: implement r...
|
1261
1262
1263
|
# Step 5: Result processing
context.start_stage(RequestContextStage.RESULT_PROCESSING)
try:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1264
1265
|
# Extract ES hits
es_hits = []
|
16c42787
tangwang
feat: implement r...
|
1266
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1267
|
es_hits = es_response['hits']['hits']
|
16c42787
tangwang
feat: implement r...
|
1268
1269
1270
1271
1272
1273
|
# 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): 统一重...
|
1274
|
# max_score 会在启用 AI 搜索时被更新为融合分数的最大值
|
25d3e81d
tangwang
fix指定sort项时候的bug
|
1275
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
|
be52af70
tangwang
first commit
|
1276
|
|
af827ce9
tangwang
rerank
|
1277
|
# 从上下文中取出重排调试信息(若有)
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
1278
1279
1280
|
rerank_debug_by_doc = _index_debug_rows_by_doc(context.get_intermediate_result('rerank_scores', None))
coarse_debug_by_doc = _index_debug_rows_by_doc(context.get_intermediate_result('coarse_rank_scores', None))
fine_debug_by_doc = _index_debug_rows_by_doc(context.get_intermediate_result('fine_rank_scores', None))
|
af827ce9
tangwang
rerank
|
1281
|
|
5c9baf91
tangwang
feat(search): 款式意...
|
1282
1283
1284
1285
1286
|
if self._should_run_sku_selection(parsed_query) and style_intent_decisions:
self.style_sku_selector.apply_precomputed_decisions(
es_hits,
style_intent_decisions,
)
|
deccd68a
tangwang
Added the SKU pre...
|
1287
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1288
|
# Format results using ResultFormatter
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
1289
1290
1291
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
ca91352a
tangwang
更新文档
|
1292
1293
|
language=language,
sku_filter_dimension=sku_filter_dimension
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
1294
|
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1295
|
|
985752f5
tangwang
1. 前端调试功能
|
1296
1297
1298
|
# Build per-result debug info (per SPU) when debug mode is enabled
per_result_debug = []
if debug and es_hits and formatted_results:
|
814e352b
tangwang
乘法公式配置化
|
1299
1300
|
final_ranks_by_doc = {
str(hit.get("_id")): from_ + rank
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1301
1302
1303
|
for rank, hit in enumerate(es_hits, 1)
if hit.get("_id") is not None
}
|
985752f5
tangwang
1. 前端调试功能
|
1304
1305
|
for hit, spu in zip(es_hits, formatted_results):
source = hit.get("_source", {}) or {}
|
af827ce9
tangwang
rerank
|
1306
1307
1308
1309
|
doc_id = hit.get("_id")
rerank_debug = None
if doc_id is not None:
rerank_debug = rerank_debug_by_doc.get(str(doc_id))
|
16d28bf8
tangwang
漏斗信息呈现,便于调整参数
|
1310
1311
1312
|
coarse_debug = None
if doc_id is not None:
coarse_debug = coarse_debug_by_doc.get(str(doc_id))
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1313
1314
1315
|
fine_debug = None
if doc_id is not None:
fine_debug = fine_debug_by_doc.get(str(doc_id))
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1316
1317
1318
1319
1320
|
style_intent_debug = None
if doc_id is not None and style_intent_decisions:
decision = style_intent_decisions.get(str(doc_id))
if decision is not None:
style_intent_debug = decision.to_dict()
|
af827ce9
tangwang
rerank
|
1321
|
|
9df421ed
tangwang
基于eval框架开始调参
|
1322
|
raw_score = hit.get("_raw_es_score", hit.get("_original_score", hit.get("_score")))
|
985752f5
tangwang
1. 前端调试功能
|
1323
1324
1325
1326
1327
|
try:
es_score = float(raw_score) if raw_score is not None else 0.0
except (TypeError, ValueError):
es_score = 0.0
try:
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1328
|
normalized = (
|
814e352b
tangwang
乘法公式配置化
|
1329
1330
|
float(es_score) / float(es_score_normalization_factor)
if es_score_normalization_factor else None
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1331
|
)
|
985752f5
tangwang
1. 前端调试功能
|
1332
1333
|
except (TypeError, ValueError, ZeroDivisionError):
normalized = None
|
985752f5
tangwang
1. 前端调试功能
|
1334
1335
1336
1337
1338
|
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
|
af827ce9
tangwang
rerank
|
1339
1340
1341
1342
|
debug_entry: Dict[str, Any] = {
"spu_id": spu.spu_id,
"es_score": es_score,
"es_score_normalized": normalized,
|
814e352b
tangwang
乘法公式配置化
|
1343
1344
|
"initial_rank": initial_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None,
"final_rank": final_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None,
|
af827ce9
tangwang
rerank
|
1345
1346
1347
1348
1349
|
"title_multilingual": title_multilingual,
"brief_multilingual": brief_multilingual,
"vendor_multilingual": vendor_multilingual,
}
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
1350
1351
1352
1353
1354
|
initial_rank = initial_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None
coarse_rank = coarse_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None
fine_rank = fine_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None
rerank_rank = rerank_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None
final_rank = final_ranks_by_doc.get(str(doc_id)) if doc_id is not None else None
|
9df421ed
tangwang
基于eval框架开始调参
|
1355
1356
1357
1358
1359
1360
1361
1362
|
rerank_previous_rank = fine_rank if fine_rank is not None else coarse_rank
final_previous_rank = rerank_rank
if final_previous_rank is None:
final_previous_rank = fine_rank
if final_previous_rank is None:
final_previous_rank = coarse_rank
if final_previous_rank is None:
final_previous_rank = initial_rank
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
1363
|
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
1364
|
debug_entry["ranking_funnel"] = {
|
dbe04e9e
tangwang
统一排序漏斗协议,精简冗余字段与前...
|
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
|
"es_recall": _build_result_stage(
rank=initial_rank,
previous_rank=None,
values={
"score": es_score,
"normalized_score": normalized,
"matched_queries": hit.get("matched_queries"),
},
),
"coarse_rank": _build_result_stage(
rank=coarse_rank,
previous_rank=initial_rank,
values={
"score": coarse_debug.get("coarse_score") if coarse_debug else None,
"es_score": coarse_debug.get("es_score") if coarse_debug else es_score,
"text_score": coarse_debug.get("text_score") if coarse_debug else None,
"knn_score": coarse_debug.get("knn_score") if coarse_debug else None,
},
signals=coarse_debug,
signal_fields={
"es_factor": "coarse_es_factor",
"text_factor": "coarse_text_factor",
"knn_factor": "coarse_knn_factor",
"text_knn_factor": "coarse_text_knn_factor",
"image_knn_factor": "coarse_image_knn_factor",
},
),
"fine_rank": _build_result_stage(
rank=fine_rank,
previous_rank=coarse_rank,
values={
"score": (
fine_debug.get("score")
if fine_debug and fine_debug.get("score") is not None
else hit.get("_fine_fused_score", hit.get("_fine_score"))
),
"fine_score": fine_debug.get("fine_score") if fine_debug else hit.get("_fine_score"),
"es_score": fine_debug.get("es_score") if fine_debug else es_score,
"text_score": fine_debug.get("text_score") if fine_debug else hit.get("_text_score"),
"knn_score": fine_debug.get("knn_score") if fine_debug else hit.get("_knn_score"),
"rerank_input": fine_debug.get("rerank_input") if fine_debug else None,
},
signals=fine_debug,
signal_fields={
"es_factor": "es_factor",
},
),
"rerank": _build_result_stage(
rank=rerank_rank,
previous_rank=rerank_previous_rank,
values={
"score": rerank_debug.get("score") if rerank_debug else hit.get("_fused_score"),
"es_score": rerank_debug.get("es_score") if rerank_debug else es_score,
"rerank_score": rerank_debug.get("rerank_score") if rerank_debug else hit.get("_rerank_score"),
"fine_score": rerank_debug.get("fine_score") if rerank_debug else hit.get("_fine_score"),
"fused_score": rerank_debug.get("fused_score") if rerank_debug else hit.get("_fused_score"),
"text_score": rerank_debug.get("text_score") if rerank_debug else hit.get("_text_score"),
"knn_score": rerank_debug.get("knn_score") if rerank_debug else hit.get("_knn_score"),
},
signals=rerank_debug,
signal_fields={
"rerank_factor": "rerank_factor",
"fine_factor": "fine_factor",
"es_factor": "es_factor",
"text_factor": "text_factor",
"knn_factor": "knn_factor",
},
),
"final_page": _build_result_stage(
rank=final_rank,
previous_rank=final_previous_rank,
),
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
1437
1438
|
}
|
cda1cd62
tangwang
意图分析&应用 baseline
|
1439
1440
1441
|
if style_intent_debug:
debug_entry["style_intent_sku"] = style_intent_debug
|
af827ce9
tangwang
rerank
|
1442
|
per_result_debug.append(debug_entry)
|
985752f5
tangwang
1. 前端调试功能
|
1443
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1444
1445
1446
1447
1448
|
# Format facets
standardized_facets = None
if facets:
standardized_facets = ResultFormatter.format_facets(
es_response.get('aggregations', {}),
|
c581becd
tangwang
feat: 实现 Multi-Se...
|
1449
1450
|
facets,
filters
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1451
1452
1453
1454
1455
1456
|
)
# 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
|
1457
|
|
16c42787
tangwang
feat: implement r...
|
1458
|
context.logger.info(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1459
|
f"结果处理完成 | 返回: {len(formatted_results)}条 | 总计: {total_value}条",
|
16c42787
tangwang
feat: implement r...
|
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
|
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
|
1472
|
|
16c42787
tangwang
feat: implement r...
|
1473
1474
1475
|
# End total timing and build result
total_duration = context.end_stage(RequestContextStage.TOTAL)
context.performance_metrics.total_duration = total_duration
|
be52af70
tangwang
first commit
|
1476
|
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1477
1478
1479
|
# Collect debug information if requested
debug_info = None
if debug:
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1480
|
query_tokens = parsed_query.query_tokens if parsed_query else []
|
465f90e1
tangwang
添加LTR数据收集
|
1481
1482
1483
1484
1485
1486
1487
1488
1489
|
token_count = len(query_tokens)
text_knn_is_long = token_count >= 5
text_knn_k = self.query_builder.knn_text_k_long if text_knn_is_long else self.query_builder.knn_text_k
text_knn_num_candidates = (
self.query_builder.knn_text_num_candidates_long
if text_knn_is_long
else self.query_builder.knn_text_num_candidates
)
ltr_summary = _summarize_ltr_features(per_result_debug)
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1490
1491
1492
|
debug_info = {
"query_analysis": {
"original_query": context.query_analysis.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
1493
|
"query_normalized": context.query_analysis.query_normalized,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1494
1495
|
"rewritten_query": context.query_analysis.rewritten_query,
"detected_language": context.query_analysis.detected_language,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1496
|
"index_languages": index_langs,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1497
|
"translations": context.query_analysis.translations,
|
9d0214bb
tangwang
qp性能优化
|
1498
|
"keywords_queries": context.query_analysis.keywords_queries,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1499
|
"has_vector": context.query_analysis.query_vector is not None,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1500
|
"has_image_vector": parsed_query.image_query_vector is not None,
|
465f90e1
tangwang
添加LTR数据收集
|
1501
|
"query_tokens": query_tokens,
|
2efad04b
tangwang
意图匹配的性能优化:
|
1502
|
"intent_detection": context.get_intermediate_result("style_intent_profile"),
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1503
|
},
|
465f90e1
tangwang
添加LTR数据收集
|
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
|
"retrieval_plan": {
"text_knn": {
"enabled": bool(enable_embedding and parsed_query and parsed_query.query_vector is not None),
"is_long_query_plan": text_knn_is_long,
"token_count": token_count,
"k": text_knn_k,
"num_candidates": text_knn_num_candidates,
"boost": (
self.query_builder.knn_text_boost * 1.4
if text_knn_is_long
else self.query_builder.knn_text_boost
),
},
"image_knn": {
"enabled": bool(
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1519
1520
|
self.image_embedding_field
and enable_embedding
|
465f90e1
tangwang
添加LTR数据收集
|
1521
|
and parsed_query
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1522
|
and image_query_vector is not None
|
465f90e1
tangwang
添加LTR数据收集
|
1523
1524
1525
1526
1527
1528
|
),
"k": self.query_builder.knn_image_k,
"num_candidates": self.query_builder.knn_image_num_candidates,
"boost": self.query_builder.knn_image_boost,
},
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1529
|
"es_query": context.get_intermediate_result('es_query', {}),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1530
|
"es_query_context": {
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1531
1532
|
"es_fetch_from": es_fetch_from,
"es_fetch_size": es_fetch_size,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1533
1534
|
"in_rank_window": in_rank_window,
"include_named_queries_score": bool(in_rank_window),
|
317c5d2c
tangwang
feat(search): 引入 ...
|
1535
1536
1537
1538
1539
1540
|
"exact_knn_rescore_enabled": bool(rc.exact_knn_rescore_enabled and in_rank_window),
"exact_knn_rescore_window": (
self._resolve_exact_knn_rescore_window()
if rc.exact_knn_rescore_enabled and in_rank_window
else None
),
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1541
|
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1542
1543
1544
1545
|
"es_response": {
"took_ms": es_response.get('took', 0),
"total_hits": total_value,
"max_score": max_score,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1546
|
"shards": es_response.get('_shards', {}),
|
814e352b
tangwang
乘法公式配置化
|
1547
|
"es_score_normalization_factor": es_score_normalization_factor,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1548
|
},
|
8c8b9d84
tangwang
ES 拉取 coarse_rank...
|
1549
1550
|
"coarse_rank": coarse_debug_info,
"fine_rank": fine_debug_info,
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
1551
|
"rerank": rerank_debug_info,
|
daa2690b
tangwang
漏斗参数调优&呈现优化
|
1552
1553
1554
1555
1556
1557
1558
1559
1560
|
"ranking_funnel": {
"es_recall": {
"docs_out": es_fetch_size,
"score_normalization_factor": es_score_normalization_factor,
},
"coarse_rank": coarse_debug_info,
"fine_rank": fine_debug_info,
"rerank": rerank_debug_info,
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1561
1562
1563
1564
|
"feature_flags": context.metadata.get('feature_flags', {}),
"stage_timings": {
k: round(v, 2) for k, v in context.performance_metrics.stage_timings.items()
},
|
8ae95af0
tangwang
1. Stage Timings:...
|
1565
1566
1567
1568
1569
1570
|
"stage_time_bounds_ms": {
stage: {
kk: round(vv, 3) for kk, vv in bounds.items()
}
for stage, bounds in context.performance_metrics.stage_time_bounds_ms.items()
},
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1571
1572
|
"search_params": context.metadata.get('search_params', {})
}
|
985752f5
tangwang
1. 前端调试功能
|
1573
1574
|
if per_result_debug:
debug_info["per_result"] = per_result_debug
|
465f90e1
tangwang
添加LTR数据收集
|
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
|
debug_info["ltr_summary"] = ltr_summary
_log_backend_verbose({
"event": "search_debug_ltr_summary",
"reqid": context.reqid,
"uid": context.uid,
"tenant_id": tenant_id,
"query": query,
"language": language,
"top_n": ltr_summary.get("top_n"),
"counts": ltr_summary.get("counts"),
"averages": ltr_summary.get("averages"),
"top_docs": ltr_summary.get("top_docs"),
"query_analysis": {
"rewritten_query": context.query_analysis.rewritten_query,
"detected_language": context.query_analysis.detected_language,
"translations": context.query_analysis.translations,
"query_tokens": query_tokens,
},
"retrieval_plan": debug_info["retrieval_plan"],
"ranking_windows": {
"es_fetch_size": es_fetch_size,
|
0ba0e0fc
tangwang
1. rerank漏斗配置优化
|
1596
1597
1598
1599
|
"coarse_output_window": coarse_output_window if in_rank_window else None,
"fine_input_window": fine_input_window if in_rank_window else None,
"fine_output_window": fine_output_window if in_rank_window else None,
"rerank_window": rerank_window if in_rank_window else None,
|
465f90e1
tangwang
添加LTR数据收集
|
1600
1601
1602
1603
|
"page_from": from_,
"page_size": size,
},
})
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1604
|
|
be52af70
tangwang
first commit
|
1605
1606
|
# Build result
result = SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1607
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
1608
1609
|
total=total_value,
max_score=max_score,
|
16c42787
tangwang
feat: implement r...
|
1610
|
took_ms=int(total_duration),
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1611
|
facets=standardized_facets,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1612
|
query_info=parsed_query.to_dict(),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1613
1614
|
suggestions=suggestions,
related_searches=related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
1615
|
debug_info=debug_info
|
be52af70
tangwang
first commit
|
1616
1617
|
)
|
16c42787
tangwang
feat: implement r...
|
1618
1619
|
# Log complete performance summary
context.log_performance_summary()
|
be52af70
tangwang
first commit
|
1620
1621
1622
1623
1624
1625
|
return result
def search_by_image(
self,
image_url: str,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1626
|
tenant_id: str,
|
be52af70
tangwang
first commit
|
1627
|
size: int = 10,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1628
1629
|
filters: Optional[Dict[str, Any]] = None,
range_filters: Optional[Dict[str, Any]] = None
|
be52af70
tangwang
first commit
|
1630
1631
|
) -> SearchResult:
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1632
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
1633
1634
1635
|
Args:
image_url: URL of query image
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1636
|
tenant_id: Tenant ID (required for filtering)
|
be52af70
tangwang
first commit
|
1637
|
size: Number of results
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1638
1639
|
filters: Exact match filters
range_filters: Range filters for numeric fields
|
be52af70
tangwang
first commit
|
1640
1641
|
Returns:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1642
|
SearchResult object with formatted results
|
be52af70
tangwang
first commit
|
1643
1644
1645
1646
1647
|
"""
if not self.image_embedding_field:
raise ValueError("Image embedding field not configured")
# Generate image embedding
|
26b910bd
tangwang
refactor service ...
|
1648
1649
|
if self.image_encoder is None:
raise RuntimeError("Image encoder is not initialized at startup")
|
b754fd41
tangwang
图片向量化支持优先级参数
|
1650
|
image_vector = self.image_encoder.encode_image_from_url(image_url, priority=1)
|
be52af70
tangwang
first commit
|
1651
1652
1653
1654
|
if image_vector is None:
raise ValueError(f"Failed to encode image: {image_url}")
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1655
1656
1657
1658
|
# 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级别索引、统一索引架构...
|
1659
|
|
be52af70
tangwang
first commit
|
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
|
# 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 ...
|
1671
1672
|
# Apply source filtering semantics (None / [] / list)
self._apply_source_filter(es_query)
|
13377199
tangwang
接口优化
|
1673
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1674
1675
1676
|
if filters or range_filters:
filter_clauses = self.query_builder._build_filters(filters, range_filters)
if filter_clauses:
|
7fbca0d7
tangwang
启动脚本优化
|
1677
1678
1679
1680
1681
1682
1683
|
if len(filter_clauses) == 1:
es_query["knn"]["filter"] = filter_clauses[0]
else:
es_query["knn"]["filter"] = {
"bool": {
"filter": filter_clauses
}
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
1684
|
}
|
be52af70
tangwang
first commit
|
1685
1686
1687
|
# Execute search
es_response = self.es_client.search(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1688
|
index_name=index_name,
|
be52af70
tangwang
first commit
|
1689
1690
1691
1692
|
body=es_query,
size=size
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1693
1694
|
# Extract ES hits
es_hits = []
|
be52af70
tangwang
first commit
|
1695
|
if 'hits' in es_response and 'hits' in es_response['hits']:
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1696
|
es_hits = es_response['hits']['hits']
|
be52af70
tangwang
first commit
|
1697
|
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1698
|
# Extract total and max_score
|
be52af70
tangwang
first commit
|
1699
1700
1701
1702
1703
1704
|
total = es_response.get('hits', {}).get('total', {})
if isinstance(total, dict):
total_value = total.get('value', 0)
else:
total_value = total
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1705
1706
1707
|
max_score = es_response.get('hits', {}).get('max_score') or 0.0
# Format results using ResultFormatter
|
ca91352a
tangwang
更新文档
|
1708
1709
1710
|
formatted_results = ResultFormatter.format_search_results(
es_hits,
max_score,
|
2739b281
tangwang
多语言索引调整
|
1711
|
language="en", # Default language for image search
|
ca91352a
tangwang
更新文档
|
1712
1713
|
sku_filter_dimension=None # Image search doesn't support SKU filtering
)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1714
|
|
be52af70
tangwang
first commit
|
1715
|
return SearchResult(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1716
|
results=formatted_results,
|
be52af70
tangwang
first commit
|
1717
|
total=total_value,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1718
|
max_score=max_score,
|
be52af70
tangwang
first commit
|
1719
|
took_ms=es_response.get('took', 0),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
1720
1721
1722
1723
|
facets=None,
query_info={'image_url': image_url, 'search_type': 'image_similarity'},
suggestions=[],
related_searches=[]
|
be52af70
tangwang
first commit
|
1724
1725
|
)
|
b926f678
tangwang
多语言查询
|
1726
1727
|
def get_domain_summary(self) -> Dict[str, Any]:
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1728
|
Get summary of dynamic text retrieval configuration.
|
b926f678
tangwang
多语言查询
|
1729
1730
|
Returns:
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1731
|
Dictionary with language-aware field information
|
b926f678
tangwang
多语言查询
|
1732
|
"""
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
1733
1734
1735
1736
1737
1738
1739
|
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
多语言查询
|
1740
|
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1741
|
def get_document(self, tenant_id: str, doc_id: str) -> Optional[Dict[str, Any]]:
|
be52af70
tangwang
first commit
|
1742
1743
1744
1745
|
"""
Get single document by ID.
Args:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1746
|
tenant_id: Tenant ID (required to determine which index to query)
|
be52af70
tangwang
first commit
|
1747
1748
1749
1750
1751
1752
|
doc_id: Document ID
Returns:
Document or None if not found
"""
try:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1753
|
index_name = get_tenant_index_name(tenant_id)
|
be52af70
tangwang
first commit
|
1754
|
response = self.es_client.client.get(
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1755
|
index=index_name,
|
be52af70
tangwang
first commit
|
1756
1757
1758
1759
|
id=doc_id
)
return response.get('_source')
except Exception as e:
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
1760
|
logger.error(f"Failed to get document {doc_id} from tenant {tenant_id}: {e}", exc_info=True)
|
be52af70
tangwang
first commit
|
1761
|
return None
|