0536222c
tangwang
query parser优化
|
1
2
3
4
|
"""
ES text recall: base_query (rewritten @ detected_language) + base_query_trans_*.
Covers combinations of query language vs tenant index_languages, translations,
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
5
6
|
and mixed Chinese/English queries. Asserts named lexical clause boundaries,
combined_fields payloads, and per-language target fields (title.{lang}).
|
0536222c
tangwang
query parser优化
|
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
"""
from types import SimpleNamespace
from typing import Any, Dict, List
import numpy as np
from search.es_query_builder import ESQueryBuilder
def _builder_multilingual_title_only(
*,
default_language: str = "en",
mixed_script_scale: float = 0.6,
) -> ESQueryBuilder:
"""Minimal builder: only title.{lang} for easy field assertions."""
return ESQueryBuilder(
match_fields=["title.en^1.0"],
multilingual_fields=["title"],
shared_fields=[],
text_embedding_field="title_embedding",
default_language=default_language,
mixed_script_merged_field_boost_scale=mixed_script_scale,
function_score_config=None,
)
def _unwrap_inner_query(es_body: Dict[str, Any]) -> Dict[str, Any]:
"""Navigate bool.must / function_score wrappers to the text recall root."""
q = es_body.get("query") or {}
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
37
|
if "bool" in q and not q["bool"].get("_name") and "must" in q["bool"] and q["bool"]["must"]:
|
0536222c
tangwang
query parser优化
|
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
q = q["bool"]["must"][0]
if "function_score" in q:
q = q["function_score"]["query"]
return q
def _extract_multi_match_clauses(es_body: Dict[str, Any]) -> List[Dict[str, Any]]:
inner = _unwrap_inner_query(es_body)
if "multi_match" in inner:
return [inner["multi_match"]]
should = (inner.get("bool") or {}).get("should") or []
return [c["multi_match"] for c in should if "multi_match" in c]
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
52
53
54
55
56
57
58
59
|
def _extract_named_lexical_clauses(es_body: Dict[str, Any]) -> List[Dict[str, Any]]:
inner = _unwrap_inner_query(es_body)
if "bool" in inner and inner["bool"].get("_name"):
return [inner["bool"]]
should = (inner.get("bool") or {}).get("should") or []
return [c["bool"] for c in should if "bool" in c and c["bool"].get("_name")]
|
0536222c
tangwang
query parser优化
|
60
|
def _clauses_index(es_body: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
61
|
"""Map lexical clause _name -> bool query body."""
|
0536222c
tangwang
query parser优化
|
62
|
out: Dict[str, Dict[str, Any]] = {}
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
63
64
|
for clause in _extract_named_lexical_clauses(es_body):
name = clause.get("_name")
|
0536222c
tangwang
query parser优化
|
65
|
if name:
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
66
|
out[str(name)] = clause
|
0536222c
tangwang
query parser优化
|
67
68
69
|
return out
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
70
71
72
|
def _combined_fields_clause(clause: Dict[str, Any]) -> Dict[str, Any]:
return clause["must"][0]["combined_fields"]
|
a3d3fb11
tangwang
加phrase提权
|
73
|
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
74
75
|
def _should_multi_matches(clause: Dict[str, Any]) -> List[Dict[str, Any]]:
return [item["multi_match"] for item in clause.get("should") or [] if "multi_match" in item]
|
a3d3fb11
tangwang
加phrase提权
|
76
|
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
77
78
79
80
81
82
83
|
def _should_multi_matches_by_type(clause: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
return {str(mm.get("type") or "best_fields"): mm for mm in _should_multi_matches(clause)}
def _title_fields(clause: Dict[str, Any]) -> List[str]:
fields = _combined_fields_clause(clause).get("fields") or []
|
0536222c
tangwang
query parser优化
|
84
85
86
|
return [f for f in fields if str(f).startswith("title.")]
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
87
|
def _has_title_lang(clause: Dict[str, Any], lang: str) -> bool:
|
0536222c
tangwang
query parser优化
|
88
89
|
"""True if any field is title.{lang} with optional ^boost suffix."""
prefix = f"title.{lang}"
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
90
|
for f in _combined_fields_clause(clause).get("fields") or []:
|
0536222c
tangwang
query parser优化
|
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
s = str(f)
if s == prefix or s.startswith(prefix + "^"):
return True
return False
def _build(
qb: ESQueryBuilder,
*,
query_text: str,
rewritten: str,
detected_language: str,
translations: Dict[str, str],
index_languages: List[str],
contains_chinese: bool = False,
contains_english: bool = False,
) -> Dict[str, Any]:
parsed = SimpleNamespace(
rewritten_query=rewritten,
detected_language=detected_language,
translations=dict(translations),
contains_chinese=contains_chinese,
contains_english=contains_english,
)
return qb.build_query(
query_text=query_text,
parsed_query=parsed,
enable_knn=False,
index_languages=index_languages,
)
# --- 检测语言在 index_languages 内:主召回 + 翻译补召回 ---
def test_zh_query_index_zh_en_includes_base_zh_and_trans_en():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="连衣裙",
rewritten="连衣裙",
detected_language="zh",
translations={"en": "dress"},
index_languages=["zh", "en"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
137
138
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
139
|
assert "title.zh" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
140
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
assert "title.en" in _title_fields(idx["base_query_trans_en"])
def test_en_query_index_zh_en_includes_base_en_and_trans_zh():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="dress",
rewritten="dress",
detected_language="en",
translations={"zh": "连衣裙"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
155
156
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
157
|
assert "title.en" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
158
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
assert "title.zh" in _title_fields(idx["base_query_trans_zh"])
def test_de_query_index_de_en_fr_includes_base_and_two_translations():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="kleid",
rewritten="kleid",
detected_language="de",
translations={"en": "dress", "fr": "robe"},
index_languages=["de", "en", "fr"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
173
174
|
assert set(idx) == {"base_query", "base_query_trans_en", "base_query_trans_fr"}
assert _combined_fields_clause(idx["base_query"])["query"] == "kleid"
|
0536222c
tangwang
query parser优化
|
175
|
assert "title.de" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
176
177
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "dress"
assert _combined_fields_clause(idx["base_query_trans_fr"])["query"] == "robe"
|
0536222c
tangwang
query parser优化
|
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
# --- 检测语言不在 index_languages:仍有 base(弱)+ 翻译(强) ---
def test_de_query_index_only_en_zh_base_on_de_translations_on_target_fields():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="schuh",
rewritten="schuh",
detected_language="de",
translations={"en": "shoe", "zh": "鞋"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
194
195
|
assert set(idx) == {"base_query", "base_query_trans_en", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "schuh"
|
0536222c
tangwang
query parser优化
|
196
197
|
assert "title.de" in _title_fields(idx["base_query"])
assert "boost" not in idx["base_query"]
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
198
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "shoe"
|
0536222c
tangwang
query parser优化
|
199
|
assert idx["base_query_trans_en"]["boost"] == qb.translation_boost
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
200
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "鞋"
|
0536222c
tangwang
query parser优化
|
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
assert idx["base_query_trans_zh"]["boost"] == qb.translation_boost
# --- 中英混写:原文在 base_query;翻译子句独立;混写时 base 子句扩列 ---
def test_mixed_zh_primary_with_en_translation_merges_en_into_zh_base_clause():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="红色 dress",
rewritten="红色 dress",
detected_language="zh",
translations={"en": "red dress"},
index_languages=["zh", "en"],
contains_chinese=True,
contains_english=True,
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
220
221
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "红色 dress"
|
0536222c
tangwang
query parser优化
|
222
|
assert _has_title_lang(idx["base_query"], "zh") and _has_title_lang(idx["base_query"], "en")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
223
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "red dress"
|
0536222c
tangwang
query parser优化
|
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
|
assert _has_title_lang(idx["base_query_trans_en"], "en")
def test_mixed_en_primary_with_zh_translation_merges_zh_into_en_base_clause():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="nike 运动鞋",
rewritten="nike 运动鞋",
detected_language="en",
translations={"zh": "耐克运动鞋"},
index_languages=["zh", "en"],
contains_chinese=True,
contains_english=True,
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
240
241
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "nike 运动鞋"
|
0536222c
tangwang
query parser优化
|
242
|
assert _has_title_lang(idx["base_query"], "en") and _has_title_lang(idx["base_query"], "zh")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
243
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "耐克运动鞋"
|
0536222c
tangwang
query parser优化
|
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
def test_mixed_zh_query_index_zh_only_no_en_merge_in_base():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="法式 dress",
rewritten="法式 dress",
detected_language="zh",
translations={},
index_languages=["zh"],
contains_chinese=True,
contains_english=True,
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
259
|
assert set(idx) == {"base_query"}
|
0536222c
tangwang
query parser优化
|
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
|
bases = {f.split("^", 1)[0] for f in _title_fields(idx["base_query"])}
assert bases == {"title.zh"}
# --- 去重:与 base 同语言同文本的翻译项跳过 ---
def test_skips_translation_when_same_lang_and_same_text_as_base():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="NIKE",
rewritten="NIKE",
detected_language="en",
translations={"en": "NIKE", "zh": "耐克"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
278
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
|
0536222c
tangwang
query parser优化
|
279
280
281
282
283
284
285
286
287
288
289
290
291
|
def test_keeps_translation_when_same_text_but_different_lang_than_base():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="NIKE",
rewritten="NIKE",
detected_language="en",
translations={"zh": "NIKE"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
292
293
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "NIKE"
|
0536222c
tangwang
query parser优化
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
|
# --- 翻译 key 规范化、空翻译跳过 ---
def test_translation_language_key_is_normalized_case_insensitive():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="dress",
rewritten="dress",
detected_language="en",
translations={"ZH": "连衣裙"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
assert "base_query_trans_zh" in idx
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
311
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
|
def test_empty_translation_value_is_skipped():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="dress",
rewritten="dress",
detected_language="en",
translations={"zh": " ", "fr": "robe"},
index_languages=["en", "zh", "fr"],
)
idx = _clauses_index(q)
assert "base_query_trans_zh" not in idx
assert "base_query_trans_fr" in idx
# --- index_languages 为空:视为「未约束」source_in_index 为 True ---
def test_empty_index_languages_treats_source_as_in_index_boosts():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="x",
rewritten="x",
detected_language="de",
translations={"en": "y"},
index_languages=[],
)
idx = _clauses_index(q)
assert "boost" not in idx["base_query"]
assert idx["base_query_trans_en"]["boost"] == qb.translation_boost
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
345
346
347
348
|
base_should = _should_multi_matches_by_type(idx["base_query"])
trans_should = _should_multi_matches_by_type(idx["base_query_trans_en"])
assert base_should["phrase"]["boost"] == qb.phrase_match_boost
assert trans_should["phrase"]["boost"] == qb.phrase_match_boost
|
0536222c
tangwang
query parser优化
|
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
# --- 无翻译:仅 base_query ---
def test_no_translations_only_base_query():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="hello",
rewritten="hello",
detected_language="en",
translations={},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
365
|
assert set(idx) == {"base_query"}
|
0536222c
tangwang
query parser优化
|
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
|
# --- 与 KNN 同存时仍能解析文本子句(顶层 knn 不影响 query 内结构) ---
def test_text_clauses_present_alongside_knn():
qb = _builder_multilingual_title_only(default_language="en")
parsed = SimpleNamespace(
rewritten_query="dress",
detected_language="en",
translations={"zh": "连衣裙"},
contains_chinese=False,
contains_english=True,
)
q = qb.build_query(
query_text="dress",
query_vector=np.array([0.1, 0.2, 0.3], dtype=np.float32),
parsed_query=parsed,
enable_knn=True,
index_languages=["en", "zh"],
)
assert "knn" in q
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
389
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
|
0536222c
tangwang
query parser优化
|
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
|
def test_detected_language_unknown_falls_back_to_default_language():
"""与 LanguageDetector 失败时 QueryConfig.default_language 行为对齐。"""
qb = _builder_multilingual_title_only(default_language="en")
parsed = SimpleNamespace(
rewritten_query="shirt",
detected_language="unknown",
translations={"zh": "衬衫"},
contains_chinese=False,
contains_english=True,
)
q = qb.build_query(
query_text="shirt",
parsed_query=parsed,
enable_knn=False,
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
409
410
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "shirt"
|
0536222c
tangwang
query parser优化
|
411
412
413
414
415
416
417
418
419
420
421
422
423
424
|
assert _has_title_lang(idx["base_query"], "en")
def test_ru_query_index_ru_en_includes_base_ru_and_trans_en():
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="платье",
rewritten="платье",
detected_language="ru",
translations={"en": "dress"},
index_languages=["ru", "en"],
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
425
426
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "платье"
|
0536222c
tangwang
query parser优化
|
427
|
assert _has_title_lang(idx["base_query"], "ru")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
428
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
|
def test_translation_for_lang_not_listed_in_index_languages_still_generates_clause():
"""
当前实现:凡是 translations 里非空的条目都会生成子句;
index_languages 只约束混写扩列,不用于过滤翻译子句。
"""
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="dress",
rewritten="dress",
detected_language="en",
translations={"zh": "连衣裙", "de": "Kleid"},
index_languages=["en", "zh"],
)
idx = _clauses_index(q)
assert "base_query_trans_de" in idx
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
447
|
assert _combined_fields_clause(idx["base_query_trans_de"])["query"] == "Kleid"
|
0536222c
tangwang
query parser优化
|
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
|
assert _has_title_lang(idx["base_query_trans_de"], "de")
def test_mixed_detected_zh_rewrite_differs_from_query_text_uses_rewritten_in_base():
"""base_query 始终用 rewritten_query,而非仅 query_text。"""
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text=" 红色 ",
rewritten="红色连衣裙",
detected_language="zh",
translations={"en": "red dress"},
index_languages=["zh", "en"],
contains_chinese=True,
contains_english=False,
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
465
466
|
assert _combined_fields_clause(idx["base_query"])["query"] == "红色连衣裙"
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "red dress"
|