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
|
import re
|
3ec5bfe6
tangwang
1. get_translatio...
|
11
|
from concurrent.futures import Future, ThreadPoolExecutor, as_completed
|
be52af70
tangwang
first commit
|
12
|
|
07cf5a93
tangwang
START_EMBEDDING=...
|
13
|
from embeddings.text_encoder import TextEmbeddingEncoder
|
9f96d6f3
tangwang
短query不用语义搜索
|
14
|
from config import SearchConfig
|
be52af70
tangwang
first commit
|
15
|
from .language_detector import LanguageDetector
|
42e3aea6
tangwang
tidy
|
16
|
from providers import create_translation_provider
|
be52af70
tangwang
first commit
|
17
18
|
from .query_rewriter import QueryRewriter, QueryNormalizer
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
19
20
|
logger = logging.getLogger(__name__)
|
484adbfe
tangwang
adapt ubuntu; con...
|
21
22
23
24
|
try:
import hanlp # type: ignore
except Exception: # pragma: no cover
hanlp = None
|
be52af70
tangwang
first commit
|
25
26
27
28
29
30
31
|
class ParsedQuery:
"""Container for parsed query results."""
def __init__(
self,
original_query: str,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
32
|
query_normalized: str,
|
be52af70
tangwang
first commit
|
33
|
rewritten_query: Optional[str] = None,
|
a5a6bab8
tangwang
多语言查询优化
|
34
|
detected_language: Optional[str] = None,
|
be52af70
tangwang
first commit
|
35
36
|
translations: Dict[str, str] = None,
query_vector: Optional[np.ndarray] = None,
|
7bc756c5
tangwang
优化 ES 查询构建
|
37
38
39
|
domain: str = "default",
keywords: str = "",
token_count: int = 0,
|
ea118f2b
tangwang
build_query:根据 qu...
|
40
|
query_tokens: Optional[List[str]] = None
|
be52af70
tangwang
first commit
|
41
42
|
):
self.original_query = original_query
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
43
44
|
self.query_normalized = query_normalized
self.rewritten_query = rewritten_query or query_normalized
|
be52af70
tangwang
first commit
|
45
46
47
48
|
self.detected_language = detected_language
self.translations = translations or {}
self.query_vector = query_vector
self.domain = domain
|
7bc756c5
tangwang
优化 ES 查询构建
|
49
50
51
|
# Query analysis fields
self.keywords = keywords
self.token_count = token_count
|
ea118f2b
tangwang
build_query:根据 qu...
|
52
|
self.query_tokens = query_tokens or []
|
be52af70
tangwang
first commit
|
53
54
55
56
57
|
def to_dict(self) -> Dict[str, Any]:
"""Convert to dictionary representation."""
result = {
"original_query": self.original_query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
58
|
"query_normalized": self.query_normalized,
|
be52af70
tangwang
first commit
|
59
60
61
|
"rewritten_query": self.rewritten_query,
"detected_language": self.detected_language,
"translations": self.translations,
|
038e4e2f
tangwang
refactor(i18n): t...
|
62
|
"domain": self.domain
|
be52af70
tangwang
first commit
|
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
}
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,
|
950a640e
tangwang
embeddings
|
80
|
text_encoder: Optional[TextEmbeddingEncoder] = None,
|
42e3aea6
tangwang
tidy
|
81
|
translator: Optional[Any] = None
|
be52af70
tangwang
first commit
|
82
83
84
85
86
|
):
"""
Initialize query parser.
Args:
|
9f96d6f3
tangwang
短query不用语义搜索
|
87
|
config: SearchConfig instance
|
26b910bd
tangwang
refactor service ...
|
88
89
|
text_encoder: Text embedding encoder (initialized at startup if not provided)
translator: Translator instance (initialized at startup if not provided)
|
be52af70
tangwang
first commit
|
90
|
"""
|
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
|
|
484adbfe
tangwang
adapt ubuntu; con...
|
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
# Optional HanLP components (heavy). If unavailable, fall back to a lightweight tokenizer.
self._tok = None
self._pos_tag = None
if hanlp is not None:
try:
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")
except Exception as e:
logger.warning(f"HanLP init failed, falling back to simple tokenizer: {e}")
self._tok = None
self._pos_tag = None
else:
logger.info("HanLP not installed; using simple tokenizer")
|
be52af70
tangwang
first commit
|
116
|
|
26b910bd
tangwang
refactor service ...
|
117
118
119
120
121
122
123
124
125
126
|
# 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()
logger.info("Initializing translator at QueryParser construction (provider=%s)...", cfg.provider)
self._translator = create_translation_provider(self.config.query_config)
|
be52af70
tangwang
first commit
|
127
|
@property
|
950a640e
tangwang
embeddings
|
128
|
def text_encoder(self) -> TextEmbeddingEncoder:
|
26b910bd
tangwang
refactor service ...
|
129
|
"""Return pre-initialized text encoder."""
|
be52af70
tangwang
first commit
|
130
131
132
|
return self._text_encoder
@property
|
42e3aea6
tangwang
tidy
|
133
|
def translator(self) -> Any:
|
26b910bd
tangwang
refactor service ...
|
134
|
"""Return pre-initialized translator."""
|
be52af70
tangwang
first commit
|
135
|
return self._translator
|
484adbfe
tangwang
adapt ubuntu; con...
|
136
137
138
139
140
141
142
143
144
145
146
147
|
def _simple_tokenize(self, text: str) -> List[str]:
"""
Lightweight tokenizer fallback.
- Groups consecutive CJK chars as a token
- Groups consecutive latin/digits/underscore/dash as a token
"""
if not text:
return []
pattern = re.compile(r"[\u4e00-\u9fff]+|[A-Za-z0-9_]+(?:-[A-Za-z0-9_]+)*")
return pattern.findall(text)
|
7bc756c5
tangwang
优化 ES 查询构建
|
148
149
150
|
def _extract_keywords(self, query: str) -> str:
"""Extract keywords (nouns with length > 1) from query."""
|
484adbfe
tangwang
adapt ubuntu; con...
|
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
if self._tok is not None and self._pos_tag is not None:
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 isinstance(pos, str) and pos.startswith("N"):
keywords.append(word)
return " ".join(keywords)
# Fallback: treat tokens with length > 1 as "keywords"
tokens = self._simple_tokenize(query)
keywords = [t for t in tokens if len(t) > 1]
|
7bc756c5
tangwang
优化 ES 查询构建
|
166
167
168
|
return " ".join(keywords)
def _get_token_count(self, query: str) -> int:
|
484adbfe
tangwang
adapt ubuntu; con...
|
169
170
171
172
173
|
"""Get token count (HanLP if available, otherwise simple)."""
if self._tok is not None:
tok_result = self._tok(query)
return len(tok_result) if tok_result else 0
return len(self._simple_tokenize(query))
|
ea118f2b
tangwang
build_query:根据 qu...
|
174
175
|
def _get_query_tokens(self, query: str) -> List[str]:
|
484adbfe
tangwang
adapt ubuntu; con...
|
176
177
178
179
180
|
"""Get token list (HanLP if available, otherwise simple)."""
if self._tok is not None:
tok_result = self._tok(query)
return [x[0] for x in tok_result] if tok_result else []
return self._simple_tokenize(query)
|
be52af70
tangwang
first commit
|
181
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
182
183
184
185
186
187
188
|
def parse(
self,
query: str,
tenant_id: Optional[str] = None,
generate_vector: bool = True,
context: Optional[Any] = None
) -> ParsedQuery:
|
be52af70
tangwang
first commit
|
189
190
191
192
193
194
|
"""
Parse query through all processing stages.
Args:
query: Raw query string
generate_vector: Whether to generate query embedding
|
16c42787
tangwang
feat: implement r...
|
195
|
context: Optional request context for tracking and logging
|
be52af70
tangwang
first commit
|
196
197
198
199
|
Returns:
ParsedQuery object with all processing results
"""
|
16c42787
tangwang
feat: implement r...
|
200
|
# Initialize logger if context provided
|
950a640e
tangwang
embeddings
|
201
202
203
|
active_logger = context.logger if context else logger
if context and hasattr(context, "logger"):
context.logger.info(
|
70dab99f
tangwang
add logs
|
204
|
f"Starting query parsing | Original query: '{query}' | Generate vector: {generate_vector}",
|
16c42787
tangwang
feat: implement r...
|
205
206
207
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
16c42787
tangwang
feat: implement r...
|
208
|
def log_info(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
209
210
|
if context and hasattr(context, 'logger'):
context.logger.info(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
211
|
else:
|
950a640e
tangwang
embeddings
|
212
|
active_logger.info(msg)
|
16c42787
tangwang
feat: implement r...
|
213
214
|
def log_debug(msg):
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
215
216
|
if context and hasattr(context, 'logger'):
context.logger.debug(msg, extra={'reqid': context.reqid, 'uid': context.uid})
|
16c42787
tangwang
feat: implement r...
|
217
|
else:
|
950a640e
tangwang
embeddings
|
218
|
active_logger.debug(msg)
|
be52af70
tangwang
first commit
|
219
220
221
|
# Stage 1: Normalize
normalized = self.normalizer.normalize(query)
|
70dab99f
tangwang
add logs
|
222
|
log_debug(f"Normalization completed | '{query}' -> '{normalized}'")
|
16c42787
tangwang
feat: implement r...
|
223
|
if context:
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
224
|
context.store_intermediate_result('query_normalized', normalized)
|
be52af70
tangwang
first commit
|
225
226
227
|
# 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
|
228
|
log_debug(f"Domain extraction | Domain: '{domain}', Query: '{query_text}'")
|
16c42787
tangwang
feat: implement r...
|
229
230
231
|
if context:
context.store_intermediate_result('extracted_domain', domain)
context.store_intermediate_result('domain_query', query_text)
|
be52af70
tangwang
first commit
|
232
233
234
|
# Stage 2: Query rewriting
rewritten = None
|
9f96d6f3
tangwang
短query不用语义搜索
|
235
|
if self.config.query_config.rewrite_dictionary: # Enable rewrite if dictionary exists
|
be52af70
tangwang
first commit
|
236
237
|
rewritten = self.rewriter.rewrite(query_text)
if rewritten != query_text:
|
70dab99f
tangwang
add logs
|
238
|
log_info(f"Query rewritten | '{query_text}' -> '{rewritten}'")
|
be52af70
tangwang
first commit
|
239
|
query_text = rewritten
|
16c42787
tangwang
feat: implement r...
|
240
241
|
if context:
context.store_intermediate_result('rewritten_query', rewritten)
|
70dab99f
tangwang
add logs
|
242
|
context.add_warning(f"Query was rewritten: {query_text}")
|
be52af70
tangwang
first commit
|
243
244
245
|
# Stage 3: Language detection
detected_lang = self.language_detector.detect(query_text)
|
a5a6bab8
tangwang
多语言查询优化
|
246
247
248
|
# 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
|
249
|
log_info(f"Language detection | Detected language: {detected_lang}")
|
16c42787
tangwang
feat: implement r...
|
250
251
|
if context:
context.store_intermediate_result('detected_language', detected_lang)
|
be52af70
tangwang
first commit
|
252
|
|
3ec5bfe6
tangwang
1. get_translatio...
|
253
|
# Stage 4: Translation (with async support and conditional waiting)
|
be52af70
tangwang
first commit
|
254
|
translations = {}
|
3ec5bfe6
tangwang
1. get_translatio...
|
255
|
translation_futures = {}
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
256
|
try:
|
038e4e2f
tangwang
refactor(i18n): t...
|
257
|
# 根据租户配置的 index_languages 决定翻译目标语言
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
258
259
260
|
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")
|
038e4e2f
tangwang
refactor(i18n): t...
|
261
|
index_langs = tenant_cfg.get("index_languages") or ["en", "zh"]
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
262
|
|
038e4e2f
tangwang
refactor(i18n): t...
|
263
|
target_langs_for_translation = [lang for lang in index_langs if lang != detected_lang]
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
264
|
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
265
|
if target_langs_for_translation:
|
038e4e2f
tangwang
refactor(i18n): t...
|
266
|
target_langs = target_langs_for_translation
|
16c42787
tangwang
feat: implement r...
|
267
268
|
if target_langs:
|
522a3964
tangwang
多语言搜索翻译的优化(deepL添...
|
269
|
# Use e-commerce context for better disambiguation
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
270
271
|
translation_context = self.config.query_config.translation_context
# For query translation, we use a general prompt (not language-specific)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
272
273
|
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...
|
274
275
|
# Determine if we need to wait for translation results
|
038e4e2f
tangwang
refactor(i18n): t...
|
276
277
|
# If detected_lang is not in index_languages, we must wait for translation
need_wait_translation = detected_lang not in index_langs
|
3ec5bfe6
tangwang
1. get_translatio...
|
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
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 类增强
|
306
307
|
if translations:
|
70dab99f
tangwang
add logs
|
308
|
log_info(f"Translation completed (cache hit) | Query text: '{query_text}' | Results: {translations}")
|
3ec5bfe6
tangwang
1. get_translatio...
|
309
|
if translation_futures:
|
70dab99f
tangwang
add logs
|
310
|
log_debug(f"Translation in progress, waiting for results... | Query text: '{query_text}' | Languages: {list(translation_futures.keys())}")
|
6e0e310c
tangwang
1. Translator 类增强
|
311
|
|
16c42787
tangwang
feat: implement r...
|
312
313
314
315
316
317
|
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...
|
318
|
except Exception as e:
|
70dab99f
tangwang
add logs
|
319
|
error_msg = f"Translation failed | Error: {str(e)}"
|
345d960b
tangwang
1. 删除全局 enable_tr...
|
320
321
322
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
be52af70
tangwang
first commit
|
323
|
|
ea118f2b
tangwang
build_query:根据 qu...
|
324
|
# Stage 5: Query analysis (keywords, token count, query_tokens)
|
7bc756c5
tangwang
优化 ES 查询构建
|
325
|
keywords = self._extract_keywords(query_text)
|
ea118f2b
tangwang
build_query:根据 qu...
|
326
327
|
query_tokens = self._get_query_tokens(query_text)
token_count = len(query_tokens)
|
7bc756c5
tangwang
优化 ES 查询构建
|
328
|
|
70dab99f
tangwang
add logs
|
329
|
log_debug(f"Query analysis | Keywords: {keywords} | Token count: {token_count} | "
|
ea118f2b
tangwang
build_query:根据 qu...
|
330
|
f"Query tokens: {query_tokens}")
|
7bc756c5
tangwang
优化 ES 查询构建
|
331
332
333
|
if context:
context.store_intermediate_result('keywords', keywords)
context.store_intermediate_result('token_count', token_count)
|
ea118f2b
tangwang
build_query:根据 qu...
|
334
|
context.store_intermediate_result('query_tokens', query_tokens)
|
7bc756c5
tangwang
优化 ES 查询构建
|
335
|
|
3ec5bfe6
tangwang
1. get_translatio...
|
336
|
# Stage 6: Text embedding (only for non-short queries) - async execution
|
be52af70
tangwang
first commit
|
337
|
query_vector = None
|
3ec5bfe6
tangwang
1. get_translatio...
|
338
|
embedding_future = None
|
7bc756c5
tangwang
优化 ES 查询构建
|
339
340
|
should_generate_embedding = (
generate_vector and
|
9f96d6f3
tangwang
短query不用语义搜索
|
341
|
self.config.query_config.enable_text_embedding and
|
d90e7428
tangwang
补充重排
|
342
|
domain == "default"
|
7bc756c5
tangwang
优化 ES 查询构建
|
343
344
|
)
|
3ec5bfe6
tangwang
1. get_translatio...
|
345
|
encoding_executor = None
|
7bc756c5
tangwang
优化 ES 查询构建
|
346
347
|
if should_generate_embedding:
try:
|
26b910bd
tangwang
refactor service ...
|
348
349
|
if self.text_encoder is None:
raise RuntimeError("Text embedding is enabled but text encoder is not initialized")
|
70dab99f
tangwang
add logs
|
350
|
log_debug("Starting query vector generation (async)")
|
3ec5bfe6
tangwang
1. get_translatio...
|
351
352
|
# Submit encoding task to thread pool for async execution
encoding_executor = ThreadPoolExecutor(max_workers=1)
|
b2e50710
tangwang
BgeEncoder.encode...
|
353
354
355
356
357
358
|
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...
|
359
|
embedding_future = encoding_executor.submit(
|
b2e50710
tangwang
BgeEncoder.encode...
|
360
|
_encode_query_vector
|
3ec5bfe6
tangwang
1. get_translatio...
|
361
|
)
|
7bc756c5
tangwang
优化 ES 查询构建
|
362
|
except Exception as e:
|
70dab99f
tangwang
add logs
|
363
|
error_msg = f"Query vector generation task submission failed | Error: {str(e)}"
|
7bc756c5
tangwang
优化 ES 查询构建
|
364
365
366
|
log_info(error_msg)
if context:
context.add_warning(error_msg)
|
3ec5bfe6
tangwang
1. get_translatio...
|
367
368
369
370
371
|
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
|
372
|
log_debug("Waiting for async tasks to complete...")
|
3ec5bfe6
tangwang
1. get_translatio...
|
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
|
# 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
|
393
|
log_info(f"Translation completed | Query text: '{query_text}' | Target language: {lang} | Translation result: '{result}'")
|
3ec5bfe6
tangwang
1. get_translatio...
|
394
395
396
397
|
if context:
context.store_intermediate_result(f'translation_{lang}', result)
elif task_type == 'embedding':
query_vector = result
|
b2e50710
tangwang
BgeEncoder.encode...
|
398
|
if query_vector is not None:
|
70dab99f
tangwang
add logs
|
399
|
log_debug(f"Query vector generation completed | Shape: {query_vector.shape}")
|
b2e50710
tangwang
BgeEncoder.encode...
|
400
401
402
|
if context:
context.store_intermediate_result('query_vector_shape', query_vector.shape)
else:
|
70dab99f
tangwang
add logs
|
403
|
log_info("Query vector generation completed but result is None, will process without vector")
|
3ec5bfe6
tangwang
1. get_translatio...
|
404
405
|
except Exception as e:
if task_type == 'translation':
|
70dab99f
tangwang
add logs
|
406
|
error_msg = f"Translation failed | Language: {lang} | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
407
|
else:
|
70dab99f
tangwang
add logs
|
408
|
error_msg = f"Query vector generation failed | Error: {str(e)}"
|
3ec5bfe6
tangwang
1. get_translatio...
|
409
410
411
412
413
414
415
416
417
418
419
|
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
|
420
421
422
423
|
# Build result
result = ParsedQuery(
original_query=query,
|
3a5fda00
tangwang
1. ES字段 skus的 ima...
|
424
|
query_normalized=normalized,
|
be52af70
tangwang
first commit
|
425
426
427
428
|
rewritten_query=rewritten,
detected_language=detected_lang,
translations=translations,
query_vector=query_vector,
|
7bc756c5
tangwang
优化 ES 查询构建
|
429
430
431
|
domain=domain,
keywords=keywords,
token_count=token_count,
|
ea118f2b
tangwang
build_query:根据 qu...
|
432
|
query_tokens=query_tokens
|
be52af70
tangwang
first commit
|
433
434
|
)
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
435
436
|
if context and hasattr(context, 'logger'):
context.logger.info(
|
70dab99f
tangwang
add logs
|
437
438
439
|
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...
|
440
441
442
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
else:
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
443
|
logger.info(
|
70dab99f
tangwang
add logs
|
444
445
|
f"Query parsing completed | Original query: '{query}' | Final query: '{rewritten or query_text}' | "
f"Language: {detected_lang} | Domain: {domain}"
|
325eec03
tangwang
1. 日志、配置基础设施,使用优化
|
446
|
)
|
16c42787
tangwang
feat: implement r...
|
447
|
|
be52af70
tangwang
first commit
|
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
|
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()
|