Skip to content

armgit / dspy

Public Imported from GitHub
0

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

Python

Support returning logprobs in Predictor (#1895)

veronicalyu320e690743d6c16
diff --git a/dspy/adapters/base.py b/dspy/adapters/base.py
index 1edf562ee..fed1e861c 100644
--- a/dspy/adapters/base.py
+++ b/dspy/adapters/base.py
@@ -22,8 +22,15 @@ class Adapter(ABC):
try:
for output in outputs:
- value = self.parse(signature, output, _parse_values=_parse_values)
+ if type(output) is str:
+ output_text, output_logprobs = output, None
+ elif type(output) is dict:
+ output_text, output_logprobs = output["text"], output["logprobs"]
+ else:
+ raise ValueError(f"Expected str or dict but got {type(output)}")
+ value = self.parse(signature, output_text, _parse_values=_parse_values)
assert set(value.keys()) == set(signature.output_fields.keys()), f"Expected {signature.output_fields.keys()} but got {value.keys()}"
+ value["logprobs"] = output_logprobs
values.append(value)
return values
diff --git a/dspy/clients/lm.py b/dspy/clients/lm.py
index 35c623dee..b30a1224d 100644
--- a/dspy/clients/lm.py
+++ b/dspy/clients/lm.py
@@ -98,8 +98,18 @@ class LM(BaseLM):
request=dict(model=self.model, messages=messages, **kwargs),
num_retries=self.num_retries,
)
- outputs = [c.message.content if hasattr(c, "message") else c["text"] for c in response["choices"]]
+ if kwargs.get("logprobs"):
+ outputs = [
+ {
+ "text": c.message.content if hasattr(c, "message") else c["text"],
+ "logprobs": c.logprobs if hasattr(c, "logprobs") else c["logprobs"]
+ }
+ for c in response["choices"]
+ ]
+ else:
+ outputs = [c.message.content if hasattr(c, "message") else c["text"] for c in response["choices"]]
+
# Logging, with removed api key & where `cost` is None on cache hit.
kwargs = {k: v for k, v in kwargs.items() if not k.startswith("api_")}
entry = dict(prompt=prompt, messages=messages, kwargs=kwargs, response=response)