From 24b1360eb8cf4fba556a5998469d18e554337247 Mon Sep 17 00:00:00 2001 From: "Paul Gauthier (aider)" Date: Tue, 4 Feb 2025 11:33:05 -0800 Subject: [PATCH] style: Run linter and fix whitespace issues in models.py and sendchat.py --- aider/models.py | 4 ++++ aider/sendchat.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aider/models.py b/aider/models.py index 11e455d42..2e0249628 100644 --- a/aider/models.py +++ b/aider/models.py @@ -528,9 +528,11 @@ class Model(ModelSettings): def send_completion(self, messages, functions, stream, temperature=0, extra_params=None): if os.environ.get("AIDER_SANITY_CHECK_TURNS"): from aider.sendchat import sanity_check_messages + sanity_check_messages(messages) if "deepseek-reasoner" in self.name: from aider.sendchat import ensure_alternating_roles + messages = ensure_alternating_roles(messages) kwargs = dict( model=self.name, @@ -549,6 +551,7 @@ class Model(ModelSettings): # dump(kwargs) hash_object = hashlib.sha1(key) from aider.sendchat import CACHE, litellm + if not stream and CACHE is not None and key in CACHE: return hash_object, CACHE[key] res = litellm.completion(**kwargs) @@ -559,6 +562,7 @@ class Model(ModelSettings): def simple_send_with_retries(self, messages): from aider.exceptions import LiteLLMExceptions from aider.sendchat import RETRY_TIMEOUT, ensure_alternating_roles + litellm_ex = LiteLLMExceptions() if "deepseek-reasoner" in self.name: messages = ensure_alternating_roles(messages) diff --git a/aider/sendchat.py b/aider/sendchat.py index f5518cc70..23e8612a1 100644 --- a/aider/sendchat.py +++ b/aider/sendchat.py @@ -75,7 +75,3 @@ def ensure_alternating_roles(messages): prev_role = current_role return fixed_messages - - - -