diff --git a/models/ali/ali_qwen_bot.py b/models/ali/ali_qwen_bot.py index 5dbdc89..c8c2588 100644 --- a/models/ali/ali_qwen_bot.py +++ b/models/ali/ali_qwen_bot.py @@ -5,7 +5,7 @@ import time from typing import List, Tuple import openai -import openai.error +from models.openai.openai_compat import RateLimitError, Timeout, APIError, APIConnectionError import broadscope_bailian from broadscope_bailian import ChatQaMessage @@ -115,22 +115,22 @@ class AliQwenBot(Bot): except Exception as e: need_retry = retry_count < 2 result = {"completion_tokens": 0, "content": "我现在有点累了,等会再来吧"} - if isinstance(e, openai.error.RateLimitError): + if isinstance(e, RateLimitError): logger.warn("[QWEN] RateLimitError: {}".format(e)) result["content"] = "提问太快啦,请休息一下再问我吧" if need_retry: time.sleep(20) - elif isinstance(e, openai.error.Timeout): + elif isinstance(e, Timeout): logger.warn("[QWEN] Timeout: {}".format(e)) result["content"] = "我没有收到你的消息" if need_retry: time.sleep(5) - elif isinstance(e, openai.error.APIError): + elif isinstance(e, APIError): logger.warn("[QWEN] Bad Gateway: {}".format(e)) result["content"] = "请再问我一次" if need_retry: time.sleep(10) - elif isinstance(e, openai.error.APIConnectionError): + elif isinstance(e, APIConnectionError): logger.warn("[QWEN] APIConnectionError: {}".format(e)) need_retry = False result["content"] = "我连接不到你的网络" diff --git a/models/chatgpt/chat_gpt_bot.py b/models/chatgpt/chat_gpt_bot.py index df39eac..f6e4b50 100644 --- a/models/chatgpt/chat_gpt_bot.py +++ b/models/chatgpt/chat_gpt_bot.py @@ -244,22 +244,22 @@ class ChatGPTBot(Bot, OpenAIImage, OpenAICompatibleBot): except Exception as e: need_retry = retry_count < 2 result = {"completion_tokens": 0, "content": "我现在有点累了,等会再来吧"} - if isinstance(e, openai.error.RateLimitError): + if isinstance(e, RateLimitError): logger.warn("[CHATGPT] RateLimitError: {}".format(e)) result["content"] = "提问太快啦,请休息一下再问我吧" if need_retry: time.sleep(20) - elif isinstance(e, openai.error.Timeout): + elif isinstance(e, Timeout): logger.warn("[CHATGPT] Timeout: {}".format(e)) result["content"] = "我没有收到你的消息" if need_retry: time.sleep(5) - elif isinstance(e, openai.error.APIError): + elif isinstance(e, APIError): logger.warn("[CHATGPT] Bad Gateway: {}".format(e)) result["content"] = "请再问我一次" if need_retry: time.sleep(10) - elif isinstance(e, openai.error.APIConnectionError): + elif isinstance(e, APIConnectionError): logger.warn("[CHATGPT] APIConnectionError: {}".format(e)) result["content"] = "我连接不到你的网络" if need_retry: diff --git a/models/modelscope/modelscope_bot.py b/models/modelscope/modelscope_bot.py index 80e86cb..2994abd 100644 --- a/models/modelscope/modelscope_bot.py +++ b/models/modelscope/modelscope_bot.py @@ -3,7 +3,6 @@ import time import json import openai -import openai.error from models.bot import Bot from models.session_manager import SessionManager from bridge.context import ContextType diff --git a/models/openai/open_ai_bot.py b/models/openai/open_ai_bot.py index 8885948..d603f6a 100644 --- a/models/openai/open_ai_bot.py +++ b/models/openai/open_ai_bot.py @@ -3,7 +3,7 @@ import time import openai -import openai.error +from models.openai.openai_compat import RateLimitError, Timeout, APIConnectionError from models.bot import Bot from models.openai_compatible_bot import OpenAICompatibleBot @@ -109,17 +109,17 @@ class OpenAIBot(Bot, OpenAIImage, OpenAICompatibleBot): except Exception as e: need_retry = retry_count < 2 result = {"completion_tokens": 0, "content": "我现在有点累了,等会再来吧"} - if isinstance(e, openai.error.RateLimitError): + if isinstance(e, RateLimitError): logger.warn("[OPEN_AI] RateLimitError: {}".format(e)) result["content"] = "提问太快啦,请休息一下再问我吧" if need_retry: time.sleep(20) - elif isinstance(e, openai.error.Timeout): + elif isinstance(e, Timeout): logger.warn("[OPEN_AI] Timeout: {}".format(e)) result["content"] = "我没有收到你的消息" if need_retry: time.sleep(5) - elif isinstance(e, openai.error.APIConnectionError): + elif isinstance(e, APIConnectionError): logger.warn("[OPEN_AI] APIConnectionError: {}".format(e)) need_retry = False result["content"] = "我连接不到你的网络"