Merge remote-tracking branch 'origin/main'

# Conflicts:
#	web/src/components/PersonalSetting.js

controller/relay-text.go

@@ -357,6 +357,15 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		isStream = isStream || strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream")
 
 		if resp.StatusCode != http.StatusOK {
+			if preConsumedQuota != 0 {
+				go func() {
+					// return pre-consumed quota
+					err := model.PostConsumeTokenQuota(tokenId, -preConsumedQuota)
+					if err != nil {
+						common.SysError("error return pre-consumed quota: " + err.Error())
+					}
+				}()
+			}
 			return relayErrorHandler(resp)
 		}
 	}