Merge remote-tracking branch 'songquanpeng/main'

# Conflicts:
#	controller/model.go

common/model-ratio.go

@@ -2,16 +2,23 @@ package common
 
 import "encoding/json"
 
+// ModelRatio
 // https://platform.openai.com/docs/models/model-endpoint-compatibility
 // https://openai.com/pricing
 // TODO: when a new api is enabled, check the pricing here
+// 1 === $0.002 / 1K tokens
 var ModelRatio = map[string]float64{
 	"gpt-4":                   15,
 	"gpt-4-0314":              15,
+	"gpt-4-0613":              15,
 	"gpt-4-32k":               30,
 	"gpt-4-32k-0314":          30,
-	"gpt-3.5-turbo":           1, // $0.002 / 1K tokens
+	"gpt-4-32k-0613":          30,
-	"gpt-3.5-turbo-0301":      1,
+	"gpt-3.5-turbo":           0.75, // $0.0015 / 1K tokens
+	"gpt-3.5-turbo-0301":      0.75,
+	"gpt-3.5-turbo-0613":      0.75,
+	"gpt-3.5-turbo-16k":       1.5, // $0.003 / 1K tokens
+	"gpt-3.5-turbo-16k-0613":  1.5,
 	"text-ada-001":            0.2,
 	"text-babbage-001":        0.25,
 	"text-curie-001":          1,

controller/model.go

@@ -72,21 +72,30 @@ func init() {
 			Parent:     nil,
 		},
 		{
-			Id:         "gpt-35-turbo",
+			Id:         "gpt-3.5-turbo-0613",
 			Object:     "model",
 			Created:    1677649963,
 			OwnedBy:    "openai",
 			Permission: permission,
-			Root:       "gpt-35-turbo",
+			Root:       "gpt-3.5-turbo-0613",
 			Parent:     nil,
 		},
 		{
-			Id:         "gpt-35-turbo-0301",
+			Id:         "gpt-3.5-turbo-16k",
 			Object:     "model",
 			Created:    1677649963,
 			OwnedBy:    "openai",
 			Permission: permission,
-			Root:       "gpt-35-turbo-0301",
+			Root:       "gpt-3.5-turbo-16k",
+			Parent:     nil,
+		},
+		{
+			Id:         "gpt-3.5-turbo-16k-0613",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "openai",
+			Permission: permission,
+			Root:       "gpt-3.5-turbo-16k-0613",
 			Parent:     nil,
 		},
 		{
@@ -107,6 +116,15 @@ func init() {
 			Root:       "gpt-4-0314",
 			Parent:     nil,
 		},
+		{
+			Id:         "gpt-4-0613",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "openai",
+			Permission: permission,
+			Root:       "gpt-4-0613",
+			Parent:     nil,
+		},
 		{
 			Id:         "gpt-4-32k",
 			Object:     "model",
@@ -125,6 +143,15 @@ func init() {
 			Root:       "gpt-4-32k-0314",
 			Parent:     nil,
 		},
+		{
+			Id:         "gpt-4-32k-0613",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "openai",
+			Permission: permission,
+			Root:       "gpt-4-32k-0613",
+			Parent:     nil,
+		},
 		{
 			Id:         "text-embedding-ada-002",
 			Object:     "model",

controller/relay.go

@@ -239,16 +239,15 @@ func relayHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 	defer func() {
 		if consumeQuota {
 			quota := 0
-			usingGPT4 := strings.HasPrefix(textRequest.Model, "gpt-4")
+			completionRatio := 1.34 // default for gpt-3
-			completionRatio := 1
+			if strings.HasPrefix(textRequest.Model, "gpt-4") {
-			if usingGPT4 {
 				completionRatio = 2
 			}
 			if isStream {
 				responseTokens := countTokenText(streamResponseText, textRequest.Model)
-				quota = promptTokens + responseTokens*completionRatio
+				quota = promptTokens + int(float64(responseTokens)*completionRatio)
 			} else {
-				quota = textResponse.Usage.PromptTokens + textResponse.Usage.CompletionTokens*completionRatio
+				quota = textResponse.Usage.PromptTokens + int(float64(textResponse.Usage.CompletionTokens)*completionRatio)
 			}
 			quota = int(float64(quota) * ratio)
 			if ratio != 0 && quota <= 0 {
@@ -260,7 +259,7 @@ func relayHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 				common.SysError("Error consuming token remain quota: " + err.Error())
 			}
 			userId := c.GetInt("id")
-			model.RecordLog(userId, model.LogTypeConsume, fmt.Sprintf("使用模型 %s 消耗 %d 点额度（模型倍率 %.2f，分组倍率 %.2f）", textRequest.Model, quota, modelRatio, groupRatio))
+			model.RecordLog(userId, model.LogTypeConsume, fmt.Sprintf("使用模型 %s 消耗 %d 点额度（模型倍率 %.2f，分组倍率 %.2f，补全倍率 %.2f）", textRequest.Model, quota, modelRatio, groupRatio, completionRatio))
 		}
 	}()
 

model/ability.go

@@ -30,15 +30,18 @@ func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
 
 func (channel *Channel) AddAbilities() error {
 	models_ := strings.Split(channel.Models, ",")
+	groups_ := strings.Split(channel.Group, ",")
 	abilities := make([]Ability, 0, len(models_))
 	for _, model := range models_ {
-		ability := Ability{
+		for _, group := range groups_ {
-			Group:     channel.Group,
+			ability := Ability{
-			Model:     model,
+				Group:     group,
-			ChannelId: channel.Id,
+				Model:     model,
-			Enabled:   channel.Status == common.ChannelStatusEnabled,
+				ChannelId: channel.Id,
+				Enabled:   channel.Status == common.ChannelStatusEnabled,
+			}
+			abilities = append(abilities, ability)
 		}
-		abilities = append(abilities, ability)
 	}
 	return DB.Create(&abilities).Error
 }

web/src/helpers/render.js

@@ -10,10 +10,17 @@ export function renderText(text, limit) {
 export function renderGroup(group) {
   if (group === "") {
     return <Label>default</Label>
-  } else if (group === "vip" || group === "pro") {
-    return <Label color='yellow'>{group}</Label>
-  } else if (group === "svip" || group === "premium") {
-    return <Label color='red'>{group}</Label>
   }
-  return <Label>{group}</Label>
+  let groups = group.split(",");
+  groups.sort();
+  return <>
+    {groups.map((group) => {
+      if (group === "vip" || group === "pro") {
+        return <Label color='yellow'>{group}</Label>
+      } else if (group === "svip" || group === "premium") {
+        return <Label color='red'>{group}</Label>
+      }
+      return <Label>{group}</Label>
+    })}
+  </>
 }

web/src/pages/Channel/EditChannel.js

@@ -15,8 +15,8 @@ const EditChannel = () => {
     key: '',
     base_url: '',
     other: '',
-    group: 'default',
     models: [],
+    groups: ['default']
   };
   const [batch, setBatch] = useState(false);
   const [inputs, setInputs] = useState(originInputs);
@@ -37,6 +37,11 @@ const EditChannel = () => {
       } else {
         data.models = data.models.split(",")
       }
+      if (data.group === "") {
+        data.groups = []
+      } else {
+        data.groups = data.group.split(",")
+      }
       setInputs(data);
     } else {
       showError(message);
@@ -94,6 +99,7 @@ const EditChannel = () => {
     }
     let res;
     localInputs.models = localInputs.models.join(",")
+    localInputs.group = localInputs.groups.join(",")
     if (isEdit) {
       res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) });
     } else {
@@ -185,14 +191,14 @@ const EditChannel = () => {
             <Form.Dropdown
               label='分组'
               placeholder={'请选择分组'}
-              name='group'
+              name='groups'
               fluid
-              search
+              multiple
               selection
               allowAdditions
               additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组：'}
               onChange={handleInputChange}
-              value={inputs.group}
+              value={inputs.groups}
               autoComplete='new-password'
               options={groupOptions}
             />