-
-
Notifications
You must be signed in to change notification settings - Fork 230
feat: calculate API costs for agent steps #1697
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package agentstep | ||
|
|
||
| import ( | ||
| "github.com/dagu-org/dagu/internal/agent" | ||
| "github.com/dagu-org/dagu/internal/core/exec" | ||
| "github.com/dagu-org/dagu/internal/llm" | ||
| ) | ||
|
|
||
| // convertMessage converts an agent.Message to one or more exec.LLMMessage values. | ||
| // User messages with tool results expand to one message per result (Role=Tool). | ||
| func convertMessage(msg agent.Message, modelCfg *agent.ModelConfig) []exec.LLMMessage { | ||
| switch msg.Type { | ||
| case agent.MessageTypeAssistant: | ||
| return []exec.LLMMessage{convertAssistantMessage(msg, modelCfg)} | ||
|
|
||
| case agent.MessageTypeUser: | ||
| if len(msg.ToolResults) > 0 { | ||
| return convertToolResultMessages(msg) | ||
| } | ||
| return []exec.LLMMessage{{ | ||
| Role: exec.RoleUser, | ||
| Content: msg.Content, | ||
| }} | ||
|
|
||
| case agent.MessageTypeError: | ||
| return []exec.LLMMessage{{ | ||
| Role: exec.RoleAssistant, | ||
| Content: msg.Content, | ||
| }} | ||
|
|
||
| default: | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| // convertAssistantMessage converts an assistant agent.Message to an exec.LLMMessage. | ||
| func convertAssistantMessage(msg agent.Message, modelCfg *agent.ModelConfig) exec.LLMMessage { | ||
| m := exec.LLMMessage{ | ||
| Role: exec.RoleAssistant, | ||
| Content: msg.Content, | ||
| } | ||
|
|
||
| // Convert tool calls if present. | ||
| if len(msg.ToolCalls) > 0 { | ||
| m.ToolCalls = make([]exec.ToolCall, len(msg.ToolCalls)) | ||
| for i, tc := range msg.ToolCalls { | ||
| m.ToolCalls[i] = exec.ToolCall{ | ||
| ID: tc.ID, | ||
| Type: tc.Type, | ||
| Function: exec.ToolCallFunction{ | ||
| Name: tc.Function.Name, | ||
| Arguments: tc.Function.Arguments, | ||
| }, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Build metadata with provider/model and optional usage/cost. | ||
| metadata := &exec.LLMMessageMetadata{ | ||
| Provider: modelCfg.Provider, | ||
| Model: modelCfg.Model, | ||
| } | ||
| if msg.Usage != nil { | ||
| metadata.PromptTokens = msg.Usage.PromptTokens | ||
| metadata.CompletionTokens = msg.Usage.CompletionTokens | ||
| metadata.TotalTokens = msg.Usage.TotalTokens | ||
| } | ||
| if msg.Cost != nil { | ||
| metadata.Cost = *msg.Cost | ||
| } | ||
| m.Metadata = metadata | ||
|
|
||
| return m | ||
| } | ||
|
|
||
| // contextToLLMHistory converts context messages to llm.Message for LoopConfig.History. | ||
| // System messages are filtered out since the loop handles system prompt separately. | ||
| func contextToLLMHistory(msgs []exec.LLMMessage) []llm.Message { | ||
| if len(msgs) == 0 { | ||
| return nil | ||
| } | ||
| var result []llm.Message | ||
| for _, msg := range msgs { | ||
| if msg.Role == exec.RoleSystem { | ||
| continue | ||
| } | ||
| m := llm.Message{ | ||
| Role: llm.Role(msg.Role), | ||
| Content: msg.Content, | ||
| ToolCallID: msg.ToolCallID, | ||
| } | ||
| if len(msg.ToolCalls) > 0 { | ||
| m.ToolCalls = make([]llm.ToolCall, len(msg.ToolCalls)) | ||
| for j, tc := range msg.ToolCalls { | ||
| m.ToolCalls[j] = llm.ToolCall{ | ||
| ID: tc.ID, | ||
| Type: tc.Type, | ||
| Function: llm.ToolCallFunction{ | ||
| Name: tc.Function.Name, | ||
| Arguments: tc.Function.Arguments, | ||
| }, | ||
| } | ||
| } | ||
| } | ||
| result = append(result, m) | ||
| } | ||
| return result | ||
| } | ||
|
|
||
| // convertToolResultMessages converts a user message with tool results | ||
| // into one exec.LLMMessage per tool result (Role=Tool). | ||
| func convertToolResultMessages(msg agent.Message) []exec.LLMMessage { | ||
| msgs := make([]exec.LLMMessage, len(msg.ToolResults)) | ||
| for i, tr := range msg.ToolResults { | ||
| msgs[i] = exec.LLMMessage{ | ||
| Role: exec.RoleTool, | ||
| Content: tr.Content, | ||
| ToolCallID: tr.ToolCallID, | ||
| } | ||
| } | ||
| return msgs | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| package agentstep | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/dagu-org/dagu/internal/agent" | ||
| "github.com/dagu-org/dagu/internal/core/exec" | ||
| "github.com/dagu-org/dagu/internal/llm" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func testModelConfig() *agent.ModelConfig { | ||
| return &agent.ModelConfig{ | ||
| Provider: "openai", | ||
| Model: "gpt-4", | ||
| } | ||
| } | ||
|
|
||
| func TestConvertMessage_AssistantWithUsageAndCost(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| cost := 0.0042 | ||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeAssistant, | ||
| Content: "hello world", | ||
| Usage: &llm.Usage{ | ||
| PromptTokens: 100, | ||
| CompletionTokens: 50, | ||
| TotalTokens: 150, | ||
| }, | ||
| Cost: &cost, | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 1) | ||
| m := result[0] | ||
| assert.Equal(t, exec.RoleAssistant, m.Role) | ||
| assert.Equal(t, "hello world", m.Content) | ||
| require.NotNil(t, m.Metadata) | ||
| assert.Equal(t, "openai", m.Metadata.Provider) | ||
| assert.Equal(t, "gpt-4", m.Metadata.Model) | ||
| assert.Equal(t, 100, m.Metadata.PromptTokens) | ||
| assert.Equal(t, 50, m.Metadata.CompletionTokens) | ||
| assert.Equal(t, 150, m.Metadata.TotalTokens) | ||
| assert.InDelta(t, 0.0042, m.Metadata.Cost, 1e-9) | ||
| } | ||
|
|
||
| func TestConvertMessage_AssistantWithToolCalls(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeAssistant, | ||
| Content: "", | ||
| ToolCalls: []llm.ToolCall{ | ||
| { | ||
| ID: "call_1", | ||
| Type: "function", | ||
| Function: llm.ToolCallFunction{ | ||
| Name: "bash", | ||
| Arguments: `{"command":"ls"}`, | ||
| }, | ||
| }, | ||
| { | ||
| ID: "call_2", | ||
| Type: "function", | ||
| Function: llm.ToolCallFunction{ | ||
| Name: "read", | ||
| Arguments: `{"path":"/tmp/test"}`, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 1) | ||
| m := result[0] | ||
| assert.Equal(t, exec.RoleAssistant, m.Role) | ||
| require.Len(t, m.ToolCalls, 2) | ||
|
|
||
| assert.Equal(t, "call_1", m.ToolCalls[0].ID) | ||
| assert.Equal(t, "function", m.ToolCalls[0].Type) | ||
| assert.Equal(t, "bash", m.ToolCalls[0].Function.Name) | ||
| assert.Equal(t, `{"command":"ls"}`, m.ToolCalls[0].Function.Arguments) | ||
|
|
||
| assert.Equal(t, "call_2", m.ToolCalls[1].ID) | ||
| assert.Equal(t, "read", m.ToolCalls[1].Function.Name) | ||
| } | ||
|
|
||
| func TestConvertMessage_UserNoToolResults(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeUser, | ||
| Content: "user input", | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 1) | ||
| assert.Equal(t, exec.RoleUser, result[0].Role) | ||
| assert.Equal(t, "user input", result[0].Content) | ||
| assert.Nil(t, result[0].Metadata) | ||
| } | ||
|
|
||
| func TestConvertMessage_UserWithToolResults(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeUser, | ||
| ToolResults: []agent.ToolResult{ | ||
| {ToolCallID: "call_1", Content: "result 1"}, | ||
| {ToolCallID: "call_2", Content: "result 2"}, | ||
| }, | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 2) | ||
|
|
||
| assert.Equal(t, exec.RoleTool, result[0].Role) | ||
| assert.Equal(t, "result 1", result[0].Content) | ||
| assert.Equal(t, "call_1", result[0].ToolCallID) | ||
|
|
||
| assert.Equal(t, exec.RoleTool, result[1].Role) | ||
| assert.Equal(t, "result 2", result[1].Content) | ||
| assert.Equal(t, "call_2", result[1].ToolCallID) | ||
| } | ||
|
|
||
| func TestConvertMessage_NilUsageAndCost(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeAssistant, | ||
| Content: "response", | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 1) | ||
| m := result[0] | ||
| require.NotNil(t, m.Metadata) | ||
| assert.Equal(t, "openai", m.Metadata.Provider) | ||
| assert.Equal(t, "gpt-4", m.Metadata.Model) | ||
| assert.Equal(t, 0, m.Metadata.PromptTokens) | ||
| assert.Equal(t, 0, m.Metadata.CompletionTokens) | ||
| assert.Equal(t, 0, m.Metadata.TotalTokens) | ||
| assert.InDelta(t, 0.0, m.Metadata.Cost, 1e-9) | ||
| } | ||
|
|
||
| func TestConvertMessage_ErrorType(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeError, | ||
| Content: "something went wrong", | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
|
|
||
| require.Len(t, result, 1) | ||
| assert.Equal(t, exec.RoleAssistant, result[0].Role) | ||
| assert.Equal(t, "something went wrong", result[0].Content) | ||
yottahmd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| func TestConvertMessage_UnknownType(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| msg := agent.Message{ | ||
| Type: agent.MessageTypeUIAction, | ||
| Content: "navigate", | ||
| } | ||
|
|
||
| result := convertMessage(msg, testModelConfig()) | ||
| assert.Nil(t, result) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.