refactor: update simple_send_with_retries to use model object and handle temperature

This commit is contained in:
Paul Gauthier (aider) 2024-12-07 13:37:14 -08:00
parent 2325f542b8
commit ccf460c1f7
3 changed files with 6 additions and 9 deletions

View file

@ -108,9 +108,7 @@ class ChatSummary:
for model in self.models: for model in self.models:
try: try:
summary = simple_send_with_retries( summary = simple_send_with_retries(model, summarize_messages)
model.name, summarize_messages, extra_params=model.extra_params
)
if summary is not None: if summary is not None:
summary = prompts.summary_prefix + summary summary = prompts.summary_prefix + summary
return [dict(role="user", content=summary)] return [dict(role="user", content=summary)]

View file

@ -192,9 +192,7 @@ class GitRepo:
max_tokens = model.info.get("max_input_tokens") or 0 max_tokens = model.info.get("max_input_tokens") or 0
if max_tokens and num_tokens > max_tokens: if max_tokens and num_tokens > max_tokens:
continue continue
commit_message = simple_send_with_retries( commit_message = simple_send_with_retries(model, messages)
model.name, messages, extra_params=model.extra_params
)
if commit_message: if commit_message:
break break

View file

@ -56,18 +56,19 @@ def send_completion(
return hash_object, res return hash_object, res
def simple_send_with_retries(model_name, messages, extra_params=None): def simple_send_with_retries(model, messages):
litellm_ex = LiteLLMExceptions() litellm_ex = LiteLLMExceptions()
retry_delay = 0.125 retry_delay = 0.125
while True: while True:
try: try:
kwargs = { kwargs = {
"model_name": model_name, "model_name": model.name,
"messages": messages, "messages": messages,
"functions": None, "functions": None,
"stream": False, "stream": False,
"extra_params": extra_params, "temperature": None if not model.use_temperature else 0,
"extra_params": model.extra_params,
} }
_hash, response = send_completion(**kwargs) _hash, response = send_completion(**kwargs)