Spaces:
Sleeping
Sleeping
Few tweaks
Browse files- backend/models/schemas.py +2 -1
- backend/routers/retrieval_router.py +2 -2
- frontend/app.js +6 -4
- frontend/index.html +12 -5
backend/models/schemas.py
CHANGED
|
@@ -117,7 +117,8 @@ class CompareRequest(BaseModel):
|
|
| 117 |
model_b: EmbeddingModel
|
| 118 |
strategy_b: Strategy
|
| 119 |
|
| 120 |
-
|
|
|
|
| 121 |
use_hyde: bool = False
|
| 122 |
use_reranking: bool = False
|
| 123 |
metadata: Optional[Dict[str, Any]] = None
|
|
|
|
| 117 |
model_b: EmbeddingModel
|
| 118 |
strategy_b: Strategy
|
| 119 |
|
| 120 |
+
retrieval_mode_a: RetrievalMode = RetrievalMode.DENSE
|
| 121 |
+
retrieval_mode_b: RetrievalMode = RetrievalMode.DENSE
|
| 122 |
use_hyde: bool = False
|
| 123 |
use_reranking: bool = False
|
| 124 |
metadata: Optional[Dict[str, Any]] = None
|
backend/routers/retrieval_router.py
CHANGED
|
@@ -85,7 +85,7 @@ async def compare(request: CompareRequest):
|
|
| 85 |
retrieval_text,
|
| 86 |
request.strategy_a,
|
| 87 |
limit,
|
| 88 |
-
request.
|
| 89 |
request.search_text,
|
| 90 |
request.metadata,
|
| 91 |
),
|
|
@@ -94,7 +94,7 @@ async def compare(request: CompareRequest):
|
|
| 94 |
retrieval_text,
|
| 95 |
request.strategy_b,
|
| 96 |
limit,
|
| 97 |
-
request.
|
| 98 |
request.search_text,
|
| 99 |
request.metadata,
|
| 100 |
),
|
|
|
|
| 85 |
retrieval_text,
|
| 86 |
request.strategy_a,
|
| 87 |
limit,
|
| 88 |
+
request.retrieval_mode_a,
|
| 89 |
request.search_text,
|
| 90 |
request.metadata,
|
| 91 |
),
|
|
|
|
| 94 |
retrieval_text,
|
| 95 |
request.strategy_b,
|
| 96 |
limit,
|
| 97 |
+
request.retrieval_mode_b,
|
| 98 |
request.search_text,
|
| 99 |
request.metadata,
|
| 100 |
),
|
frontend/app.js
CHANGED
|
@@ -1457,7 +1457,8 @@ const domArena = {
|
|
| 1457 |
modelB: document.getElementById("arena-model-b"),
|
| 1458 |
strategyB: document.getElementById("arena-strategy-b"),
|
| 1459 |
resultsB: document.getElementById("arena-results-b"),
|
| 1460 |
-
|
|
|
|
| 1461 |
};
|
| 1462 |
|
| 1463 |
if (domArena.btnOpen) {
|
|
@@ -1522,7 +1523,8 @@ if (domArena.btnFight) {
|
|
| 1522 |
strategy_a: domArena.strategyA.value,
|
| 1523 |
model_b: domArena.modelB.value,
|
| 1524 |
strategy_b: domArena.strategyB.value,
|
| 1525 |
-
|
|
|
|
| 1526 |
use_hyde: useHyde,
|
| 1527 |
use_reranking: useReranking,
|
| 1528 |
metadata: whereClause,
|
|
@@ -1558,7 +1560,7 @@ if (domArena.btnFight) {
|
|
| 1558 |
${getRankShiftBadgeHtml(chunk.original_rank, i + 1)}
|
| 1559 |
</span>
|
| 1560 |
<span class="dist-badge">
|
| 1561 |
-
${formatScoreHtml(chunk.score, chunk.original_score, domArena.
|
| 1562 |
</span>
|
| 1563 |
</div>
|
| 1564 |
<div class="query-result-text">${chunk.text_highlighted || escapeHtml(chunk.text)}</div>
|
|
@@ -1581,7 +1583,7 @@ if (domArena.btnFight) {
|
|
| 1581 |
${getRankShiftBadgeHtml(chunk.original_rank, i + 1)}
|
| 1582 |
</span>
|
| 1583 |
<span class="dist-badge">
|
| 1584 |
-
${formatScoreHtml(chunk.score, chunk.original_score, domArena.
|
| 1585 |
</span>
|
| 1586 |
</div>
|
| 1587 |
<div class="query-result-text">${chunk.text_highlighted || escapeHtml(chunk.text)}</div>
|
|
|
|
| 1457 |
modelB: document.getElementById("arena-model-b"),
|
| 1458 |
strategyB: document.getElementById("arena-strategy-b"),
|
| 1459 |
resultsB: document.getElementById("arena-results-b"),
|
| 1460 |
+
retrievalModeA: document.getElementById("arena-retrieval-mode-a"),
|
| 1461 |
+
retrievalModeB: document.getElementById("arena-retrieval-mode-b"),
|
| 1462 |
};
|
| 1463 |
|
| 1464 |
if (domArena.btnOpen) {
|
|
|
|
| 1523 |
strategy_a: domArena.strategyA.value,
|
| 1524 |
model_b: domArena.modelB.value,
|
| 1525 |
strategy_b: domArena.strategyB.value,
|
| 1526 |
+
retrieval_mode_a: domArena.retrievalModeA ? domArena.retrievalModeA.value : "dense",
|
| 1527 |
+
retrieval_mode_b: domArena.retrievalModeB ? domArena.retrievalModeB.value : "dense",
|
| 1528 |
use_hyde: useHyde,
|
| 1529 |
use_reranking: useReranking,
|
| 1530 |
metadata: whereClause,
|
|
|
|
| 1560 |
${getRankShiftBadgeHtml(chunk.original_rank, i + 1)}
|
| 1561 |
</span>
|
| 1562 |
<span class="dist-badge">
|
| 1563 |
+
${formatScoreHtml(chunk.score, chunk.original_score, domArena.retrievalModeA ? domArena.retrievalModeA.value : "dense", useReranking)}
|
| 1564 |
</span>
|
| 1565 |
</div>
|
| 1566 |
<div class="query-result-text">${chunk.text_highlighted || escapeHtml(chunk.text)}</div>
|
|
|
|
| 1583 |
${getRankShiftBadgeHtml(chunk.original_rank, i + 1)}
|
| 1584 |
</span>
|
| 1585 |
<span class="dist-badge">
|
| 1586 |
+
${formatScoreHtml(chunk.score, chunk.original_score, domArena.retrievalModeB ? domArena.retrievalModeB.value : "dense", useReranking)}
|
| 1587 |
</span>
|
| 1588 |
</div>
|
| 1589 |
<div class="query-result-text">${chunk.text_highlighted || escapeHtml(chunk.text)}</div>
|
frontend/index.html
CHANGED
|
@@ -332,11 +332,6 @@
|
|
| 332 |
</div>
|
| 333 |
|
| 334 |
<div class="arena-query-bar">
|
| 335 |
-
<select id="arena-retrieval-mode" class="select-input" style="width: 110px; flex-shrink: 0;">
|
| 336 |
-
<option value="dense" selected>Dense</option>
|
| 337 |
-
<option value="sparse">Sparse</option>
|
| 338 |
-
<option value="hybrid">Hybrid</option>
|
| 339 |
-
</select>
|
| 340 |
<input type="text" id="arena-query-input" placeholder="Type a query to compare configurations (e.g., 'What is Clark Kent's weakness?')..." />
|
| 341 |
<button class="btn-run" id="btn-arena-fight" style="width: 150px; flex-shrink: 0;">🔥 FIGHT!</button>
|
| 342 |
</div>
|
|
@@ -373,6 +368,11 @@
|
|
| 373 |
<div class="arena-col-header">
|
| 374 |
<h3>Corner A</h3>
|
| 375 |
<div class="arena-config-row">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 376 |
<select id="arena-model-a" class="select-input">
|
| 377 |
<option value="nomic-embed-text">Nomic Embed</option>
|
| 378 |
<option value="EmbeddingGemma">Gemma Embed</option>
|
|
@@ -383,6 +383,7 @@
|
|
| 383 |
<option value="sentence">Sentence</option>
|
| 384 |
<option value="recursive">Recursive</option>
|
| 385 |
<option value="semantic">Semantic</option>
|
|
|
|
| 386 |
</select>
|
| 387 |
</div>
|
| 388 |
</div>
|
|
@@ -396,6 +397,11 @@
|
|
| 396 |
<div class="arena-col-header" style="border-bottom-color: var(--info-color);">
|
| 397 |
<h3>Corner B</h3>
|
| 398 |
<div class="arena-config-row">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 399 |
<select id="arena-model-b" class="select-input">
|
| 400 |
<option value="nomic-embed-text">Nomic Embed</option>
|
| 401 |
<option value="EmbeddingGemma">Gemma Embed</option>
|
|
@@ -406,6 +412,7 @@
|
|
| 406 |
<option value="sentence">Sentence</option>
|
| 407 |
<option value="recursive">Recursive</option>
|
| 408 |
<option value="semantic">Semantic</option>
|
|
|
|
| 409 |
</select>
|
| 410 |
</div>
|
| 411 |
</div>
|
|
|
|
| 332 |
</div>
|
| 333 |
|
| 334 |
<div class="arena-query-bar">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 335 |
<input type="text" id="arena-query-input" placeholder="Type a query to compare configurations (e.g., 'What is Clark Kent's weakness?')..." />
|
| 336 |
<button class="btn-run" id="btn-arena-fight" style="width: 150px; flex-shrink: 0;">🔥 FIGHT!</button>
|
| 337 |
</div>
|
|
|
|
| 368 |
<div class="arena-col-header">
|
| 369 |
<h3>Corner A</h3>
|
| 370 |
<div class="arena-config-row">
|
| 371 |
+
<select id="arena-retrieval-mode-a" class="select-input">
|
| 372 |
+
<option value="dense" selected>Dense</option>
|
| 373 |
+
<option value="sparse">Sparse</option>
|
| 374 |
+
<option value="hybrid">Hybrid</option>
|
| 375 |
+
</select>
|
| 376 |
<select id="arena-model-a" class="select-input">
|
| 377 |
<option value="nomic-embed-text">Nomic Embed</option>
|
| 378 |
<option value="EmbeddingGemma">Gemma Embed</option>
|
|
|
|
| 383 |
<option value="sentence">Sentence</option>
|
| 384 |
<option value="recursive">Recursive</option>
|
| 385 |
<option value="semantic">Semantic</option>
|
| 386 |
+
<option value="parent_child">Parent/Child</option>
|
| 387 |
</select>
|
| 388 |
</div>
|
| 389 |
</div>
|
|
|
|
| 397 |
<div class="arena-col-header" style="border-bottom-color: var(--info-color);">
|
| 398 |
<h3>Corner B</h3>
|
| 399 |
<div class="arena-config-row">
|
| 400 |
+
<select id="arena-retrieval-mode-b" class="select-input">
|
| 401 |
+
<option value="dense" selected>Dense</option>
|
| 402 |
+
<option value="sparse">Sparse</option>
|
| 403 |
+
<option value="hybrid">Hybrid</option>
|
| 404 |
+
</select>
|
| 405 |
<select id="arena-model-b" class="select-input">
|
| 406 |
<option value="nomic-embed-text">Nomic Embed</option>
|
| 407 |
<option value="EmbeddingGemma">Gemma Embed</option>
|
|
|
|
| 412 |
<option value="sentence">Sentence</option>
|
| 413 |
<option value="recursive">Recursive</option>
|
| 414 |
<option value="semantic">Semantic</option>
|
| 415 |
+
<option value="parent_child">Parent/Child</option>
|
| 416 |
</select>
|
| 417 |
</div>
|
| 418 |
</div>
|