From 46930bc890558abf334aba7e3e5978b5f18e1e50 Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Sat, 11 Nov 2023 01:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E7=A7=BB=E9=99=A4=E8=BF=91?=
 =?UTF-8?q?=E4=BC=BC=E4=BC=B0=E7=AE=97token=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/constants.go                    |  2 +-
 controller/relay-utils.go              | 11 ++---------
 model/option.go                        |  3 ---
 web/src/components/OperationSetting.js |  7 -------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/common/constants.go b/common/constants.go
index 19a5c1c..a18ff74 100644
--- a/common/constants.go
+++ b/common/constants.go
@@ -84,7 +84,7 @@ var ChannelDisableThreshold = 5.0
 var AutomaticDisableChannelEnabled = false
 var QuotaRemindThreshold = 1000
 var PreConsumedQuota = 500
-var ApproximateTokenEnabled = false
+
 var RetryTimes = 0
 
 var RootUserEmail = ""
diff --git a/controller/relay-utils.go b/controller/relay-utils.go
index c586e71..d2f3d2f 100644
--- a/controller/relay-utils.go
+++ b/controller/relay-utils.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 	"one-api/common"
-	"regexp"
 	"strconv"
 	"strings"
 )
@@ -60,9 +59,6 @@ func getTokenEncoder(model string) *tiktoken.Tiktoken {
 }
 
 func getTokenNum(tokenEncoder *tiktoken.Tiktoken, text string) int {
-	if common.ApproximateTokenEnabled {
-		return int(float64(len(text)) * 0.38)
-	}
 	return len(tokenEncoder.Encode(text, nil, nil))
 }
 
@@ -118,11 +114,8 @@ func countTokenText(text string, model string) int {
 func errorWrapper(err error, code string, statusCode int) *OpenAIErrorWithStatusCode {
 	text := err.Error()
 	// 定义一个正则表达式匹配URL
-	urlPattern := `http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+`
-
-	urlRegexp, reErr := regexp.Compile(urlPattern)
-	if reErr == nil {
-		text = urlRegexp.ReplaceAllString(text, "https://api.openai.com")
+	if strings.Contains(text, "Post") {
+		text = "请求上游地址失败"
 	}
 	//避免暴露内部错误
 
diff --git a/model/option.go b/model/option.go
index a56ab4a..f68a08e 100644
--- a/model/option.go
+++ b/model/option.go
@@ -34,7 +34,6 @@ func InitOptionMap() {
 	common.OptionMap["TurnstileCheckEnabled"] = strconv.FormatBool(common.TurnstileCheckEnabled)
 	common.OptionMap["RegisterEnabled"] = strconv.FormatBool(common.RegisterEnabled)
 	common.OptionMap["AutomaticDisableChannelEnabled"] = strconv.FormatBool(common.AutomaticDisableChannelEnabled)
-	common.OptionMap["ApproximateTokenEnabled"] = strconv.FormatBool(common.ApproximateTokenEnabled)
 	common.OptionMap["LogConsumeEnabled"] = strconv.FormatBool(common.LogConsumeEnabled)
 	common.OptionMap["DisplayInCurrencyEnabled"] = strconv.FormatBool(common.DisplayInCurrencyEnabled)
 	common.OptionMap["DisplayTokenStatEnabled"] = strconv.FormatBool(common.DisplayTokenStatEnabled)
@@ -153,8 +152,6 @@ func updateOptionMap(key string, value string) (err error) {
 			common.EmailDomainRestrictionEnabled = boolValue
 		case "AutomaticDisableChannelEnabled":
 			common.AutomaticDisableChannelEnabled = boolValue
-		case "ApproximateTokenEnabled":
-			common.ApproximateTokenEnabled = boolValue
 		case "LogConsumeEnabled":
 			common.LogConsumeEnabled = boolValue
 		case "DisplayInCurrencyEnabled":
diff --git a/web/src/components/OperationSetting.js b/web/src/components/OperationSetting.js
index 2c31a26..c71de3c 100644
--- a/web/src/components/OperationSetting.js
+++ b/web/src/components/OperationSetting.js
@@ -19,7 +19,6 @@ const OperationSetting = () => {
         LogConsumeEnabled: '',
         DisplayInCurrencyEnabled: '',
         DisplayTokenStatEnabled: '',
-        ApproximateTokenEnabled: '',
         RetryTimes: 0
     });
     const [originInputs, setOriginInputs] = useState({});
@@ -201,12 +200,6 @@ const OperationSetting = () => {
                             name='DisplayTokenStatEnabled'
                             onChange={handleInputChange}
                         />
-                        <Form.Checkbox
-                            checked={inputs.ApproximateTokenEnabled === 'true'}
-                            label='使用近似的方式估算 token 数以减少计算量'
-                            name='ApproximateTokenEnabled'
-                            onChange={handleInputChange}
-                        />
                     </Form.Group>
                     <Form.Button onClick={() => {
                         submitConfig('general').then();