From b78cc3c1cab491a81bc59ddeff2f2ba96d3bc650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8E=98=E6=9D=83=20=E9=A9=AC?= Date: Fri, 19 Jan 2024 11:49:35 +0800 Subject: [PATCH] feat: Maintain the original exceptions of OpenAI and HTTPX during exception handling. --- metagpt/utils/common.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/metagpt/utils/common.py b/metagpt/utils/common.py index 3295603b4..3102158c2 100644 --- a/metagpt/utils/common.py +++ b/metagpt/utils/common.py @@ -28,7 +28,7 @@ from typing import Any, List, Tuple, Union import aiofiles import loguru from pydantic_core import to_jsonable_python -from tenacity import RetryCallState, _utils +from tenacity import RetryCallState, RetryError, _utils from metagpt.const import MESSAGE_ROUTE_TO_ALL from metagpt.logs import logger @@ -510,10 +510,11 @@ def role_raise_decorator(func): # remove role newest observed msg to make it observed again self.rc.memory.delete(self.latest_observed_msg) # raise again to make it captured outside - last_error = e.last_attempt._exception - name = any_to_str(last_error) - if re.match(r"^openai\.", name) or re.match(r"^httpx\.", name): - raise last_error + if isinstance(e, RetryError): + last_error = e.last_attempt._exception + name = any_to_str(last_error) + if re.match(r"^openai\.", name) or re.match(r"^httpx\.", name): + raise last_error raise Exception(format_trackback_info(limit=None))