Browse Source
Merge pull request #2286 from 6vision/gpt
feat: support gpt-4o-2024-08-06 modelmaster
vision
GitHub
2 months ago
2 changed files with 3 additions and 2 deletions
+ 1
- 1
bot/chatgpt/chat_gpt_session.py
View File
| @@ -67,7 +67,7 @@ def num_tokens_from_messages(messages, model): | |||||
| elif model in ["gpt-4-0314", "gpt-4-0613", "gpt-4-32k", "gpt-4-32k-0613", "gpt-3.5-turbo-0613", | elif model in ["gpt-4-0314", "gpt-4-0613", "gpt-4-32k", "gpt-4-32k-0613", "gpt-3.5-turbo-0613", | ||||
| "gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613", "gpt-35-turbo-16k", "gpt-4-turbo-preview", | "gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613", "gpt-35-turbo-16k", "gpt-4-turbo-preview", | ||||
| "gpt-4-1106-preview", const.GPT4_TURBO_PREVIEW, const.GPT4_VISION_PREVIEW, const.GPT4_TURBO_01_25, | "gpt-4-1106-preview", const.GPT4_TURBO_PREVIEW, const.GPT4_VISION_PREVIEW, const.GPT4_TURBO_01_25, | ||||
| const.GPT_4o, const.GPT_4o_MINI, const.LINKAI_4o, const.LINKAI_4_TURBO]: | |||||
| const.GPT_4o, const.GPT_4O_0806, const.GPT_4o_MINI, const.LINKAI_4o, const.LINKAI_4_TURBO]: | |||||
| return num_tokens_from_messages(messages, model="gpt-4") | return num_tokens_from_messages(messages, model="gpt-4") | ||||
| elif model.startswith("claude-3"): | elif model.startswith("claude-3"): | ||||
| return num_tokens_from_messages(messages, model="gpt-3.5-turbo") | return num_tokens_from_messages(messages, model="gpt-3.5-turbo") | ||||
+ 2
- 1
common/const.py
View File
| @@ -24,6 +24,7 @@ GPT35_0125 = "gpt-3.5-turbo-0125" | |||||
| GPT35_1106 = "gpt-3.5-turbo-1106" | GPT35_1106 = "gpt-3.5-turbo-1106" | ||||
| GPT_4o = "gpt-4o" | GPT_4o = "gpt-4o" | ||||
| GPT_4O_0806 = "gpt-4o-2024-08-06" | |||||
| GPT4_TURBO = "gpt-4-turbo" | GPT4_TURBO = "gpt-4-turbo" | ||||
| GPT4_TURBO_PREVIEW = "gpt-4-turbo-preview" | GPT4_TURBO_PREVIEW = "gpt-4-turbo-preview" | ||||
| GPT4_TURBO_04_09 = "gpt-4-turbo-2024-04-09" | GPT4_TURBO_04_09 = "gpt-4-turbo-2024-04-09" | ||||
| @@ -58,7 +59,7 @@ GEMINI_15_PRO = "gemini-1.5-pro" | |||||
| MODEL_LIST = [ | MODEL_LIST = [ | ||||
| GPT35, GPT35_0125, GPT35_1106, "gpt-3.5-turbo-16k", | GPT35, GPT35_0125, GPT35_1106, "gpt-3.5-turbo-16k", | ||||
| GPT_4o, GPT_4o_MINI, GPT4_TURBO, GPT4_TURBO_PREVIEW, GPT4_TURBO_01_25, GPT4_TURBO_11_06, GPT4, GPT4_32k, GPT4_06_13, GPT4_32k_06_13, | |||||
| GPT_4o, GPT_4O_0806, GPT_4o_MINI, GPT4_TURBO, GPT4_TURBO_PREVIEW, GPT4_TURBO_01_25, GPT4_TURBO_11_06, GPT4, GPT4_32k, GPT4_06_13, GPT4_32k_06_13, | |||||
| WEN_XIN, WEN_XIN_4, | WEN_XIN, WEN_XIN_4, | ||||
| XUNFEI, ZHIPU_AI, MOONSHOT, MiniMax, | XUNFEI, ZHIPU_AI, MOONSHOT, MiniMax, | ||||
| GEMINI, GEMINI_PRO, GEMINI_15_flash, GEMINI_15_PRO, | GEMINI, GEMINI_PRO, GEMINI_15_flash, GEMINI_15_PRO, | ||||
Loading…