be52af70
tangwang
first commit
|
1
2
3
|
"""
Query parser - main module for query processing.
|
ef5baa86
tangwang
混杂语言处理
|
4
5
6
7
8
|
Responsibilities are intentionally narrow:
- normalize and rewrite the incoming query
- detect language and tokenize with HanLP
- run translation and embedding requests concurrently
- return parser facts, not Elasticsearch language-planning data
|
be52af70
tangwang
first commit
|
9
10
|
"""
|
ef5baa86
tangwang
混杂语言处理
|
11
12
|
from dataclasses import dataclass, field
from typing import Any, Callable, Dict, List, Optional, Tuple
|
be52af70
tangwang
first commit
|
13
|
import numpy as np
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
14
|
import logging
|
db9c469c
tangwang
log optimize
|
15
|
import time
|
1556989b
tangwang
query翻译等待超时逻辑
|
16
|
from concurrent.futures import ThreadPoolExecutor, wait
|
be52af70
tangwang
first commit
|
17
|
|
dc403578
tangwang
多模态搜索
|
18
|
from embeddings.image_encoder import CLIPImageEncoder
|
07cf5a93
tangwang
START_EMBEDDING=...
|
19
|
from embeddings.text_encoder import TextEmbeddingEncoder
|
9f96d6f3
tangwang
短query不用语义搜索
|
20
|
from config import SearchConfig
|
0fd2f875
tangwang
translate
|
21
|
from translation import create_translation_client
|
be52af70
tangwang
first commit
|
22
|
from .language_detector import LanguageDetector
|
74fdf9bd
tangwang
1.
|
23
24
25
26
27
|
from .product_title_exclusion import (
ProductTitleExclusionDetector,
ProductTitleExclusionProfile,
ProductTitleExclusionRegistry,
)
|
be52af70
tangwang
first commit
|
28
|
from .query_rewriter import QueryRewriter, QueryNormalizer
|
cda1cd62
tangwang
意图分析&应用 baseline
|
29
|
from .style_intent import StyleIntentDetector, StyleIntentProfile, StyleIntentRegistry
|
42024409
tangwang
评估框架-批量打标
|
30
|
from .tokenization import QueryTextAnalysisCache, extract_token_strings
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
31
|
from .keyword_extractor import KeywordExtractor, collect_keywords_queries
|
be52af70
tangwang
first commit
|
32
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
33
34
|
logger = logging.getLogger(__name__)
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
35
|
import hanlp # type: ignore
|
be52af70
tangwang
first commit
|
36
|
|
00c8ddb9
tangwang
suggest rank opti...
|
37
|
|
db9c469c
tangwang
log optimize
|
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
def _async_enrichment_result_summary(
task_type: str, lang: Optional[str], result: Any
) -> str:
"""One-line description of a completed translation/embedding task for logging."""
if task_type == "translation":
if result:
return f"lang={lang} translated={result!r}"
return f"lang={lang} empty_translation"
if task_type in ("embedding", "image_embedding"):
if result is not None:
return f"vector_shape={tuple(result.shape)}"
return "no_vector" if task_type == "embedding" else "no_image_vector"
return f"unexpected_task_type={task_type!r}"
def _async_enrichment_failure_warning(task_type: str, lang: Optional[str], err: BaseException) -> str:
"""Warning text aligned with historical messages for context.add_warning."""
msg = str(err)
if task_type == "translation":
return f"Translation failed | Language: {lang} | Error: {msg}"
if task_type == "image_embedding":
return f"CLIP text query vector generation failed | Error: {msg}"
return f"Query vector generation failed | Error: {msg}"
def _log_async_enrichment_finished(
log_info: Callable[[str], None],
*,
task_type: str,
summary: str,
elapsed_ms: float,
) -> None:
log_info(
f"Async enrichment task finished | task_type={task_type} | "
f"summary={summary} | elapsed_ms={elapsed_ms:.1f}"
)
|
74fdf9bd
tangwang
1.
|
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
def rerank_query_text(
original_query: str,
*,
detected_language: Optional[str] = None,
translations: Optional[Dict[str, str]] = None,
) -> str:
"""
Text substituted for ``{query}`` when calling the reranker.
Chinese and English queries use the original string. For any other detected
language, prefer the English translation, then Chinese; if neither exists,
fall back to the original query.
"""
lang = (detected_language or "").strip().lower()
if lang in ("zh", "en"):
return original_query
trans = translations or {}
for key in ("en", "zh"):
t = (trans.get(key) or "").strip()
if t:
return t
return original_query
|
ef5baa86
tangwang
混杂语言处理
|
100
|
@dataclass(slots=True)
|
be52af70
tangwang
first commit
|
101
|
class ParsedQuery:
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
102
103
104
105
106
107
108
109
|
"""
Container for query parser facts.
``keywords_queries`` parallels text variants: key ``base`` (see
``keyword_extractor.KEYWORDS_QUERY_BASE_KEY``) for ``rewritten_query``,
and the same language codes as ``translations`` for each translated string.
Entries with no extracted nouns are omitted.
"""
|
ef5baa86
tangwang
混杂语言处理
|
110
111
112
113
114
115
116
|
original_query: str
query_normalized: str
rewritten_query: str
detected_language: Optional[str] = None
translations: Dict[str, str] = field(default_factory=dict)
query_vector: Optional[np.ndarray] = None
|
dc403578
tangwang
多模态搜索
|
117
|
image_query_vector: Optional[np.ndarray] = None
|
ef5baa86
tangwang
混杂语言处理
|
118
|
query_tokens: List[str] = field(default_factory=list)
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
119
|
keywords_queries: Dict[str, str] = field(default_factory=dict)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
120
|
style_intent_profile: Optional[StyleIntentProfile] = None
|
74fdf9bd
tangwang
1.
|
121
|
product_title_exclusion_profile: Optional[ProductTitleExclusionProfile] = None
|
45b39796
tangwang
qp性能优化
|
122
|
_text_analysis_cache: Optional[QueryTextAnalysisCache] = field(default=None, repr=False)
|
74fdf9bd
tangwang
1.
|
123
124
125
126
127
128
129
130
|
def text_for_rerank(self) -> str:
"""See :func:`rerank_query_text`."""
return rerank_query_text(
self.original_query,
detected_language=self.detected_language,
translations=self.translations,
)
|
be52af70
tangwang
first commit
|
131
132
133
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
ef5baa86
tangwang
混杂语言处理
|
134
|
return {
|
be52af70
tangwang
first commit
|
135
|
"original_query": self.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
136
|
"query_normalized": self.query_normalized,
|
be52af70
tangwang
first commit
|
137
138
139
|
"rewritten_query": self.rewritten_query,
"detected_language": self.detected_language,
"translations": self.translations,
|
dc403578
tangwang
多模态搜索
|
140
141
|
"has_query_vector": self.query_vector is not None,
"has_image_query_vector": self.image_query_vector is not None,
|
ef5baa86
tangwang
混杂语言处理
|
142
|
"query_tokens": self.query_tokens,
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
143
|
"keywords_queries": dict(self.keywords_queries),
|
cda1cd62
tangwang
意图分析&应用 baseline
|
144
145
146
|
"style_intent_profile": (
self.style_intent_profile.to_dict() if self.style_intent_profile is not None else None
),
|
74fdf9bd
tangwang
1.
|
147
148
149
150
151
|
"product_title_exclusion_profile": (
self.product_title_exclusion_profile.to_dict()
if self.product_title_exclusion_profile is not None
else None
),
|
be52af70
tangwang
first commit
|
152
|
}
|
be52af70
tangwang
first commit
|
153
154
155
156
157
158
159
160
|
class QueryParser:
"""
Main query parser that processes queries through multiple stages:
1. Normalization
2. Query rewriting (brand/category mappings, synonyms)
3. Language detection
|
ef5baa86
tangwang
混杂语言处理
|
161
|
4. Translation to caller-provided target languages
|
be52af70
tangwang
first commit
|
162
163
164
165
166
|
5. Text embedding generation (for semantic search)
"""
def __init__(
self,
|
9f96d6f3
tangwang
短query不用语义搜索
|
167
|
config: SearchConfig,
|
950a640e
tangwang
embeddings
|
168
|
text_encoder: Optional[TextEmbeddingEncoder] = None,
|
dc403578
tangwang
多模态搜索
|
169
|
image_encoder: Optional[CLIPImageEncoder] = None,
|
ef5baa86
tangwang
混杂语言处理
|
170
171
|
translator: Optional[Any] = None,
tokenizer: Optional[Callable[[str], Any]] = None,
|
be52af70
tangwang
first commit
|
172
173
174
175
176
|
):
"""
Initialize query parser.
Args:
|
9f96d6f3
tangwang
短query不用语义搜索
|
177
|
config: SearchConfig instance
|
26b910bd
tangwang
refactor service ...
|
178
179
|
text_encoder: Text embedding encoder (initialized at startup if not provided)
translator: Translator instance (initialized at startup if not provided)
|
be52af70
tangwang
first commit
|
180
|
"""
|
9f96d6f3
tangwang
短query不用语义搜索
|
181
|
self.config = config
|
be52af70
tangwang
first commit
|
182
|
self._text_encoder = text_encoder
|
dc403578
tangwang
多模态搜索
|
183
|
self._image_encoder = image_encoder
|
be52af70
tangwang
first commit
|
184
185
186
187
188
|
self._translator = translator
# Initialize components
self.normalizer = QueryNormalizer()
self.language_detector = LanguageDetector()
|
9f96d6f3
tangwang
短query不用语义搜索
|
189
|
self.rewriter = QueryRewriter(config.query_config.rewrite_dictionary)
|
ef5baa86
tangwang
混杂语言处理
|
190
|
self._tokenizer = tokenizer or self._build_tokenizer()
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
191
|
self._keyword_extractor = KeywordExtractor(tokenizer=self._tokenizer)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
192
193
194
195
196
|
self.style_intent_registry = StyleIntentRegistry.from_query_config(config.query_config)
self.style_intent_detector = StyleIntentDetector(
self.style_intent_registry,
tokenizer=self._tokenizer,
)
|
74fdf9bd
tangwang
1.
|
197
198
199
200
201
202
203
|
self.product_title_exclusion_registry = ProductTitleExclusionRegistry.from_query_config(
config.query_config
)
self.product_title_exclusion_detector = ProductTitleExclusionDetector(
self.product_title_exclusion_registry,
tokenizer=self._tokenizer,
)
|
be52af70
tangwang
first commit
|
204
|
|
26b910bd
tangwang
refactor service ...
|
205
206
207
208
|
# Eager initialization (startup-time failure visibility, no lazy init in request path)
if self.config.query_config.enable_text_embedding and self._text_encoder is None:
logger.info("Initializing text encoder at QueryParser construction...")
self._text_encoder = TextEmbeddingEncoder()
|
dc403578
tangwang
多模态搜索
|
209
210
211
|
if self.config.query_config.image_embedding_field and self._image_encoder is None:
logger.info("Initializing image encoder at QueryParser construction...")
self._image_encoder = CLIPImageEncoder()
|
26b910bd
tangwang
refactor service ...
|
212
213
214
|
if self._translator is None:
from config.services_config import get_translation_config
cfg = get_translation_config()
|
5e4dc8e4
tangwang
翻译架构按“一个翻译服务 +
|
215
216
|
logger.info(
"Initializing translator client at QueryParser construction (service_url=%s, default_model=%s)...",
|
a8261ece
tangwang
检索效果优化
|
217
218
|
cfg.get("service_url"),
cfg.get("default_model"),
|
5e4dc8e4
tangwang
翻译架构按“一个翻译服务 +
|
219
|
)
|
0fd2f875
tangwang
translate
|
220
|
self._translator = create_translation_client()
|
26b910bd
tangwang
refactor service ...
|
221
|
|
be52af70
tangwang
first commit
|
222
|
@property
|
950a640e
tangwang
embeddings
|
223
|
def text_encoder(self) -> TextEmbeddingEncoder:
|
26b910bd
tangwang
refactor service ...
|
224
|
"""Return pre-initialized text encoder."""
|
be52af70
tangwang
first commit
|
225
226
227
|
return self._text_encoder
@property
|
42e3aea6
tangwang
tidy
|
228
|
def translator(self) -> Any:
|
26b910bd
tangwang
refactor service ...
|
229
|
"""Return pre-initialized translator."""
|
be52af70
tangwang
first commit
|
230
|
return self._translator
|
484adbfe
tangwang
adapt ubuntu; con...
|
231
|
|
dc403578
tangwang
多模态搜索
|
232
233
234
235
236
|
@property
def image_encoder(self) -> Optional[CLIPImageEncoder]:
"""Return pre-initialized image encoder for CLIP text embeddings."""
return self._image_encoder
|
ef5baa86
tangwang
混杂语言处理
|
237
238
239
240
241
|
def _build_tokenizer(self) -> Callable[[str], Any]:
"""Build the tokenizer used by query parsing. No fallback path by design."""
if hanlp is None:
raise RuntimeError("HanLP is required for QueryParser tokenization")
logger.info("Initializing HanLP tokenizer...")
|
45b39796
tangwang
qp性能优化
|
242
|
tokenizer = hanlp.load(hanlp.pretrained.tok.FINE_ELECTRA_SMALL_ZH)
|
ef5baa86
tangwang
混杂语言处理
|
243
244
245
246
|
tokenizer.config.output_spans = True
logger.info("HanLP tokenizer initialized")
return tokenizer
|
e56fbdc1
tangwang
query trans
|
247
|
@staticmethod
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
248
249
250
251
252
253
|
def _pick_query_translation_model(
source_lang: str,
target_lang: str,
config: SearchConfig,
source_language_in_index: bool,
) -> str:
|
77bfa7e3
tangwang
query translate
|
254
|
"""Pick the translation capability for query-time translation (configurable)."""
|
e56fbdc1
tangwang
query trans
|
255
256
|
src = str(source_lang or "").strip().lower()
tgt = str(target_lang or "").strip().lower()
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
257
258
259
260
261
262
263
264
|
qc = config.query_config
if source_language_in_index:
if src == "zh" and tgt == "en":
return qc.zh_to_en_model
if src == "en" and tgt == "zh":
return qc.en_to_zh_model
return qc.default_translation_model
|
77bfa7e3
tangwang
query translate
|
265
|
|
e56fbdc1
tangwang
query trans
|
266
|
if src == "zh" and tgt == "en":
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
267
|
return qc.zh_to_en_model_source_not_in_index or qc.zh_to_en_model
|
e56fbdc1
tangwang
query trans
|
268
|
if src == "en" and tgt == "zh":
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
269
270
|
return qc.en_to_zh_model_source_not_in_index or qc.en_to_zh_model
return qc.default_translation_model_source_not_in_index or qc.default_translation_model
|
e56fbdc1
tangwang
query trans
|
271
|
|
ef5baa86
tangwang
混杂语言处理
|
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
@staticmethod
def _normalize_language_codes(languages: Optional[List[str]]) -> List[str]:
normalized: List[str] = []
seen = set()
for language in languages or []:
token = str(language or "").strip().lower()
if not token or token in seen:
continue
seen.add(token)
normalized.append(token)
return normalized
@staticmethod
def _extract_tokens(tokenizer_result: Any) -> List[str]:
"""Normalize tokenizer output into a flat token string list."""
|
cda1cd62
tangwang
意图分析&应用 baseline
|
287
|
return extract_token_strings(tokenizer_result)
|
ea118f2b
tangwang
build_query:根据 qu...
|
288
289
|
def _get_query_tokens(self, query: str) -> List[str]:
|
ef5baa86
tangwang
混杂语言处理
|
290
|
return self._extract_tokens(self._tokenizer(query))
|
be52af70
tangwang
first commit
|
291
|
|
45b39796
tangwang
qp性能优化
|
292
293
294
295
296
297
|
def _detect_query_language(
self,
query_text: str,
*,
target_languages: Optional[List[str]] = None,
) -> str:
|
45b39796
tangwang
qp性能优化
|
298
299
|
return self.language_detector.detect(query_text)
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
300
301
302
303
304
|
def parse(
self,
query: str,
tenant_id: Optional[str] = None,
generate_vector: bool = True,
|
ef5baa86
tangwang
混杂语言处理
|
305
306
|
context: Optional[Any] = None,
target_languages: Optional[List[str]] = None,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
307
|
) -> ParsedQuery:
|
be52af70
tangwang
first commit
|
308
309
310
311
312
|
"""
Parse query through all processing stages.
Args:
query: Raw query string
|
ef5baa86
tangwang
混杂语言处理
|
313
314
|
tenant_id: Deprecated and ignored by QueryParser. Kept temporarily
to avoid a wider refactor in this first step.
|
be52af70
tangwang
first commit
|
315
|
generate_vector: Whether to generate query embedding
|
16c42787
tangwang
feat: implement r...
|
316
|
context: Optional request context for tracking and logging
|
ef5baa86
tangwang
混杂语言处理
|
317
|
target_languages: Translation target languages decided by the caller
|
be52af70
tangwang
first commit
|
318
319
320
321
|
Returns:
ParsedQuery object with all processing results
"""
|
f8219b5e
tangwang
1.
|
322
|
parse_t0 = time.perf_counter()
|
16c42787
tangwang
feat: implement r...
|
323
|
# Initialize logger if context provided
|
950a640e
tangwang
embeddings
|
324
325
326
|
active_logger = context.logger if context else logger
if context and hasattr(context, "logger"):
context.logger.info(
|
70dab99f
tangwang
add logs
|
327
|
f"Starting query parsing | Original query: '{query}' | Generate vector: {generate_vector}",
|
16c42787
tangwang
feat: implement r...
|
328
329
330
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
16c42787
tangwang
feat: implement r...
|
331
|
def log_info(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
332
333
|
if context and hasattr(context, 'logger'):
context.logger.info(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
334
|
else:
|
950a640e
tangwang
embeddings
|
335
|
active_logger.info(msg)
|
16c42787
tangwang
feat: implement r...
|
336
337
|
def log_debug(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
338
339
|
if context and hasattr(context, 'logger'):
context.logger.debug(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
340
|
else:
|
950a640e
tangwang
embeddings
|
341
|
active_logger.debug(msg)
|
be52af70
tangwang
first commit
|
342
|
|
9d0214bb
tangwang
qp性能优化
|
343
344
|
before_wait_t0 = time.perf_counter()
|
be52af70
tangwang
first commit
|
345
|
# Stage 1: Normalize
|
be52af70
tangwang
first commit
|
346
|
normalized = self.normalizer.normalize(query)
|
70dab99f
tangwang
add logs
|
347
|
log_debug(f"Normalization completed | '{query}' -> '{normalized}'")
|
16c42787
tangwang
feat: implement r...
|
348
|
if context:
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
349
|
context.store_intermediate_result('query_normalized', normalized)
|
be52af70
tangwang
first commit
|
350
|
|
be52af70
tangwang
first commit
|
351
|
# Stage 2: Query rewriting
|
ef5baa86
tangwang
混杂语言处理
|
352
353
|
query_text = normalized
rewritten = normalized
|
9f96d6f3
tangwang
短query不用语义搜索
|
354
|
if self.config.query_config.rewrite_dictionary: # Enable rewrite if dictionary exists
|
be52af70
tangwang
first commit
|
355
356
|
rewritten = self.rewriter.rewrite(query_text)
if rewritten != query_text:
|
70dab99f
tangwang
add logs
|
357
|
log_info(f"Query rewritten | '{query_text}' -> '{rewritten}'")
|
be52af70
tangwang
first commit
|
358
|
query_text = rewritten
|
16c42787
tangwang
feat: implement r...
|
359
360
|
if context:
context.store_intermediate_result('rewritten_query', rewritten)
|
70dab99f
tangwang
add logs
|
361
|
context.add_warning(f"Query was rewritten: {query_text}")
|
45b39796
tangwang
qp性能优化
|
362
363
|
normalized_targets = self._normalize_language_codes(target_languages)
|
be52af70
tangwang
first commit
|
364
365
|
# Stage 3: Language detection
|
45b39796
tangwang
qp性能优化
|
366
367
368
369
|
detected_lang = self._detect_query_language(
query_text,
target_languages=normalized_targets,
)
|
a5a6bab8
tangwang
多语言查询优化
|
370
371
372
|
# Use default language if detection failed (None or "unknown")
if not detected_lang or detected_lang == "unknown":
detected_lang = self.config.query_config.default_language
|
70dab99f
tangwang
add logs
|
373
|
log_info(f"Language detection | Detected language: {detected_lang}")
|
16c42787
tangwang
feat: implement r...
|
374
375
|
if context:
context.store_intermediate_result('detected_language', detected_lang)
|
45b39796
tangwang
qp性能优化
|
376
377
378
|
text_analysis_cache = QueryTextAnalysisCache(tokenizer=self._tokenizer)
for text_variant in (query, normalized, query_text):
text_analysis_cache.set_language_hint(text_variant, detected_lang)
|
be52af70
tangwang
first commit
|
379
|
|
ef5baa86
tangwang
混杂语言处理
|
380
381
|
# Stage 5: Translation + embedding. Parser only coordinates async enrichment work; the
# caller decides translation targets and later search-field planning.
|
1556989b
tangwang
query翻译等待超时逻辑
|
382
|
translations: Dict[str, str] = {}
|
ef5baa86
tangwang
混杂语言处理
|
383
|
future_to_task: Dict[Any, Tuple[str, Optional[str]]] = {}
|
db9c469c
tangwang
log optimize
|
384
|
future_submit_at: Dict[Any, float] = {}
|
ef5baa86
tangwang
混杂语言处理
|
385
|
async_executor: Optional[ThreadPoolExecutor] = None
|
1556989b
tangwang
query翻译等待超时逻辑
|
386
|
detected_norm = str(detected_lang or "").strip().lower()
|
ef5baa86
tangwang
混杂语言处理
|
387
|
translation_targets = [lang for lang in normalized_targets if lang != detected_norm]
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
388
|
source_language_in_index = bool(normalized_targets) and detected_norm in normalized_targets
|
ef5baa86
tangwang
混杂语言处理
|
389
390
391
|
# Stage 6: Text embedding - async execution
query_vector = None
|
dc403578
tangwang
多模态搜索
|
392
|
image_query_vector = None
|
ef5baa86
tangwang
混杂语言处理
|
393
394
395
396
|
should_generate_embedding = (
generate_vector and
self.config.query_config.enable_text_embedding
)
|
dc403578
tangwang
多模态搜索
|
397
398
399
400
|
should_generate_image_embedding = (
generate_vector and
bool(self.config.query_config.image_embedding_field)
)
|
ef5baa86
tangwang
混杂语言处理
|
401
|
|
dc403578
tangwang
多模态搜索
|
402
403
404
405
406
|
task_count = (
len(translation_targets)
+ (1 if should_generate_embedding else 0)
+ (1 if should_generate_image_embedding else 0)
)
|
ef5baa86
tangwang
混杂语言处理
|
407
408
409
410
411
|
if task_count > 0:
async_executor = ThreadPoolExecutor(
max_workers=max(1, min(task_count, 4)),
thread_name_prefix="query-enrichment",
)
|
1556989b
tangwang
query翻译等待超时逻辑
|
412
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
413
|
try:
|
ef5baa86
tangwang
混杂语言处理
|
414
415
|
if async_executor is not None:
for lang in translation_targets:
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
416
417
418
419
420
421
|
model_name = self._pick_query_translation_model(
detected_lang,
lang,
self.config,
source_language_in_index,
)
|
1556989b
tangwang
query翻译等待超时逻辑
|
422
423
424
|
log_debug(
f"Submitting query translation | source={detected_lang} target={lang} model={model_name}"
)
|
ef5baa86
tangwang
混杂语言处理
|
425
|
future = async_executor.submit(
|
1556989b
tangwang
query翻译等待超时逻辑
|
426
427
428
429
430
431
432
|
self.translator.translate,
query_text,
lang,
detected_lang,
"ecommerce_search_query",
model_name,
)
|
ef5baa86
tangwang
混杂语言处理
|
433
|
future_to_task[future] = ("translation", lang)
|
db9c469c
tangwang
log optimize
|
434
|
future_submit_at[future] = time.perf_counter()
|
ef5baa86
tangwang
混杂语言处理
|
435
436
437
438
439
440
441
|
if should_generate_embedding:
if self.text_encoder is None:
raise RuntimeError("Text embedding is enabled but text encoder is not initialized")
log_debug("Submitting query vector generation")
def _encode_query_vector() -> Optional[np.ndarray]:
|
4650fcec
tangwang
日志优化、日志串联(uid rqid)
|
442
443
444
445
446
447
|
arr = self.text_encoder.encode(
[query_text],
priority=1,
request_id=(context.reqid if context else None),
user_id=(context.uid if context else None),
)
|
ef5baa86
tangwang
混杂语言处理
|
448
449
450
451
452
453
454
455
456
|
if arr is None or len(arr) == 0:
return None
vec = arr[0]
if vec is None:
return None
return np.asarray(vec, dtype=np.float32)
future = async_executor.submit(_encode_query_vector)
future_to_task[future] = ("embedding", None)
|
db9c469c
tangwang
log optimize
|
457
|
future_submit_at[future] = time.perf_counter()
|
dc403578
tangwang
多模态搜索
|
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
|
if should_generate_image_embedding:
if self.image_encoder is None:
raise RuntimeError(
"Image embedding field is configured but image encoder is not initialized"
)
log_debug("Submitting CLIP text query vector generation")
def _encode_image_query_vector() -> Optional[np.ndarray]:
vec = self.image_encoder.encode_clip_text(
query_text,
normalize_embeddings=True,
priority=1,
request_id=(context.reqid if context else None),
user_id=(context.uid if context else None),
)
if vec is None:
return None
return np.asarray(vec, dtype=np.float32)
future = async_executor.submit(_encode_image_query_vector)
future_to_task[future] = ("image_embedding", None)
|
db9c469c
tangwang
log optimize
|
480
|
future_submit_at[future] = time.perf_counter()
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
481
|
except Exception as e:
|
ef5baa86
tangwang
混杂语言处理
|
482
|
error_msg = f"Async query enrichment submission failed | Error: {str(e)}"
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
483
484
485
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
ef5baa86
tangwang
混杂语言处理
|
486
487
488
489
|
if async_executor is not None:
async_executor.shutdown(wait=False)
async_executor = None
future_to_task.clear()
|
db9c469c
tangwang
log optimize
|
490
|
future_submit_at.clear()
|
be52af70
tangwang
first commit
|
491
|
|
45b39796
tangwang
qp性能优化
|
492
|
# Stage 4: Query analysis (tokenization) now overlaps with async enrichment work.
|
45b39796
tangwang
qp性能优化
|
493
|
query_tokenizer_result = text_analysis_cache.get_tokenizer_result(query_text)
|
45b39796
tangwang
qp性能优化
|
494
|
query_tokens = self._extract_tokens(query_tokenizer_result)
|
45b39796
tangwang
qp性能优化
|
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
|
log_debug(f"Query analysis | Query tokens: {query_tokens}")
if context:
context.store_intermediate_result('query_tokens', query_tokens)
keywords_base_query = ""
keywords_base_ms = 0.0
try:
keywords_base_t0 = time.perf_counter()
keywords_base_query = self._keyword_extractor.extract_keywords(
query_text,
language_hint=detected_lang,
tokenizer_result=text_analysis_cache.get_tokenizer_result(query_text),
)
keywords_base_ms = (time.perf_counter() - keywords_base_t0) * 1000.0
except Exception as e:
log_info(f"Base keyword extraction failed | Error: {e}")
|
9d0214bb
tangwang
qp性能优化
|
512
|
before_wait_ms = (time.perf_counter() - before_wait_t0) * 1000.0
|
45b39796
tangwang
qp性能优化
|
513
|
|
ef5baa86
tangwang
混杂语言处理
|
514
515
|
# Wait for translation + embedding concurrently; shared budget depends on whether
# the detected language belongs to caller-provided target_languages.
|
1556989b
tangwang
query翻译等待超时逻辑
|
516
|
qc = self.config.query_config
|
ef5baa86
tangwang
混杂语言处理
|
517
|
source_in_target_languages = bool(normalized_targets) and detected_norm in normalized_targets
|
1556989b
tangwang
query翻译等待超时逻辑
|
518
519
|
budget_ms = (
qc.translation_embedding_wait_budget_ms_source_in_index
|
ef5baa86
tangwang
混杂语言处理
|
520
|
if source_in_target_languages
|
1556989b
tangwang
query翻译等待超时逻辑
|
521
522
523
524
|
else qc.translation_embedding_wait_budget_ms_source_not_in_index
)
budget_sec = max(0.0, float(budget_ms) / 1000.0)
|
ef5baa86
tangwang
混杂语言处理
|
525
|
if translation_targets:
|
1556989b
tangwang
query翻译等待超时逻辑
|
526
527
|
log_info(
f"Translation+embedding shared wait budget | budget_ms={budget_ms} | "
|
ef5baa86
tangwang
混杂语言处理
|
528
529
|
f"source_in_target_languages={source_in_target_languages} | "
f"translation_targets={translation_targets}"
|
1556989b
tangwang
query翻译等待超时逻辑
|
530
531
|
)
|
ef5baa86
tangwang
混杂语言处理
|
532
|
if future_to_task:
|
1556989b
tangwang
query翻译等待超时逻辑
|
533
534
|
log_debug(
f"Waiting for async tasks (translation+embedding) | budget_ms={budget_ms} | "
|
ef5baa86
tangwang
混杂语言处理
|
535
|
f"source_in_target_languages={source_in_target_languages}"
|
1556989b
tangwang
query翻译等待超时逻辑
|
536
537
|
)
|
45b39796
tangwang
qp性能优化
|
538
|
async_wait_t0 = time.perf_counter()
|
ef5baa86
tangwang
混杂语言处理
|
539
|
done, not_done = wait(list(future_to_task.keys()), timeout=budget_sec)
|
45b39796
tangwang
qp性能优化
|
540
|
async_wait_ms = (time.perf_counter() - async_wait_t0) * 1000.0
|
d4cadc13
tangwang
翻译重构
|
541
|
for future in done:
|
ef5baa86
tangwang
混杂语言处理
|
542
|
task_type, lang = future_to_task[future]
|
db9c469c
tangwang
log optimize
|
543
544
|
t0 = future_submit_at.pop(future, None)
elapsed_ms = (time.perf_counter() - t0) * 1000.0 if t0 is not None else 0.0
|
3ec5bfe6
tangwang
1. get_translatio...
|
545
546
|
try:
result = future.result()
|
1556989b
tangwang
query翻译等待超时逻辑
|
547
|
if task_type == "translation":
|
3ec5bfe6
tangwang
1. get_translatio...
|
548
549
|
if result:
translations[lang] = result
|
45b39796
tangwang
qp性能优化
|
550
|
text_analysis_cache.set_language_hint(result, lang)
|
3ec5bfe6
tangwang
1. get_translatio...
|
551
|
if context:
|
1556989b
tangwang
query翻译等待超时逻辑
|
552
553
|
context.store_intermediate_result(f"translation_{lang}", result)
elif task_type == "embedding":
|
3ec5bfe6
tangwang
1. get_translatio...
|
554
|
query_vector = result
|
db9c469c
tangwang
log optimize
|
555
556
|
if query_vector is not None and context:
context.store_intermediate_result("query_vector_shape", query_vector.shape)
|
dc403578
tangwang
多模态搜索
|
557
558
|
elif task_type == "image_embedding":
image_query_vector = result
|
db9c469c
tangwang
log optimize
|
559
560
561
562
|
if image_query_vector is not None and context:
context.store_intermediate_result(
"image_query_vector_shape",
image_query_vector.shape,
|
dc403578
tangwang
多模态搜索
|
563
|
)
|
db9c469c
tangwang
log optimize
|
564
565
566
567
568
569
|
_log_async_enrichment_finished(
log_info,
task_type=task_type,
summary=_async_enrichment_result_summary(task_type, lang, result),
elapsed_ms=elapsed_ms,
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
570
|
except Exception as e:
|
db9c469c
tangwang
log optimize
|
571
572
573
574
575
576
|
_log_async_enrichment_finished(
log_info,
task_type=task_type,
summary=f"error={e!s}",
elapsed_ms=elapsed_ms,
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
577
|
if context:
|
db9c469c
tangwang
log optimize
|
578
|
context.add_warning(_async_enrichment_failure_warning(task_type, lang, e))
|
d4cadc13
tangwang
翻译重构
|
579
|
|
d4cadc13
tangwang
翻译重构
|
580
581
|
if not_done:
for future in not_done:
|
db9c469c
tangwang
log optimize
|
582
|
future_submit_at.pop(future, None)
|
ef5baa86
tangwang
混杂语言处理
|
583
|
task_type, lang = future_to_task[future]
|
1556989b
tangwang
query翻译等待超时逻辑
|
584
|
if task_type == "translation":
|
d4cadc13
tangwang
翻译重构
|
585
|
timeout_msg = (
|
1556989b
tangwang
query翻译等待超时逻辑
|
586
|
f"Translation timeout (>{budget_ms}ms) | Language: {lang} | "
|
d4cadc13
tangwang
翻译重构
|
587
588
|
f"Query text: '{query_text}'"
)
|
dc403578
tangwang
多模态搜索
|
589
590
591
592
593
|
elif task_type == "image_embedding":
timeout_msg = (
f"CLIP text query vector generation timeout (>{budget_ms}ms), "
"proceeding without image embedding result"
)
|
d4cadc13
tangwang
翻译重构
|
594
|
else:
|
1556989b
tangwang
query翻译等待超时逻辑
|
595
596
597
|
timeout_msg = (
f"Query vector generation timeout (>{budget_ms}ms), proceeding without embedding result"
)
|
d4cadc13
tangwang
翻译重构
|
598
599
600
|
log_info(timeout_msg)
if context:
context.add_warning(timeout_msg)
|
d4cadc13
tangwang
翻译重构
|
601
|
|
ef5baa86
tangwang
混杂语言处理
|
602
603
|
if async_executor:
async_executor.shutdown(wait=False)
|
1556989b
tangwang
query翻译等待超时逻辑
|
604
|
|
3ec5bfe6
tangwang
1. get_translatio...
|
605
|
if translations and context:
|
1556989b
tangwang
query翻译等待超时逻辑
|
606
|
context.store_intermediate_result("translations", translations)
|
45b39796
tangwang
qp性能优化
|
607
608
|
else:
async_wait_ms = 0.0
|
be52af70
tangwang
first commit
|
609
|
|
45b39796
tangwang
qp性能优化
|
610
|
tail_sync_t0 = time.perf_counter()
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
611
|
keywords_queries: Dict[str, str] = {}
|
45b39796
tangwang
qp性能优化
|
612
|
keyword_tail_ms = 0.0
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
613
|
try:
|
45b39796
tangwang
qp性能优化
|
614
|
keywords_t0 = time.perf_counter()
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
615
616
617
618
|
keywords_queries = collect_keywords_queries(
self._keyword_extractor,
query_text,
translations,
|
45b39796
tangwang
qp性能优化
|
619
620
621
|
source_language=detected_lang,
text_analysis_cache=text_analysis_cache,
base_keywords_query=keywords_base_query,
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
622
|
)
|
45b39796
tangwang
qp性能优化
|
623
|
keyword_tail_ms = (time.perf_counter() - keywords_t0) * 1000.0
|
9d0214bb
tangwang
qp性能优化
|
624
625
626
|
if context:
context.store_intermediate_result("keywords_queries", keywords_queries)
log_info(f"Keyword extraction completed | keywords_queries={keywords_queries}")
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
627
628
629
|
except Exception as e:
log_info(f"Keyword extraction failed | Error: {e}")
|
be52af70
tangwang
first commit
|
630
|
# Build result
|
cda1cd62
tangwang
意图分析&应用 baseline
|
631
632
633
634
635
636
637
|
base_result = ParsedQuery(
original_query=query,
query_normalized=normalized,
rewritten_query=query_text,
detected_language=detected_lang,
translations=translations,
query_vector=query_vector,
|
dc403578
tangwang
多模态搜索
|
638
|
image_query_vector=image_query_vector,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
639
|
query_tokens=query_tokens,
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
640
|
keywords_queries=keywords_queries,
|
45b39796
tangwang
qp性能优化
|
641
|
_text_analysis_cache=text_analysis_cache,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
642
|
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
643
|
style_intent_profile = self.style_intent_detector.detect(base_result)
|
74fdf9bd
tangwang
1.
|
644
|
product_title_exclusion_profile = self.product_title_exclusion_detector.detect(base_result)
|
45b39796
tangwang
qp性能优化
|
645
|
tail_sync_ms = (time.perf_counter() - tail_sync_t0) * 1000.0
|
45b39796
tangwang
qp性能优化
|
646
647
|
log_info(
"Query parse stage timings | "
|
45b39796
tangwang
qp性能优化
|
648
649
|
f"before_wait_ms={before_wait_ms:.1f} | "
f"async_wait_ms={async_wait_ms:.1f} | "
|
45b39796
tangwang
qp性能优化
|
650
651
|
f"base_keywords_ms={keywords_base_ms:.1f} | "
f"keyword_tail_ms={keyword_tail_ms:.1f} | "
|
45b39796
tangwang
qp性能优化
|
652
653
|
f"tail_sync_ms={tail_sync_ms:.1f}"
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
654
655
656
657
658
|
if context:
context.store_intermediate_result(
"style_intent_profile",
style_intent_profile.to_dict(),
)
|
74fdf9bd
tangwang
1.
|
659
660
661
662
|
context.store_intermediate_result(
"product_title_exclusion_profile",
product_title_exclusion_profile.to_dict(),
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
663
|
|
be52af70
tangwang
first commit
|
664
665
|
result = ParsedQuery(
original_query=query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
666
|
query_normalized=normalized,
|
ef5baa86
tangwang
混杂语言处理
|
667
|
rewritten_query=query_text,
|
be52af70
tangwang
first commit
|
668
669
670
|
detected_language=detected_lang,
translations=translations,
query_vector=query_vector,
|
dc403578
tangwang
多模态搜索
|
671
|
image_query_vector=image_query_vector,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
672
|
query_tokens=query_tokens,
|
ceaf6d03
tangwang
召回限定:must条件补充主干词命...
|
673
|
keywords_queries=keywords_queries,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
674
|
style_intent_profile=style_intent_profile,
|
74fdf9bd
tangwang
1.
|
675
|
product_title_exclusion_profile=product_title_exclusion_profile,
|
45b39796
tangwang
qp性能优化
|
676
|
_text_analysis_cache=text_analysis_cache,
|
be52af70
tangwang
first commit
|
677
678
|
)
|
f8219b5e
tangwang
1.
|
679
680
681
682
683
684
685
|
parse_total_ms = (time.perf_counter() - parse_t0) * 1000.0
completion_tail = (
f"Translation count: {len(translations)} | "
f"Vector: {'yes' if query_vector is not None else 'no'} | "
f"Image vector: {'yes' if image_query_vector is not None else 'no'} | "
f"parse_total_ms={parse_total_ms:.1f}"
)
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
686
687
|
if context and hasattr(context, 'logger'):
context.logger.info(
|
70dab99f
tangwang
add logs
|
688
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
|
f8219b5e
tangwang
1.
|
689
|
f"Language: {detected_lang} | {completion_tail}",
|
16c42787
tangwang
feat: implement r...
|
690
691
692
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
693
|
logger.info(
|
70dab99f
tangwang
add logs
|
694
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
|
f8219b5e
tangwang
1.
|
695
|
f"Language: {detected_lang} | {completion_tail}"
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
696
|
)
|
16c42787
tangwang
feat: implement r...
|
697
|
|
be52af70
tangwang
first commit
|
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
|
return result
def get_search_queries(self, parsed_query: ParsedQuery) -> List[str]:
"""
Get list of queries to search (original + translations).
Args:
parsed_query: Parsed query object
Returns:
List of query strings to search
"""
queries = [parsed_query.rewritten_query]
# Add translations
for lang, translation in parsed_query.translations.items():
if translation and translation != parsed_query.rewritten_query:
queries.append(translation)
return queries
|
00c8ddb9
tangwang
suggest rank opti...
|
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
|
def detect_text_language_for_suggestions(
text: str,
*,
index_languages: Optional[List[str]] = None,
primary_language: str = "en",
) -> Tuple[str, float, str]:
"""
Language detection for short strings (mixed-language tags, query-log fallback).
Uses the same ``LanguageDetector`` as :class:`QueryParser`. Returns a language
code present in ``index_languages`` when possible, otherwise the tenant primary.
Returns:
(lang, confidence, source) where source is ``detector``, ``fallback``, or ``default``.
"""
langs_list = [x for x in (index_languages or []) if x]
langs_set = set(langs_list)
def _norm_lang(raw: Optional[str]) -> Optional[str]:
if not raw:
return None
token = str(raw).strip().lower().replace("-", "_")
if not token:
return None
if token in {"zh_tw", "pt_br"}:
return token
return token.split("_")[0]
primary = _norm_lang(primary_language) or "en"
if primary not in langs_set and langs_list:
primary = _norm_lang(langs_list[0]) or langs_list[0]
if not text or not str(text).strip():
return primary, 0.0, "default"
raw_code = LanguageDetector().detect(str(text).strip())
if not raw_code or raw_code == "unknown":
return primary, 0.35, "default"
def _index_lang_base(cand: str) -> str:
t = str(cand).strip().lower().replace("-", "_")
return t.split("_")[0] if t else ""
def _resolve_index_lang(code: str) -> Optional[str]:
if code in langs_set:
return code
for cand in langs_list:
if _index_lang_base(cand) == code:
return cand
return None
if langs_list:
resolved = _resolve_index_lang(raw_code)
if resolved is None:
return primary, 0.5, "fallback"
return resolved, 0.92, "detector"
return raw_code, 0.92, "detector"
|