Merge pull request #661 from tenacioustommy/fix-title-schema

fix delete title schema
Merge pull request #662 from xqx333/main
2024-12-26 14:27:07 +08:00 · 2024-12-26 14:26:50 +08:00 · 2024-12-26 14:25:44 +08:00 · 2024-12-26 02:00:04 +08:00 · 2024-12-26 00:24:45 +08:00
3 changed files with 14 additions and 7 deletions
@@ -245,12 +245,12 @@ func removeAdditionalPropertiesWithDepth(schema interface{}, depth int) interfac
 	if !ok || len(v) == 0 {
 		return schema
 	}
-
+	// 删除所有的title字段
+	delete(v, "title")
 	// 如果type不为object和array，则直接返回
 	if typeVal, exists := v["type"]; !exists || (typeVal != "object" && typeVal != "array") {
 		return schema
 	}
-	delete(v, "title")
 	switch v["type"] {
 	case "object":
 		delete(v, "additionalProperties")
@@ -108,10 +108,17 @@ func TextHelper(c *gin.Context) (openaiErr *dto.OpenAIErrorWithStatusCode) {
 		}
 	}

-	promptTokens, err := getPromptTokens(textRequest, relayInfo)
-	// count messages token error 计算promptTokens错误
-	if err != nil {
-		return service.OpenAIErrorWrapper(err, "count_token_messages_failed", http.StatusInternalServerError)
+	// 获取 promptTokens，如果上下文中已经存在，则直接使用
+	var promptTokens int
+	if value, exists := c.Get("prompt_tokens"); exists {
+		promptTokens = value.(int)
+	} else {
+		promptTokens, err = getPromptTokens(textRequest, relayInfo)
+		// count messages token error 计算promptTokens错误
+		if err != nil {
+			return service.OpenAIErrorWrapper(err, "count_token_messages_failed", http.StatusInternalServerError)
+		}
+		c.Set("prompt_tokens", promptTokens)
 	}

 	if !getModelPriceSuccess {
@@ -143,7 +143,7 @@ const Detail = (props) => {
        content: [
          {
            key: (datum) => datum['Model'],
-            value: (datum) => renderQuotaNumberWithDigit(datum['rawQuota'] || 0, 4),
+            value: (datum) => renderQuota(datum['rawQuota'] || 0, 4),
          },
        ],
      },
Author	SHA1	Message	Date
Calcium-Ion	b3899a4635	Merge pull request #661 from tenacioustommy/fix-title-schema fix delete title schema	2024-12-26 14:27:07 +08:00
Calcium-Ion	b71e50339c	Merge pull request #662 from xqx333/main fix 重试过程多次获取图片	2024-12-26 14:26:50 +08:00
CalciumIon	340b2a230f	fix: update render function for quota display in Detail page	2024-12-26 14:25:44 +08:00
xqx333	541e07e6e7	Update relay-text.go 在上下文中存入promptTokens,避免重试过程重复计算	2024-12-26 02:00:04 +08:00
tenacious	18e308bdf7	fix delete title schema	2024-12-26 00:24:45 +08:00