add gpt4 alpha model

This commit is contained in:
Zhang Minghan 2023-11-09 11:05:14 +08:00
parent b6968bb12b
commit f4cad0e125
6 changed files with 15 additions and 24 deletions

View File

@ -52,7 +52,7 @@ func NewChatInstanceFromModel(props *InstanceProps) *ChatInstance {
globals.GPT432k, globals.GPT432k0613, globals.GPT432k0314:
return NewChatInstanceFromConfig("gpt4")
case globals.GPT4Vision, globals.Dalle3:
case globals.GPT4Vision, globals.GPT4Dalle, globals.GPT4All:
return NewChatInstanceFromConfig("reverse")
case globals.GPT3Turbo, globals.GPT3TurboInstruct, globals.GPT3Turbo0613, globals.GPT3Turbo0301,

View File

@ -25,17 +25,6 @@ func processFormat(data string) string {
}
func formatMessages(props *ChatProps) []globals.Message {
if props.Model == globals.GPT4Vision {
base := props.Message[len(props.Message)-1].Content
urls := utils.ExtractUrls(base)
if len(urls) > 0 {
base = fmt.Sprintf("%s %s", strings.Join(urls, " "), base)
}
props.Message[len(props.Message)-1].Content = base
return props.Message
}
return props.Message
}

View File

@ -8,7 +8,7 @@ import {
} from "@/utils/env.ts";
import { getMemory } from "@/utils/memory.ts";
export const version = "3.6.15";
export const version = "3.6.15rc";
export const dev: boolean = getDev();
export const deploy: boolean = true;
export let rest_api: string = getRestApi(deploy);
@ -21,8 +21,9 @@ export const supportModels: Model[] = [
{ id: "gpt-3.5-turbo-0613", name: "GPT-3.5", free: true, auth: false },
{ id: "gpt-3.5-turbo-16k-0613", name: "GPT-3.5-16k", free: true, auth: true },
{ id: "gpt-4-0613", name: "GPT-4", free: false, auth: true },
{ id: "gpt-4-v", name: "GPT-4V", free: false, auth: true },
{ id: "gpt-4-dalle", name: "DALLE3", free: false, auth: true },
{ id: "gpt-4-all", name: "GPT-4 Alpha", free: false, auth: true },
{ id: "gpt-4-v", name: "GPT-4 Vision", free: false, auth: true },
{ id: "gpt-4-dalle", name: "GPT-4 DALLE", free: false, auth: true },
// anthropic models
{ id: "claude-2", name: "Claude-2", free: true, auth: true },

View File

@ -46,14 +46,15 @@ const (
GPT3Turbo16k0613 = "gpt-3.5-turbo-16k-0613"
GPT3Turbo16k0301 = "gpt-3.5-turbo-16k-0301"
GPT4 = "gpt-4"
GPT4All = "gpt-4-all"
GPT4Vision = "gpt-4-v"
GPT4Dalle = "gpt-4-dalle"
GPT40314 = "gpt-4-0314"
GPT40613 = "gpt-4-0613"
GPT432k = "gpt-4-32k"
GPT432k0314 = "gpt-4-32k-0314"
GPT432k0613 = "gpt-4-32k-0613"
Dalle2 = "dalle"
Dalle3 = "gpt-4-dalle"
Claude1 = "claude-1"
Claude1100k = "claude-1-100k"
Claude2 = "claude-2"
@ -89,9 +90,8 @@ var GPT3Turbo16kArray = []string{
}
var GPT4Array = []string{
GPT4,
GPT4Vision, Dalle3,
GPT40314, GPT40613,
GPT4, GPT40314, GPT40613,
GPT4Vision, GPT4Dalle, GPT4All,
}
var GPT432kArray = []string{
@ -172,7 +172,8 @@ var AllModels = []string{
GPT40314,
GPT40613,
GPT4Vision,
Dalle3,
GPT4All,
GPT4Dalle,
GPT432k,
GPT432k0314,
GPT432k0613,

View File

@ -4,6 +4,6 @@ import "github.com/gin-gonic/gin"
func Register(app *gin.Engine) {
app.GET("/chat", ChatAPI)
app.GET("/v1/chat/models", ModelAPI)
app.GET("/v1/models", ModelAPI)
app.POST("/v1/chat/completions", TranshipmentAPI)
}

View File

@ -18,7 +18,7 @@ func GetWeightByModel(model string) int {
return 2
case globals.GPT3Turbo, globals.GPT3Turbo0613,
globals.GPT3Turbo16k, globals.GPT3Turbo16k0613,
globals.GPT4, globals.GPT4Vision, globals.Dalle3, globals.GPT40314, globals.GPT40613,
globals.GPT4, globals.GPT4Vision, globals.GPT4Dalle, globals.GPT4All, globals.GPT40314, globals.GPT40613,
globals.GPT432k, globals.GPT432k0613, globals.GPT432k0314,
globals.SparkDesk, globals.SparkDeskV2, globals.SparkDeskV3,
@ -77,7 +77,7 @@ func CountInputToken(model string, v []globals.Message) float32 {
case globals.GPT3Turbo, globals.GPT3Turbo0613, globals.GPT3Turbo0301, globals.GPT3TurboInstruct,
globals.GPT3Turbo16k, globals.GPT3Turbo16k0613, globals.GPT3Turbo16k0301:
return 0
case globals.GPT4, globals.GPT4Vision, globals.Dalle3, globals.GPT40314, globals.GPT40613:
case globals.GPT4, globals.GPT4Vision, globals.GPT4All, globals.GPT4Dalle, globals.GPT40314, globals.GPT40613:
return float32(CountTokenPrice(v, model)) / 1000 * 2.1 * 0.6
case globals.GPT432k, globals.GPT432k0613, globals.GPT432k0314:
return float32(CountTokenPrice(v, model)) / 1000 * 4.2
@ -107,7 +107,7 @@ func CountOutputToken(model string, t int) float32 {
case globals.GPT3Turbo, globals.GPT3Turbo0613, globals.GPT3Turbo0301, globals.GPT3TurboInstruct,
globals.GPT3Turbo16k, globals.GPT3Turbo16k0613, globals.GPT3Turbo16k0301:
return 0
case globals.GPT4, globals.GPT4Vision, globals.Dalle3, globals.GPT40314, globals.GPT40613:
case globals.GPT4, globals.GPT4Vision, globals.GPT4All, globals.GPT4Dalle, globals.GPT40314, globals.GPT40613:
return float32(t*GetWeightByModel(model)) / 1000 * 4.3 * 0.6
case globals.GPT432k, globals.GPT432k0613, globals.GPT432k0314:
return float32(t*GetWeightByModel(model)) / 1000 * 8.6