From 84da88506f91de31c73b3682c2f6e4ec61ac1048 Mon Sep 17 00:00:00 2001 From: CaIon <1808837298@qq.com> Date: Sat, 18 May 2024 16:06:12 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4=20(#262)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relay/channel/openai/adaptor.go | 8 ++++---- web/src/pages/Channel/EditChannel.js | 18 +++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/relay/channel/openai/adaptor.go b/relay/channel/openai/adaptor.go index 46d827a..a0a5b07 100644 --- a/relay/channel/openai/adaptor.go +++ b/relay/channel/openai/adaptor.go @@ -41,10 +41,10 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { return relaycommon.GetFullRequestURL(info.BaseUrl, requestURL, info.ChannelType), nil case common.ChannelTypeMiniMax: return minimax.GetRequestURL(info) - //case common.ChannelTypeCustom: - // url := info.BaseUrl - // url = strings.Replace(url, "{model}", info.UpstreamModelName, -1) - // return url, nil + case common.ChannelTypeCustom: + url := info.BaseUrl + url = strings.Replace(url, "{model}", info.UpstreamModelName, -1) + return url, nil default: return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil } diff --git a/web/src/pages/Channel/EditChannel.js b/web/src/pages/Channel/EditChannel.js index 03b8e3b..a32a065 100644 --- a/web/src/pages/Channel/EditChannel.js +++ b/web/src/pages/Channel/EditChannel.js @@ -301,17 +301,18 @@ const EditChannel = (props) => { const addCustomModels = () => { if (customModel.trim() === '') return; // 使用逗号分隔字符串，然后去除每个模型名称前后的空格 - const modelArray = customModel.split(',').map(model => model.trim()); - + const modelArray = customModel.split(',').map((model) => model.trim()); + let localModels = [...inputs.models]; let localModelOptions = [...modelOptions]; let hasError = false; - modelArray.forEach(model => { + modelArray.forEach((model) => { // 检查模型是否已存在，且模型名称非空 if (model && !localModels.includes(model)) { localModels.push(model); // 添加到模型列表 - localModelOptions.push({ // 添加到下拉选项 + localModelOptions.push({ + // 添加到下拉选项 key: model, text: model, value: model, @@ -330,7 +331,6 @@ const EditChannel = (props) => { handleInputChange('models', localModels); }; - return ( <> { {inputs.type === 8 && ( <>
- Base URL： + + 完整的 Base URL，支持变量{'{model}'}： +
{ handleInputChange('base_url', value); }} From dbaa9390d3350f8ea04390ae241297715c56db97 Mon Sep 17 00:00:00 2001 From: CaIon <1808837298@qq.com> Date: Sat, 18 May 2024 17:51:53 +0800 Subject: [PATCH 02/11] feat: update model ratio --- common/model-ratio.go | 170 +++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/common/model-ratio.go b/common/model-ratio.go index 4e7bc11..5670810 100644 --- a/common/model-ratio.go +++ b/common/model-ratio.go @@ -5,7 +5,7 @@ import ( "strings" ) -//from songquanpeng/one-api +// from songquanpeng/one-api const ( USD2RMB = 7.3 // 暂定 1 USD = 7.3 RMB USD = 500 // $0.002 = 1 -> $1 = 500 @@ -40,86 +40,86 @@ var DefaultModelRatio = map[string]float64{ "gpt-4-turbo-2024-04-09": 5, // $0.01 / 1K tokens "gpt-3.5-turbo": 0.25, // $0.0015 / 1K tokens //"gpt-3.5-turbo-0301": 0.75, //deprecated - "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, - "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, - "babbage-002": 0.2, // $0.0004 / 1K tokens - "davinci-002": 1, // $0.002 / 1K tokens - "text-ada-001": 0.2, - "text-babbage-001": 0.25, - "text-curie-001": 1, - "text-davinci-002": 10, - "text-davinci-003": 10, - "text-davinci-edit-001": 10, - "code-davinci-edit-001": 10, - "whisper-1": 15, // $0.006 / minute -> $0.006 / 150 words -> $0.006 / 200 tokens -> $0.03 / 1k tokens - "tts-1": 7.5, // 1k characters -> $0.015 - "tts-1-1106": 7.5, // 1k characters -> $0.015 - "tts-1-hd": 15, // 1k characters -> $0.03 - "tts-1-hd-1106": 15, // 1k characters -> $0.03 - "davinci": 10, - "curie": 10, - "babbage": 10, - "ada": 10, - "text-embedding-3-small": 0.01, - "text-embedding-3-large": 0.065, - "text-embedding-ada-002": 0.05, - "text-search-ada-doc-001": 10, - "text-moderation-stable": 0.1, - "text-moderation-latest": 0.1, - "claude-instant-1": 0.4, // $0.8 / 1M tokens - "claude-2.0": 4, // $8 / 1M tokens - "claude-2.1": 4, // $8 / 1M tokens - "claude-3-haiku-20240307": 0.125, // $0.25 / 1M tokens - "claude-3-sonnet-20240229": 1.5, // $3 / 1M tokens - "claude-3-opus-20240229": 7.5, // $15 / 1M tokens - "ERNIE-Bot": 0.8572, // ￥0.012 / 1k tokens //renamed to ERNIE-3.5-8K - "ERNIE-Bot-turbo": 0.5715, // ￥0.008 / 1k tokens //renamed to ERNIE-Lite-8K - "ERNIE-Bot-4": 8.572, // ￥0.12 / 1k tokens //renamed to ERNIE-4.0-8K - "ERNIE-4.0-8K": 8.572, // ￥0.12 / 1k tokens - "ERNIE-3.5-8K": 0.8572, // ￥0.012 / 1k tokens - "ERNIE-Speed-8K": 0.2858, // ￥0.004 / 1k tokens - "ERNIE-Speed-128K": 0.2858, // ￥0.004 / 1k tokens - "ERNIE-Lite-8K": 0.2143, // ￥0.003 / 1k tokens - "ERNIE-Tiny-8K": 0.0715, // ￥0.001 / 1k tokens - "ERNIE-Character-8K": 0.2858, // ￥0.004 / 1k tokens - "ERNIE-Functions-8K": 0.2858, // ￥0.004 / 1k tokens - "Embedding-V1": 0.1429, // ￥0.002 / 1k tokens - "PaLM-2": 1, - "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens - "gemini-pro-vision": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens - "gemini-1.0-pro-vision-001": 1, - "gemini-1.0-pro-001": 1, - "gemini-1.5-pro-latest": 1, - "gemini-1.5-flash-latest": 1, - "gemini-1.0-pro-latest": 1, - "gemini-1.0-pro-vision-latest": 1, - "gemini-ultra": 1, - "chatglm_turbo": 0.3572, // ￥0.005 / 1k tokens - "chatglm_pro": 0.7143, // ￥0.01 / 1k tokens - "chatglm_std": 0.3572, // ￥0.005 / 1k tokens - "chatglm_lite": 0.1429, // ￥0.002 / 1k tokens - "glm-4": 7.143, // ￥0.1 / 1k tokens - "glm-4v": 7.143, // ￥0.1 / 1k tokens - "glm-3-turbo": 0.3572, - "qwen-turbo": 0.8572, // ￥0.012 / 1k tokens - "qwen-plus": 10, // ￥0.14 / 1k tokens - "text-embedding-v1": 0.05, // ￥0.0007 / 1k tokens - "SparkDesk-v1.1": 1.2858, // ￥0.018 / 1k tokens - "SparkDesk-v2.1": 1.2858, // ￥0.018 / 1k tokens - "SparkDesk-v3.1": 1.2858, // ￥0.018 / 1k tokens - "SparkDesk-v3.5": 1.2858, // ￥0.018 / 1k tokens - "360GPT_S2_V9": 0.8572, // ¥0.012 / 1k tokens - "360gpt-turbo": 0.0858, // ¥0.0012 / 1k tokens + "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, + "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, + "babbage-002": 0.2, // $0.0004 / 1K tokens + "davinci-002": 1, // $0.002 / 1K tokens + "text-ada-001": 0.2, + "text-babbage-001": 0.25, + "text-curie-001": 1, + "text-davinci-002": 10, + "text-davinci-003": 10, + "text-davinci-edit-001": 10, + "code-davinci-edit-001": 10, + "whisper-1": 15, // $0.006 / minute -> $0.006 / 150 words -> $0.006 / 200 tokens -> $0.03 / 1k tokens + "tts-1": 7.5, // 1k characters -> $0.015 + "tts-1-1106": 7.5, // 1k characters -> $0.015 + "tts-1-hd": 15, // 1k characters -> $0.03 + "tts-1-hd-1106": 15, // 1k characters -> $0.03 + "davinci": 10, + "curie": 10, + "babbage": 10, + "ada": 10, + "text-embedding-3-small": 0.01, + "text-embedding-3-large": 0.065, + "text-embedding-ada-002": 0.05, + "text-search-ada-doc-001": 10, + "text-moderation-stable": 0.1, + "text-moderation-latest": 0.1, + "claude-instant-1": 0.4, // $0.8 / 1M tokens + "claude-2.0": 4, // $8 / 1M tokens + "claude-2.1": 4, // $8 / 1M tokens + "claude-3-haiku-20240307": 0.125, // $0.25 / 1M tokens + "claude-3-sonnet-20240229": 1.5, // $3 / 1M tokens + "claude-3-opus-20240229": 7.5, // $15 / 1M tokens + "ERNIE-Bot": 0.8572, // ￥0.012 / 1k tokens //renamed to ERNIE-3.5-8K + "ERNIE-Bot-turbo": 0.5715, // ￥0.008 / 1k tokens //renamed to ERNIE-Lite-8K + "ERNIE-Bot-4": 8.572, // ￥0.12 / 1k tokens //renamed to ERNIE-4.0-8K + "ERNIE-4.0-8K": 8.572, // ￥0.12 / 1k tokens + "ERNIE-3.5-8K": 0.8572, // ￥0.012 / 1k tokens + "ERNIE-Speed-8K": 0.2858, // ￥0.004 / 1k tokens + "ERNIE-Speed-128K": 0.2858, // ￥0.004 / 1k tokens + "ERNIE-Lite-8K": 0.2143, // ￥0.003 / 1k tokens + "ERNIE-Tiny-8K": 0.0715, // ￥0.001 / 1k tokens + "ERNIE-Character-8K": 0.2858, // ￥0.004 / 1k tokens + "ERNIE-Functions-8K": 0.2858, // ￥0.004 / 1k tokens + "Embedding-V1": 0.1429, // ￥0.002 / 1k tokens + "PaLM-2": 1, + "gemini-pro": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens + "gemini-pro-vision": 1, // $0.00025 / 1k characters -> $0.001 / 1k tokens + "gemini-1.0-pro-vision-001": 1, + "gemini-1.0-pro-001": 1, + "gemini-1.5-pro-latest": 1, + "gemini-1.5-flash-latest": 1, + "gemini-1.0-pro-latest": 1, + "gemini-1.0-pro-vision-latest": 1, + "gemini-ultra": 1, + "chatglm_turbo": 0.3572, // ￥0.005 / 1k tokens + "chatglm_pro": 0.7143, // ￥0.01 / 1k tokens + "chatglm_std": 0.3572, // ￥0.005 / 1k tokens + "chatglm_lite": 0.1429, // ￥0.002 / 1k tokens + "glm-4": 7.143, // ￥0.1 / 1k tokens + "glm-4v": 7.143, // ￥0.1 / 1k tokens + "glm-3-turbo": 0.3572, + "qwen-turbo": 0.8572, // ￥0.012 / 1k tokens + "qwen-plus": 10, // ￥0.14 / 1k tokens + "text-embedding-v1": 0.05, // ￥0.0007 / 1k tokens + "SparkDesk-v1.1": 1.2858, // ￥0.018 / 1k tokens + "SparkDesk-v2.1": 1.2858, // ￥0.018 / 1k tokens + "SparkDesk-v3.1": 1.2858, // ￥0.018 / 1k tokens + "SparkDesk-v3.5": 1.2858, // ￥0.018 / 1k tokens + "360GPT_S2_V9": 0.8572, // ¥0.012 / 1k tokens + "360gpt-turbo": 0.0858, // ¥0.0012 / 1k tokens "360gpt-turbo-responsibility-8k": 0.8572, // ¥0.012 / 1k tokens - "360gpt-pro": 0.8572, // ¥0.012 / 1k tokens - "embedding-bert-512-v1": 0.0715, // ¥0.001 / 1k tokens - "embedding_s1_v1": 0.0715, // ¥0.001 / 1k tokens - "semantic_similarity_s1_v1": 0.0715, // ¥0.001 / 1k tokens - "hunyuan": 7.143, // ¥0.1 / 1k tokens // https://cloud.tencent.com/document/product/1729/97731#e0e6be58-60c8-469f-bdeb-6c264ce3b4d0 + "360gpt-pro": 0.8572, // ¥0.012 / 1k tokens + "embedding-bert-512-v1": 0.0715, // ¥0.001 / 1k tokens + "embedding_s1_v1": 0.0715, // ¥0.001 / 1k tokens + "semantic_similarity_s1_v1": 0.0715, // ¥0.001 / 1k tokens + "hunyuan": 7.143, // ¥0.1 / 1k tokens // https://cloud.tencent.com/document/product/1729/97731#e0e6be58-60c8-469f-bdeb-6c264ce3b4d0 // https://platform.lingyiwanwu.com/docs#-计费单元 // 已经按照 7.2 来换算美元价格 "yi-34b-chat-0205": 0.18, @@ -143,10 +143,10 @@ var DefaultModelRatio = map[string]float64{ "deepseek-chat": 0.07, "deepseek-coder": 0.07, // Perplexity online 模型对搜索额外收费，有需要应自行调整，此处不计入搜索费用 - "llama-3-sonar-small-32k-chat": 0.2 / 1000 * USD, - "llama-3-sonar-small-32k-online": 0.2 / 1000 * USD, - "llama-3-sonar-large-32k-chat": 1 / 1000 * USD, - "llama-3-sonar-large-32k-online": 1 / 1000 * USD, + "llama-3-sonar-small-32k-chat": 0.2 / 1000 * USD, + "llama-3-sonar-small-32k-online": 0.2 / 1000 * USD, + "llama-3-sonar-large-32k-chat": 1 / 1000 * USD, + "llama-3-sonar-large-32k-online": 1 / 1000 * USD, } var DefaultModelPrice = map[string]float64{ @@ -289,7 +289,7 @@ func GetCompletionRatio(name string) float64 { } return 4.0 / 3.0 } - if strings.HasPrefix(name, "gpt-4") && name != "gpt-4-all" && name != "gpt-4-gizmo-*" { + if strings.HasPrefix(name, "gpt-4") && !strings.HasSuffix(name, "-all") && !strings.Contains(name, "gizmo") { if strings.HasPrefix(name, "gpt-4-turbo") || strings.HasSuffix(name, "preview") || strings.HasPrefix(name, "gpt-4o") { return 3 } From 774ce7195c8a9f48c643c385728d4397a56dba84 Mon Sep 17 00:00:00 2001 From: CaIon <1808837298@qq.com> Date: Sat, 18 May 2024 18:32:10 +0800 Subject: [PATCH 03/11] feat: update model ratio --- common/model-ratio.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/model-ratio.go b/common/model-ratio.go index 5670810..8bb78ea 100644 --- a/common/model-ratio.go +++ b/common/model-ratio.go @@ -289,7 +289,7 @@ func GetCompletionRatio(name string) float64 { } return 4.0 / 3.0 } - if strings.HasPrefix(name, "gpt-4") && !strings.HasSuffix(name, "-all") && !strings.Contains(name, "gizmo") { + if strings.HasPrefix(name, "gpt-4") && !strings.HasSuffix(name, "-all") && !strings.HasSuffix(name, "-gizmo-*") { if strings.HasPrefix(name, "gpt-4-turbo") || strings.HasSuffix(name, "preview") || strings.HasPrefix(name, "gpt-4o") { return 3 } From 1ab93717bbab3a9a884e16c5766450cdff3a190d Mon Sep 17 00:00:00 2001 From: hepeichun Date: Tue, 21 May 2024 18:14:23 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=80=8D=E7=8E=87=E9=83=BD=E4=B9=98=E4=B8=A4?= =?UTF-8?q?=E5=80=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/ModelPricing.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index c7a45d7..3699f1e 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -146,11 +146,10 @@ const ModelPricing = () => { render: (text, record, index) => { let content = text; if (record.quota_type === 0) { - let inputRatioPrice = record.model_ratio * 2.0 * record.group_ratio; + let inputRatioPrice = record.model_ratio * record.group_ratio; let completionRatioPrice = record.model_ratio * record.completion_ratio * - 2.0 * record.group_ratio; content = ( <> From 51e0754ade67318fe698b517471d1a90b9342fa0 Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 19:57:50 +0800 Subject: [PATCH 05/11] fix: log page error (close #270) --- web/src/components/LogsTable.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/components/LogsTable.js b/web/src/components/LogsTable.js index f8436ad..d94eb60 100644 --- a/web/src/components/LogsTable.js +++ b/web/src/components/LogsTable.js @@ -302,6 +302,9 @@ const LogsTable = () => { let content = '渠道：' + record.channel; if (record.other !== '') { let other = JSON.parse(record.other); + if (other === null) { + return <> + } if (other.admin_info !== undefined) { if ( other.admin_info.use_channel !== null && @@ -322,7 +325,8 @@ const LogsTable = () => { title: '详情', dataIndex: 'content', render: (text, record, index) => { - if (record.other === '') { + let other = JSON.parse(record.other); + if (other == null) { return ( { ); } - let other = JSON.parse(record.other); let content = renderModelPrice( record.prompt_tokens, record.completion_tokens, From 01160658a5982f33c739faefba398e57d870559d Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 20:01:32 +0800 Subject: [PATCH 06/11] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/ChannelsTable.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/src/components/ChannelsTable.js b/web/src/components/ChannelsTable.js index ad53999..c49d85b 100644 --- a/web/src/components/ChannelsTable.js +++ b/web/src/components/ChannelsTable.js @@ -310,12 +310,12 @@ const ChannelsTable = () => { const setChannelFormat = (channels) => { for (let i = 0; i < channels.length; i++) { - if (channels[i].type === 8) { - showWarning( - '检测到您使用了“自定义渠道”类型，请更换为“OpenAI”渠道类型！', - ); - showWarning('下个版本将不再支持“自定义渠道”类型！'); - } + // if (channels[i].type === 8) { + // showWarning( + // '检测到您使用了“自定义渠道”类型，请更换为“OpenAI”渠道类型！', + // ); + // showWarning('下个版本将不再支持“自定义渠道”类型！'); + // } channels[i].key = '' + channels[i].id; let test_models = []; channels[i].models.split(',').forEach((item, index) => { From d05a786b4c25cade3a0256559f66766a43ed73ad Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 20:50:48 +0800 Subject: [PATCH 07/11] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/helpers/render.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/helpers/render.js b/web/src/helpers/render.js index d84b2eb..8db5091 100644 --- a/web/src/helpers/render.js +++ b/web/src/helpers/render.js @@ -149,8 +149,8 @@ export function renderModelPrice( if (completionRatio === undefined) { completionRatio = 0; } - let inputRatioPrice = modelRatio * 2.0 * groupRatio; - let completionRatioPrice = modelRatio * completionRatio * 2.0 * groupRatio; + let inputRatioPrice = modelRatio * groupRatio; + let completionRatioPrice = modelRatio * completionRatio * groupRatio; let price = (inputTokens / 1000000) * inputRatioPrice + (completionTokens / 1000000) * completionRatioPrice; From 1568d6481a2047c4a0370b214744198354604fa1 Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 21:07:32 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/ModelPricing.js | 2 +- web/src/helpers/render.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index 3699f1e..3a5b8c8 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -146,7 +146,7 @@ const ModelPricing = () => { render: (text, record, index) => { let content = text; if (record.quota_type === 0) { - let inputRatioPrice = record.model_ratio * record.group_ratio; + let inputRatioPrice = record.model_ratio * 2 * record.group_ratio; let completionRatioPrice = record.model_ratio * record.completion_ratio * diff --git a/web/src/helpers/render.js b/web/src/helpers/render.js index 8db5091..5815ed0 100644 --- a/web/src/helpers/render.js +++ b/web/src/helpers/render.js @@ -149,7 +149,7 @@ export function renderModelPrice( if (completionRatio === undefined) { completionRatio = 0; } - let inputRatioPrice = modelRatio * groupRatio; + let inputRatioPrice = modelRatio * 2.0 * groupRatio; let completionRatioPrice = modelRatio * completionRatio * groupRatio; let price = (inputTokens / 1000000) * inputRatioPrice + From cf8fe63fb6658fc78c8690771169de09c6956aca Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 21:12:38 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/ModelPricing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index 3a5b8c8..908415a 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -149,7 +149,7 @@ const ModelPricing = () => { let inputRatioPrice = record.model_ratio * 2 * record.group_ratio; let completionRatioPrice = record.model_ratio * - record.completion_ratio * + record.completion_ratio * 2 * record.group_ratio; content = ( <> From d86028960191e587488e47a2c0648f5c84a0e58d Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Tue, 21 May 2024 21:16:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/ModelPricing.js | 1 + web/src/helpers/render.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/components/ModelPricing.js b/web/src/components/ModelPricing.js index 908415a..f5bb01c 100644 --- a/web/src/components/ModelPricing.js +++ b/web/src/components/ModelPricing.js @@ -146,6 +146,7 @@ const ModelPricing = () => { render: (text, record, index) => { let content = text; if (record.quota_type === 0) { + // 这里的 *2 是因为 1倍率=0.002刀，请勿删除 let inputRatioPrice = record.model_ratio * 2 * record.group_ratio; let completionRatioPrice = record.model_ratio * diff --git a/web/src/helpers/render.js b/web/src/helpers/render.js index 5815ed0..971b1d8 100644 --- a/web/src/helpers/render.js +++ b/web/src/helpers/render.js @@ -149,8 +149,9 @@ export function renderModelPrice( if (completionRatio === undefined) { completionRatio = 0; } + // 这里的 *2 是因为 1倍率=0.002刀，请勿删除 let inputRatioPrice = modelRatio * 2.0 * groupRatio; - let completionRatioPrice = modelRatio * completionRatio * groupRatio; + let completionRatioPrice = modelRatio * 2.0 * completionRatio * groupRatio; let price = (inputTokens / 1000000) * inputRatioPrice + (completionTokens / 1000000) * completionRatioPrice; From f07ae8139ba974b64bd96af44fe7091f2241ede1 Mon Sep 17 00:00:00 2001 From: "1808837298@qq.com" <1808837298@qq.com> Date: Wed, 22 May 2024 01:20:48 +0800 Subject: [PATCH 11/11] fix: log page error --- web/src/components/LogsTable.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/src/components/LogsTable.js b/web/src/components/LogsTable.js index d94eb60..ba4df1b 100644 --- a/web/src/components/LogsTable.js +++ b/web/src/components/LogsTable.js @@ -325,6 +325,9 @@ const LogsTable = () => { title: '详情', dataIndex: 'content', render: (text, record, index) => { + if (record.other === '') { + record.other = '{}' + } let other = JSON.parse(record.other); if (other == null) { return (