From 810aeccf94df91158e751380b39a6e07917a096f Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Fri, 27 Sep 2024 13:09:43 -0700 Subject: [PATCH] fix: Replace extra_headers and extra_body with extra_params in Coder, ChatSummary, and GitRepo --- aider/coders/base_coder.py | 4 +--- aider/history.py | 2 +- aider/repo.py | 2 +- aider/sendchat.py | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 772a16b17..2c6072a66 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -1409,9 +1409,7 @@ class Coder: functions, self.stream, temp, - extra_headers=model.extra_headers, - extra_body=model.extra_body, - max_tokens=model.max_tokens, + extra_params=model.extra_params, ) self.chat_completion_call_hashes.append(hash_object.hexdigest()) diff --git a/aider/history.py b/aider/history.py index d6e1136f7..d758ccbe7 100644 --- a/aider/history.py +++ b/aider/history.py @@ -109,7 +109,7 @@ class ChatSummary: for model in self.models: try: summary = simple_send_with_retries( - model.name, summarize_messages, extra_headers=model.extra_headers + model.name, summarize_messages, extra_params=model.extra_params ) if summary is not None: summary = prompts.summary_prefix + summary diff --git a/aider/repo.py b/aider/repo.py index 65cd6c7a5..d3ccc07b8 100644 --- a/aider/repo.py +++ b/aider/repo.py @@ -193,7 +193,7 @@ class GitRepo: if max_tokens and num_tokens > max_tokens: continue commit_message = simple_send_with_retries( - model.name, messages, extra_headers=model.extra_headers + model.name, messages, extra_params=model.extra_params ) if commit_message: break diff --git a/aider/sendchat.py b/aider/sendchat.py index 14efce945..0fb9406c4 100644 --- a/aider/sendchat.py +++ b/aider/sendchat.py @@ -96,9 +96,8 @@ def simple_send_with_retries(model_name, messages, extra_params=None): "messages": messages, "functions": None, "stream": False, + "extra_params": extra_params, } - if extra_params is not None: - kwargs["extra_params"] = extra_params _hash, response = send_completion(**kwargs) return response.choices[0].message.content