Skip to content

armgit / dspy

Public Imported from GitHub
0

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

Python

fix usage tracking when None exists (#8339)

Chen Qianede6434c8300
diff --git a/dspy/utils/usage_tracker.py b/dspy/utils/usage_tracker.py
index 2643645a7..5199f3ade 100644
--- a/dspy/utils/usage_tracker.py
+++ b/dspy/utils/usage_tracker.py
@@ -38,7 +38,7 @@ class UsageTracker:
result = dict(usage_entry2)
for k, v in usage_entry1.items():
current_v = result.get(k)
- if isinstance(v, dict):
+ if isinstance(v, dict) or isinstance(current_v, dict):
result[k] = self._merge_usage_entries(current_v, v)
else:
result[k] = (current_v or 0) + (v or 0)
diff --git a/tests/utils/test_usage_tracker.py b/tests/utils/test_usage_tracker.py
index 86b2d9ba5..70244b328 100644
--- a/tests/utils/test_usage_tracker.py
+++ b/tests/utils/test_usage_tracker.py
@@ -170,3 +170,62 @@ def test_merge_usage_entries_with_new_keys():
assert total_usage["model-x"]["prompt_tokens"] == 5
assert total_usage["model-x"]["completion_tokens"] == 2
+
+
+def test_merge_usage_entries_with_none_values():
+ """Test tracking usage across multiple models."""
+ tracker = UsageTracker()
+
+ # Add usage entries for different models
+ usage_entries = [
+ {
+ "model": "gpt-4o-mini",
+ "usage": {
+ "prompt_tokens": 1117,
+ "completion_tokens": 46,
+ "total_tokens": 1163,
+ "prompt_tokens_details": None,
+ "completion_tokens_details": {},
+ },
+ },
+ {
+ "model": "gpt-4o-mini",
+ "usage": {
+ "prompt_tokens": 800,
+ "completion_tokens": 100,
+ "total_tokens": 900,
+ "prompt_tokens_details": {"cached_tokens": 50, "audio_tokens": 50},
+ "completion_tokens_details": None,
+ },
+ },
+ {
+ "model": "gpt-4o-mini",
+ "usage": {
+ "prompt_tokens": 800,
+ "completion_tokens": 100,
+ "total_tokens": 900,
+ "prompt_tokens_details": None,
+ "completion_tokens_details": {
+ "reasoning_tokens": 1,
+ "audio_tokens": 1,
+ "accepted_prediction_tokens": 1,
+ "rejected_prediction_tokens": 1,
+ },
+ },
+ },
+ ]
+
+ for entry in usage_entries:
+ tracker.add_usage(entry["model"], entry["usage"])
+
+ total_usage = tracker.get_total_tokens()
+
+ assert total_usage["gpt-4o-mini"]["prompt_tokens"] == 2717
+ assert total_usage["gpt-4o-mini"]["completion_tokens"] == 246
+ assert total_usage["gpt-4o-mini"]["total_tokens"] == 2963
+ assert total_usage["gpt-4o-mini"]["prompt_tokens_details"]["cached_tokens"] == 50
+ assert total_usage["gpt-4o-mini"]["prompt_tokens_details"]["audio_tokens"] == 50
+ assert total_usage["gpt-4o-mini"]["completion_tokens_details"]["reasoning_tokens"] == 1
+ assert total_usage["gpt-4o-mini"]["completion_tokens_details"]["audio_tokens"] == 1
+ assert total_usage["gpt-4o-mini"]["completion_tokens_details"]["accepted_prediction_tokens"] == 1
+ assert total_usage["gpt-4o-mini"]["completion_tokens_details"]["rejected_prediction_tokens"] == 1