DSPy: The framework for programming—not prompting—language models
Python
few better exception handling
Sri Vardhamanan4e49b4a64199
diff --git a/dsp/modules/colbertv2.py b/dsp/modules/colbertv2.pyindex 80b47abdf..501b84270 100644--- a/dsp/modules/colbertv2.py+++ b/dsp/modules/colbertv2.py@@ -1,4 +1,5 @@import functools+from typing import Optional, Union, Anyimport requestsfrom dsp.modules.cache_utils import CacheMemory, NotebookCacheMemory@@ -9,34 +10,42 @@ from dsp.utils import dotdictclass ColBERTv2:- def __init__(self, url='http://0.0.0.0', port=None, post_requests=False):+ """Wrapper for the ColBERTv2 Retrieval."""++ def __init__(+ self,+ url: str = "http://0.0.0.0",+ port: Optional[Union[str, int]] = None,+ post_requests: bool = False,+ ):self.post_requests = post_requests- self.url = f'{url}:{port}' if port else url+ self.url = f"{url}:{port}" if port else url- def __call__(self, query: str, k=10, simplify=False):+ def __call__(+ self, query: str, k: int = 10, simplify: bool = False+ ) -> Union[list[str], list[dotdict]]:if self.post_requests:- topk = colbertv2_post_request(self.url, query, k)+ topk: list[dict[str, Any]] = colbertv2_post_request(self.url, query, k)else:- topk = colbertv2_get_request(self.url, query, k)-- topk = [dotdict(psg) for psg in topk]+ topk: list[dict[str, Any]] = colbertv2_get_request(self.url, query, k)if simplify:- topk = [psg.long_text for psg in topk]+ return [psg["long_text"] for psg in topk]- return topk+ return [dotdict(psg) for psg in topk]@CacheMemory.cachedef colbertv2_get_request_v2(url: str, query: str, k: int):- assert k <= 100, f'Only k <= 100 is supported for the hosted ColBERTv2 server at the moment.'+ assert (+ k <= 100+ ), "Only k <= 100 is supported for the hosted ColBERTv2 server at the moment."payload = {"query": query, "k": k}- res = requests.get(url, params=payload)-- topk = res.json()['topk'][:k]- topk = [{**d, 'long_text': d['text']} for d in topk]+ res = requests.get(url, params=payload, timeout=10)+ topk = res.json()["topk"][:k]+ topk = [{**d, "long_text": d["text"]} for d in topk]return topk[:k]@@ -53,9 +62,9 @@ colbertv2_get_request = colbertv2_get_request_v2_wrappeddef colbertv2_post_request_v2(url: str, query: str, k: int):headers = {"Content-Type": "application/json; charset=utf-8"}payload = {"query": query, "k": k}- res = requests.post(url, json=payload, headers=headers)+ res = requests.post(url, json=payload, headers=headers, timeout=10)- return res.json()['topk'][:k]+ return res.json()["topk"][:k]@functools.lru_cache(maxsize=None)diff --git a/dsp/primitives/demonstrate.py b/dsp/primitives/demonstrate.pyindex e0770330e..3da97bc44 100644--- a/dsp/primitives/demonstrate.py+++ b/dsp/primitives/demonstrate.py@@ -13,6 +13,7 @@ class Example(dotdict):demos: list[Any]def __init__(self, *args, **kwargs):+ assert len(args) <= 1super().__init__()if args:diff --git a/dsp/primitives/predict.py b/dsp/primitives/predict.pyindex da18814f8..4b4ae1dc1 100644--- a/dsp/primitives/predict.py+++ b/dsp/primitives/predict.py@@ -45,7 +45,6 @@ class Completions:def generate(template: Template, **kwargs) -> Callable:"""Returns a callable function that generates completions for a given example using the provided template."""- # todo: re-think this? doesn't seem like a good way to pass the template to nested functionif not dsp.settings.lm:raise AssertionError("No LM is loaded.")@@ -54,6 +53,8 @@ def generate(template: Template, **kwargs) -> Callable:def do_generate(example: Example, stage: str, max_depth: int = 2, original_example=None):+ if not dsp.settings.lm:+ raise AssertionError("No LM is loaded.")original_example = original_example or exampleassert stage is not None@@ -103,7 +104,6 @@ def generate(template: Template, **kwargs) -> Callable:original_example=original_example,)- # print("completion found: {}".format(completions))completions = Completions(completions, template=template)example = example.copy(completions=completions)@@ -145,6 +145,8 @@ def generate(template: Template, **kwargs) -> Callable:def generate_sc(example, prompt, normalize=True, extract=None, prediction_field=None, **kwargs):+ if not dsp.settings.lm:+ raise AssertionError("No LM is loaded.")kwargs = {"temperature": 0.7, "max_tokens": 150, "n": 20, **kwargs}completions = dsp.settings.lm(prompt, **kwargs)completions = extract_final_answer(example, completions, extract=extract)@@ -154,6 +156,8 @@ def generate_sc(def extract_final_answer(example, completions, extract=None):+ if not dsp.settings.lm:+ raise AssertionError("No LM is loaded.")if extract:completions = [extract(example, p) for p in completions]else:@@ -182,6 +186,10 @@ def majority(def majority_vote_(completions: Completions, normalize: bool, prediction_field: str):"""Core logic for majority vote."""++ if not dsp.settings.lm:+ raise AssertionError("No LM is loaded.")+normalized_to_original = {}if normalize:original_completions = completionsdiff --git a/dsp/primitives/search.py b/dsp/primitives/search.pyindex e27f574e5..4a77d7d55 100644--- a/dsp/primitives/search.py+++ b/dsp/primitives/search.py@@ -3,6 +3,8 @@ import dspdef retrieve(query: str, k: int) -> list[str]:"""Retrieves passages from the RM for the query and returns the top k passages."""+ if not dsp.settings.rm:+ raise AssertionError("No RM is loaded.")passages = dsp.settings.rm(query, k=k)passages = [psg.long_text for psg in passages]@@ -13,6 +15,9 @@ def retrieveEnsemble(queries: list[str], k: int, by_prob: bool = True) -> list[s"""Retrieves passages from the RM for each query in queries and returns the top k passagesbased on the probability or score."""+ if not dsp.settings.rm:+ raise AssertionError("No RM is loaded.")+queries = [q for q in queries if q]passages = {}