huangzhenpc/newapi-yx-diy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: xai refusal reason"

Browse Source 
This reverts commit fd25b60e7a.
This commit is contained in:
Seefs
2026-01-25 16:38:58 +08:00
parent fd25b60e7a
commit 7d64e5908c
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package openai package openai
import ( import (
"bytes"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@@ -23,19 +22,6 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
) )
const xaiCSAMSafetyCheckType = "SAFETY_CHECK_TYPE_CSAM"
func maybeMarkXaiCSAMRefusal(c *gin.Context, info *relaycommon.RelayInfo, responseBody []byte) bool {
if c == nil || info == nil || len(responseBody) == 0 {
return false
}
if !bytes.Contains(responseBody, []byte(xaiCSAMSafetyCheckType)) {
return false
}
common.SetContextKey(c, constant.ContextKeyAdminRejectReason, "grok_safety_check_type=csam")
return true
}
func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, forceFormat bool, thinkToContent bool) error { func sendStreamData(c *gin.Context, info *relaycommon.RelayInfo, data string, forceFormat bool, thinkToContent bool) error {
if data == "" { if data == "" {
return nil return nil
@@ -215,7 +201,6 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
if err != nil { if err != nil {
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError) return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
} }
isXaiCSAMRefusal := maybeMarkXaiCSAMRefusal(c, info, responseBody)
if common.DebugEnabled { if common.DebugEnabled {
println("upstream response body:", string(responseBody)) println("upstream response body:", string(responseBody))
} }
@@ -237,16 +222,10 @@ func OpenaiHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Respo
err = common.Unmarshal(responseBody, &simpleResponse) err = common.Unmarshal(responseBody, &simpleResponse)
if err != nil { if err != nil {
if isXaiCSAMRefusal {
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError, types.ErrOptionWithSkipRetry())
}
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError) return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
} }
if oaiError := simpleResponse.GetOpenAIError(); oaiError != nil && oaiError.Type != "" { if oaiError := simpleResponse.GetOpenAIError(); oaiError != nil && oaiError.Type != "" {
if isXaiCSAMRefusal {
return nil, types.WithOpenAIError(*oaiError, resp.StatusCode, types.ErrOptionWithSkipRetry())
}
return nil, types.WithOpenAIError(*oaiError, resp.StatusCode) return nil, types.WithOpenAIError(*oaiError, resp.StatusCode)
} }