dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 10:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Expand valid_responses to their whole words

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-08-24 08:57:28 -07:00
parent 668ab7e204
commit 231e962c7f
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
aider/io.py
View file

@ -387,15 +387,15 @@ class InputOutput:
if group and not group.show_group: if group and not group.show_group:
group = None group = None
valid_responses = "yn" valid_responses = ["yes", "no"]
options = " (Y)es/(N)o" options = " (Y)es/(N)o"
if group: if group:
if not explicit_yes_required: if not explicit_yes_required:
options += "/(A)ll" options += "/(A)ll"
valid_responses += "a" valid_responses.append("all")
options += "/(S)kip all" options += "/(S)kip all"
valid_responses += "s" valid_responses.append("skip")
question += options + " [Y]: " question += options + " [Yes]: "
if subject: if subject:
self.tool_output() self.tool_output()
@ -416,9 +416,9 @@ class InputOutput:
def is_valid_response(text): def is_valid_response(text):
if not text: if not text:
return True return True
return text.lower()[0] in valid_responses return text.lower() in valid_responses
error_message = f"Please answer one of {options}" error_message = f"Please answer with one of: {', '.join(valid_responses)}"
validator = Validator.from_callable( validator = Validator.from_callable(
is_valid_response, is_valid_response,
error_message=error_message, error_message=error_message,
@ -441,21 +441,21 @@ class InputOutput:
if not res: if not res:
res = "y" # Default to Yes if no input res = "y" # Default to Yes if no input
res = res.lower()[0] res = res.lower()
if explicit_yes_required: if explicit_yes_required:
is_yes = res == "y" is_yes = res == "yes"
else: else:
is_yes = res in ("y", "a") is_yes = res in ("yes", "all")
is_all = res == "a" and group is not None and not explicit_yes_required is_all = res == "all" and group is not None and not explicit_yes_required
is_skip = res == "s" and group is not None is_skip = res == "skip" and group is not None
if group: if group:
if is_all and not explicit_yes_required: if is_all and not explicit_yes_required:
group.preference = "a" group.preference = "all"
elif is_skip: elif is_skip:
group.preference = "s" group.preference = "skip"
hist = f"{question.strip()} {res}" hist = f"{question.strip()} {res}"
self.append_chat_history(hist, linebreak=True, blockquote=True) self.append_chat_history(hist, linebreak=True, blockquote=True)