Revert "rename simple_send_with_retries -> send_with_retries"

This reverts commit d619edf6e9.

aider/history.py

@@ -2,7 +2,7 @@ import argparse
 
 from aider import models, prompts
 from aider.dump import dump  # noqa: F401
-from aider.sendchat import send_with_retries
+from aider.sendchat import simple_send_with_retries
 
 
 class ChatSummary:
@@ -108,7 +108,7 @@ class ChatSummary:
 
         for model in self.models:
             try:
-                summary = send_with_retries(model.name, summarize_messages)
+                summary = simple_send_with_retries(model.name, summarize_messages)
                 if summary is not None:
                     summary = prompts.summary_prefix + summary
                     return [dict(role="user", content=summary)]

aider/repo.py

@@ -6,7 +6,7 @@ import git
 import pathspec
 
 from aider import prompts, utils
-from aider.sendchat import send_with_retries
+from aider.sendchat import simple_send_with_retries
 
 from .dump import dump  # noqa: F401
 
@@ -170,7 +170,7 @@ class GitRepo:
         ]
 
         for model in self.models:
-            commit_message = send_with_retries(model.name, messages)
+            commit_message = simple_send_with_retries(model.name, messages)
             if commit_message:
                 break
 

aider/sendchat.py

@@ -66,13 +66,7 @@ def lazy_litellm_retry_decorator(func):
 
 @lazy_litellm_retry_decorator
 def send_with_retries(
-    model_name,
-    messages,
-    functions=None,
-    stream=False,
-    temperature=0,
-    extra_headers=None,
-    max_tokens=None,
+    model_name, messages, functions, stream, temperature=0, extra_headers=None, max_tokens=None
 ):
     from aider.llm import litellm
 
@@ -105,3 +99,16 @@ def send_with_retries(
         CACHE[key] = res
 
     return hash_object, res
+
+
+def simple_send_with_retries(model_name, messages):
+    try:
+        _hash, response = send_with_retries(
+            model_name=model_name,
+            messages=messages,
+            functions=None,
+            stream=False,
+        )
+        return response.choices[0].message.content
+    except (AttributeError, litellm.exceptions.BadRequestError):
+        return