chore: Move commit message spinner into model loop and show model name

This commit is contained in:
Paul Gauthier (aider) 2025-05-09 18:07:58 -07:00
parent 43cd0164e0
commit a9cb1a9d61

View file

@ -343,15 +343,16 @@ class GitRepo:
] ]
commit_message = None commit_message = None
with WaitingSpinner("Generating commit message"): for model in self.models:
for model in self.models: spinner_text = f"Waiting for {model.name} to generate commit message"
with WaitingSpinner(spinner_text):
num_tokens = model.token_count(messages) num_tokens = model.token_count(messages)
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 = model.simple_send_with_retries(messages) commit_message = model.simple_send_with_retries(messages)
if commit_message: if commit_message:
break break # Found a model that could generate the message
if not commit_message: if not commit_message:
self.io.tool_error("Failed to generate commit message!") self.io.tool_error("Failed to generate commit message!")