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
|
1556989b
tangwang
query翻译等待超时逻辑
|
15
|
from concurrent.futures import ThreadPoolExecutor, wait
|
be52af70
tangwang
first commit
|
16
|
|
dc403578
tangwang
多模态搜索
|
17
|
from embeddings.image_encoder import CLIPImageEncoder
|
07cf5a93
tangwang
START_EMBEDDING=...
|
18
|
from embeddings.text_encoder import TextEmbeddingEncoder
|
9f96d6f3
tangwang
短query不用语义搜索
|
19
|
from config import SearchConfig
|
0fd2f875
tangwang
translate
|
20
|
from translation import create_translation_client
|
be52af70
tangwang
first commit
|
21
|
from .language_detector import LanguageDetector
|
74fdf9bd
tangwang
1.
|
22
23
24
25
26
|
from .product_title_exclusion import (
ProductTitleExclusionDetector,
ProductTitleExclusionProfile,
ProductTitleExclusionRegistry,
)
|
be52af70
tangwang
first commit
|
27
|
from .query_rewriter import QueryRewriter, QueryNormalizer
|
cda1cd62
tangwang
意图分析&应用 baseline
|
28
29
|
from .style_intent import StyleIntentDetector, StyleIntentProfile, StyleIntentRegistry
from .tokenization import extract_token_strings, simple_tokenize_query
|
be52af70
tangwang
first commit
|
30
|
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
31
32
|
logger = logging.getLogger(__name__)
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
33
|
import hanlp # type: ignore
|
be52af70
tangwang
first commit
|
34
|
|
00c8ddb9
tangwang
suggest rank opti...
|
35
|
|
74fdf9bd
tangwang
1.
|
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
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
混杂语言处理
|
60
|
@dataclass(slots=True)
|
be52af70
tangwang
first commit
|
61
|
class ParsedQuery:
|
ef5baa86
tangwang
混杂语言处理
|
62
63
64
65
66
67
68
69
|
"""Container for query parser facts."""
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
多模态搜索
|
70
|
image_query_vector: Optional[np.ndarray] = None
|
ef5baa86
tangwang
混杂语言处理
|
71
|
query_tokens: List[str] = field(default_factory=list)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
72
|
style_intent_profile: Optional[StyleIntentProfile] = None
|
74fdf9bd
tangwang
1.
|
73
74
75
76
77
78
79
80
81
|
product_title_exclusion_profile: Optional[ProductTitleExclusionProfile] = None
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
|
82
83
84
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
|
ef5baa86
tangwang
混杂语言处理
|
85
|
return {
|
be52af70
tangwang
first commit
|
86
|
"original_query": self.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
87
|
"query_normalized": self.query_normalized,
|
be52af70
tangwang
first commit
|
88
89
90
|
"rewritten_query": self.rewritten_query,
"detected_language": self.detected_language,
"translations": self.translations,
|
dc403578
tangwang
多模态搜索
|
91
92
|
"has_query_vector": self.query_vector is not None,
"has_image_query_vector": self.image_query_vector is not None,
|
ef5baa86
tangwang
混杂语言处理
|
93
|
"query_tokens": self.query_tokens,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
94
95
96
|
"style_intent_profile": (
self.style_intent_profile.to_dict() if self.style_intent_profile is not None else None
),
|
74fdf9bd
tangwang
1.
|
97
98
99
100
101
|
"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
|
102
|
}
|
be52af70
tangwang
first commit
|
103
104
105
106
107
108
109
110
|
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
混杂语言处理
|
111
|
4. Translation to caller-provided target languages
|
be52af70
tangwang
first commit
|
112
113
114
115
116
|
5. Text embedding generation (for semantic search)
"""
def __init__(
self,
|
9f96d6f3
tangwang
短query不用语义搜索
|
117
|
config: SearchConfig,
|
950a640e
tangwang
embeddings
|
118
|
text_encoder: Optional[TextEmbeddingEncoder] = None,
|
dc403578
tangwang
多模态搜索
|
119
|
image_encoder: Optional[CLIPImageEncoder] = None,
|
ef5baa86
tangwang
混杂语言处理
|
120
121
|
translator: Optional[Any] = None,
tokenizer: Optional[Callable[[str], Any]] = None,
|
be52af70
tangwang
first commit
|
122
123
124
125
126
|
):
"""
Initialize query parser.
Args:
|
9f96d6f3
tangwang
短query不用语义搜索
|
127
|
config: SearchConfig instance
|
26b910bd
tangwang
refactor service ...
|
128
129
|
text_encoder: Text embedding encoder (initialized at startup if not provided)
translator: Translator instance (initialized at startup if not provided)
|
be52af70
tangwang
first commit
|
130
|
"""
|
9f96d6f3
tangwang
短query不用语义搜索
|
131
|
self.config = config
|
be52af70
tangwang
first commit
|
132
|
self._text_encoder = text_encoder
|
dc403578
tangwang
多模态搜索
|
133
|
self._image_encoder = image_encoder
|
be52af70
tangwang
first commit
|
134
135
136
137
138
|
self._translator = translator
# Initialize components
self.normalizer = QueryNormalizer()
self.language_detector = LanguageDetector()
|
9f96d6f3
tangwang
短query不用语义搜索
|
139
|
self.rewriter = QueryRewriter(config.query_config.rewrite_dictionary)
|
ef5baa86
tangwang
混杂语言处理
|
140
|
self._tokenizer = tokenizer or self._build_tokenizer()
|
cda1cd62
tangwang
意图分析&应用 baseline
|
141
142
143
144
145
|
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.
|
146
147
148
149
150
151
152
|
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
|
153
|
|
26b910bd
tangwang
refactor service ...
|
154
155
156
157
|
# 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
多模态搜索
|
158
159
160
|
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 ...
|
161
162
163
|
if self._translator is None:
from config.services_config import get_translation_config
cfg = get_translation_config()
|
5e4dc8e4
tangwang
翻译架构按“一个翻译服务 +
|
164
165
|
logger.info(
"Initializing translator client at QueryParser construction (service_url=%s, default_model=%s)...",
|
a8261ece
tangwang
检索效果优化
|
166
167
|
cfg.get("service_url"),
cfg.get("default_model"),
|
5e4dc8e4
tangwang
翻译架构按“一个翻译服务 +
|
168
|
)
|
0fd2f875
tangwang
translate
|
169
|
self._translator = create_translation_client()
|
26b910bd
tangwang
refactor service ...
|
170
|
|
be52af70
tangwang
first commit
|
171
|
@property
|
950a640e
tangwang
embeddings
|
172
|
def text_encoder(self) -> TextEmbeddingEncoder:
|
26b910bd
tangwang
refactor service ...
|
173
|
"""Return pre-initialized text encoder."""
|
be52af70
tangwang
first commit
|
174
175
176
|
return self._text_encoder
@property
|
42e3aea6
tangwang
tidy
|
177
|
def translator(self) -> Any:
|
26b910bd
tangwang
refactor service ...
|
178
|
"""Return pre-initialized translator."""
|
be52af70
tangwang
first commit
|
179
|
return self._translator
|
484adbfe
tangwang
adapt ubuntu; con...
|
180
|
|
dc403578
tangwang
多模态搜索
|
181
182
183
184
185
|
@property
def image_encoder(self) -> Optional[CLIPImageEncoder]:
"""Return pre-initialized image encoder for CLIP text embeddings."""
return self._image_encoder
|
ef5baa86
tangwang
混杂语言处理
|
186
187
188
189
190
191
192
193
194
195
|
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...")
tokenizer = hanlp.load(hanlp.pretrained.tok.CTB9_TOK_ELECTRA_BASE_CRF)
tokenizer.config.output_spans = True
logger.info("HanLP tokenizer initialized")
return tokenizer
|
e56fbdc1
tangwang
query trans
|
196
|
@staticmethod
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
197
198
199
200
201
202
|
def _pick_query_translation_model(
source_lang: str,
target_lang: str,
config: SearchConfig,
source_language_in_index: bool,
) -> str:
|
77bfa7e3
tangwang
query translate
|
203
|
"""Pick the translation capability for query-time translation (configurable)."""
|
e56fbdc1
tangwang
query trans
|
204
205
|
src = str(source_lang or "").strip().lower()
tgt = str(target_lang or "").strip().lower()
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
206
207
208
209
210
211
212
213
|
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
|
214
|
|
e56fbdc1
tangwang
query trans
|
215
|
if src == "zh" and tgt == "en":
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
216
|
return qc.zh_to_en_model_source_not_in_index or qc.zh_to_en_model
|
e56fbdc1
tangwang
query trans
|
217
|
if src == "en" and tgt == "zh":
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
218
219
|
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
|
220
|
|
ef5baa86
tangwang
混杂语言处理
|
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
|
@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
|
236
|
return extract_token_strings(tokenizer_result)
|
ea118f2b
tangwang
build_query:根据 qu...
|
237
238
|
def _get_query_tokens(self, query: str) -> List[str]:
|
ef5baa86
tangwang
混杂语言处理
|
239
|
return self._extract_tokens(self._tokenizer(query))
|
be52af70
tangwang
first commit
|
240
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
241
242
243
244
245
|
def parse(
self,
query: str,
tenant_id: Optional[str] = None,
generate_vector: bool = True,
|
ef5baa86
tangwang
混杂语言处理
|
246
247
|
context: Optional[Any] = None,
target_languages: Optional[List[str]] = None,
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
248
|
) -> ParsedQuery:
|
be52af70
tangwang
first commit
|
249
250
251
252
253
|
"""
Parse query through all processing stages.
Args:
query: Raw query string
|
ef5baa86
tangwang
混杂语言处理
|
254
255
|
tenant_id: Deprecated and ignored by QueryParser. Kept temporarily
to avoid a wider refactor in this first step.
|
be52af70
tangwang
first commit
|
256
|
generate_vector: Whether to generate query embedding
|
16c42787
tangwang
feat: implement r...
|
257
|
context: Optional request context for tracking and logging
|
ef5baa86
tangwang
混杂语言处理
|
258
|
target_languages: Translation target languages decided by the caller
|
be52af70
tangwang
first commit
|
259
260
261
262
|
Returns:
ParsedQuery object with all processing results
"""
|
16c42787
tangwang
feat: implement r...
|
263
|
# Initialize logger if context provided
|
950a640e
tangwang
embeddings
|
264
265
266
|
active_logger = context.logger if context else logger
if context and hasattr(context, "logger"):
context.logger.info(
|
70dab99f
tangwang
add logs
|
267
|
f"Starting query parsing | Original query: '{query}' | Generate vector: {generate_vector}",
|
16c42787
tangwang
feat: implement r...
|
268
269
270
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
16c42787
tangwang
feat: implement r...
|
271
|
def log_info(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
272
273
|
if context and hasattr(context, 'logger'):
context.logger.info(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
274
|
else:
|
950a640e
tangwang
embeddings
|
275
|
active_logger.info(msg)
|
16c42787
tangwang
feat: implement r...
|
276
277
|
def log_debug(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
278
279
|
if context and hasattr(context, 'logger'):
context.logger.debug(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
280
|
else:
|
950a640e
tangwang
embeddings
|
281
|
active_logger.debug(msg)
|
be52af70
tangwang
first commit
|
282
283
284
|
# Stage 1: Normalize
normalized = self.normalizer.normalize(query)
|
70dab99f
tangwang
add logs
|
285
|
log_debug(f"Normalization completed | '{query}' -> '{normalized}'")
|
16c42787
tangwang
feat: implement r...
|
286
|
if context:
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
287
|
context.store_intermediate_result('query_normalized', normalized)
|
be52af70
tangwang
first commit
|
288
|
|
be52af70
tangwang
first commit
|
289
|
# Stage 2: Query rewriting
|
ef5baa86
tangwang
混杂语言处理
|
290
291
|
query_text = normalized
rewritten = normalized
|
9f96d6f3
tangwang
短query不用语义搜索
|
292
|
if self.config.query_config.rewrite_dictionary: # Enable rewrite if dictionary exists
|
be52af70
tangwang
first commit
|
293
294
|
rewritten = self.rewriter.rewrite(query_text)
if rewritten != query_text:
|
70dab99f
tangwang
add logs
|
295
|
log_info(f"Query rewritten | '{query_text}' -> '{rewritten}'")
|
be52af70
tangwang
first commit
|
296
|
query_text = rewritten
|
16c42787
tangwang
feat: implement r...
|
297
298
|
if context:
context.store_intermediate_result('rewritten_query', rewritten)
|
70dab99f
tangwang
add logs
|
299
|
context.add_warning(f"Query was rewritten: {query_text}")
|
be52af70
tangwang
first commit
|
300
301
302
|
# Stage 3: Language detection
detected_lang = self.language_detector.detect(query_text)
|
a5a6bab8
tangwang
多语言查询优化
|
303
304
305
|
# 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
|
306
|
log_info(f"Language detection | Detected language: {detected_lang}")
|
16c42787
tangwang
feat: implement r...
|
307
308
|
if context:
context.store_intermediate_result('detected_language', detected_lang)
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
309
|
# Stage 4: Query analysis (tokenization)
|
ef5baa86
tangwang
混杂语言处理
|
310
|
query_tokens = self._get_query_tokens(query_text)
|
ef5baa86
tangwang
混杂语言处理
|
311
|
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
312
|
log_debug(f"Query analysis | Query tokens: {query_tokens}")
|
ef5baa86
tangwang
混杂语言处理
|
313
314
|
if context:
context.store_intermediate_result('query_tokens', query_tokens)
|
be52af70
tangwang
first commit
|
315
|
|
ef5baa86
tangwang
混杂语言处理
|
316
317
|
# Stage 5: Translation + embedding. Parser only coordinates async enrichment work; the
# caller decides translation targets and later search-field planning.
|
1556989b
tangwang
query翻译等待超时逻辑
|
318
|
translations: Dict[str, str] = {}
|
ef5baa86
tangwang
混杂语言处理
|
319
320
|
future_to_task: Dict[Any, Tuple[str, Optional[str]]] = {}
async_executor: Optional[ThreadPoolExecutor] = None
|
1556989b
tangwang
query翻译等待超时逻辑
|
321
|
detected_norm = str(detected_lang or "").strip().lower()
|
ef5baa86
tangwang
混杂语言处理
|
322
323
|
normalized_targets = self._normalize_language_codes(target_languages)
translation_targets = [lang for lang in normalized_targets if lang != detected_norm]
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
324
|
source_language_in_index = bool(normalized_targets) and detected_norm in normalized_targets
|
ef5baa86
tangwang
混杂语言处理
|
325
326
327
|
# Stage 6: Text embedding - async execution
query_vector = None
|
dc403578
tangwang
多模态搜索
|
328
|
image_query_vector = None
|
ef5baa86
tangwang
混杂语言处理
|
329
330
331
332
|
should_generate_embedding = (
generate_vector and
self.config.query_config.enable_text_embedding
)
|
dc403578
tangwang
多模态搜索
|
333
334
335
336
|
should_generate_image_embedding = (
generate_vector and
bool(self.config.query_config.image_embedding_field)
)
|
ef5baa86
tangwang
混杂语言处理
|
337
|
|
dc403578
tangwang
多模态搜索
|
338
339
340
341
342
|
task_count = (
len(translation_targets)
+ (1 if should_generate_embedding else 0)
+ (1 if should_generate_image_embedding else 0)
)
|
ef5baa86
tangwang
混杂语言处理
|
343
344
345
346
347
|
if task_count > 0:
async_executor = ThreadPoolExecutor(
max_workers=max(1, min(task_count, 4)),
thread_name_prefix="query-enrichment",
)
|
1556989b
tangwang
query翻译等待超时逻辑
|
348
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
349
|
try:
|
ef5baa86
tangwang
混杂语言处理
|
350
351
|
if async_executor is not None:
for lang in translation_targets:
|
86d0e83d
tangwang
query翻译,根据源语言是否在索...
|
352
353
354
355
356
357
|
model_name = self._pick_query_translation_model(
detected_lang,
lang,
self.config,
source_language_in_index,
)
|
1556989b
tangwang
query翻译等待超时逻辑
|
358
359
360
|
log_debug(
f"Submitting query translation | source={detected_lang} target={lang} model={model_name}"
)
|
ef5baa86
tangwang
混杂语言处理
|
361
|
future = async_executor.submit(
|
1556989b
tangwang
query翻译等待超时逻辑
|
362
363
364
365
366
367
368
|
self.translator.translate,
query_text,
lang,
detected_lang,
"ecommerce_search_query",
model_name,
)
|
ef5baa86
tangwang
混杂语言处理
|
369
370
371
372
373
374
375
376
|
future_to_task[future] = ("translation", lang)
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)
|
377
378
379
380
381
382
|
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
混杂语言处理
|
383
384
385
386
387
388
389
390
391
|
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)
|
dc403578
tangwang
多模态搜索
|
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
|
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)
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
414
|
except Exception as e:
|
ef5baa86
tangwang
混杂语言处理
|
415
|
error_msg = f"Async query enrichment submission failed | Error: {str(e)}"
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
416
417
418
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
ef5baa86
tangwang
混杂语言处理
|
419
420
421
422
|
if async_executor is not None:
async_executor.shutdown(wait=False)
async_executor = None
future_to_task.clear()
|
be52af70
tangwang
first commit
|
423
|
|
ef5baa86
tangwang
混杂语言处理
|
424
425
|
# Wait for translation + embedding concurrently; shared budget depends on whether
# the detected language belongs to caller-provided target_languages.
|
1556989b
tangwang
query翻译等待超时逻辑
|
426
|
qc = self.config.query_config
|
ef5baa86
tangwang
混杂语言处理
|
427
|
source_in_target_languages = bool(normalized_targets) and detected_norm in normalized_targets
|
1556989b
tangwang
query翻译等待超时逻辑
|
428
429
|
budget_ms = (
qc.translation_embedding_wait_budget_ms_source_in_index
|
ef5baa86
tangwang
混杂语言处理
|
430
|
if source_in_target_languages
|
1556989b
tangwang
query翻译等待超时逻辑
|
431
432
433
434
|
else qc.translation_embedding_wait_budget_ms_source_not_in_index
)
budget_sec = max(0.0, float(budget_ms) / 1000.0)
|
ef5baa86
tangwang
混杂语言处理
|
435
|
if translation_targets:
|
1556989b
tangwang
query翻译等待超时逻辑
|
436
437
|
log_info(
f"Translation+embedding shared wait budget | budget_ms={budget_ms} | "
|
ef5baa86
tangwang
混杂语言处理
|
438
439
|
f"source_in_target_languages={source_in_target_languages} | "
f"translation_targets={translation_targets}"
|
1556989b
tangwang
query翻译等待超时逻辑
|
440
441
|
)
|
ef5baa86
tangwang
混杂语言处理
|
442
|
if future_to_task:
|
1556989b
tangwang
query翻译等待超时逻辑
|
443
444
|
log_debug(
f"Waiting for async tasks (translation+embedding) | budget_ms={budget_ms} | "
|
ef5baa86
tangwang
混杂语言处理
|
445
|
f"source_in_target_languages={source_in_target_languages}"
|
1556989b
tangwang
query翻译等待超时逻辑
|
446
447
|
)
|
ef5baa86
tangwang
混杂语言处理
|
448
|
done, not_done = wait(list(future_to_task.keys()), timeout=budget_sec)
|
d4cadc13
tangwang
翻译重构
|
449
|
for future in done:
|
ef5baa86
tangwang
混杂语言处理
|
450
|
task_type, lang = future_to_task[future]
|
3ec5bfe6
tangwang
1. get_translatio...
|
451
452
|
try:
result = future.result()
|
1556989b
tangwang
query翻译等待超时逻辑
|
453
|
if task_type == "translation":
|
3ec5bfe6
tangwang
1. get_translatio...
|
454
455
|
if result:
translations[lang] = result
|
d4cadc13
tangwang
翻译重构
|
456
|
log_info(
|
1556989b
tangwang
query翻译等待超时逻辑
|
457
458
|
f"Translation completed | Query text: '{query_text}' | "
f"Target language: {lang} | Translation result: '{result}'"
|
d4cadc13
tangwang
翻译重构
|
459
|
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
460
|
if context:
|
1556989b
tangwang
query翻译等待超时逻辑
|
461
462
|
context.store_intermediate_result(f"translation_{lang}", result)
elif task_type == "embedding":
|
3ec5bfe6
tangwang
1. get_translatio...
|
463
|
query_vector = result
|
b2e50710
tangwang
BgeEncoder.encode...
|
464
|
if query_vector is not None:
|
70dab99f
tangwang
add logs
|
465
|
log_debug(f"Query vector generation completed | Shape: {query_vector.shape}")
|
b2e50710
tangwang
BgeEncoder.encode...
|
466
|
if context:
|
1556989b
tangwang
query翻译等待超时逻辑
|
467
|
context.store_intermediate_result("query_vector_shape", query_vector.shape)
|
b2e50710
tangwang
BgeEncoder.encode...
|
468
|
else:
|
1556989b
tangwang
query翻译等待超时逻辑
|
469
470
471
|
log_info(
"Query vector generation completed but result is None, will process without vector"
)
|
dc403578
tangwang
多模态搜索
|
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
|
elif task_type == "image_embedding":
image_query_vector = result
if image_query_vector is not None:
log_debug(
f"CLIP text query vector generation completed | Shape: {image_query_vector.shape}"
)
if context:
context.store_intermediate_result(
"image_query_vector_shape",
image_query_vector.shape,
)
else:
log_info(
"CLIP text query vector generation completed but result is None, "
"will process without image vector"
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
488
|
except Exception as e:
|
1556989b
tangwang
query翻译等待超时逻辑
|
489
|
if task_type == "translation":
|
70dab99f
tangwang
add logs
|
490
|
error_msg = f"Translation failed | Language: {lang} | Error: {str(e)}"
|
dc403578
tangwang
多模态搜索
|
491
492
|
elif task_type == "image_embedding":
error_msg = f"CLIP text query vector generation failed | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
493
|
else:
|
70dab99f
tangwang
add logs
|
494
|
error_msg = f"Query vector generation failed | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
495
496
497
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
d4cadc13
tangwang
翻译重构
|
498
|
|
d4cadc13
tangwang
翻译重构
|
499
500
|
if not_done:
for future in not_done:
|
ef5baa86
tangwang
混杂语言处理
|
501
|
task_type, lang = future_to_task[future]
|
1556989b
tangwang
query翻译等待超时逻辑
|
502
|
if task_type == "translation":
|
d4cadc13
tangwang
翻译重构
|
503
|
timeout_msg = (
|
1556989b
tangwang
query翻译等待超时逻辑
|
504
|
f"Translation timeout (>{budget_ms}ms) | Language: {lang} | "
|
d4cadc13
tangwang
翻译重构
|
505
506
|
f"Query text: '{query_text}'"
)
|
dc403578
tangwang
多模态搜索
|
507
508
509
510
511
|
elif task_type == "image_embedding":
timeout_msg = (
f"CLIP text query vector generation timeout (>{budget_ms}ms), "
"proceeding without image embedding result"
)
|
d4cadc13
tangwang
翻译重构
|
512
|
else:
|
1556989b
tangwang
query翻译等待超时逻辑
|
513
514
515
|
timeout_msg = (
f"Query vector generation timeout (>{budget_ms}ms), proceeding without embedding result"
)
|
d4cadc13
tangwang
翻译重构
|
516
517
518
519
|
log_info(timeout_msg)
if context:
context.add_warning(timeout_msg)
|
ef5baa86
tangwang
混杂语言处理
|
520
521
|
if async_executor:
async_executor.shutdown(wait=False)
|
1556989b
tangwang
query翻译等待超时逻辑
|
522
|
|
3ec5bfe6
tangwang
1. get_translatio...
|
523
|
if translations and context:
|
1556989b
tangwang
query翻译等待超时逻辑
|
524
|
context.store_intermediate_result("translations", translations)
|
be52af70
tangwang
first commit
|
525
526
|
# Build result
|
cda1cd62
tangwang
意图分析&应用 baseline
|
527
528
529
530
531
532
533
|
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
多模态搜索
|
534
|
image_query_vector=image_query_vector,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
535
536
537
|
query_tokens=query_tokens,
)
style_intent_profile = self.style_intent_detector.detect(base_result)
|
74fdf9bd
tangwang
1.
|
538
|
product_title_exclusion_profile = self.product_title_exclusion_detector.detect(base_result)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
539
540
541
542
543
|
if context:
context.store_intermediate_result(
"style_intent_profile",
style_intent_profile.to_dict(),
)
|
74fdf9bd
tangwang
1.
|
544
545
546
547
|
context.store_intermediate_result(
"product_title_exclusion_profile",
product_title_exclusion_profile.to_dict(),
)
|
cda1cd62
tangwang
意图分析&应用 baseline
|
548
|
|
be52af70
tangwang
first commit
|
549
550
|
result = ParsedQuery(
original_query=query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
551
|
query_normalized=normalized,
|
ef5baa86
tangwang
混杂语言处理
|
552
|
rewritten_query=query_text,
|
be52af70
tangwang
first commit
|
553
554
555
|
detected_language=detected_lang,
translations=translations,
query_vector=query_vector,
|
dc403578
tangwang
多模态搜索
|
556
|
image_query_vector=image_query_vector,
|
bd96cead
tangwang
1. 动态多语言字段与统一策略配置
|
557
|
query_tokens=query_tokens,
|
cda1cd62
tangwang
意图分析&应用 baseline
|
558
|
style_intent_profile=style_intent_profile,
|
74fdf9bd
tangwang
1.
|
559
|
product_title_exclusion_profile=product_title_exclusion_profile,
|
be52af70
tangwang
first commit
|
560
561
|
)
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
562
563
|
if context and hasattr(context, 'logger'):
context.logger.info(
|
70dab99f
tangwang
add logs
|
564
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
|
dc403578
tangwang
多模态搜索
|
565
566
|
f"Translation count: {len(translations)} | Vector: {'yes' if query_vector is not None else 'no'} | "
f"Image vector: {'yes' if image_query_vector is not None else 'no'}",
|
16c42787
tangwang
feat: implement r...
|
567
568
569
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
570
|
logger.info(
|
70dab99f
tangwang
add logs
|
571
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
|
ef5baa86
tangwang
混杂语言处理
|
572
|
f"Language: {detected_lang}"
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
573
|
)
|
16c42787
tangwang
feat: implement r...
|
574
|
|
be52af70
tangwang
first commit
|
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
|
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...
|
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
|
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"
|