zfc/sub2api
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2197 from learnerLj/fix/ws-preflight-ping-fc-output-recovery

Browse Source 
fix: preflight ping 恢复时跳过携带 function_call_output 的请求
This commit is contained in:
Wesley Liddick 2026-05-05 17:21:21 +08:00 committed by GitHub
commit 94e494319a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/internal/service/openai_ws_forwarder.go
View File

@ -3135,6 +3135,12 @@ func (s *OpenAIGatewayService) ProxyResponsesWebSocketFromClient(
if turnPrevRecoveryTried || !s.openAIWSIngressPreviousResponseRecoveryEnabled() {
return false
}
// 携带 function_call_output 的请求不能丢弃 previous_response_id：
// 上游 API 需要 response chain 来匹配 tool_result 与之前的 tool_use，
// 丢弃后会导致 "No tool call found for function call output" 400 错误。
if gjson.GetBytes(currentPayload, `input.#(type=="function_call_output")`).Exists() {
return false
}
if isStrictAffinityTurn(currentPayload) {
// Layer 2：严格亲和链路命中 previous_response_not_found 时，降级为“去掉 previous_response_id 后重放一次”。
// 该错误说明续链锚点已失效，继续 strict fail-close 只会直接中断本轮请求。
@ -3401,7 +3407,11 @@ func (s *OpenAIGatewayService) ProxyResponsesWebSocketFromClient(
truncateOpenAIWSLogValue(pingErr.Error(), openAIWSLogValueMaxLen),
)
if forcePreferredConn {
if !turnPrevRecoveryTried && currentPreviousResponseID != "" {
// 携带 function_call_output 的请求不能丢弃 previous_response_id：
// 上游 API 需要 response chain 来匹配 tool_result 与之前的 tool_use，
// 丢弃后会导致 "No tool call found for function call output" 400 错误。
hasFCOutput := gjson.GetBytes(currentPayload, `input.#(type=="function_call_output")`).Exists()
if !turnPrevRecoveryTried && currentPreviousResponseID != "" && !hasFCOutput {
updatedPayload, removed, dropErr := dropPreviousResponseIDFromRawPayload(currentPayload)
if dropErr != nil || !removed {
reason := "not_removed"