Przeglądaj źródła

feat: 记录更多的错误信息

1808837298@qq.com 2 lat temu
rodzic
commit
81167c4322
2 zmienionych plików z 5 dodań i 4 usunięć
  1. 4 3
      controller/relay.go
  2. 1 1
      middleware/distributor.go

+ 4 - 3
controller/relay.go

@@ -409,12 +409,13 @@ func RelayMidjourney(c *gin.Context) {
 			if err.Code == 30 {
 			if err.Code == 30 {
 				err.Result = "当前分组负载已饱和,请稍后再试,或升级账户以提升服务质量。"
 				err.Result = "当前分组负载已饱和,请稍后再试,或升级账户以提升服务质量。"
 			}
 			}
-			c.JSON(400, gin.H{
-				"error": err.Description + " " + err.Result,
+			c.JSON(429, gin.H{
+				"error": fmt.Sprintf("%s %s", err.Description, err.Result),
+				"type":  "upstream_error",
 			})
 			})
 		}
 		}
 		channelId := c.GetInt("channel_id")
 		channelId := c.GetInt("channel_id")
-		common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, err.Result))
+		common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, fmt.Sprintf("%s %s", err.Description, err.Result)))
 		//if shouldDisableChannel(&err.OpenAIError) {
 		//if shouldDisableChannel(&err.OpenAIError) {
 		//	channelId := c.GetInt("channel_id")
 		//	channelId := c.GetInt("channel_id")
 		//	channelName := c.GetString("channel_name")
 		//	channelName := c.GetString("channel_name")

+ 1 - 1
middleware/distributor.go

@@ -48,7 +48,7 @@ func Distribute() func(c *gin.Context) {
 				err = common.UnmarshalBodyReusable(c, &modelRequest)
 				err = common.UnmarshalBodyReusable(c, &modelRequest)
 			}
 			}
 			if err != nil {
 			if err != nil {
-				abortWithMessage(c, http.StatusBadRequest, "无效的请求: "+err.Error())
+				abortWithMessage(c, http.StatusBadRequest, "无效的请求, "+err.Error())
 				return
 				return
 			}
 			}
 			if strings.HasPrefix(c.Request.URL.Path, "/v1/moderations") {
 			if strings.HasPrefix(c.Request.URL.Path, "/v1/moderations") {