dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-24 14:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

treat litellm.exceptions.BadRequestError as a 400 error and do not retry

Browse source
This commit is contained in:
Paul Gauthier 2024-04-30 15:40:13 -07:00
parent 3469e04eb8
commit a3a4d87a0c
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
aider/coders/base_coder.py
View file

@ -11,6 +11,7 @@ from json.decoder import JSONDecodeError
from pathlib import Path from pathlib import Path
import git import git
import litellm
import openai import openai
from jsonschema import Draft7Validator from jsonschema import Draft7Validator
from rich.console import Console, Text from rich.console import Console, Text
@ -28,6 +29,8 @@ from aider.utils import is_image_file
from ..dump import dump # noqa: F401 from ..dump import dump # noqa: F401
litellm.suppress_debug_info = True
class MissingAPIKeyError(ValueError): class MissingAPIKeyError(ValueError):
pass pass
@ -572,6 +575,9 @@ class Coder:
interrupted = True interrupted = True
except ExhaustedContextWindow: except ExhaustedContextWindow:
exhausted = True exhausted = True
except litellm.exceptions.BadRequestError as err:
self.io.tool_error(f"BadRequestError: {err}")
return
except openai.BadRequestError as err: except openai.BadRequestError as err:
if "maximum context length" in str(err): if "maximum context length" in str(err):
exhausted = True exhausted = True

8
aider/sendchat.py
View file

@ -18,12 +18,6 @@ CACHE = None
litellm.suppress_debug_info = True litellm.suppress_debug_info = True
def giveup_on_recitiation(ex):
if not isinstance(ex, litellm.exceptions.BadRequestError):
return
return "RECITATION" in str(ex)
@backoff.on_exception( @backoff.on_exception(
backoff.expo, backoff.expo,
( (
@ -31,10 +25,8 @@ def giveup_on_recitiation(ex):
RateLimitError, RateLimitError,
APIConnectionError, APIConnectionError,
httpx.ConnectError, httpx.ConnectError,
litellm.exceptions.BadRequestError,
litellm.exceptions.ServiceUnavailableError, litellm.exceptions.ServiceUnavailableError,
), ),
giveup=giveup_on_recitiation,
max_tries=10, max_tries=10,
on_backoff=lambda details: print( on_backoff=lambda details: print(
f"{details.get('exception','Exception')}\nRetry in {details['wait']:.1f} seconds." f"{details.get('exception','Exception')}\nRetry in {details['wait']:.1f} seconds."