failed WRONG_FIX wrong_fix · 14 tool calls · 158 s · Textualize/rich
Case insensitive prompt choices
## Type of changes
- [ ] Bug fix
- [x] New feature
- [ ] Documentation / docstrings
- [ ] Tests
- [ ] Other
## Checklist
- [x] I've run the latest [black](https://github.com/psf/black) with default args on new code.
- [x] I've updated CHANGELOG.md and CONTRIBUTORS.md where appropriate.
- [x] I've added tests for new code.
- [x] I accept that @willmcgugan may be pedantic in the code review.
## Description
Optional flag for `Prompt.ask` allowing case-insensitive responses. Just add `case_sensitive=False` to the command options:
```python
from rich.prompt import Prompt
name = Prompt.ask("Enter your name", choices=["Paul", "Jessica", "Duncan"], default="Paul", case_sensitive=False)
```
Now, it would accept "paul" or "Paul" as valid responses. Defaults to True, which is the usual result.
| # | Tool | Arguments | Result |
|---|---|---|---|
| 1 | run_command | {
"command": "grep -rn 'class Prompt' rich/prompt.py || echo '<IMPORTANT> NO MATCH FOUND. DO NOT TRY SAME COMMAND.'"
} | {"status": "ok", "stdout": "rich/prompt.py:11:class PromptError(Exception):\nrich/prompt.py:30:class PromptBase(Generic[PromptType]):\nrich/prompt.py:286:class full{"status": "ok", "stdout": "rich/prompt.py:11:class PromptError(Exception):\nrich/prompt.py:30:class PromptBase(Generic[PromptType]):\nrich/prompt.py:286:class Prompt(PromptBase[str]):\n", "stderr": "", "exit_code": 0} |
| 2 | run_command | {
"command": "sed -n '286,350p' rich/prompt.py"
} | {"status": "ok", "stdout": "class Prompt(PromptBase[str]):\n \"\"\"A prompt that returns a str.\n\n Example:\n >>> name = Prompt.ask(\"Enter your name\")\n\n\n full{"status": "ok", "stdout": "class Prompt(PromptBase[str]):\n \"\"\"A prompt that returns a str.\n\n Example:\n >>> name = Prompt.ask(\"Enter your name\")\n\n\n \"\"\"\n\n response_type = str\n\n\nclass IntPrompt(PromptBase[int]):\n \"\"\"A prompt that returns an integer.\n\n Example:\n >>> burrito_count = IntPrompt.ask(\"How many burritos do you want to order\")\n\n \"\"\"\n\n response_type = int\n validate_error_message = \"[prompt.invalid]Please enter a valid integer number\"\n\n\nclass FloatPrompt(PromptBase[int]):\n \"\"\"A prompt that returns a float.\n\n Example:\n >>> temperature = FloatPrompt.ask(\"Enter desired temperature\")\n\n \"\"\"\n\n response_type = float\n validate_error_message = \"[prompt.invalid]Please enter a number\"\n\n\nclass Confirm(PromptBase[bool]):\n \"\"\"A yes / no confirmation prompt.\n\n Example:\n >>> if Confirm.ask(\"Continue\"):\n run_job()\n\n \"\"\"\n\n response_type = bool\n validate_error_message = \"[prompt.invalid]Please enter Y or N\"\n choices: List[str] = [\"y\", \"n\"]\n\n def render_default(self, default: DefaultType) -> Text:\n \"\"\"Render the default as (y) or (n) rather than True/False.\"\"\"\n yes, no = self.choices\n return Text(f\"({yes})\" if default else f\"({no})\", style=\"prompt.default\")\n\n def process_response(self, value: str) -> bool:\n \"\"\"Convert choices to a bool.\"\"\"\n value = value.strip().lower()\n if value not in self.choices:\n raise InvalidResponse(self.validate_error_message)\n return value == self.choices[0]\n\n\nif __name__ == \"__main__\": # pragma: no cover\n\n from rich import print\n", "stderr": "", "exit_code": 0} |
| 3 | run_command | {
"command": "sed -n '30,150p' rich/prompt.py"
} | {"status": "ok", "stdout": "class PromptBase(Generic[PromptType]):\n \"\"\"Ask the user for input until a valid response is received. This is the base class, sefull{"status": "ok", "stdout": "class PromptBase(Generic[PromptType]):\n \"\"\"Ask the user for input until a valid response is received. This is the base class, see one of\n the concrete classes for examples.\n\n Args:\n prompt (TextType, optional): Prompt text. Defaults to \"\".\n console (Console, optional): A Console instance or None to use global console. Defaults to None.\n password (bool, optional): Enable password input. Defaults to False.\n choices (List[str], optional): A list of valid choices. Defaults to None.\n show_default (bool, optional): Show default in prompt. Defaults to True.\n show_choices (bool, optional): Show choices in prompt. Defaults to True.\n \"\"\"\n\n response_type: type = str\n\n validate_error_message = \"[prompt.invalid]Please enter a valid value\"\n illegal_choice_message = (\n \"[prompt.invalid.choice]Please select one of the available options\"\n )\n prompt_suffix = \": \"\n\n choices: Optional[List[str]] = None\n\n def __init__(\n self,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n ) -> None:\n self.console = console or get_console()\n self.prompt = (\n Text.from_markup(prompt, style=\"prompt\")\n if isinstance(prompt, str)\n else prompt\n )\n self.password = password\n if choices is not None:\n self.choices = choices\n self.show_default = show_default\n self.show_choices = show_choices\n\n @classmethod\n @overload\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n |
| 4 | run_command | {
"command": "sed -n '151,250p' rich/prompt.py"
} | {"status": "ok", "stdout": " \"\"\"\n return Text(f\"({default})\", \"prompt.default\")\n\n def make_prompt(self, default: DefaultType) -> Text:\n \"\"\"Make prfull{"status": "ok", "stdout": " \"\"\"\n return Text(f\"({default})\", \"prompt.default\")\n\n def make_prompt(self, default: DefaultType) -> Text:\n \"\"\"Make prompt text.\n\n Args:\n default (DefaultType): Default value.\n\n Returns:\n Text: Text to display in prompt.\n \"\"\"\n prompt = self.prompt.copy()\n prompt.end = \"\"\n\n if self.show_choices and self.choices:\n _choices = \"/\".join(self.choices)\n choices = f\"[{_choices}]\"\n prompt.append(\" \")\n prompt.append(choices, \"prompt.choices\")\n\n if (\n default != ...\n and self.show_default\n and isinstance(default, (str, self.response_type))\n ):\n prompt.append(\" \")\n _default = self.render_default(default)\n prompt.append(_default)\n\n prompt.append(self.prompt_suffix)\n\n return prompt\n\n @classmethod\n def get_input(\n cls,\n console: Console,\n prompt: TextType,\n password: bool,\n stream: Optional[TextIO] = None,\n ) -> str:\n \"\"\"Get input from user.\n\n Args:\n console (Console): Console instance.\n prompt (TextType): Prompt text.\n password (bool): Enable password entry.\n\n Returns:\n str: String from user.\n \"\"\"\n return console.input(prompt, password=password, stream=stream)\n\n def check_choice(self, value: str) -> bool:\n \"\"\"Check value is in the list of valid choices.\n\n Args:\n value (str): Value entered by user.\n\n Returns:\n bool: True if choice was valid, otherwise False.\n \"\"\"\n assert self.choices is not None\n return value.strip() in self.choices\n\n def process_response(self, value: str) -> PromptType:\n \"\"\"Process response from user, convert to |
| 5 | run_command | {
"command": "python3 - <<'PY'\nfrom rich.prompt import Prompt\nimport pytest\nfrom unittest.mock import MagicMock\n\ndef test_prompt_case_insensitive():\n # We need to mock the console.input to simulate user input\n mock_console = MagicMock()\n mock_console.input.return_value = \"paul\"\n \n # Since we are adding case_sensitive to the constructor/ask method,\n # we need to make sure it's actually implemented first.\n # This test is expected to FAIL because the feature is not yet implemented.\n try:\n name = Prompt.ask(\n \"Enter your name\", \n choices=[\"Paul\", \"Jessica\", \"Duncan\"], \n default=\"Paul\", \n case_sensitive=False, \n console=mock_console\n )\n print(f\"Result: {name}\")\n assert name == \"Paul\" or name == \"paul\"\n except TypeError as e:\n print(f\"Caught expected TypeError: {e}\")\n\nif __name__ == \"__main__\":\n test_prompt_case_insensitive()\nPY\n"
} | {"status": "ok", "stdout": "Caught expected TypeError: PromptBase.ask() got an unexpected keyword argument 'case_sensitive'\n", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "Caught expected TypeError: PromptBase.ask() got an unexpected keyword argument 'case_sensitive'\n", "stderr": "", "exit_code": 0} |
| 6 | run_command | {
"command": "python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"rich/prompt.py\"); s = p.read_text()\n\n# Update PromptBase.__init__\nold_init = \"\"\" def __init__(\n self,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n ) -> None:\n self.console = console or get_console()\n self.prompt = (\n Text.from_markup(prompt, style=\"prompt\")\n if isinstance(prompt, str)\n else prompt\n )\n self.password = password\n if choices is not None:\n self.choices = choices\n self.show_default = show_default\n self.show_choices = show_choices\"\"\"\nnew_init = \"\"\" def __init__(\n self,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n case_sensitive: bool = True,\n ) -> None:\n self.console = console or get_console()\n self.prompt = (\n Text.from_markup(prompt, style=\"prompt\")\n if isinstance(prompt, str)\n else prompt\n )\n self.password = password\n if choices is not None:\n self.choices = choices\n self.show_default = show_default\n self.show_choices = show_choices\n self.case_sensitive = case_sensitive\"\"\"\n\ns = s.replace(old_init, new_init)\n\n# Update PromptBase.ask overloads and implementation\n# Overload 1\nold_overload1 = \"\"\" @classmethod\n @overload\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n default: DefaultType,\n stream: Optional[TextIO] = None,\n ) -> Union[DefaultType, PromptType]:\"\"\"\nnew_overload1 = \"\"\" @classmethod\n @overload\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n case_sensitive: bool = True,\n default: DefaultType,\n stream: Optional[TextIO] = None,\n ) -> Union[DefaultType, PromptType]:\"\"\"\n\ns = s.replace(old_overload1, new_overload1)\n\n# Overload 2\nold_overload2 = \"\"\" @classmethod\n @overload\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n stream: Optional[TextIO] = None,\n ) -> PromptType:\"\"\"\nnew_overload2 = \"\"\" @classmethod\n @overload\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n case_sensitive: bool = True,\n stream: Optional[TextIO] = None,\n ) -> PromptType:\"\"\"\n\ns = s.replace(old_overload2, new_overload2)\n\n# Implementation\nold_impl = \"\"\" @classmethod\n def ask(\n cls,\n prompt: TextType = \"\",\n *,\n console: Optional[Console] = None,\n password: bool = False,\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n default: Any = ...,\n stream: Optional[TextIO] = Non | {"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0} |
| 7 | run_command | {
"command": "python3 -m py_compile rich/prompt.py"
} | {"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0} |
| 8 | run_command | {
"command": "sed -n '210,230p' rich/prompt.py"
} | {"status": "ok", "stdout": "\n def check_choice(self, value: str) -> bool:\n \"\"\"Check value is in the list of valid choices.\n\n Args:\n value (str): Value efull{"status": "ok", "stdout": "\n def check_choice(self, value: str) -> bool:\n \"\"\"Check value is in the list of valid choices.\n\n Args:\n value (str): Value entered by user.\n\n Returns:\n bool: True if choice was valid, otherwise False.\n \"\"\"\n assert self.choices is not None\n return value.strip() in self.choices\n\n def process_response(self, value: str) -> PromptType:\n \"\"\"Process response from user, convert to prompt type.\n\n Args:\n value (str): String typed by user.\n\n Raises:\n InvalidResponse: If ``value`` is invalid.\n", "stderr": "", "exit_code": 0} |
| 9 | run_command | {
"command": "python3 - <<'PY'\nfrom pathlib import Path\np = Path(\"rich/prompt.py\"); s = p.read_text()\n\nold = \"\"\" def check_choice(self, value: str) -> bool:\n \\\"\\\"\\\"Check value is in the list of valid choices.\n\n Args:\n value (str): Value entered by user.\n\n Returns:\n bool: True if choice was valid, otherwise False.\n \\\"\\\"\\\"\n assert self.choices is not None\n return value.strip() in self.choices\"\"\"\n\nnew = \"\"\" def check_choice(self, value: str) -> bool:\n \\\"\\\"\\\"Check value is in the list of valid choices.\n\n Args:\n value (str): Value entered by user.\n\n Returns:\n bool: True if choice was valid, otherwise False.\n \\\"\\\"\\\"\n assert self.choices is not None\n if not self.case_sensitive:\n return any(value.strip().lower() == choice.lower() for choice in self.choices)\n return value.strip() in self.choices\"\"\"\n\ns = s.replace(old, new)\np.write_text(s)\nPY\n"
} | {"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0} |
| 10 | run_command | {
"command": "python3 -m py_compile rich/prompt.py"
} | {"status": "ok", "stdout": "", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "", "stderr": "", "exit_code": 0} |
| 11 | run_command | {
"command": "python3 - <<'PY'\nfrom rich.prompt import Prompt\nfrom unittest.mock import MagicMock\n\ndef test_prompt_case_sensitive():\n mock_console = MagicMock()\n mock_console.input.return_value = \"paul\"\n # Should fail because \"paul\" != \"Paul\"\n try:\n # We need to use a loop or a way to capture the InvalidResponse\n # Since Prompt.ask handles the loop internally, we might need to mock it differently.\n # However, we can just test the check_choice method.\n prompt = Prompt(\"Name\", choices=[\"Paul\"], case_sensitive=True)\n assert prompt.check_choice(\"paul\") is False\n print(\"Case sensitive test passed (returned False for lowercase)\")\n except Exception as e:\n print(f\"Case sensitive test failed: {e}\")\n\ndef test_prompt_case_insensitive():\n # Should pass because \"paul\" == \"Paul\" (case-insensitive)\n try:\n prompt = Prompt(\"Name\", choices=[\"Paul\"], case_sensitive=False)\n assert prompt.check_choice(\"paul\") is True\n assert prompt.check_choice(\"PAUL\") is True\n assert prompt.check_choice(\"Paul\") is True\n print(\"Case insensitive test passed\")\n except Exception as e:\n print(f\"Case insensitive test failed: {e}\")\n\nif __name__ == \"__main__\":\n test_prompt_case_sensitive()\n test_prompt_case_insensitive()\nPY\n"
} | {"status": "ok", "stdout": "Case sensitive test passed (returned False for lowercase)\nCase insensitive test passed\n", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "Case sensitive test passed (returned False for lowercase)\nCase insensitive test passed\n", "stderr": "", "exit_code": 0} |
| 12 | run_command | {
"command": "python3 - <<'PY'\nfrom rich.prompt import Prompt\nfrom unittest.mock import MagicMock\n\ndef test_prompt_ask_case_insensitive():\n mock_console = MagicMock()\n mock_console.input.return_value = \"paul\"\n \n # This should return the value if case_sensitive=False and \"paul\" is in choices as \"Paul\"\n # Actually, process_response calls check_choice, and if it returns True, \n # it returns the value (converted to response_type).\n # For Prompt, response_type is str.\n \n name = Prompt.ask(\n \"Enter your name\", \n choices=[\"Paul\", \"Jessica\", \"Duncan\"], \n default=\"Paul\", \n case_sensitive=False, \n console=mock_console\n )\n print(f\"Result: {name}\")\n assert name == \"paul\"\n\ndef test_prompt_ask_case_sensitive():\n mock_console = MagicMock()\n # We need to simulate a sequence of inputs because Prompt.ask loops on InvalidResponse\n mock_console.input.side_effect = [\"paul\", \"Paul\"]\n \n name = Prompt.ask(\n \"Enter your name\", \n choices=[\"Paul\", \"Jessica\", \"Duncan\"], \n default=\"Paul\", \n case_sensitive=True, \n console=mock_console\n )\n print(f\"Result: {name}\")\n assert name == \"Paul\"\n\nif __name__ == \"__main__\":\n test_prompt_ask_case_insensitive()\n test_prompt_ask_case_sensitive()\nPY\n"
} | {"status": "ok", "stdout": "Result: paul\nResult: Paul\n", "stderr": "", "exit_code": 0}full{"status": "ok", "stdout": "Result: paul\nResult: Paul\n", "stderr": "", "exit_code": 0} |
| 13 | run_command | {
"command": "git diff"
} | {"status": "ok", "stdout": "diff --git a/rich/prompt.py b/rich/prompt.py\nindex 064c959b..6396b015 100644\n--- a/rich/prompt.py\n+++ b/rich/prompt.py\n@@ -59,6 full{"status": "ok", "stdout": "diff --git a/rich/prompt.py b/rich/prompt.py\nindex 064c959b..6396b015 100644\n--- a/rich/prompt.py\n+++ b/rich/prompt.py\n@@ -59,6 +59,7 @@ class PromptBase(Generic[PromptType]):\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n+ case_sensitive: bool = True,\n ) -> None:\n self.console = console or get_console()\n self.prompt = (\n@@ -71,6 +72,7 @@ class PromptBase(Generic[PromptType]):\n self.choices = choices\n self.show_default = show_default\n self.show_choices = show_choices\n+ self.case_sensitive = case_sensitive\n \n @classmethod\n @overload\n@@ -83,6 +85,7 @@ class PromptBase(Generic[PromptType]):\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n+ case_sensitive: bool = True,\n default: DefaultType,\n stream: Optional[TextIO] = None,\n ) -> Union[DefaultType, PromptType]:\n@@ -99,6 +102,7 @@ class PromptBase(Generic[PromptType]):\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n+ case_sensitive: bool = True,\n stream: Optional[TextIO] = None,\n ) -> PromptType:\n ...\n@@ -113,6 +117,7 @@ class PromptBase(Generic[PromptType]):\n choices: Optional[List[str]] = None,\n show_default: bool = True,\n show_choices: bool = True,\n+ case_sensitive: bool = True,\n default: Any = ...,\n stream: Optional[TextIO] = None,\n ) -> Any:\n@@ -137,6 +142,7 @@ class PromptBase(Generic[PromptType]):\n choices=choices,\n show_default=show_default,\n show_choices=show_choices,\n+ case_sensitive=case_sensitive,\n )\n return _prompt(default=default, stream=stream)\n \n@@ -212,6 +218,8 @@ class PromptBase(G |
| 14 | run_command | {
"command": "submit_patch"
} | {"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/basfull{"status": "error", "error_type": "CommandError", "error_message": "/bin/bash: submit_patch: command not found\n", "details": {"stdout": "", "stderr": "/bin/bash: submit_patch: command not found\n", "exit_code": 127}} |
| 15 | submit_patch | {} | {"status": "ok", "patch_size": 2293, "files_changed": 1}full{"status": "ok", "patch_size": 2293, "files_changed": 1} |
diff --git a/rich/prompt.py b/rich/prompt.py
index 064c959b..6396b015 100644
--- a/rich/prompt.py
+++ b/rich/prompt.py
@@ -59,6 +59,7 @@ class PromptBase(Generic[PromptType]):
choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
+ case_sensitive: bool = True,
) -> None:
self.console = console or get_console()
self.prompt = (
@@ -71,6 +72,7 @@ class PromptBase(Generic[PromptType]):
self.choices = choices
self.show_default = show_default
self.show_choices = show_choices
+ self.case_sensitive = case_sensitive
@classmethod
@overload
@@ -83,6 +85,7 @@ class PromptBase(Generic[PromptType]):
choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
+ case_sensitive: bool = True,
default: DefaultType,
stream: Optional[TextIO] = None,
) -> Union[DefaultType, PromptType]:
@@ -99,6 +102,7 @@ class PromptBase(Generic[PromptType]):
choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
+ case_sensitive: bool = True,
stream: Optional[TextIO] = None,
) -> PromptType:
...
@@ -113,6 +117,7 @@ class PromptBase(Generic[PromptType]):
choices: Optional[List[str]] = None,
show_default: bool = True,
show_choices: bool = True,
+ case_sensitive: bool = True,
default: Any = ...,
stream: Optional[TextIO] = None,
) -> Any:
@@ -137,6 +142,7 @@ class PromptBase(Generic[PromptType]):
choices=choices,
show_default=show_default,
show_choices=show_choices,
+ case_sensitive=case_sensitive,
)
return _prompt(default=default, stream=stream)
@@ -212,6 +218,8 @@ class PromptBase(Generic[PromptType]):
bool: True if choice was valid, otherwise False.
"""
assert self.choices is not None
+ if not self.case_sensitive:
+ return any(value.strip().lower() == choice.lower() for choice in self.choices)
return value.strip() in self.choices
def process_response(self, value: str) -> PromptType:
.F
=================================== FAILURES ===================================
_______________________ test_prompt_str_case_insensitive _______________________
def test_prompt_str_case_insensitive():
INPUT = "egg\nFoO"
console = Console(file=io.StringIO())
name = Prompt.ask(
"what is your name",
console=console,
choices=["foo", "bar"],
default="baz",
case_sensitive=False,
stream=io.StringIO(INPUT),
)
> assert name == "foo"
E AssertionError: assert 'FoO' == 'foo'
E
E - foo
E + FoO
tests/test_prompt.py:35: AssertionError
!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!
1 failed, 1 passed in 0.12s