0536222c
tangwang
query parser优化
|
1
2
3
|
"""
ES text recall: base_query (rewritten @ detected_language) + base_query_trans_*.
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
4
5
6
|
Covers translation routing, mixed-script queries (per-clause language fields only),
and clause naming. 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
|
"""
from types import SimpleNamespace
from typing import Any, Dict, List
import numpy as np
from search.es_query_builder import ESQueryBuilder
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
17
|
def _builder_multilingual_title_only(*, default_language: str = "en") -> ESQueryBuilder:
|
0536222c
tangwang
query parser优化
|
18
19
20
21
22
23
24
|
"""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,
|
0536222c
tangwang
query parser优化
|
25
26
27
28
29
30
31
|
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...
|
32
|
if "bool" in q and not q["bool"].get("_name") and "must" in q["bool"] and q["bool"]["must"]:
|
0536222c
tangwang
query parser优化
|
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
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...
|
47
48
49
50
51
52
53
54
|
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优化
|
55
|
def _clauses_index(es_body: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
56
|
"""Map lexical clause _name -> bool query body."""
|
0536222c
tangwang
query parser优化
|
57
|
out: Dict[str, Dict[str, Any]] = {}
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
58
59
|
for clause in _extract_named_lexical_clauses(es_body):
name = clause.get("_name")
|
0536222c
tangwang
query parser优化
|
60
|
if name:
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
61
|
out[str(name)] = clause
|
0536222c
tangwang
query parser优化
|
62
63
64
|
return out
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
65
66
67
|
def _combined_fields_clause(clause: Dict[str, Any]) -> Dict[str, Any]:
return clause["must"][0]["combined_fields"]
|
a3d3fb11
tangwang
加phrase提权
|
68
|
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
69
70
|
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提权
|
71
|
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
72
73
74
75
76
77
78
|
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优化
|
79
80
81
|
return [f for f in fields if str(f).startswith("title.")]
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
82
|
def _has_title_lang(clause: Dict[str, Any], lang: str) -> bool:
|
0536222c
tangwang
query parser优化
|
83
84
|
"""True if any field is title.{lang} with optional ^boost suffix."""
prefix = f"title.{lang}"
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
85
|
for f in _combined_fields_clause(clause).get("fields") or []:
|
0536222c
tangwang
query parser优化
|
86
87
88
89
90
91
92
93
94
95
96
97
98
|
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],
|
0536222c
tangwang
query parser优化
|
99
100
101
102
103
|
) -> Dict[str, Any]:
parsed = SimpleNamespace(
rewritten_query=rewritten,
detected_language=detected_language,
translations=dict(translations),
|
0536222c
tangwang
query parser优化
|
104
105
106
107
108
|
)
return qb.build_query(
query_text=query_text,
parsed_query=parsed,
enable_knn=False,
|
0536222c
tangwang
query parser优化
|
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
)
# --- 检测语言在 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"},
|
0536222c
tangwang
query parser优化
|
123
124
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
125
126
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
127
|
assert "title.zh" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
128
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
129
130
131
132
133
134
135
136
137
138
139
|
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": "连衣裙"},
|
0536222c
tangwang
query parser优化
|
140
141
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
142
143
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
144
|
assert "title.en" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
145
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
146
147
148
149
150
151
152
153
154
155
156
|
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"},
|
0536222c
tangwang
query parser优化
|
157
158
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
159
160
|
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优化
|
161
|
assert "title.de" in _title_fields(idx["base_query"])
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
162
163
|
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优化
|
164
165
166
167
168
169
170
171
172
173
174
175
176
|
# --- 检测语言不在 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": "鞋"},
|
0536222c
tangwang
query parser优化
|
177
178
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
179
180
|
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优化
|
181
182
|
assert "title.de" in _title_fields(idx["base_query"])
assert "boost" not in idx["base_query"]
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
183
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "shoe"
|
0536222c
tangwang
query parser优化
|
184
|
assert idx["base_query_trans_en"]["boost"] == qb.translation_boost
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
185
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "鞋"
|
0536222c
tangwang
query parser优化
|
186
187
188
|
assert idx["base_query_trans_zh"]["boost"] == qb.translation_boost
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
189
|
# --- 中英混写:base 打在检测语种字段;翻译子句打在译文语种字段 ---
|
0536222c
tangwang
query parser优化
|
190
191
|
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
192
|
def test_mixed_zh_detected_base_clause_zh_fields_only_with_en_translation():
|
0536222c
tangwang
query parser优化
|
193
194
195
196
197
198
199
|
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="红色 dress",
rewritten="红色 dress",
detected_language="zh",
translations={"en": "red dress"},
|
0536222c
tangwang
query parser优化
|
200
201
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
202
203
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "红色 dress"
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
204
|
assert _has_title_lang(idx["base_query"], "zh") and not _has_title_lang(idx["base_query"], "en")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
205
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "red dress"
|
0536222c
tangwang
query parser优化
|
206
207
208
|
assert _has_title_lang(idx["base_query_trans_en"], "en")
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
209
|
def test_mixed_en_detected_base_clause_en_fields_only_with_zh_translation():
|
0536222c
tangwang
query parser优化
|
210
211
212
213
214
215
216
|
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="nike 运动鞋",
rewritten="nike 运动鞋",
detected_language="en",
translations={"zh": "耐克运动鞋"},
|
0536222c
tangwang
query parser优化
|
217
218
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
219
220
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "nike 运动鞋"
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
221
|
assert _has_title_lang(idx["base_query"], "en") and not _has_title_lang(idx["base_query"], "zh")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
222
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "耐克运动鞋"
|
0536222c
tangwang
query parser优化
|
223
224
|
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
225
|
def test_zh_query_no_translations_only_zh_fields():
|
0536222c
tangwang
query parser优化
|
226
227
228
229
230
231
232
|
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="法式 dress",
rewritten="法式 dress",
detected_language="zh",
translations={},
|
0536222c
tangwang
query parser优化
|
233
234
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
235
|
assert set(idx) == {"base_query"}
|
0536222c
tangwang
query parser优化
|
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
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": "耐克"},
|
0536222c
tangwang
query parser优化
|
251
252
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
253
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
|
0536222c
tangwang
query parser优化
|
254
255
256
257
258
259
260
261
262
263
|
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"},
|
0536222c
tangwang
query parser优化
|
264
265
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
266
267
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "NIKE"
|
0536222c
tangwang
query parser优化
|
268
269
270
271
272
273
274
275
276
277
278
279
280
|
# --- 翻译 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": "连衣裙"},
|
0536222c
tangwang
query parser优化
|
281
282
283
|
)
idx = _clauses_index(q)
assert "base_query_trans_zh" in idx
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
284
|
assert _combined_fields_clause(idx["base_query_trans_zh"])["query"] == "连衣裙"
|
0536222c
tangwang
query parser优化
|
285
286
287
288
289
290
291
292
293
294
|
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"},
|
0536222c
tangwang
query parser优化
|
295
296
297
298
299
300
|
)
idx = _clauses_index(q)
assert "base_query_trans_zh" not in idx
assert "base_query_trans_fr" in idx
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
301
|
# --- base 子句无 bool.boost;翻译子句带 translation_boost;phrase should 继承 phrase_match_boost ---
|
0536222c
tangwang
query parser优化
|
302
303
|
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
304
|
def test_de_base_and_en_translation_phrase_boosts():
|
0536222c
tangwang
query parser优化
|
305
306
307
308
309
310
311
|
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="x",
rewritten="x",
detected_language="de",
translations={"en": "y"},
|
0536222c
tangwang
query parser优化
|
312
313
314
315
|
)
idx = _clauses_index(q)
assert "boost" not in idx["base_query"]
assert idx["base_query_trans_en"]["boost"] == qb.translation_boost
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
316
317
318
319
|
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优化
|
320
321
322
323
324
325
326
327
328
329
330
331
332
|
# --- 无翻译:仅 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={},
|
0536222c
tangwang
query parser优化
|
333
334
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
335
|
assert set(idx) == {"base_query"}
|
0536222c
tangwang
query parser优化
|
336
337
338
339
340
341
342
343
344
345
346
|
# --- 与 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": "连衣裙"},
|
0536222c
tangwang
query parser优化
|
347
348
349
350
351
352
|
)
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,
|
0536222c
tangwang
query parser优化
|
353
354
355
|
)
assert "knn" in q
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
356
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
|
0536222c
tangwang
query parser优化
|
357
358
359
360
361
362
363
364
365
|
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": "衬衫"},
|
0536222c
tangwang
query parser优化
|
366
367
368
369
370
|
)
q = qb.build_query(
query_text="shirt",
parsed_query=parsed,
enable_knn=False,
|
0536222c
tangwang
query parser优化
|
371
372
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
373
374
|
assert set(idx) == {"base_query", "base_query_trans_zh"}
assert _combined_fields_clause(idx["base_query"])["query"] == "shirt"
|
0536222c
tangwang
query parser优化
|
375
376
377
378
379
380
381
382
383
384
385
|
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"},
|
0536222c
tangwang
query parser优化
|
386
387
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
388
389
|
assert set(idx) == {"base_query", "base_query_trans_en"}
assert _combined_fields_clause(idx["base_query"])["query"] == "платье"
|
0536222c
tangwang
query parser优化
|
390
|
assert _has_title_lang(idx["base_query"], "ru")
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
391
|
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "dress"
|
0536222c
tangwang
query parser优化
|
392
393
|
|
35da3813
tangwang
中英混写query的优化逻辑,不适...
|
394
395
|
def test_translation_generates_clause_for_any_target_lang_key():
"""translations 里非空的每个语种键都会生成对应 base_query_trans_* 子句。"""
|
0536222c
tangwang
query parser优化
|
396
397
398
399
400
401
402
|
qb = _builder_multilingual_title_only(default_language="en")
q = _build(
qb,
query_text="dress",
rewritten="dress",
detected_language="en",
translations={"zh": "连衣裙", "de": "Kleid"},
|
0536222c
tangwang
query parser优化
|
403
404
405
|
)
idx = _clauses_index(q)
assert "base_query_trans_de" in idx
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
406
|
assert _combined_fields_clause(idx["base_query_trans_de"])["query"] == "Kleid"
|
0536222c
tangwang
query parser优化
|
407
408
409
410
411
412
413
414
415
416
417
418
|
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"},
|
0536222c
tangwang
query parser优化
|
419
420
|
)
idx = _clauses_index(q)
|
e756b18e
tangwang
重构了文本召回构建器,现在每个 b...
|
421
422
|
assert _combined_fields_clause(idx["base_query"])["query"] == "红色连衣裙"
assert _combined_fields_clause(idx["base_query_trans_en"])["query"] == "red dress"
|