refactor help install and add to test setup

aider/commands.py

@@ -6,8 +6,8 @@ from pathlib import Path
 
 import git
 
-from aider import models, prompts, utils, voice
-from aider.help import Help
+from aider import models, prompts, voice
+from aider.help import Help, install_help_extra
 from aider.llm import litellm
 from aider.scrape import Scraper
 from aider.utils import is_image_file
@@ -662,17 +662,7 @@ class Commands:
         from aider.coders import Coder
 
         if not self.help:
-            pip_install_cmd = [
-                "aider-chat[hf-embed]",
-                "--extra-index-url",
-                "https://download.pytorch.org/whl/cpu",
-            ]
-            res = utils.check_pip_install_extra(
-                self.io,
-                "llama_index.embeddings.huggingface",
-                "To use interactive /help you need to install HuggingFace embeddings",
-                pip_install_cmd,
-            )
+            res = install_help_extra(self.io)
             if not res:
                 self.io.tool_error("Unable to initialize interactive help.")
                 return

aider/help.py

@@ -6,13 +6,28 @@ from pathlib import Path
 
 import importlib_resources
 
-from aider import __version__
+from aider import __version__, utils
 from aider.dump import dump  # noqa: F401
 from aider.help_pats import exclude_website_pats
 
 warnings.simplefilter("ignore", category=FutureWarning)
 
 
+def install_help_extra(io):
+    pip_install_cmd = [
+        "aider-chat[hf-embed]",
+        "--extra-index-url",
+        "https://download.pytorch.org/whl/cpu",
+    ]
+    res = utils.check_pip_install_extra(
+        io,
+        "llama_index.embeddings.huggingface",
+        "To use interactive /help you need to install HuggingFace embeddings",
+        pip_install_cmd,
+    )
+    return res
+
+
 def get_package_files():
     for path in importlib_resources.files("aider.website").iterdir():
         if path.is_file():
@@ -88,7 +103,7 @@ def get_index():
 
 
 class Help:
-    def __init__(self, pip_install=False):
+    def __init__(self):
         from llama_index.core import Settings
         from llama_index.embeddings.huggingface import HuggingFaceEmbedding
 

aider/tests/test_help.py

@@ -1,11 +1,13 @@
 import unittest
 
-from aider.help import Help
+from aider.help import Help, install_help_extra
+from aider.io import InputOutput
 
 
 class TestHelp(unittest.TestCase):
     def setUp(self):
-        Help(pip_install=True)
+        io = InputOutput(yes=True)
+        install_help_extra(io)
 
     def test_init(self):
         help_inst = Help()

aider/utils.py

@@ -236,7 +236,7 @@ def check_pip_install_extra(io, module, prompt, pip_install_cmd):
 
     cmd = get_pip_install(pip_install_cmd)
 
-    text = f"{prompt}:\n\n{' '.join(cmd)}\n\n"
+    text = f"{prompt}:\n\n{' '.join(cmd)}\n"
     io.tool_error(text)
 
     if not io.confirm_ask("Run pip install?", default="y"):