Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix miner min rank #117

Merged
merged 3 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ragatouille/data/training_data_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ def process_raw_data(
negative_label: int = 0,
hard_negative_minimum_rank: int = 10,
):
self.negative_miner.min_rank = hard_negative_minimum_rank
if self.negative_miner is None and mine_hard_negatives:
raise ValueError(
"mine_hard_negatives is True but no negative miner was provided!"
)
if self.negative_miner:
self.negative_miner.min_rank = hard_negative_minimum_rank
if data_type == "pairs":
self._process_raw_pairs(
raw_data=raw_data,
Expand Down
1 change: 1 addition & 0 deletions ragatouille/models/colbert.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from colbert import Indexer, IndexUpdater, Searcher, Trainer
from colbert.infra import ColBERTConfig, Run, RunConfig
from colbert.modeling.checkpoint import Checkpoint

from ragatouille.models.base import LateInteractionModel


Expand Down
36 changes: 36 additions & 0 deletions tests/test_training_data_processor.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
from unittest.mock import MagicMock

import pytest

from ragatouille.data import TrainingDataProcessor


@pytest.fixture
def collection():
return ["doc1", "doc2", "doc3"]


@pytest.fixture
def queries():
return ["query1", "query2"]


def test_process_raw_data_without_miner(collection, queries):
processor = TrainingDataProcessor(collection, queries, None)
processor._process_raw_pairs = MagicMock(return_value=None)

processor.process_raw_data(
raw_data=[], data_type="pairs", data_dir="./", mine_hard_negatives=False
)

processor._process_raw_pairs.assert_called_once()


def test_process_raw_data_with_miner(collection, queries):
negative_miner = MagicMock()
processor = TrainingDataProcessor(collection, queries, negative_miner)
processor._process_raw_pairs = MagicMock(return_value=None)

processor.process_raw_data(raw_data=[], data_type="pairs", data_dir="./")

processor._process_raw_pairs.assert_called_once()
Loading