Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(ai-proxy): add chat completion usage for dashscope director #6389

Merged
merged 3 commits into from
Jul 8, 2024
Merged

feat(ai-proxy): add chat completion usage for dashscope director #6389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
711dbc4
feat(ai-proxy): add chat completion usage for dashscope director
sfwn Jul 5, 2024
10e8a19
tidy go.sum
sfwn Jul 5, 2024
bdfb546
stream resp only have usage field at last chunk
sfwn Jul 5, 2024
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/russross/blackfriday/v2 v2.1.0
github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
github.com/sashabaranov/go-openai v1.17.9
github.com/sashabaranov/go-openai v1.26.2
github.com/satori/go.uuid v1.2.0
github.com/scylladb/gocqlx v1.5.0
github.com/shirou/gopsutil v3.21.11+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2469,8 +2469,8 @@ github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu
github.com/santhosh-tekuri/jsonschema v1.2.4 h1:hNhW8e7t+H1vgY+1QeEQpveR6D4+OwKPXCfD2aieJis=
github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
github.com/sashabaranov/go-openai v1.17.9 h1:QEoBiGKWW68W79YIfXWEFZ7l5cEgZBV4/Ow3uy+5hNY=
github.com/sashabaranov/go-openai v1.17.9/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
github.com/sashabaranov/go-openai v1.26.2 h1:cVlQa3gn3eYqNXRW03pPlpy6zLG52EU4g0FrWXc0EFI=
github.com/sashabaranov/go-openai v1.26.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ=
Expand Down
7 changes: 7 additions & 0 deletions internal/apps/ai-proxy/filters/dashscope-director/sdk/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,12 @@ func ConvertDsStreamChunkToOpenAIFormat(dsChunk DsRespStreamChunk, modelName str
Model: modelName,
Choices: ocs,
}
if dsChunk.Usage != nil {
openaiChunk.Usage = &openai.Usage{
PromptTokens: int(dsChunk.Usage.InputTokens),
CompletionTokens: int(dsChunk.Usage.OutputTokens),
TotalTokens: int(dsChunk.Usage.TotalTokens),
}
}
return &openaiChunk, nil
}
6 changes: 6 additions & 0 deletions internal/apps/ai-proxy/filters/dashscope-director/sdk/resp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type (
DsRespStreamChunk struct {
Output DsRespStreamChunkOutput `json:"output,omitempty"`
RequestID string `json:"request_id,omitempty"`
Usage *DsRespStreamUsage `json:"usage,omitempty"`
}
DsRespStreamChunkOutput struct {
Choices []DsRespStreamChunkOutputChoice `json:"choices,omitempty"`
Expand All @@ -34,4 +35,9 @@ type (
DsRespStreamChunkOutputChoiceMessagePart struct {
Text string `json:"text,omitempty"`
}
DsRespStreamUsage struct {
TotalTokens uint64 `json:"total_tokens"`
InputTokens uint64 `json:"input_tokens"`
OutputTokens uint64 `json:"output_tokens"`
}
)
Loading