Skip to content

fix: check if model attr of model exists #1499

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.

Sign up for GitHub

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

Merged
KennethEnevoldsen merged 3 commits into from
Nov 26, 2024
Merged

fix: check if model attr of model exists #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3304a3
check if model attr of model exists
Samoed Nov 26, 2024
c83ced1
lint
Samoed Nov 26, 2024
bf6ffca
Fix retrieval evaluator
Samoed Nov 26, 2024
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
8 changes: 5 additions & 3 deletions mteb/evaluation/evaluators/RetrievalEvaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def search_cross_encoder(
for qid in queries.keys():
if self.previous_results is None:
# try to use all of them
logging.logging(
logging.info(
f"previous_results is None. Using all the documents to rerank: {len(corpus)}"
)
q_results = {doc_id: 0.0 for doc_id in corpus.keys()}
Expand Down Expand Up @@ -318,7 +318,9 @@ def search_cross_encoder(
len(queries_in_pair) == len(corpus_in_pair) == len(instructions_in_pair)
)

if isinstance(self.model.model, CrossEncoder):
if hasattr(self.model, "model") and isinstance(
self.model.model, CrossEncoder
):
# can't take instructions, so add them here
queries_in_pair = [
f"{q} {i}".strip()
Expand Down Expand Up @@ -428,7 +430,7 @@ def encode(


def is_cross_encoder_compatible(model) -> bool:
op = getattr(model.model, "predict", None)
op = getattr(model, "predict", None)
return callable(op)


Expand Down
5 changes: 4 additions & 1 deletion mteb/models/sentence_transformer_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ def __init__(
self.model.prompts = model_prompts
self.model_prompts = self.validate_task_to_prompt_name(model_prompts)

if isinstance(self.model, CrossEncoder):
self.predict = self._predict

def encode(
self,
sentences: Sequence[str],
Expand Down Expand Up @@ -106,7 +109,7 @@ def encode(
embeddings = embeddings.cpu().detach().float().numpy()
return embeddings

def predict(
def _predict(
self,
sentences: Sequence[str],
**kwargs: Any,
Expand Down