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