be52af70
tangwang
first commit
|
1
2
3
4
5
6
|
"""
Query parser - main module for query processing.
Handles query rewriting, translation, and embedding generation.
"""
|
3ec5bfe6
tangwang
1. get_translatio...
|
7
|
from typing import Dict, List, Optional, Any, Union
|
be52af70
tangwang
first commit
|
8
|
import numpy as np
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
9
|
import logging
|
7bc756c5
tangwang
优化 ES 查询构建
|
10
11
|
import re
import hanlp
|
3ec5bfe6
tangwang
1. get_translatio...
|
12
|
from concurrent.futures import Future, ThreadPoolExecutor, as_completed
|
be52af70
tangwang
first commit
|
13
|
|
be52af70
tangwang
first commit
|
14
|
from embeddings import BgeEncoder
|
9f96d6f3
tangwang
短query不用语义搜索
|
15
|
from config import SearchConfig
|
be52af70
tangwang
first commit
|
16
17
18
19
|
from .language_detector import LanguageDetector
from .translator import Translator
from .query_rewriter import QueryRewriter, QueryNormalizer
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
20
21
|
logger = logging.getLogger(__name__)
|
be52af70
tangwang
first commit
|
22
23
24
25
26
27
28
29
30
|
class ParsedQuery:
"""Container for parsed query results."""
def __init__(
self,
original_query: str,
normalized_query: str,
rewritten_query: Optional[str] = None,
|
a5a6bab8
tangwang
多语言查询优化
|
31
|
detected_language: Optional[str] = None,
|
be52af70
tangwang
first commit
|
32
33
|
translations: Dict[str, str] = None,
query_vector: Optional[np.ndarray] = None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
34
35
36
37
38
|
domain: str = "default",
keywords: str = "",
token_count: int = 0,
is_short_query: bool = False,
is_long_query: bool = False
|
be52af70
tangwang
first commit
|
39
40
41
42
43
44
45
46
|
):
self.original_query = original_query
self.normalized_query = normalized_query
self.rewritten_query = rewritten_query or normalized_query
self.detected_language = detected_language
self.translations = translations or {}
self.query_vector = query_vector
self.domain = domain
|
7bc756c5
tangwang
优化 ES 查询构建
|
47
48
49
50
51
|
# Query analysis fields
self.keywords = keywords
self.token_count = token_count
self.is_short_query = is_short_query
self.is_long_query = is_long_query
|
be52af70
tangwang
first commit
|
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
result = {
"original_query": self.original_query,
"normalized_query": self.normalized_query,
"rewritten_query": self.rewritten_query,
"detected_language": self.detected_language,
"translations": self.translations,
"domain": self.domain,
"has_vector": self.query_vector is not None
}
return result
class QueryParser:
"""
Main query parser that processes queries through multiple stages:
1. Normalization
2. Query rewriting (brand/category mappings, synonyms)
3. Language detection
4. Translation to target languages
5. Text embedding generation (for semantic search)
"""
def __init__(
self,
|
9f96d6f3
tangwang
短query不用语义搜索
|
79
|
config: SearchConfig,
|
be52af70
tangwang
first commit
|
80
81
82
83
84
85
86
|
text_encoder: Optional[BgeEncoder] = None,
translator: Optional[Translator] = None
):
"""
Initialize query parser.
Args:
|
9f96d6f3
tangwang
短query不用语义搜索
|
87
|
config: SearchConfig instance
|
be52af70
tangwang
first commit
|
88
89
90
|
text_encoder: Text embedding encoder (lazy loaded if not provided)
translator: Translator instance (lazy loaded if not provided)
"""
|
9f96d6f3
tangwang
短query不用语义搜索
|
91
|
self.config = config
|
be52af70
tangwang
first commit
|
92
93
94
95
96
97
|
self._text_encoder = text_encoder
self._translator = translator
# Initialize components
self.normalizer = QueryNormalizer()
self.language_detector = LanguageDetector()
|
9f96d6f3
tangwang
短query不用语义搜索
|
98
|
self.rewriter = QueryRewriter(config.query_config.rewrite_dictionary)
|
7bc756c5
tangwang
优化 ES 查询构建
|
99
100
101
102
103
104
105
|
# Initialize HanLP components at startup
logger.info("Initializing HanLP components...")
self._tok = hanlp.load(hanlp.pretrained.tok.CTB9_TOK_ELECTRA_BASE_CRF)
self._tok.config.output_spans = True
self._pos_tag = hanlp.load(hanlp.pretrained.pos.CTB9_POS_ELECTRA_SMALL)
logger.info("HanLP components initialized")
|
be52af70
tangwang
first commit
|
106
107
108
109
|
@property
def text_encoder(self) -> BgeEncoder:
"""Lazy load text encoder."""
|
9f96d6f3
tangwang
短query不用语义搜索
|
110
|
if self._text_encoder is None and self.config.query_config.enable_text_embedding:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
111
|
logger.info("Initializing text encoder (lazy load)...")
|
be52af70
tangwang
first commit
|
112
113
114
115
116
117
|
self._text_encoder = BgeEncoder()
return self._text_encoder
@property
def translator(self) -> Translator:
"""Lazy load translator."""
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
118
|
if self._translator is None:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
119
|
logger.info("Initializing translator (lazy load)...")
|
be52af70
tangwang
first commit
|
120
|
self._translator = Translator(
|
9f96d6f3
tangwang
短query不用语义搜索
|
121
|
api_key=self.config.query_config.translation_api_key,
|
522a3964
tangwang
多语言搜索翻译的优化(deepL添...
|
122
|
use_cache=True,
|
9f96d6f3
tangwang
短query不用语义搜索
|
123
124
|
glossary_id=self.config.query_config.translation_glossary_id,
translation_context=self.config.query_config.translation_context
|
be52af70
tangwang
first commit
|
125
126
|
)
return self._translator
|
7bc756c5
tangwang
优化 ES 查询构建
|
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
def _extract_keywords(self, query: str) -> str:
"""Extract keywords (nouns with length > 1) from query."""
tok_result = self._tok(query)
if not tok_result:
return ""
words = [x[0] for x in tok_result]
pos_tags = self._pos_tag(words)
keywords = []
for word, pos in zip(words, pos_tags):
if len(word) > 1 and pos.startswith('N'):
keywords.append(word)
return " ".join(keywords)
def _get_token_count(self, query: str) -> int:
"""Get token count using HanLP."""
tok_result = self._tok(query)
return len(tok_result) if tok_result else 0
def _analyze_query_type(self, query: str, token_count: int) -> tuple:
"""Analyze query type: (is_short_query, is_long_query)."""
is_quoted = query.startswith('"') and query.endswith('"')
is_short = is_quoted or ((token_count <= 2 or len(query) <= 4) and ' ' not in query)
is_long = token_count >= 4
return is_short, is_long
|
be52af70
tangwang
first commit
|
155
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
156
157
158
159
160
161
162
|
def parse(
self,
query: str,
tenant_id: Optional[str] = None,
generate_vector: bool = True,
context: Optional[Any] = None
) -> ParsedQuery:
|
be52af70
tangwang
first commit
|
163
164
165
166
167
168
|
"""
Parse query through all processing stages.
Args:
query: Raw query string
generate_vector: Whether to generate query embedding
|
16c42787
tangwang
feat: implement r...
|
169
|
context: Optional request context for tracking and logging
|
be52af70
tangwang
first commit
|
170
171
172
173
|
Returns:
ParsedQuery object with all processing results
"""
|
16c42787
tangwang
feat: implement r...
|
174
175
176
177
|
# Initialize logger if context provided
logger = context.logger if context else None
if logger:
logger.info(
|
70dab99f
tangwang
add logs
|
178
|
f"Starting query parsing | Original query: '{query}' | Generate vector: {generate_vector}",
|
16c42787
tangwang
feat: implement r...
|
179
180
181
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
16c42787
tangwang
feat: implement r...
|
182
|
def log_info(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
183
184
|
if context and hasattr(context, 'logger'):
context.logger.info(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
185
|
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
186
|
logger.info(msg)
|
16c42787
tangwang
feat: implement r...
|
187
188
|
def log_debug(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
189
190
|
if context and hasattr(context, 'logger'):
context.logger.debug(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
191
|
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
192
|
logger.debug(msg)
|
be52af70
tangwang
first commit
|
193
194
195
|
# Stage 1: Normalize
normalized = self.normalizer.normalize(query)
|
70dab99f
tangwang
add logs
|
196
|
log_debug(f"Normalization completed | '{query}' -> '{normalized}'")
|
16c42787
tangwang
feat: implement r...
|
197
198
|
if context:
context.store_intermediate_result('normalized_query', normalized)
|
be52af70
tangwang
first commit
|
199
200
201
|
# Extract domain if present (e.g., "brand:Nike" -> domain="brand", query="Nike")
domain, query_text = self.normalizer.extract_domain_query(normalized)
|
70dab99f
tangwang
add logs
|
202
|
log_debug(f"Domain extraction | Domain: '{domain}', Query: '{query_text}'")
|
16c42787
tangwang
feat: implement r...
|
203
204
205
|
if context:
context.store_intermediate_result('extracted_domain', domain)
context.store_intermediate_result('domain_query', query_text)
|
be52af70
tangwang
first commit
|
206
207
208
|
# Stage 2: Query rewriting
rewritten = None
|
9f96d6f3
tangwang
短query不用语义搜索
|
209
|
if self.config.query_config.rewrite_dictionary: # Enable rewrite if dictionary exists
|
be52af70
tangwang
first commit
|
210
211
|
rewritten = self.rewriter.rewrite(query_text)
if rewritten != query_text:
|
70dab99f
tangwang
add logs
|
212
|
log_info(f"Query rewritten | '{query_text}' -> '{rewritten}'")
|
be52af70
tangwang
first commit
|
213
|
query_text = rewritten
|
16c42787
tangwang
feat: implement r...
|
214
215
|
if context:
context.store_intermediate_result('rewritten_query', rewritten)
|
70dab99f
tangwang
add logs
|
216
|
context.add_warning(f"Query was rewritten: {query_text}")
|
be52af70
tangwang
first commit
|
217
218
219
|
# Stage 3: Language detection
detected_lang = self.language_detector.detect(query_text)
|
a5a6bab8
tangwang
多语言查询优化
|
220
221
222
|
# 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
|
223
|
log_info(f"Language detection | Detected language: {detected_lang}")
|
16c42787
tangwang
feat: implement r...
|
224
225
|
if context:
context.store_intermediate_result('detected_language', detected_lang)
|
be52af70
tangwang
first commit
|
226
|
|
3ec5bfe6
tangwang
1. get_translatio...
|
227
|
# Stage 4: Translation (with async support and conditional waiting)
|
be52af70
tangwang
first commit
|
228
|
translations = {}
|
3ec5bfe6
tangwang
1. get_translatio...
|
229
|
translation_futures = {}
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
try:
# 根据租户配置决定翻译目标语言
from config.tenant_config_loader import get_tenant_config_loader
tenant_loader = get_tenant_config_loader()
tenant_cfg = tenant_loader.get_tenant_config(tenant_id or "default")
translate_to_zh = bool(tenant_cfg.get("translate_to_zh"))
translate_to_en = bool(tenant_cfg.get("translate_to_en"))
target_langs_for_translation = []
if translate_to_zh:
target_langs_for_translation.append('zh')
if translate_to_en:
target_langs_for_translation.append('en')
# 如果该租户未开启任何翻译方向,则直接跳过翻译阶段
if target_langs_for_translation:
|
3ec5bfe6
tangwang
1. get_translatio...
|
247
|
target_langs = [lang for lang in target_langs_for_translation if detected_lang != lang]
|
16c42787
tangwang
feat: implement r...
|
248
249
|
if target_langs:
|
522a3964
tangwang
多语言搜索翻译的优化(deepL添...
|
250
|
# Use e-commerce context for better disambiguation
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
251
252
|
translation_context = self.config.query_config.translation_context
# For query translation, we use a general prompt (not language-specific)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
253
254
|
query_prompt = self.config.query_config.translation_prompts.get('query_zh') or \
self.config.query_config.translation_prompts.get('default_zh')
|
3ec5bfe6
tangwang
1. get_translatio...
|
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
# Determine if we need to wait for translation results
# If detected_lang is neither 'en' nor 'zh', we must wait for translation
need_wait_translation = detected_lang not in ['en', 'zh']
if need_wait_translation:
# Use async method that returns Futures, so we can wait for results
translation_results = self.translator.translate_multi_async(
query_text,
target_langs,
source_lang=detected_lang,
context=translation_context,
prompt=query_prompt
)
# Separate cached results and futures
for lang, result in translation_results.items():
if isinstance(result, Future):
translation_futures[lang] = result
else:
translations[lang] = result
else:
# Use async mode: returns cached translations immediately, missing ones translated in background
translations = self.translator.translate_multi(
query_text,
target_langs,
source_lang=detected_lang,
context=translation_context,
async_mode=True,
prompt=query_prompt
)
# Filter out None values (missing translations that are being processed async)
translations = {k: v for k, v in translations.items() if v is not None}
|
6e0e310c
tangwang
1. Translator 类增强
|
287
288
|
if translations:
|
70dab99f
tangwang
add logs
|
289
|
log_info(f"Translation completed (cache hit) | Query text: '{query_text}' | Results: {translations}")
|
3ec5bfe6
tangwang
1. get_translatio...
|
290
|
if translation_futures:
|
70dab99f
tangwang
add logs
|
291
|
log_debug(f"Translation in progress, waiting for results... | Query text: '{query_text}' | Languages: {list(translation_futures.keys())}")
|
6e0e310c
tangwang
1. Translator 类增强
|
292
|
|
16c42787
tangwang
feat: implement r...
|
293
294
295
296
297
298
|
if context:
context.store_intermediate_result('translations', translations)
for lang, translation in translations.items():
if translation:
context.store_intermediate_result(f'translation_{lang}', translation)
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
299
|
except Exception as e:
|
70dab99f
tangwang
add logs
|
300
|
error_msg = f"Translation failed | Error: {str(e)}"
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
301
302
303
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
be52af70
tangwang
first commit
|
304
|
|
7bc756c5
tangwang
优化 ES 查询构建
|
305
306
307
308
309
|
# Stage 5: Query analysis (keywords, token count, query type)
keywords = self._extract_keywords(query_text)
token_count = self._get_token_count(query_text)
is_short_query, is_long_query = self._analyze_query_type(query_text, token_count)
|
70dab99f
tangwang
add logs
|
310
311
|
log_debug(f"Query analysis | Keywords: {keywords} | Token count: {token_count} | "
f"Short query: {is_short_query} | Long query: {is_long_query}")
|
7bc756c5
tangwang
优化 ES 查询构建
|
312
313
314
315
316
317
|
if context:
context.store_intermediate_result('keywords', keywords)
context.store_intermediate_result('token_count', token_count)
context.store_intermediate_result('is_short_query', is_short_query)
context.store_intermediate_result('is_long_query', is_long_query)
|
3ec5bfe6
tangwang
1. get_translatio...
|
318
|
# Stage 6: Text embedding (only for non-short queries) - async execution
|
be52af70
tangwang
first commit
|
319
|
query_vector = None
|
3ec5bfe6
tangwang
1. get_translatio...
|
320
|
embedding_future = None
|
7bc756c5
tangwang
优化 ES 查询构建
|
321
322
|
should_generate_embedding = (
generate_vector and
|
9f96d6f3
tangwang
短query不用语义搜索
|
323
|
self.config.query_config.enable_text_embedding and
|
7bc756c5
tangwang
优化 ES 查询构建
|
324
325
326
327
|
domain == "default" and
not is_short_query
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
328
|
encoding_executor = None
|
7bc756c5
tangwang
优化 ES 查询构建
|
329
330
|
if should_generate_embedding:
try:
|
70dab99f
tangwang
add logs
|
331
|
log_debug("Starting query vector generation (async)")
|
3ec5bfe6
tangwang
1. get_translatio...
|
332
333
|
# Submit encoding task to thread pool for async execution
encoding_executor = ThreadPoolExecutor(max_workers=1)
|
b2e50710
tangwang
BgeEncoder.encode...
|
334
335
336
337
338
339
|
def _encode_query_vector() -> Optional[np.ndarray]:
arr = self.text_encoder.encode([query_text])
if arr is None or len(arr) == 0:
return None
vec = arr[0]
return vec if isinstance(vec, np.ndarray) else None
|
3ec5bfe6
tangwang
1. get_translatio...
|
340
|
embedding_future = encoding_executor.submit(
|
b2e50710
tangwang
BgeEncoder.encode...
|
341
|
_encode_query_vector
|
3ec5bfe6
tangwang
1. get_translatio...
|
342
|
)
|
7bc756c5
tangwang
优化 ES 查询构建
|
343
|
except Exception as e:
|
70dab99f
tangwang
add logs
|
344
|
error_msg = f"Query vector generation task submission failed | Error: {str(e)}"
|
7bc756c5
tangwang
优化 ES 查询构建
|
345
346
347
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
3ec5bfe6
tangwang
1. get_translatio...
|
348
349
350
351
352
|
encoding_executor = None
embedding_future = None
# Wait for all async tasks to complete (translation and embedding)
if translation_futures or embedding_future:
|
70dab99f
tangwang
add logs
|
353
|
log_debug("Waiting for async tasks to complete...")
|
3ec5bfe6
tangwang
1. get_translatio...
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
|
# Collect all futures with their identifiers
all_futures = []
future_to_lang = {}
for lang, future in translation_futures.items():
all_futures.append(future)
future_to_lang[future] = ('translation', lang)
if embedding_future:
all_futures.append(embedding_future)
future_to_lang[embedding_future] = ('embedding', None)
# Wait for all futures to complete
for future in as_completed(all_futures):
task_type, lang = future_to_lang[future]
try:
result = future.result()
if task_type == 'translation':
if result:
translations[lang] = result
|
70dab99f
tangwang
add logs
|
374
|
log_info(f"Translation completed | Query text: '{query_text}' | Target language: {lang} | Translation result: '{result}'")
|
3ec5bfe6
tangwang
1. get_translatio...
|
375
376
377
378
|
if context:
context.store_intermediate_result(f'translation_{lang}', result)
elif task_type == 'embedding':
query_vector = result
|
b2e50710
tangwang
BgeEncoder.encode...
|
379
|
if query_vector is not None:
|
70dab99f
tangwang
add logs
|
380
|
log_debug(f"Query vector generation completed | Shape: {query_vector.shape}")
|
b2e50710
tangwang
BgeEncoder.encode...
|
381
382
383
|
if context:
context.store_intermediate_result('query_vector_shape', query_vector.shape)
else:
|
70dab99f
tangwang
add logs
|
384
|
log_info("Query vector generation completed but result is None, will process without vector")
|
3ec5bfe6
tangwang
1. get_translatio...
|
385
386
|
except Exception as e:
if task_type == 'translation':
|
70dab99f
tangwang
add logs
|
387
|
error_msg = f"Translation failed | Language: {lang} | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
388
|
else:
|
70dab99f
tangwang
add logs
|
389
|
error_msg = f"Query vector generation failed | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
390
391
392
393
394
395
396
397
398
399
400
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
# Clean up encoding executor
if encoding_executor:
encoding_executor.shutdown(wait=False)
# Update translations in context after all are complete
if translations and context:
context.store_intermediate_result('translations', translations)
|
be52af70
tangwang
first commit
|
401
402
403
404
405
406
407
408
409
|
# Build result
result = ParsedQuery(
original_query=query,
normalized_query=normalized,
rewritten_query=rewritten,
detected_language=detected_lang,
translations=translations,
query_vector=query_vector,
|
7bc756c5
tangwang
优化 ES 查询构建
|
410
411
412
413
414
|
domain=domain,
keywords=keywords,
token_count=token_count,
is_short_query=is_short_query,
is_long_query=is_long_query
|
be52af70
tangwang
first commit
|
415
416
|
)
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
417
418
|
if context and hasattr(context, 'logger'):
context.logger.info(
|
70dab99f
tangwang
add logs
|
419
420
421
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
f"Language: {detected_lang} | Domain: {domain} | "
f"Translation count: {len(translations)} | Vector: {'yes' if query_vector is not None else 'no'}",
|
16c42787
tangwang
feat: implement r...
|
422
423
424
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
425
|
logger.info(
|
70dab99f
tangwang
add logs
|
426
427
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
f"Language: {detected_lang} | Domain: {domain}"
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
428
|
)
|
16c42787
tangwang
feat: implement r...
|
429
|
|
be52af70
tangwang
first commit
|
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
|
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
def update_rewrite_rules(self, rules: Dict[str, str]) -> None:
"""
Update query rewrite rules.
Args:
rules: Dictionary of pattern -> replacement mappings
"""
for pattern, replacement in rules.items():
self.rewriter.add_rule(pattern, replacement)
def get_rewrite_rules(self) -> Dict[str, str]:
"""Get current rewrite rules."""
return self.rewriter.get_rules()
|