a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
1
2
|
from math import isclose
|
47452e1d
tangwang
feat(search): 支持可...
|
3
4
|
from config.schema import CoarseRankFusionConfig, RerankFusionConfig
from search.rerank_client import coarse_resort_hits, fuse_scores_and_resort, run_lightweight_rerank
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
5
6
|
|
c90f80ed
tangwang
相关性优化
|
7
|
def test_fuse_scores_and_resort_aggregates_text_components_and_keeps_rerank_primary():
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
8
9
10
11
12
13
|
hits = [
{
"_id": "1",
"_score": 3.2,
"matched_queries": {
"base_query": 2.4,
|
c90f80ed
tangwang
相关性优化
|
14
|
"base_query_trans_zh": 1.8,
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
15
16
17
18
19
20
21
|
"knn_query": 0.8,
},
},
{
"_id": "2",
"_score": 2.8,
"matched_queries": {
|
c90f80ed
tangwang
相关性优化
|
22
|
"base_query": 9.0,
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
23
24
25
26
27
|
"knn_query": 0.2,
},
},
]
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
28
|
debug = fuse_scores_and_resort(hits, [0.9, 0.7], debug=True)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
29
|
|
0536222c
tangwang
query parser优化
|
30
|
expected_text_1 = 2.4 + 0.25 * (0.8 * 1.8)
|
c90f80ed
tangwang
相关性优化
|
31
32
|
expected_fused_1 = (0.9 + 0.00001) * ((expected_text_1 + 0.1) ** 0.35) * ((0.8 + 0.6) ** 0.2)
expected_fused_2 = (0.7 + 0.00001) * ((9.0 + 0.1) ** 0.35) * ((0.2 + 0.6) ** 0.2)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
33
|
|
c90f80ed
tangwang
相关性优化
|
34
35
36
37
38
39
40
|
by_id = {hit["_id"]: hit for hit in hits}
assert isclose(by_id["1"]["_text_score"], expected_text_1, rel_tol=1e-9)
assert isclose(by_id["1"]["_fused_score"], expected_fused_1, rel_tol=1e-9)
assert isclose(by_id["2"]["_fused_score"], expected_fused_2, rel_tol=1e-9)
assert debug[0]["text_source_score"] == 2.4
assert debug[0]["text_translation_score"] == 1.8
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
41
|
assert isclose(debug[0]["text_weighted_translation_score"], 1.44, rel_tol=1e-9)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
42
|
assert debug[0]["knn_score"] == 0.8
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
43
|
assert isclose(debug[0]["rerank_factor"], 0.90001, rel_tol=1e-9)
|
c90f80ed
tangwang
相关性优化
|
44
|
assert [hit["_id"] for hit in hits] == ["2", "1"]
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
45
46
47
48
49
50
51
52
|
def test_fuse_scores_and_resort_falls_back_when_matched_queries_missing():
hits = [
{"_id": "1", "_score": 0.5},
{"_id": "2", "_score": 2.0},
]
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
53
|
debug = fuse_scores_and_resort(hits, [0.4, 0.3], debug=True)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
54
|
|
c90f80ed
tangwang
相关性优化
|
55
56
57
58
|
expected_1 = (0.4 + 0.00001) * ((0.5 + 0.1) ** 0.35) * ((0.0 + 0.6) ** 0.2)
expected_2 = (0.3 + 0.00001) * ((2.0 + 0.1) ** 0.35) * ((0.0 + 0.6) ** 0.2)
by_id = {hit["_id"]: hit for hit in hits}
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
59
|
|
c90f80ed
tangwang
相关性优化
|
60
61
62
63
|
assert isclose(by_id["1"]["_text_score"], 0.5, rel_tol=1e-9)
assert isclose(by_id["1"]["_fused_score"], expected_1, rel_tol=1e-9)
assert isclose(by_id["2"]["_text_score"], 2.0, rel_tol=1e-9)
assert isclose(by_id["2"]["_fused_score"], expected_2, rel_tol=1e-9)
|
581dafae
tangwang
debug工具,每条结果的打分中间...
|
64
65
|
assert debug[0]["text_score_fallback_to_es"] is True
assert debug[1]["text_score_fallback_to_es"] is True
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
66
|
assert [hit["_id"] for hit in hits] == ["2", "1"]
|
c90f80ed
tangwang
相关性优化
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
def test_fuse_scores_and_resort_downweights_text_only_advantage():
hits = [
{
"_id": "lexical-heavy",
"_score": 10.0,
"matched_queries": {
"base_query": 10.0,
"knn_query": 0.0,
},
},
{
"_id": "rerank-better",
"_score": 6.0,
"matched_queries": {
"base_query": 6.0,
"knn_query": 0.0,
},
},
]
fuse_scores_and_resort(hits, [0.72, 0.98])
assert [hit["_id"] for hit in hits] == ["rerank-better", "lexical-heavy"]
|
814e352b
tangwang
乘法公式配置化
|
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
|
def test_fuse_scores_and_resort_uses_configurable_fusion_params():
hits = [
{
"_id": "a",
"_score": 1.0,
"matched_queries": {"base_query": 2.0, "knn_query": 0.5},
},
{
"_id": "b",
"_score": 1.0,
"matched_queries": {"base_query": 3.0, "knn_query": 0.0},
},
]
fusion = RerankFusionConfig(
rerank_bias=0.0,
rerank_exponent=1.0,
text_bias=0.0,
text_exponent=1.0,
knn_bias=0.0,
knn_exponent=1.0,
)
fuse_scores_and_resort(hits, [1.0, 1.0], fusion=fusion)
# b 的 knn 为 0 -> 融合为 0;a 为 1 * 2 * 0.5
assert [h["_id"] for h in hits] == ["a", "b"]
by_id = {h["_id"]: h for h in hits}
assert isclose(by_id["a"]["_fused_score"], 1.0, rel_tol=1e-9)
assert isclose(by_id["b"]["_fused_score"], 0.0, rel_tol=1e-9)
|
87cacb1b
tangwang
融合公式优化。加入意图匹配因子
|
121
122
123
124
125
126
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
|
def test_fuse_scores_and_resort_boosts_hits_with_selected_sku():
hits = [
{
"_id": "style-selected",
"_score": 1.0,
"_style_rerank_suffix": "Blue XL",
"matched_queries": {"base_query": 1.0, "knn_query": 0.0},
},
{
"_id": "plain",
"_score": 1.0,
"matched_queries": {"base_query": 1.0, "knn_query": 0.0},
},
]
debug = fuse_scores_and_resort(
hits,
[1.0, 1.0],
style_intent_selected_sku_boost=1.2,
debug=True,
)
by_id = {h["_id"]: h for h in hits}
assert isclose(by_id["style-selected"]["_fused_score"], by_id["plain"]["_fused_score"] * 1.2, rel_tol=1e-9)
assert by_id["style-selected"]["_style_intent_selected_sku_boost"] == 1.2
assert by_id["plain"]["_style_intent_selected_sku_boost"] == 1.0
assert [h["_id"] for h in hits] == ["style-selected", "plain"]
assert debug[0]["style_intent_selected_sku"] is True
assert debug[0]["style_intent_selected_sku_boost"] == 1.2
|
dc403578
tangwang
多模态搜索
|
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
def test_fuse_scores_and_resort_uses_max_of_text_and_image_knn_scores():
hits = [
{
"_id": "mm-hit",
"_score": 1.0,
"matched_queries": {
"base_query": 1.5,
"knn_query": 0.2,
"image_knn_query": 0.7,
},
}
]
debug = fuse_scores_and_resort(hits, [0.8], debug=True)
assert isclose(hits[0]["_knn_score"], 0.7, rel_tol=1e-9)
assert isclose(debug[0]["knn_score"], 0.7, rel_tol=1e-9)
|
24edc208
tangwang
修改_extract_combin...
|
171
172
173
174
|
assert isclose(debug[0]["text_knn_score"], 0.2, rel_tol=1e-9)
assert isclose(debug[0]["image_knn_score"], 0.7, rel_tol=1e-9)
|
317c5d2c
tangwang
feat(search): 引入 ...
|
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
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
def test_fuse_scores_and_resort_prefers_exact_knn_scores_over_ann_scores():
hits = [
{
"_id": "exact-mm-hit",
"_score": 1.0,
"matched_queries": {
"base_query": 1.5,
"knn_query": 0.2,
"image_knn_query": 0.7,
"exact_text_knn_query": 0.9,
"exact_image_knn_query": 0.1,
},
}
]
debug = fuse_scores_and_resort(hits, [0.8], debug=True)
assert isclose(hits[0]["_knn_score"], 0.9, rel_tol=1e-9)
assert isclose(debug[0]["text_knn_score"], 0.9, rel_tol=1e-9)
assert isclose(debug[0]["image_knn_score"], 0.1, rel_tol=1e-9)
assert isclose(debug[0]["exact_text_knn_score"], 0.9, rel_tol=1e-9)
assert isclose(debug[0]["exact_image_knn_score"], 0.1, rel_tol=1e-9)
assert isclose(debug[0]["approx_text_knn_score"], 0.2, rel_tol=1e-9)
assert isclose(debug[0]["approx_image_knn_score"], 0.7, rel_tol=1e-9)
assert debug[0]["text_knn_source"] == "exact_text_knn_query"
assert debug[0]["image_knn_source"] == "exact_image_knn_query"
def test_fuse_scores_and_resort_falls_back_to_ann_when_exact_knn_missing():
hits = [
{
"_id": "ann-only-hit",
"_score": 1.0,
"matched_queries": {
"base_query": 1.5,
"knn_query": 0.4,
"image_knn_query": 0.5,
},
}
]
debug = fuse_scores_and_resort(hits, [0.8], debug=True)
assert isclose(debug[0]["text_knn_score"], 0.4, rel_tol=1e-9)
assert isclose(debug[0]["image_knn_score"], 0.5, rel_tol=1e-9)
assert isclose(debug[0]["approx_text_knn_score"], 0.4, rel_tol=1e-9)
assert isclose(debug[0]["approx_image_knn_score"], 0.5, rel_tol=1e-9)
assert debug[0]["text_knn_source"] == "knn_query"
assert debug[0]["image_knn_source"] == "image_knn_query"
|
24edc208
tangwang
修改_extract_combin...
|
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
def test_fuse_scores_and_resort_applies_knn_dismax_weights_and_tie_breaker():
hits = [
{
"_id": "mm-hit",
"_score": 1.0,
"matched_queries": {
"base_query": 1.5,
"knn_query": 0.4,
"image_knn_query": 0.5,
},
}
]
fusion = RerankFusionConfig(
rerank_bias=0.00001,
rerank_exponent=1.0,
text_bias=0.1,
text_exponent=0.35,
knn_text_weight=2.0,
knn_image_weight=1.0,
knn_tie_breaker=0.25,
knn_bias=0.0,
knn_exponent=1.0,
)
debug = fuse_scores_and_resort(hits, [0.8], fusion=fusion, debug=True)
expected_knn = 0.8 + 0.25 * 0.5
assert isclose(hits[0]["_knn_score"], expected_knn, rel_tol=1e-9)
assert isclose(debug[0]["weighted_text_knn_score"], 0.8, rel_tol=1e-9)
assert isclose(debug[0]["weighted_image_knn_score"], 0.5, rel_tol=1e-9)
assert isclose(debug[0]["knn_primary_score"], 0.8, rel_tol=1e-9)
assert isclose(debug[0]["knn_support_score"], 0.5, rel_tol=1e-9)
|
c3425429
tangwang
在以下文件中完成精排/融合清理工作...
|
258
259
|
|
47452e1d
tangwang
feat(search): 支持可...
|
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
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
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
345
346
347
348
349
|
def test_fuse_scores_and_resort_can_add_weighted_text_and_image_knn_factors():
hits = [
{
"_id": "a",
"_score": 1.0,
"matched_queries": {
"base_query": 2.0,
"knn_query": 0.4,
"image_knn_query": 0.5,
},
}
]
fusion = RerankFusionConfig(
rerank_bias=0.0,
rerank_exponent=1.0,
text_bias=0.0,
text_exponent=1.0,
knn_text_weight=2.0,
knn_image_weight=1.0,
knn_tie_breaker=0.25,
knn_bias=0.1,
knn_exponent=1.0,
knn_text_exponent=2.0,
knn_image_exponent=3.0,
)
debug = fuse_scores_and_resort(hits, [0.8], fusion=fusion, debug=True)
weighted_text_knn = 0.8
weighted_image_knn = 0.5
expected_knn = weighted_text_knn + 0.25 * weighted_image_knn
expected_fused = (
0.8
* 2.0
* (expected_knn + 0.1)
* ((weighted_text_knn + 0.1) ** 2.0)
* ((weighted_image_knn + 0.1) ** 3.0)
)
assert isclose(hits[0]["_fused_score"], expected_fused, rel_tol=1e-9)
assert isclose(debug[0]["text_knn_factor"], (weighted_text_knn + 0.1) ** 2.0, rel_tol=1e-9)
assert isclose(debug[0]["image_knn_factor"], (weighted_image_knn + 0.1) ** 3.0, rel_tol=1e-9)
assert "weighted_text_knn_score=" in debug[0]["fusion_summary"]
assert "weighted_image_knn_score=" in debug[0]["fusion_summary"]
def test_coarse_resort_hits_can_add_weighted_text_and_image_knn_factors():
hits = [
{
"_id": "coarse-a",
"_score": 1.0,
"matched_queries": {
"base_query": 2.0,
"knn_query": 0.4,
"image_knn_query": 0.5,
},
}
]
fusion = CoarseRankFusionConfig(
es_bias=0.0,
es_exponent=1.0,
text_bias=0.0,
text_exponent=1.0,
knn_text_weight=2.0,
knn_image_weight=1.0,
knn_tie_breaker=0.25,
knn_bias=0.1,
knn_exponent=1.0,
knn_text_exponent=2.0,
knn_image_exponent=3.0,
)
debug = coarse_resort_hits(hits, fusion=fusion, debug=True)
weighted_text_knn = 0.8
weighted_image_knn = 0.5
expected_knn = weighted_text_knn + 0.25 * weighted_image_knn
expected_coarse = (
1.0
* 2.0
* (expected_knn + 0.1)
* ((weighted_text_knn + 0.1) ** 2.0)
* ((weighted_image_knn + 0.1) ** 3.0)
)
assert isclose(hits[0]["_coarse_score"], expected_coarse, rel_tol=1e-9)
assert isclose(debug[0]["coarse_text_knn_factor"], (weighted_text_knn + 0.1) ** 2.0, rel_tol=1e-9)
assert isclose(debug[0]["coarse_image_knn_factor"], (weighted_image_knn + 0.1) ** 3.0, rel_tol=1e-9)
|
c3425429
tangwang
在以下文件中完成精排/融合清理工作...
|
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
|
def test_run_lightweight_rerank_sorts_by_fused_stage_score(monkeypatch):
hits = [
{
"_id": "fine-raw-better",
"_score": 1.0,
"_source": {"title": {"en": "Alpha"}},
"matched_queries": {"base_query": 0.5, "knn_query": 0.0},
},
{
"_id": "fusion-better",
"_score": 1.0,
"_source": {"title": {"en": "Beta"}},
"matched_queries": {"base_query": 40.0, "knn_query": 0.0},
},
]
monkeypatch.setattr(
"search.rerank_client.call_rerank_service",
lambda *args, **kwargs: ([0.9, 0.8], {"model": "fine-bge"}),
)
scores, meta, debug_rows = run_lightweight_rerank(
query="toy",
es_hits=hits,
language="en",
debug=True,
)
assert scores == [0.9, 0.8]
assert meta == {"model": "fine-bge"}
assert [hit["_id"] for hit in hits] == ["fusion-better", "fine-raw-better"]
assert hits[0]["_fine_fused_score"] > hits[1]["_fine_fused_score"]
assert debug_rows[0]["fusion_summary"]
assert "fine_score=" in debug_rows[0]["fusion_summary"]
assert "text_score=" in debug_rows[0]["fusion_summary"]
def test_fuse_scores_and_resort_uses_hit_level_fine_score_when_not_passed_separately():
hits = [
{
"_id": "with-fine",
"_score": 1.0,
"_fine_score": 0.7,
"matched_queries": {"base_query": 2.0, "knn_query": 0.5},
}
]
debug = fuse_scores_and_resort(hits, [0.8], debug=True)
assert isclose(debug[0]["fine_factor"], (0.7 + 0.00001), rel_tol=1e-9)
assert debug[0]["fusion_inputs"]["fine_score"] == 0.7
assert "fine_score=" in debug[0]["fusion_summary"]
|
9df421ed
tangwang
基于eval框架开始调参
|
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
|
def test_fuse_scores_and_resort_can_include_raw_es_score_as_factor():
hits = [
{
"_id": "es-strong",
"_score": 100.0,
"matched_queries": {"base_query": 1.0, "knn_query": 0.0},
},
{
"_id": "es-weak",
"_score": 1.0,
"matched_queries": {"base_query": 1.0, "knn_query": 0.0},
},
]
fusion = RerankFusionConfig(
es_bias=0.0,
es_exponent=1.0,
rerank_bias=0.0,
rerank_exponent=1.0,
text_bias=0.0,
text_exponent=0.0,
knn_bias=1.0,
knn_exponent=0.0,
)
debug = fuse_scores_and_resort(hits, [1.0, 1.0], fusion=fusion, debug=True)
assert [hit["_id"] for hit in hits] == ["es-strong", "es-weak"]
assert isclose(hits[0]["_raw_es_score"], 100.0, rel_tol=1e-9)
assert isclose(debug[0]["es_factor"], 100.0, rel_tol=1e-9)
assert debug[0]["fusion_inputs"]["es_score"] == 100.0
|