Skip to content

Commit 424224d

Browse files
authored
fix: ollama input/output token count (#2008)
1 parent e2b6036 commit 424224d

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/strands/models/ollama.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ def format_chunk(self, event: dict[str, Any]) -> StreamEvent:
273273
return {
274274
"metadata": {
275275
"usage": {
276-
"inputTokens": event["data"].eval_count,
277-
"outputTokens": event["data"].prompt_eval_count,
276+
"inputTokens": event["data"].prompt_eval_count,
277+
"outputTokens": event["data"].eval_count,
278278
"totalTokens": event["data"].eval_count + event["data"].prompt_eval_count,
279279
},
280280
"metrics": {

tests/strands/models/test_ollama.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ def test_format_chunk_metadata(model):
394394
exp_chunk = {
395395
"metadata": {
396396
"usage": {
397-
"inputTokens": 100,
398-
"outputTokens": 50,
397+
"inputTokens": 50,
398+
"outputTokens": 100,
399399
"totalTokens": 150,
400400
},
401401
"metrics": {
@@ -438,7 +438,7 @@ async def test_stream(ollama_client, model, agenerator, alist, captured_warnings
438438
{"messageStop": {"stopReason": "end_turn"}},
439439
{
440440
"metadata": {
441-
"usage": {"inputTokens": 10, "outputTokens": 5, "totalTokens": 15},
441+
"usage": {"inputTokens": 5, "outputTokens": 10, "totalTokens": 15},
442442
"metrics": {"latencyMs": 1.0},
443443
}
444444
},
@@ -510,7 +510,7 @@ async def test_stream_with_tool_calls(ollama_client, model, agenerator, alist):
510510
{"messageStop": {"stopReason": "tool_use"}},
511511
{
512512
"metadata": {
513-
"usage": {"inputTokens": 15, "outputTokens": 8, "totalTokens": 23},
513+
"usage": {"inputTokens": 8, "outputTokens": 15, "totalTokens": 23},
514514
"metrics": {"latencyMs": 2.0},
515515
}
516516
},

0 commit comments

Comments
 (0)