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

refactor: remove unnecessary call to helper.Done and adjust data rendering in ClaudeChunkData

Browse Source
This commit is contained in:
CaIon
2025-05-04 17:35:45 +08:00
parent 48af027903
commit 419a056fbf
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
relay/channel/openai/relay-openai.go
View File

@@ -724,8 +724,6 @@ func OaiResponsesStreamHandler(c *gin.Context, resp *http.Response, info *relayc
return true return true
}) })
helper.Done(c)
if usage.CompletionTokens == 0 { if usage.CompletionTokens == 0 {
// 计算输出文本的 token 数量 // 计算输出文本的 token 数量
tempStr := responseTextBuilder.String() tempStr := responseTextBuilder.String()

2
relay/helper/common.go
View File

@@ -37,7 +37,7 @@ func ClaudeData(c *gin.Context, resp dto.ClaudeResponse) error {
func ClaudeChunkData(c *gin.Context, resp dto.ClaudeResponse, data string) { func ClaudeChunkData(c *gin.Context, resp dto.ClaudeResponse, data string) {
c.Render(-1, common.CustomEvent{Data: fmt.Sprintf("event: %s\n", resp.Type)}) c.Render(-1, common.CustomEvent{Data: fmt.Sprintf("event: %s\n", resp.Type)})
c.Render(-1, common.CustomEvent{Data: fmt.Sprintf("data: %s\n", data)}) c.Render(-1, common.CustomEvent{Data: fmt.Sprintf("data: %s", data)})
if flusher, ok := c.Writer.(http.Flusher); ok { if flusher, ok := c.Writer.(http.Flusher); ok {
flusher.Flush() flusher.Flush()
} }

4
relay/helper/stream_scanner.go
View File

@@ -32,7 +32,7 @@ func StreamScannerHandler(c *gin.Context, resp *http.Response, info *relaycommon
defer resp.Body.Close() defer resp.Body.Close()
streamingTimeout := time.Duration(constant.StreamingTimeout) * time.Second streamingTimeout := time.Duration(constant.StreamingTimeout) * time.Second
if strings.HasPrefix(info.UpstreamModelName, "o1") || strings.HasPrefix(info.UpstreamModelName, "o3") { if strings.HasPrefix(info.UpstreamModelName, "o") {
// twice timeout for thinking model // twice timeout for thinking model
streamingTimeout *= 2 streamingTimeout *= 2
} }
@@ -115,7 +115,7 @@ func StreamScannerHandler(c *gin.Context, resp *http.Response, info *relaycommon
} }
data = data[5:] data = data[5:]
data = strings.TrimLeft(data, " ") data = strings.TrimLeft(data, " ")
data = strings.TrimSuffix(data, "\"") data = strings.TrimSuffix(data, "\r")
if !strings.HasPrefix(data, "[DONE]") { if !strings.HasPrefix(data, "[DONE]") {
info.SetFirstResponseTime() info.SetFirstResponseTime()
writeMutex.Lock() // Lock before writing writeMutex.Lock() // Lock before writing