Skip to content

armgit / dspy

Public Imported from GitHub
0

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

Python

Track backtracking attempts in demos

Shangyint28f59f3ecf09
diff --git a/dspy/predict/retry.py b/dspy/predict/retry.py
index 176e6a803..ab74945c0 100644
--- a/dspy/predict/retry.py
+++ b/dspy/predict/retry.py
@@ -1,3 +1,4 @@
+import copy
import dspy
import dsp
@@ -44,19 +45,26 @@ class Retry(Predict):
kwargs[past_key] = value
del kwargs["past_outputs"]
kwargs["signature"] = self.new_signature
- demos = kwargs.pop("demos", self.demos if self.demos is not None else [])
- return self.original_forward(demos=demos, **kwargs)
+ return self.original_forward(**kwargs)
def __call__(self, **kwargs):
+ cached_kwargs = copy.deepcopy(kwargs)
+ kwargs["_trace"] = False
+ kwargs.setdefault("demos", self.demos if self.demos is not None else [])
+
# perform backtracking
- if dspy.settings.backtrack_to == self.module:
+ if dspy.settings.backtrack_to == self:
for key, value in dspy.settings.backtrack_to_args.items():
kwargs.setdefault(key, value)
- kwargs["_trace"] = False
pred = self.forward(**kwargs)
- dsp.settings.trace.append((self.module, {**kwargs}, pred))
- return pred
else:
- # seems like a hack, but it works for now
- demos = kwargs.pop("demos", self.demos if self.demos is not None else [])
- return self.module(demos=demos, **kwargs)
+ pred = self.module(**kwargs)
+
+ # now pop multiple reserved keys
+ # NOTE(shangyin) past_outputs seems not useful to include in demos,
+ # therefore dropped
+ for key in ["_trace", "demos", "signature", "config", "lm", "past_outputs"]:
+ kwargs.pop(key, None)
+
+ dsp.settings.trace.append((self, {**kwargs}, pred))
+ return pred
diff --git a/dspy/primitives/assertions.py b/dspy/primitives/assertions.py
index 0f0765498..2c7b04646 100644
--- a/dspy/primitives/assertions.py
+++ b/dspy/primitives/assertions.py
@@ -220,6 +220,7 @@ def backtrack_handler(func, bypass_suggest=True, max_backtracks=2):
if i == max_backtracks:
if isinstance(current_error, DSPyAssertionError):
raise current_error
+ dspy.settings.trace = []
result = (
bypass_suggest_handler(func)(*args, **kwargs)
if bypass_suggest
@@ -228,6 +229,7 @@ def backtrack_handler(func, bypass_suggest=True, max_backtracks=2):
break
else:
try:
+ dspy.settings.trace = []
result = func(*args, **kwargs)
break
except (DSPySuggestionError, DSPyAssertionError) as e: