tests: de-duplicate online scoring API format checks

Refactor repeated score request format tests into a shared assertion helper and parametrized cases in bi-encoder and cross-encoder online suites, reducing bloat while preserving coverage.

Co-authored-by: Claude <noreply@anthropic.com>

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

tests/entrypoints/pooling/scoring/test_bi_encoder_online.py

@@ -26,6 +26,25 @@ TEXTS_2 = [
 ]
 
 
+def _assert_score_output_matches_hf(hf_model, server: RemoteOpenAIServer,
+                                    payload: dict, text_pairs: list[list[str]]):
+    score_response = requests.post(
+        server.url_for("score"),
+        json={"model": MODEL_NAME, **payload},
+    )
+    score_response.raise_for_status()
+    score = ScoreResponse.model_validate(score_response.json())
+
+    assert score.id is not None
+    assert score.data is not None
+
+    vllm_outputs = [d.score for d in score.data]
+    hf_outputs = hf_model.predict(text_pairs).tolist()
+    assert len(vllm_outputs) == len(hf_outputs)
+    for hf_output, vllm_output in zip(hf_outputs, vllm_outputs):
+        assert hf_output == pytest.approx(vllm_output, rel=0.01)
+
+
 @pytest.fixture(scope="module")
 def server():
     args = ["--enforce-eager", "--max-model-len", "100", "--dtype", DTYPE]
@@ -44,207 +63,78 @@ def hf_model():
 
 
 @pytest.mark.asyncio
-async def test_score_api_queries_str_1_documents_str_1(
-    hf_model, server: RemoteOpenAIServer
-):
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1[0],
-            "documents": TEXTS_2[0],
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 1
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict([[TEXTS_1[0], TEXTS_2[0]]]).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_str_1_documents_str_n(
-    hf_model, server: RemoteOpenAIServer
-):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[0], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1[0],
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_str_n_documents_str_n(
-    hf_model, server: RemoteOpenAIServer
-):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_vs_documents(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_vs_items(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "items": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_text_1_vs_text_2(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "text_1": TEXTS_1,
-            "text_2": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_data_1_vs_data_2(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "data_1": TEXTS_1,
-            "data_2": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
+@pytest.mark.parametrize(
+    ("payload", "text_pairs"),
+    [
+        pytest.param(
+            {
+                "queries": TEXTS_1[0],
+                "documents": TEXTS_2[0],
+            },
+            [[TEXTS_1[0], TEXTS_2[0]]],
+            id="queries-str-documents-str",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1[0],
+                "documents": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[0], TEXTS_2[1]],
+            ],
+            id="queries-str-documents-list",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1,
+                "documents": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="queries-list-documents-list",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1,
+                "items": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="queries-list-items-list",
+        ),
+        pytest.param(
+            {
+                "text_1": TEXTS_1,
+                "text_2": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="text-1-vs-text-2",
+        ),
+        pytest.param(
+            {
+                "data_1": TEXTS_1,
+                "data_2": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="data-1-vs-data-2",
+        ),
+    ],
+)
+async def test_score_api_request_formats(hf_model, server: RemoteOpenAIServer,
+                                         payload: dict,
+                                         text_pairs: list[list[str]]):
+    _assert_score_output_matches_hf(hf_model, server, payload, text_pairs)
 
 
 @pytest.mark.asyncio

tests/entrypoints/pooling/scoring/test_cross_encoder_online.py

@@ -28,6 +28,25 @@ TEXTS_2 = [
 ]
 
 
+def _assert_score_output_matches_hf(hf_model, server: RemoteOpenAIServer,
+                                    payload: dict, text_pairs: list[list[str]]):
+    score_response = requests.post(
+        server.url_for("score"),
+        json={"model": MODEL_NAME, **payload},
+    )
+    score_response.raise_for_status()
+    score = ScoreResponse.model_validate(score_response.json())
+
+    assert score.id is not None
+    assert score.data is not None
+
+    vllm_outputs = [d.score for d in score.data]
+    hf_outputs = hf_model.predict(text_pairs).tolist()
+    assert len(vllm_outputs) == len(hf_outputs)
+    for hf_output, vllm_output in zip(hf_outputs, vllm_outputs):
+        assert hf_output == pytest.approx(vllm_output, rel=0.01)
+
+
 @pytest.fixture(scope="module")
 def server():
     args = ["--enforce-eager", "--max-model-len", "100", "--dtype", DTYPE]
@@ -61,207 +80,78 @@ async def test_basic(server: RemoteOpenAIServer):
 
 
 @pytest.mark.asyncio
-async def test_score_api_queries_str_1_documents_str_1(
-    hf_model, server: RemoteOpenAIServer
-):
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1[0],
-            "documents": TEXTS_2[0],
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 1
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict([[TEXTS_1[0], TEXTS_2[0]]]).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_str_1_documents_str_n(
-    hf_model, server: RemoteOpenAIServer
-):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[0], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1[0],
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_str_n_documents_str_n(
-    hf_model, server: RemoteOpenAIServer
-):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_vs_documents(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "documents": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_queries_vs_items(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "queries": TEXTS_1,
-            "items": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_text_1_vs_text_2(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "text_1": TEXTS_1,
-            "text_2": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
-
-
-@pytest.mark.asyncio
-async def test_score_api_data_1_vs_data_2(hf_model, server: RemoteOpenAIServer):
-    text_pairs = [
-        [TEXTS_1[0], TEXTS_2[0]],
-        [TEXTS_1[1], TEXTS_2[1]],
-    ]
-
-    score_response = requests.post(
-        server.url_for("score"),
-        json={
-            "model": MODEL_NAME,
-            "data_1": TEXTS_1,
-            "data_2": TEXTS_2,
-        },
-    )
-    score_response.raise_for_status()
-    score = ScoreResponse.model_validate(score_response.json())
-
-    assert score.id is not None
-    assert score.data is not None
-    assert len(score.data) == 2
-
-    vllm_outputs = [d.score for d in score.data]
-    hf_outputs = hf_model.predict(text_pairs).tolist()
-
-    for i in range(len(vllm_outputs)):
-        assert hf_outputs[i] == pytest.approx(vllm_outputs[i], rel=0.01)
+@pytest.mark.parametrize(
+    ("payload", "text_pairs"),
+    [
+        pytest.param(
+            {
+                "queries": TEXTS_1[0],
+                "documents": TEXTS_2[0],
+            },
+            [[TEXTS_1[0], TEXTS_2[0]]],
+            id="queries-str-documents-str",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1[0],
+                "documents": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[0], TEXTS_2[1]],
+            ],
+            id="queries-str-documents-list",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1,
+                "documents": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="queries-list-documents-list",
+        ),
+        pytest.param(
+            {
+                "queries": TEXTS_1,
+                "items": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="queries-list-items-list",
+        ),
+        pytest.param(
+            {
+                "text_1": TEXTS_1,
+                "text_2": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="text-1-vs-text-2",
+        ),
+        pytest.param(
+            {
+                "data_1": TEXTS_1,
+                "data_2": TEXTS_2,
+            },
+            [
+                [TEXTS_1[0], TEXTS_2[0]],
+                [TEXTS_1[1], TEXTS_2[1]],
+            ],
+            id="data-1-vs-data-2",
+        ),
+    ],
+)
+async def test_score_api_request_formats(hf_model, server: RemoteOpenAIServer,
+                                         payload: dict,
+                                         text_pairs: list[list[str]]):
+    _assert_score_output_matches_hf(hf_model, server, payload, text_pairs)
 
 
 @pytest.mark.asyncio