Commit 33f8f5784de3d6d5b6df5336dff6e3dbc36c28fc
1 parent
d4cadc13
tidy
Showing
7 changed files
with
8 additions
and
12 deletions
Show diff stats
docs/blog/全渠道数据整合、外部数据打通/竞品参考文档/prefixbox_api.md
| @@ -198,7 +198,7 @@ X-Search-Engine-Id: your-engine-identifier | @@ -198,7 +198,7 @@ X-Search-Engine-Id: your-engine-identifier | ||
| 198 | {"id": "cat_footwear", "name": "Footwear"} | 198 | {"id": "cat_footwear", "name": "Footwear"} |
| 199 | ], | 199 | ], |
| 200 | "personalized": false, | 200 | "personalized": false, |
| 201 | - "ai_reranking": true | 201 | + "reranking": true |
| 202 | } | 202 | } |
| 203 | ``` | 203 | ``` |
| 204 | 204 |
frontend/static/js/app.js
| @@ -383,7 +383,6 @@ function displayResults(data) { | @@ -383,7 +383,6 @@ function displayResults(data) { | ||
| 383 | <div class="product-debug"> | 383 | <div class="product-debug"> |
| 384 | <div class="product-debug-title">Ranking Debug</div> | 384 | <div class="product-debug-title">Ranking Debug</div> |
| 385 | <div class="product-debug-line">spu_id: ${escapeHtml(String(spuId || ''))}</div> | 385 | <div class="product-debug-line">spu_id: ${escapeHtml(String(spuId || ''))}</div> |
| 386 | - <div class="product-debug-line">es_id: ${escapeHtml(String(debug.es_id || ''))}</div> | ||
| 387 | <div class="product-debug-line">ES score: ${esScore}</div> | 386 | <div class="product-debug-line">ES score: ${esScore}</div> |
| 388 | <div class="product-debug-line">ES normalized: ${esNorm}</div> | 387 | <div class="product-debug-line">ES normalized: ${esNorm}</div> |
| 389 | ${titleLines} | 388 | ${titleLines} |
query/llm_translate.py
| @@ -148,8 +148,7 @@ class LLMTranslatorProvider: | @@ -148,8 +148,7 @@ class LLMTranslatorProvider: | ||
| 148 | if not content: | 148 | if not content: |
| 149 | logger.warning("[llm] Empty result | src=%s tgt=%s latency=%.1fms", src, tgt, latency_ms) | 149 | logger.warning("[llm] Empty result | src=%s tgt=%s latency=%.1fms", src, tgt, latency_ms) |
| 150 | return None | 150 | return None |
| 151 | - logger.info("[llm] Response | src=%s tgt=%s response=%s", src, tgt, content) | ||
| 152 | - logger.info("[llm] Success | src=%s tgt=%s latency=%.1fms", src, tgt, latency_ms) | 151 | + logger.info("[llm] Success | src=%s tgt=%s src_text=%s response=%s latency=%.1fms", src, tgt, text, content, latency_ms) |
| 153 | return content | 152 | return content |
| 154 | except Exception as exc: | 153 | except Exception as exc: |
| 155 | latency_ms = (time.time() - start) * 1000 | 154 | latency_ms = (time.time() - start) * 1000 |
scripts/benchmark_reranker_1000docs.sh
| @@ -109,7 +109,6 @@ for bs in ${BATCH_SIZES}; do | @@ -109,7 +109,6 @@ for bs in ${BATCH_SIZES}; do | ||
| 109 | cleanup | 109 | cleanup |
| 110 | RERANK_VLLM_INFER_BATCH_SIZE="${bs}" \ | 110 | RERANK_VLLM_INFER_BATCH_SIZE="${bs}" \ |
| 111 | RERANK_VLLM_SORT_BY_DOC_LENGTH="true" \ | 111 | RERANK_VLLM_SORT_BY_DOC_LENGTH="true" \ |
| 112 | - RERANK_VLLM_LENGTH_SORT_MODE="char" \ | ||
| 113 | nohup ./scripts/start_reranker.sh >"${OUT_DIR}/start_bs${bs}.log" 2>&1 & | 112 | nohup ./scripts/start_reranker.sh >"${OUT_DIR}/start_bs${bs}.log" 2>&1 & |
| 114 | 113 | ||
| 115 | for i in $(seq 1 180); do | 114 | for i in $(seq 1 180); do |
search/rerank_client.py
| @@ -107,7 +107,7 @@ def fuse_scores_and_resort( | @@ -107,7 +107,7 @@ def fuse_scores_and_resort( | ||
| 107 | 107 | ||
| 108 | 对每条 hit 会写入: | 108 | 对每条 hit 会写入: |
| 109 | - _original_score: 原始 ES 分数 | 109 | - _original_score: 原始 ES 分数 |
| 110 | - - _ai_rerank_score: 重排服务返回的分数 | 110 | + - _rerank_score: 重排服务返回的分数 |
| 111 | - _fused_score: 融合分数 | 111 | - _fused_score: 融合分数 |
| 112 | - _score: 置为融合分数(供后续 ResultFormatter 使用) | 112 | - _score: 置为融合分数(供后续 ResultFormatter 使用) |
| 113 | 113 | ||
| @@ -140,15 +140,15 @@ def fuse_scores_and_resort( | @@ -140,15 +140,15 @@ def fuse_scores_and_resort( | ||
| 140 | es_score = es_scores[idx] | 140 | es_score = es_scores[idx] |
| 141 | ai_score_raw = rerank_scores[idx] | 141 | ai_score_raw = rerank_scores[idx] |
| 142 | try: | 142 | try: |
| 143 | - ai_score = float(ai_score_raw) | 143 | + rerank_score = float(ai_score_raw) |
| 144 | except (TypeError, ValueError): | 144 | except (TypeError, ValueError): |
| 145 | - ai_score = 0.0 | 145 | + rerank_score = 0.0 |
| 146 | 146 | ||
| 147 | es_norm = (es_score / max_es) if max_es > 0 else 0.0 | 147 | es_norm = (es_score / max_es) if max_es > 0 else 0.0 |
| 148 | - fused = weight_es * es_norm + weight_ai * ai_score | 148 | + fused = weight_es * es_norm + weight_ai * rerank_score |
| 149 | 149 | ||
| 150 | hit["_original_score"] = hit.get("_score") | 150 | hit["_original_score"] = hit.get("_score") |
| 151 | - hit["_ai_rerank_score"] = ai_score | 151 | + hit["_rerank_score"] = rerank_score |
| 152 | hit["_fused_score"] = fused | 152 | hit["_fused_score"] = fused |
| 153 | hit["_score"] = fused | 153 | hit["_score"] = fused |
| 154 | 154 | ||
| @@ -156,7 +156,7 @@ def fuse_scores_and_resort( | @@ -156,7 +156,7 @@ def fuse_scores_and_resort( | ||
| 156 | "doc_id": hit.get("_id"), | 156 | "doc_id": hit.get("_id"), |
| 157 | "es_score": es_score, | 157 | "es_score": es_score, |
| 158 | "es_score_norm": es_norm, | 158 | "es_score_norm": es_norm, |
| 159 | - "ai_rerank_score": ai_score, | 159 | + "rerank_score": rerank_score, |
| 160 | "fused_score": fused, | 160 | "fused_score": fused, |
| 161 | }) | 161 | }) |
| 162 | 162 |
search/searcher.py
| @@ -637,7 +637,6 @@ class Searcher: | @@ -637,7 +637,6 @@ class Searcher: | ||
| 637 | per_result_debug.append( | 637 | per_result_debug.append( |
| 638 | { | 638 | { |
| 639 | "spu_id": spu.spu_id, | 639 | "spu_id": spu.spu_id, |
| 640 | - "es_id": hit.get("_id"), | ||
| 641 | "es_score": es_score, | 640 | "es_score": es_score, |
| 642 | "es_score_normalized": normalized, | 641 | "es_score_normalized": normalized, |
| 643 | "title_multilingual": title_multilingual, | 642 | "title_multilingual": title_multilingual, |
services.translation.providers.llm deleted