Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

def log_run_summary(logger: Logger | logging.Logger, result: AgentRunResult[Any]) -> None:
"""Log model name, token usage, and tool call sequence from an agent run."""
usage = result.usage()
usage = result.usage
model_name = getattr(result.response, "model_name", "unknown")
logger.info(
"::group::LLM run complete: model=%s, requests=%s, tool_calls=%s, "
Expand Down
6 changes: 2 additions & 4 deletions providers/common/ai/tests/unit/common/ai/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@ def isolate_hook_lineage_collector(hook_lineage_collector):
def make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary.

Returns a MagicMock with .output, .usage(), .response, and .all_messages()
Returns a MagicMock with .output, .usage, .response, and .all_messages()
configured so that log_run_summary can read them without error.
"""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
def _make_mock_run_result(output):
mock_result = MagicMock(spec=["output", "usage", "response", "all_messages"])
mock_result.output = output
mock_result.usage.return_value = MagicMock(
mock_result.usage = MagicMock(
spec=["requests", "tool_calls", "input_tokens", "output_tokens", "total_tokens"],
requests=1,
tool_calls=0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Summary(BaseModel):
def _make_mock_run_result(output):
mock_result = MagicMock(spec=["output", "usage", "response", "all_messages"])
mock_result.output = output
mock_result.usage.return_value = MagicMock(
mock_result.usage = MagicMock(
spec=["requests", "tool_calls", "input_tokens", "output_tokens", "total_tokens"],
requests=1,
tool_calls=0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ def _make_mock_run_result(output):
"""Create a mock AgentRunResult compatible with log_run_summary."""
mock_result = MagicMock()
mock_result.output = output
mock_result.usage.return_value = MagicMock(
requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0
)
mock_result.usage = MagicMock(requests=1, tool_calls=0, input_tokens=0, output_tokens=0, total_tokens=0)
mock_result.response = MagicMock(model_name="test-model")
mock_result.all_messages.return_value = []
return mock_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _make_mock_result(model_name="gpt-5", tool_names=None, usage_kwargs=None):
"total_tokens": 3359,
}
result = MagicMock()
result.usage.return_value = MagicMock(**usage_kwargs)
result.usage = MagicMock(**usage_kwargs)
result.response = MagicMock(model_name=model_name)

messages: list = []
Expand Down
Loading