DSPy: The framework for programming—not prompting—language models
Python
Remove dead code paths (and flags) from Predict, Adapters, and Settings (#1944)
Omar Khattab741ac1021a5b
diff --git a/dspy/adapters/base.py b/dspy/adapters/base.pyindex d472ddda3..d9b72f2ff 100644--- a/dspy/adapters/base.py+++ b/dspy/adapters/base.py@@ -13,7 +13,7 @@ class Adapter(ABC):cls.format = with_callbacks(cls.format)cls.parse = with_callbacks(cls.parse)- def __call__(self, lm, lm_kwargs, signature, demos, inputs, _parse_values=True):+ def __call__(self, lm, lm_kwargs, signature, demos, inputs):inputs_ = self.format(signature, demos, inputs)inputs_ = dict(prompt=inputs_) if isinstance(inputs_, str) else dict(messages=inputs_)@@ -27,7 +27,7 @@ class Adapter(ABC):if isinstance(output, dict):output, output_logprobs = output["text"], output["logprobs"]- value = self.parse(signature, output, _parse_values=_parse_values)+ value = self.parse(signature, output)assert set(value.keys()) == set(signature.output_fields.keys()), \f"Expected {signature.output_fields.keys()} but got {value.keys()}"@@ -41,8 +41,8 @@ class Adapter(ABC):except Exception as e:from .json_adapter import JSONAdapter- if _parse_values and not isinstance(self, JSONAdapter):- return JSONAdapter()(lm, lm_kwargs, signature, demos, inputs, _parse_values=_parse_values)+ if not isinstance(self, JSONAdapter):+ return JSONAdapter()(lm, lm_kwargs, signature, demos, inputs)raise e@abstractmethod@@ -50,7 +50,7 @@ class Adapter(ABC):raise NotImplementedError@abstractmethod- def parse(self, signature, completion, _parse_values):+ def parse(self, signature, completion):raise NotImplementedErrordef format_finetune_data(self, signature, demos, inputs, outputs):diff --git a/dspy/adapters/chat_adapter.py b/dspy/adapters/chat_adapter.pyindex f92ee6595..3f58fb0e8 100644--- a/dspy/adapters/chat_adapter.py+++ b/dspy/adapters/chat_adapter.py@@ -58,7 +58,7 @@ class ChatAdapter(Adapter):messages.append(format_turn(signature, inputs, role="user"))return messages- def parse(self, signature, completion, _parse_values=True):+ def parse(self, signature, completion):sections = [(None, [])]for line in completion.splitlines():@@ -74,7 +74,7 @@ class ChatAdapter(Adapter):for k, v in sections:if (k not in fields) and (k in signature.output_fields):try:- fields[k] = parse_value(v, signature.output_fields[k].annotation) if _parse_values else v+ fields[k] = parse_value(v, signature.output_fields[k].annotation)except Exception as e:raise ValueError(f"Error parsing field {k}: {e}.\n\n\t\tOn attempting to parse the value\n```\n{v}\n```"diff --git a/dspy/adapters/json_adapter.py b/dspy/adapters/json_adapter.pyindex 281df5cb4..0636497d8 100644--- a/dspy/adapters/json_adapter.py+++ b/dspy/adapters/json_adapter.py@@ -32,7 +32,7 @@ class JSONAdapter(Adapter):def __init__(self):pass- def __call__(self, lm, lm_kwargs, signature, demos, inputs, _parse_values=True):+ def __call__(self, lm, lm_kwargs, signature, demos, inputs):inputs = self.format(signature, demos, inputs)inputs = dict(prompt=inputs) if isinstance(inputs, str) else dict(messages=inputs)@@ -58,7 +58,7 @@ class JSONAdapter(Adapter):values = []for output in outputs:- value = self.parse(signature, output, _parse_values=_parse_values)+ value = self.parse(signature, output)assert set(value.keys()) == set(signature.output_fields.keys()), f"Expected {signature.output_fields.keys()} but got {value.keys()}"@@ -90,7 +90,7 @@ class JSONAdapter(Adapter):return messages- def parse(self, signature, completion, _parse_values=True):+ def parse(self, signature, completion):fields = json_repair.loads(completion)fields = {k: v for k, v in fields.items() if k in signature.output_fields}diff --git a/dspy/dsp/utils/settings.py b/dspy/dsp/utils/settings.pyindex f5ec1cd51..821f80e03 100644--- a/dspy/dsp/utils/settings.py+++ b/dspy/dsp/utils/settings.py@@ -8,18 +8,11 @@ DEFAULT_CONFIG = dotdict(adapter=None,rm=None,branch_idx=0,- reranker=None,- compiled_lm=None,- force_reuse_cached_compilation=False,- compiling=False,- skip_logprobs=False,trace=[],- release=0,bypass_assert=False,bypass_suggest=False,assert_failures=0,suggest_failures=0,- langchain_history=[],experimental=False,backoff_time=10,callbacks=[],diff --git a/dspy/predict/predict.py b/dspy/predict/predict.pyindex 05d66bb48..0e15137b3 100644--- a/dspy/predict/predict.py+++ b/dspy/predict/predict.py@@ -1,6 +1,4 @@-import loggingimport random-from functools import lru_cachefrom pydantic import BaseModel@@ -12,18 +10,12 @@ from dspy.signatures.signature import ensure_signaturefrom dspy.utils.callback import with_callbacks-@lru_cache(maxsize=None)-def warn_once(msg: str):- logging.warning(msg)--class Predict(Module, Parameter):- def __init__(self, signature, _parse_values=True, callbacks=None, **config):+ def __init__(self, signature, callbacks=None, **config):self.stage = random.randbytes(8).hex()self.signature = ensure_signature(signature)self.config = configself.callbacks = callbacks or []- self._parse_values = _parse_valuesself.reset()def reset(self):@@ -80,7 +72,7 @@ class Predict(Module, Parameter):self.signature = self.signature.load_state(state["signature"])if "extended_signature" in state: # legacy, up to and including 2.5, for CoT.- self.signature = self.signature.load_state(state["extended_signature"])+ raise NotImplementedError("Loading extended_signature is no longer supported in DSPy 2.6+")return self@@ -90,7 +82,6 @@ class Predict(Module, Parameter):def forward(self, **kwargs):import dspy- assert not dspy.settings.compiling, "It's no longer ever the case that .compiling is True"# Extract the three privileged keyword arguments.assert "new_signature" not in kwargs, "new_signature is no longer a valid keyword argument."@@ -115,7 +106,9 @@ class Predict(Module, Parameter):missing = [k for k in signature.input_fields if k not in kwargs]print(f"WARNING: Not all input fields were provided to module. Present: {present}. Missing: {missing}.")- completions = v2_5_generate(lm, config, signature, demos, kwargs, _parse_values=self._parse_values)+ import dspy+ adapter = dspy.settings.adapter or dspy.ChatAdapter()+ completions = adapter(lm, lm_kwargs=config, signature=signature, demos=demos, inputs=kwargs)pred = Prediction.from_completions(completions, signature=signature)@@ -135,16 +128,6 @@ class Predict(Module, Parameter):return f"{self.__class__.__name__}({self.signature})"-def v2_5_generate(lm, lm_kwargs, signature, demos, inputs, _parse_values=True):- import dspy-- adapter = dspy.settings.adapter or dspy.ChatAdapter()-- return adapter(- lm, lm_kwargs=lm_kwargs, signature=signature, demos=demos, inputs=inputs, _parse_values=_parse_values- )--# TODO: get some defaults during init from the context window?# # TODO: FIXME: Hmm, I guess expected behavior is that contexts can# affect execution. Well, we need to determine whether context dominates, __init__ demoninates, or forward dominates.diff --git a/dspy/teleprompt/bootstrap.py b/dspy/teleprompt/bootstrap.pyindex 840bfe911..fdc48b083 100644--- a/dspy/teleprompt/bootstrap.py+++ b/dspy/teleprompt/bootstrap.py@@ -260,10 +260,6 @@ class BootstrapFewShot(Teleprompter):sample_size = max(0, sample_size)raw_demos = rng.sample(raw_demos, sample_size)-- if dspy.settings.release >= 20230928:- predictor.demos = raw_demos + augmented_demos- else:- predictor.demos = augmented_demos + raw_demos+ predictor.demos = augmented_demos + raw_demosreturn self.student