Skip to content

armgit / dspy

Public Imported from GitHub
0

DSPy: The framework for programming—not prompting—language models

Python

Clean up knn related functionalities a bit

Xiao Cui5a54d5970b4f
diff --git a/dspy/predict/knn.py b/dspy/predict/knn.py
index e275ccb6a..1ce85fdba 100644
--- a/dspy/predict/knn.py
+++ b/dspy/predict/knn.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
import numpy as np
@@ -6,17 +6,20 @@ import dsp
class KNN:
- def __init__(self, k: int, trainset: List[dsp.Example]):
+ def __init__(self, k: int, trainset: List[dsp.Example], vectorizer: Optional[dsp.BaseSentenceVectorizer] = None):
self.k = k
self.trainset = trainset
- self.vectorizer = dsp.SentenceTransformersVectorizer()
- trainset_casted_to_vectorize = [" | ".join([f"{key}: {value}" for key, value in example.items() if key in example._input_keys]) for example in self.trainset]
+ self.vectorizer = vectorizer or dsp.SentenceTransformersVectorizer()
+ trainset_casted_to_vectorize = [
+ " | ".join([f"{key}: {value}" for key, value in example.items() if key in example._input_keys])
+ for example in self.trainset
+ ]
self.trainset_vectors = self.vectorizer(trainset_casted_to_vectorize).astype(np.float32)
def __call__(self, **kwargs) -> List[dsp.Example]:
with dsp.settings.context(vectorizer=self.vectorizer):
input_example_vector = self.vectorizer([" | ".join([f"{key}: {val}" for key, val in kwargs.items()])])
scores = np.dot(self.trainset_vectors, input_example_vector.T).squeeze()
- nearest_samples_idxs = scores.argsort()[-self.k:][::-1]
+ nearest_samples_idxs = scores.argsort()[-self.k :][::-1]
train_sampled = [self.trainset[cur_idx] for cur_idx in nearest_samples_idxs]
return train_sampled
diff --git a/dspy/teleprompt/knn_fewshot.py b/dspy/teleprompt/knn_fewshot.py
index ca9405268..6a4062def 100644
--- a/dspy/teleprompt/knn_fewshot.py
+++ b/dspy/teleprompt/knn_fewshot.py
@@ -2,16 +2,17 @@ import types
from typing import List
import dsp
+from dspy.predict.knn import KNN
from dspy.teleprompt import BootstrapFewShot
from .teleprompt import Teleprompter
class KNNFewShot(Teleprompter):
- def __init__(self, KNN, k: int, trainset: List[dsp.Example]):
+ def __init__(self, k: int, trainset: List[dsp.Example]):
self.KNN = KNN(k, trainset)
- def compile(self, student, *, teacher=None, trainset, valset=None):
+ def compile(self, student, *, teacher=None, trainset=None, valset=None):
student_copy = student.reset_copy()
def forward_pass(*args, **kwargs):
diff --git a/tests/teleprompt/test_knn_fewshot.py b/tests/teleprompt/test_knn_fewshot.py
index b267d3dce..1670a83b6 100644
--- a/tests/teleprompt/test_knn_fewshot.py
+++ b/tests/teleprompt/test_knn_fewshot.py
@@ -1,6 +1,5 @@
import pytest
import dsp, dspy
-from dspy.predict.knn import KNN
from dspy.teleprompt.knn_fewshot import KNNFewShot
from dspy.utils.dummies import DummyLM, DummyVectorizer
@@ -19,7 +18,7 @@ def setup_knn_few_shot():
mock_example("What is 2+2?", "4"),
]
dsp.SentenceTransformersVectorizer = DummyVectorizer
- knn_few_shot = KNNFewShot(KNN, k=2, trainset=trainset)
+ knn_few_shot = KNNFewShot(k=2, trainset=trainset)
return knn_few_shot
@@ -60,9 +59,9 @@ def _test_knn_few_shot_compile(setup_knn_few_shot):
assert len(compiled_student.predictor.demos) == 1
assert compiled_student.predictor.demos[0].input == trainset[0].input
assert compiled_student.predictor.demos[0].output == trainset[0].output
-
+
# Simulate a query that is similar to one of the training examples
- output = compiled_student.forward(input = "What is the capital of Spain?").output
+ output = compiled_student.forward(input="What is the capital of Spain?").output
print("CONVO")
print(lm.get_convo(-1))