From 8da952a04c0dba3fdc3fe1135b069d4abe4a954a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=90=8C=E8=B4=B5?= Date: Mon, 7 Aug 2023 16:26:52 +0800 Subject: [PATCH] 1. use English as much as possible. 2. handle callback in function, no need to set reraise=True in "@retry" 3. fix log format in loguru --- metagpt/provider/openai_api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/metagpt/provider/openai_api.py b/metagpt/provider/openai_api.py index 66b0da45d..20013edf4 100644 --- a/metagpt/provider/openai_api.py +++ b/metagpt/provider/openai_api.py @@ -117,10 +117,10 @@ class CostManager(metaclass=Singleton): def log_and_reraise(retry_state): - logger.error("Retry attempts exhausted. Last exception: %s", retry_state.outcome.exception()) + logger.error(f"Retry attempts exhausted. Last exception: {retry_state.outcome.exception()}") logger.warning(""" Recommend going to https://deepwisdom.feishu.cn/wiki/MsGnwQBjiif9c3koSJNcYaoSnu4#part-XdatdVlhEojeAfxaaEZcMV3ZniQ -See FAQ 5.8 PRD卡住/无法访问/连接中断 +See FAQ 5.8 """) raise retry_state.outcome.exception() @@ -216,7 +216,6 @@ class OpenAIGPTAPI(BaseGPTAPI, RateLimiter): wait=wait_fixed(1), after=after_log(logger, logging.WARNING), retry=retry_if_exception_type(APIConnectionError), - reraise=True, retry_error_callback=log_and_reraise, ) async def acompletion_text(self, messages: list[dict], stream=False) -> str: