Merge pull request #2994 from seefs001/fix/grok-violates-check

Calcium-Ion · web-flow · commit 7cf35ca8db2b · 2026-02-23T22:03:52.000+08:00
fix: violation fee check
diff --git a/service/violation_fee.go b/service/violation_fee.go
@@ -18,8 +18,9 @@ import (
 )
 
 const (
-	ViolationFeeCodePrefix = "violation_fee."
-	CSAMViolationMarker    = "Failed check: SAFETY_CHECK_TYPE_CSAM"
+	ViolationFeeCodePrefix     = "violation_fee."
+	CSAMViolationMarker        = "Failed check: SAFETY_CHECK_TYPE"
+	ContentViolatesUsageMarker = "Content violates usage guidelines"
 )
 
 func IsViolationFeeCode(code types.ErrorCode) bool {
@@ -30,11 +31,11 @@ func HasCSAMViolationMarker(err *types.NewAPIError) bool {
 	if err == nil {
 		return false
 	}
-	if strings.Contains(err.Error(), CSAMViolationMarker) {
+	if strings.Contains(err.Error(), CSAMViolationMarker) || strings.Contains(err.Error(), ContentViolatesUsageMarker) {
 		return true
 	}
 	msg := err.ToOpenAIError().Message
-	return strings.Contains(msg, CSAMViolationMarker)
+	return strings.Contains(msg, CSAMViolationMarker) || strings.Contains(err.Error(), ContentViolatesUsageMarker)
 }
 
 func WrapAsViolationFeeGrokCSAM(err *types.NewAPIError) *types.NewAPIError {

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ import (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`const (`
`21`		`- ViolationFeeCodePrefix = "violation_fee."`
`22`		`- CSAMViolationMarker = "Failed check: SAFETY_CHECK_TYPE_CSAM"`
	`21`	`+ ViolationFeeCodePrefix = "violation_fee."`
	`22`	`+ CSAMViolationMarker = "Failed check: SAFETY_CHECK_TYPE"`
	`23`	`+ ContentViolatesUsageMarker = "Content violates usage guidelines"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`func IsViolationFeeCode(code types.ErrorCode) bool {`
`@@ -30,11 +31,11 @@ func HasCSAMViolationMarker(err *types.NewAPIError) bool {`
`30`	`31`	`if err == nil {`
`31`	`32`	`return false`
`32`	`33`	`}`
`33`		`- if strings.Contains(err.Error(), CSAMViolationMarker) {`
	`34`	`+ if strings.Contains(err.Error(), CSAMViolationMarker) \|\| strings.Contains(err.Error(), ContentViolatesUsageMarker) {`
`34`	`35`	`return true`
`35`	`36`	`}`
`36`	`37`	`msg := err.ToOpenAIError().Message`
`37`		`- return strings.Contains(msg, CSAMViolationMarker)`
	`38`	`+ return strings.Contains(msg, CSAMViolationMarker) \|\| strings.Contains(err.Error(), ContentViolatesUsageMarker)`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`func WrapAsViolationFeeGrokCSAM(err types.NewAPIError) types.NewAPIError {`