refactor: refactor config part

refactor: refactor relay part
2025-11-06 00:33:43 +08:00 · 2024-01-21 23:18:32 +08:00 · 2024-01-21 22:56:20 +08:00
9 changed files with 15 additions and 137 deletions
--- a/README.en.md
+++ b/README.en.md
@@ -134,12 +134,12 @@ The initial account username is `root` and password is `123456`.
   git clone https://github.com/songquanpeng/one-api.git
   
   # Build the frontend
-   cd one-api/web/default
+   cd one-api/web
   npm install
   npm run build
   
   # Build the backend
-   cd ../..
+   cd ..
   go mod download
   go build -ldflags "-s -w" -o one-api
   ```
--- a/README.ja.md
+++ b/README.ja.md
@@ -135,12 +135,12 @@ sudo service nginx restart
   git clone https://github.com/songquanpeng/one-api.git

   # フロントエンドのビルド
-   cd one-api/web/default
+   cd one-api/web
   npm install
   npm run build

   # バックエンドのビルド
-   cd ../..
+   cd ..
   go mod download
   go build -ldflags "-s -w" -o one-api
   ```
--- a/README.md
+++ b/README.md
@@ -174,12 +174,12 @@ docker-compose ps
   git clone https://github.com/songquanpeng/one-api.git
   
   # 构建前端
-   cd one-api/web/default
+   cd one-api/web
   npm install
   npm run build
   
   # 构建后端
-   cd ../..
+   cd ..
   go mod download
   go build -ldflags "-s -w" -o one-api
   ````
