|
|
@@ -46,9 +46,17 @@ func OaiResponsesHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
|
|
|
usage.PromptTokensDetails.CachedTokens = responsesResponse.Usage.InputTokensDetails.CachedTokens
|
|
|
}
|
|
|
}
|
|
|
+ if info == nil || info.ResponsesUsageInfo == nil || info.ResponsesUsageInfo.BuiltInTools == nil {
|
|
|
+ return &usage, nil
|
|
|
+ }
|
|
|
// 解析 Tools 用量
|
|
|
for _, tool := range responsesResponse.Tools {
|
|
|
- info.ResponsesUsageInfo.BuiltInTools[common.Interface2String(tool["type"])].CallCount++
|
|
|
+ buildToolinfo, ok := info.ResponsesUsageInfo.BuiltInTools[common.Interface2String(tool["type"])]
|
|
|
+ if !ok || buildToolinfo == nil {
|
|
|
+ logger.LogError(c, fmt.Sprintf("BuiltInTools not found for tool type: %v", tool["type"]))
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ buildToolinfo.CallCount++
|
|
|
}
|
|
|
return &usage, nil
|
|
|
}
|
|
|
@@ -72,7 +80,7 @@ func OaiResponsesStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp
|
|
|
sendResponsesStreamData(c, streamResponse, data)
|
|
|
switch streamResponse.Type {
|
|
|
case "response.completed":
|
|
|
- if streamResponse.Response.Usage != nil {
|
|
|
+ if streamResponse.Response != nil && streamResponse.Response.Usage != nil {
|
|
|
if streamResponse.Response.Usage.InputTokens != 0 {
|
|
|
usage.PromptTokens = streamResponse.Response.Usage.InputTokens
|
|
|
}
|