diff --git a/README.md b/README.md index 93ca910..d884db6 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ https://t.me/chat2api > 已完成 > - [x] 免登录 GPT3.5 > - [x] 使用 AccessToken -> - [x] GPT3.5 对话 -> - [x] GPT4.0 对话 +> - [x] GPT3.5 对话 (模型名不包含gpt-4,则默认使用text-davinci-002-render-sha模型,也就是gpt-3.5) +> - [x] GPT4.0 对话 (模型名包含gpt-4,则使用gpt-4, 若包含moblie则使用gpt-4-moblie) > - [x] Tokens 计算 > - [x] Stream 流式传输 > - [x] 配置 PROXY 代理 @@ -30,7 +30,7 @@ https://t.me/chat2api > - [x] GPT4.0 画图、工具 (beta) > - [x] 支持 WSS (暂不支持代理,容易403) > - [x] 返回 conversation_id (beta) -> - [x] 支持GPTs(使用模型名称:gpt-4-gizmo-g-*) +> - [x] 支持GPTs(模型名:gpt-4-gizmo-g-*) > - [x] 上传图片、文件 (格式为API对应格式,支持url和base64) > TODO diff --git a/chatgpt/ChatService.py b/chatgpt/ChatService.py index b7249ca..cd3f23b 100644 --- a/chatgpt/ChatService.py +++ b/chatgpt/ChatService.py @@ -152,12 +152,16 @@ class ChatService: model = "gpt-4" gizmo_id = self.data.get("model").split("gpt-4-gizmo-")[-1] conversation_mode = {"kind": "gizmo_interaction", "gizmo_id": gizmo_id} + elif "gpt-4-mobile" in self.origin_model: + model = "gpt-4-mobile" + conversation_mode = {"kind": "primary_assistant"} elif "gpt-4" in self.origin_model: model = "gpt-4" conversation_mode = {"kind": "primary_assistant"} else: model = "text-davinci-002-render-sha" conversation_mode = {"kind": "primary_assistant"} + Logger.info(f"Model mapping: {self.origin_model} -> {model}") self.chat_request = { "action": "next", "messages": chat_messages, diff --git a/utils/config.py b/utils/config.py index 95e85ad..6deaa8e 100644 --- a/utils/config.py +++ b/utils/config.py @@ -29,7 +29,8 @@ chatgpt_base_url_list = chatgpt_base_url.split(',') if chatgpt_base_url else [] arkose_token_url_list = arkose_token_url.split(',') if arkose_token_url else [] proxy_url_list = proxy_url.split(',') if proxy_url else [] -logger.info("Environment variables (AUTHORIZATION not displayed):") +logger.info("Environment variables:") +logger.info("AUTHORIZATION: " + str(authorization_list)) logger.info("CHATGPT_BASE_URL: " + str(chatgpt_base_url_list)) logger.info("ARKOSE_TOKEN_URL: " + str(arkose_token_url_list)) logger.info("PROXY_URL: " + str(proxy_url_list))