--- a/common/model-ratio.go
+++ b/common/model-ratio.go
@@ -45,8 +45,6 @@ var ModelRatio = map[string]float64{
 	"gpt-4-32k-0314":            30,
 	"gpt-4-32k-0613":            30,
 	"gpt-4-1106-preview":        5,    // $0.01 / 1K tokens
-	"gpt-4-0125-preview":        5,    // $0.01 / 1K tokens
-	"gpt-4-turbo-preview":       5,    // $0.01 / 1K tokens
 	"gpt-4-vision-preview":      5,    // $0.01 / 1K tokens
 	"gpt-3.5-turbo":             0.75, // $0.0015 / 1K tokens
 	"gpt-3.5-turbo-0301":        0.75,
@@ -55,7 +53,6 @@ var ModelRatio = map[string]float64{
 	"gpt-3.5-turbo-16k-0613":    1.5,
 	"gpt-3.5-turbo-instruct":    0.75, // $0.0015 / 1K tokens
 	"gpt-3.5-turbo-1106":        0.5,  // $0.001 / 1K tokens
-	"gpt-3.5-turbo-0125":        0.25, // $0.0005 / 1K tokens
 	"davinci-002":               1,    // $0.002 / 1K tokens
 	"babbage-002":               0.2,  // $0.0004 / 1K tokens
 	"text-ada-001":              0.2,
@@ -75,8 +72,6 @@ var ModelRatio = map[string]float64{
 	"babbage":                   10,
 	"ada":                       10,
 	"text-embedding-ada-002":    0.05,
-	"text-embedding-3-small":    0.01,
-	"text-embedding-3-large":    0.065,
 	"text-search-ada-doc-001":   10,
 	"text-moderation-stable":    0.1,
 	"text-moderation-latest":    0.1,
@@ -135,31 +130,8 @@ func GetModelRatio(name string) float64 {
 	return ratio
 }

-var CompletionRatio = map[string]float64{}
-
-func CompletionRatio2JSONString() string {
-	jsonBytes, err := json.Marshal(CompletionRatio)
-	if err != nil {
-		logger.SysError("error marshalling completion ratio: " + err.Error())
-	}
-	return string(jsonBytes)
-}
-
-func UpdateCompletionRatioByJSONString(jsonStr string) error {
-	CompletionRatio = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &CompletionRatio)
-}
-
 func GetCompletionRatio(name string) float64 {
-	if ratio, ok := CompletionRatio[name]; ok {
-		return ratio
-	}
 	if strings.HasPrefix(name, "gpt-3.5") {
-		if strings.HasSuffix(name, "0125") {
-			// https://openai.com/blog/new-embedding-models-and-api-updates
-			// Updated GPT-3.5 Turbo model and lower pricing
-			return 3
-		}
 		if strings.HasSuffix(name, "1106") {
 			return 2
 		}
--- a/controller/model.go
+++ b/controller/model.go
@@ -171,15 +171,6 @@ func init() {
 			Root:       "gpt-3.5-turbo-1106",
 			Parent:     nil,
 		},
-		{
-			Id:         "gpt-3.5-turbo-0125",
-			Object:     "model",
-			Created:    1706232090,
-			OwnedBy:    "openai",
-			Permission: permission,
-			Root:       "gpt-3.5-turbo-0125",
-			Parent:     nil,
-		},
 		{
 			Id:         "gpt-3.5-turbo-instruct",
 			Object:     "model",
@@ -252,24 +243,6 @@ func init() {
 			Root:       "gpt-4-1106-preview",
 			Parent:     nil,
 		},
-		{
-			Id:         "gpt-4-0125-preview",
-			Object:     "model",
-			Created:    1706232090,
-			OwnedBy:    "openai",
-			Permission: permission,
-			Root:       "gpt-4-0125-preview",
-			Parent:     nil,
-		},
-		{
-			Id:         "gpt-4-turbo-preview",
-			Object:     "model",
-			Created:    1706232090,
-			OwnedBy:    "openai",
-			Permission: permission,
-			Root:       "gpt-4-turbo-preview",
-			Parent:     nil,
-		},
 		{
 			Id:         "gpt-4-vision-preview",
 			Object:     "model",
@@ -288,24 +261,6 @@ func init() {
 			Root:       "text-embedding-ada-002",
 			Parent:     nil,
 		},
-		{
-			Id:         "text-embedding-3-small",
-			Object:     "model",
-			Created:    1706232090,
-			OwnedBy:    "openai",
-			Permission: permission,
-			Root:       "text-embedding-3-small",
-			Parent:     nil,
-		},
-		{
-			Id:         "text-embedding-3-large",
-			Object:     "model",
-			Created:    1706232090,
-			OwnedBy:    "openai",
-			Permission: permission,
-			Root:       "text-embedding-3-large",
-			Parent:     nil,
-		},
 		{
 			Id:         "text-davinci-003",
 			Object:     "model",
--- a/model/option.go
+++ b/model/option.go
@@ -66,7 +66,6 @@ func InitOptionMap() {
 	config.OptionMap["PreConsumedQuota"] = strconv.Itoa(config.PreConsumedQuota)
 	config.OptionMap["ModelRatio"] = common.ModelRatio2JSONString()
 	config.OptionMap["GroupRatio"] = common.GroupRatio2JSONString()
-	config.OptionMap["CompletionRatio"] = common.CompletionRatio2JSONString()
 	config.OptionMap["TopUpLink"] = config.TopUpLink
 	config.OptionMap["ChatLink"] = config.ChatLink
 	config.OptionMap["QuotaPerUnit"] = strconv.FormatFloat(config.QuotaPerUnit, 'f', -1, 64)
@@ -199,8 +198,6 @@ func updateOptionMap(key string, value string) (err error) {
 		err = common.UpdateModelRatioByJSONString(value)
 	case "GroupRatio":
 		err = common.UpdateGroupRatioByJSONString(value)
-	case "CompletionRatio":
-		err = common.UpdateCompletionRatioByJSONString(value)
 	case "TopUpLink":
 		config.TopUpLink = value
 	case "ChatLink":
--- a/web/berry/src/views/Setting/component/OperationSetting.js
+++ b/web/berry/src/views/Setting/component/OperationSetting.js
@@ -27,7 +27,6 @@ const OperationSetting = () => {
    QuotaRemindThreshold: 0,
    PreConsumedQuota: 0,
    ModelRatio: "",
-    CompletionRatio: "",
    GroupRatio: "",
    TopUpLink: "",
    ChatLink: "",
@@ -53,12 +52,9 @@ const OperationSetting = () => {
    if (success) {
      let newInputs = {};
      data.forEach((item) => {
-        if (item.key === "ModelRatio" || item.key === "GroupRatio" || item.key === "CompletionRatio") {
+        if (item.key === "ModelRatio" || item.key === "GroupRatio") {
          item.value = JSON.stringify(JSON.parse(item.value), null, 2);
        }
-        if (item.value === '{}') {
-          item.value = '';
-        }
        newInputs[item.key] = item.value;
      });
      setInputs(newInputs);
@@ -137,13 +133,6 @@ const OperationSetting = () => {
          }
          await updateOption("GroupRatio", inputs.GroupRatio);
        }
-        if (originInputs['CompletionRatio'] !== inputs.CompletionRatio) {
-          if (!verifyJSON(inputs.CompletionRatio)) {
-            showError('补全倍率不是合法的 JSON 字符串');
-            return;
-          }
-          await updateOption('CompletionRatio', inputs.CompletionRatio);
-        }
        break;
      case "quota":
        if (originInputs["QuotaForNewUser"] !== inputs.QuotaForNewUser) {
@@ -511,20 +500,7 @@ const OperationSetting = () => {
              placeholder="为一个 JSON 文本，键为模型名称，值为倍率"
            />
          </FormControl>
-          <FormControl fullWidth>
-            <TextField
-              multiline
-              maxRows={15}
-              id="channel-CompletionRatio-label"
-              label="补全倍率"
-              value={inputs.CompletionRatio}
-              name="CompletionRatio"
-              onChange={handleInputChange}
-              aria-describedby="helper-text-channel-CompletionRatio-label"
-              minRows={5}
-              placeholder="为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例"
-            />
-          </FormControl>
+
          <FormControl fullWidth>
            <TextField
              multiline
--- a/web/berry/src/views/Token/component/TableRow.js
+++ b/web/berry/src/views/Token/component/TableRow.js
@@ -192,7 +192,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
              id={`switch-${item.id}`}
              checked={statusSwitch === 1}
              onChange={handleStatus}
-            // disabled={statusSwitch !== 1 && statusSwitch !== 2}
+              // disabled={statusSwitch !== 1 && statusSwitch !== 2}
            />
          </Tooltip>
        </TableCell>
@@ -222,7 +222,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
              </Button>
            </ButtonGroup>
            <ButtonGroup size="small" aria-label="split button">
-              <Button color="primary" onClick={(e) => handleCopy(COPY_OPTIONS[0], 'link')}>聊天</Button>
+              <Button color="primary">聊天</Button>
              <Button size="small" onClick={(e) => handleOpenMenu(e, 'link')}>
                <IconCaretDownFilled size={'16px'} />
              </Button>
--- a/web/default/src/components/OperationSetting.js
+++ b/web/default/src/components/OperationSetting.js
@@ -11,7 +11,6 @@ const OperationSetting = () => {
    QuotaRemindThreshold: 0,
    PreConsumedQuota: 0,
    ModelRatio: '',
-    CompletionRatio: '',
    GroupRatio: '',
    TopUpLink: '',
    ChatLink: '',
@@ -35,12 +34,9 @@ const OperationSetting = () => {
    if (success) {
      let newInputs = {};
      data.forEach((item) => {
-        if (item.key === 'ModelRatio' || item.key === 'GroupRatio' || item.key === 'CompletionRatio') {
+        if (item.key === 'ModelRatio' || item.key === 'GroupRatio') {
          item.value = JSON.stringify(JSON.parse(item.value), null, 2);
        }
-        if (item.value === '{}') {
-          item.value = '';
-        }
        newInputs[item.key] = item.value;
      });
      setInputs(newInputs);
@@ -105,13 +101,6 @@ const OperationSetting = () => {
          }
          await updateOption('GroupRatio', inputs.GroupRatio);
        }
-        if (originInputs['CompletionRatio'] !== inputs.CompletionRatio) {
-          if (!verifyJSON(inputs.CompletionRatio)) {
-            showError('补全倍率不是合法的 JSON 字符串');
-            return;
-          }
-          await updateOption('CompletionRatio', inputs.CompletionRatio);
-        }
        break;
      case 'quota':
        if (originInputs['QuotaForNewUser'] !== inputs.QuotaForNewUser) {
@@ -282,10 +271,10 @@ const OperationSetting = () => {
              onChange={handleInputChange}
            />
            <Form.Checkbox
-              checked={inputs.AutomaticEnableChannelEnabled === 'true'}
-              label='成功时自动启用通道'
-              name='AutomaticEnableChannelEnabled'
-              onChange={handleInputChange}
+                checked={inputs.AutomaticEnableChannelEnabled === 'true'}
+                label='成功时自动启用通道'
+                name='AutomaticEnableChannelEnabled'
+                onChange={handleInputChange}
            />
          </Form.Group>
          <Form.Button onClick={() => {
@@ -355,17 +344,6 @@ const OperationSetting = () => {
              placeholder='为一个 JSON 文本，键为模型名称，值为倍率'
            />
          </Form.Group>
-          <Form.Group widths='equal'>
-            <Form.TextArea
-              label='补全倍率'
-              name='CompletionRatio'
-              onChange={handleInputChange}
-              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete='new-password'
-              value={inputs.CompletionRatio}
-              placeholder='为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例'
-            />
-          </Form.Group>
          <Form.Group widths='equal'>
            <Form.TextArea
              label='分组倍率'
Author	SHA1	Message	Date
JustSong	42569c83c0	refactor: refactor config part	2024-01-21 23:18:32 +08:00
JustSong	b373882814	refactor: refactor relay part	2024-01-21 22:56:20 +08:00