oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance token usage details for upstream OpenRouter

Browse Source
This commit is contained in:
neotf
2025-05-29 00:49:21 +08:00
parent 361b0abec9
commit 66778efcc5
3 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
dto/openai_request.go
View File

@@ -18,43 +18,45 @@ type FormatJsonSchema struct {
} }
type GeneralOpenAIRequest struct { type GeneralOpenAIRequest struct {
Model string `json:"model,omitempty"` Model string `json:"model,omitempty"`
Messages []Message `json:"messages,omitempty"` Messages []Message `json:"messages,omitempty"`
Prompt any `json:"prompt,omitempty"` Prompt any `json:"prompt,omitempty"`
Prefix any `json:"prefix,omitempty"` Prefix any `json:"prefix,omitempty"`
Suffix any `json:"suffix,omitempty"` Suffix any `json:"suffix,omitempty"`
Stream bool `json:"stream,omitempty"` Stream bool `json:"stream,omitempty"`
StreamOptions *StreamOptions `json:"stream_options,omitempty"` StreamOptions *StreamOptions `json:"stream_options,omitempty"`
MaxTokens uint `json:"max_tokens,omitempty"` MaxTokens uint `json:"max_tokens,omitempty"`
MaxCompletionTokens uint `json:"max_completion_tokens,omitempty"` MaxCompletionTokens uint `json:"max_completion_tokens,omitempty"`
ReasoningEffort string `json:"reasoning_effort,omitempty"` ReasoningEffort string `json:"reasoning_effort,omitempty"`
//Reasoning json.RawMessage `json:"reasoning,omitempty"` Temperature *float64 `json:"temperature,omitempty"`
Temperature *float64 `json:"temperature,omitempty"` TopP float64 `json:"top_p,omitempty"`
TopP float64 `json:"top_p,omitempty"` TopK int `json:"top_k,omitempty"`
TopK int `json:"top_k,omitempty"` Stop any `json:"stop,omitempty"`
Stop any `json:"stop,omitempty"` N int `json:"n,omitempty"`
N int `json:"n,omitempty"` Input any `json:"input,omitempty"`
Input any `json:"input,omitempty"` Instruction string `json:"instruction,omitempty"`
Instruction string `json:"instruction,omitempty"` Size string `json:"size,omitempty"`
Size string `json:"size,omitempty"` Functions any `json:"functions,omitempty"`
Functions any `json:"functions,omitempty"` FrequencyPenalty float64 `json:"frequency_penalty,omitempty"`
FrequencyPenalty float64 `json:"frequency_penalty,omitempty"` PresencePenalty float64 `json:"presence_penalty,omitempty"`
PresencePenalty float64 `json:"presence_penalty,omitempty"` ResponseFormat *ResponseFormat `json:"response_format,omitempty"`
ResponseFormat *ResponseFormat `json:"response_format,omitempty"` EncodingFormat any `json:"encoding_format,omitempty"`
EncodingFormat any `json:"encoding_format,omitempty"` Seed float64 `json:"seed,omitempty"`
Seed float64 `json:"seed,omitempty"` ParallelTooCalls *bool `json:"parallel_tool_calls,omitempty"`
ParallelTooCalls *bool `json:"parallel_tool_calls,omitempty"` Tools []ToolCallRequest `json:"tools,omitempty"`
Tools []ToolCallRequest `json:"tools,omitempty"` ToolChoice any `json:"tool_choice,omitempty"`
ToolChoice any `json:"tool_choice,omitempty"` User string `json:"user,omitempty"`
User string `json:"user,omitempty"` LogProbs bool `json:"logprobs,omitempty"`
LogProbs bool `json:"logprobs,omitempty"` TopLogProbs int `json:"top_logprobs,omitempty"`
TopLogProbs int `json:"top_logprobs,omitempty"` Dimensions int `json:"dimensions,omitempty"`
Dimensions int `json:"dimensions,omitempty"` Modalities any `json:"modalities,omitempty"`
Modalities any `json:"modalities,omitempty"` Audio any `json:"audio,omitempty"`
Audio any `json:"audio,omitempty"` EnableThinking any `json:"enable_thinking,omitempty"` // ali
EnableThinking any `json:"enable_thinking,omitempty"` // ali ExtraBody any `json:"extra_body,omitempty"`
ExtraBody any `json:"extra_body,omitempty"` WebSearchOptions *WebSearchOptions `json:"web_search_options,omitempty"`
WebSearchOptions *WebSearchOptions `json:"web_search_options,omitempty"` // OpenRouter Params
Usage json.RawMessage `json:"usage,omitempty"`
Reasoning json.RawMessage `json:"reasoning,omitempty"`
} }
type ToolCallRequest struct { type ToolCallRequest struct {

3
relay/channel/openai/adaptor.go
View File

@@ -152,6 +152,9 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
if info.ChannelType != common.ChannelTypeOpenAI && info.ChannelType != common.ChannelTypeAzure { if info.ChannelType != common.ChannelTypeOpenAI && info.ChannelType != common.ChannelTypeAzure {
request.StreamOptions = nil request.StreamOptions = nil
} }
if info.ChannelType == common.ChannelTypeOpenRouter {
request.Usage = json.RawMessage("{\"include\": true}")
}
if strings.HasPrefix(request.Model, "o") { if strings.HasPrefix(request.Model, "o") {
if request.MaxCompletionTokens == 0 && request.MaxTokens != 0 { if request.MaxCompletionTokens == 0 && request.MaxTokens != 0 {
request.MaxCompletionTokens = request.MaxTokens request.MaxCompletionTokens = request.MaxTokens

9
service/convert.go
View File

@@ -246,12 +246,15 @@ func StreamResponseOpenAI2Claude(openAIResponse *dto.ChatCompletionsStreamRespon
} }
if info.Done { if info.Done {
claudeResponses = append(claudeResponses, generateStopBlock(info.ClaudeConvertInfo.Index)) claudeResponses = append(claudeResponses, generateStopBlock(info.ClaudeConvertInfo.Index))
if info.ClaudeConvertInfo.Usage != nil { oaiUsage := info.ClaudeConvertInfo.Usage
if oaiUsage != nil {
claudeResponses = append(claudeResponses, &dto.ClaudeResponse{ claudeResponses = append(claudeResponses, &dto.ClaudeResponse{
Type: "message_delta", Type: "message_delta",
Usage: &dto.ClaudeUsage{ Usage: &dto.ClaudeUsage{
InputTokens: info.ClaudeConvertInfo.Usage.PromptTokens, InputTokens: oaiUsage.PromptTokens,
OutputTokens: info.ClaudeConvertInfo.Usage.CompletionTokens, OutputTokens: oaiUsage.CompletionTokens,
CacheCreationInputTokens: oaiUsage.PromptTokensDetails.CachedCreationTokens,
CacheReadInputTokens: oaiUsage.PromptTokensDetails.CachedTokens,
}, },
Delta: &dto.ClaudeMediaMessage{ Delta: &dto.ClaudeMediaMessage{
StopReason: common.GetPointer[string](stopReasonOpenAI2Claude(info.FinishReason)), StopReason: common.GetPointer[string](stopReasonOpenAI2Claude(info.FinishReason)),