path: root/aur-install-notice.patch

From 164c4fc945d1a315db8feb44e544f866c1c0f5cb Mon Sep 17 00:00:00 2001
From: Claudia Pellegrino <claui@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:17:21 +0100
Subject: [PATCH 1/5] AUR-specific: replace auto-updater with a notice

---
 aider/versioncheck.py | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/aider/versioncheck.py b/aider/versioncheck.py
index ac511a02..bf1490ab 100644
--- a/aider/versioncheck.py
+++ b/aider/versioncheck.py
@@ -36,29 +36,11 @@ def install_upgrade(io, latest_version=None):
     else:
         new_ver_text = "Install latest version of aider?"
 
-    docker_image = os.environ.get("AIDER_DOCKER_IMAGE")
-    if docker_image:
-        text = f"""
-{new_ver_text} To upgrade, run:
-
-    docker pull {docker_image}
+    text = f"""
+{new_ver_text} To upgrade, use the latest version available on the AUR.
 """
-        io.tool_warning(text)
-        return True
-
-    success = utils.check_pip_install_extra(
-        io,
-        None,
-        new_ver_text,
-        ["aider-chat"],
-        self_update=True,
-    )
-
-    if success:
-        io.tool_output("Re-run aider to use new version.")
-        sys.exit()
-
-    return
+    io.tool_warning(text)
+    return True
 
 
 def check_version(io, just_check=False, verbose=False):
-- 
2.48.1


From cdc572e4c28c97a84243984c59cb586fc1b4a80f Mon Sep 17 00:00:00 2001
From: Claudia Pellegrino <claui@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:14:04 +0100
Subject: [PATCH 2/5] AUR-specific: replace `/help` feature installer

The interactive `/help` feature requires an optional package from the
AUR. Replace the automatic installer with a notice that asks the user
to download and install the package by themselves.
---
 aider/help.py  | 11 ++---------
 aider/utils.py | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/aider/help.py b/aider/help.py
index c76188d1..c8772f0b 100755
--- a/aider/help.py
+++ b/aider/help.py
@@ -16,18 +16,11 @@ warnings.simplefilter("ignore", category=FutureWarning)
 
 
 def install_help_extra(io):
-    pip_install_cmd = [
-        "aider-chat[help]",
-        "--extra-index-url",
-        "https://download.pytorch.org/whl/cpu",
-    ]
-    res = utils.check_pip_install_extra(
+    return utils.check_aur_package(
         io,
         "llama_index.embeddings.huggingface",
-        "To use interactive /help you need to install the help extras",
-        pip_install_cmd,
+        "python-llama-index-embeddings-huggingface",
     )
-    return res
 
 
 def get_package_files():
diff --git a/aider/utils.py b/aider/utils.py
index 42012417..f3e10383 100644
--- a/aider/utils.py
+++ b/aider/utils.py
@@ -330,6 +330,22 @@ def touch_file(fname):
         return False
 
 
+def check_aur_package(io, module, aur_package):
+    if module:
+        try:
+            __import__(module)
+            return True
+        except (ImportError, ModuleNotFoundError, RuntimeError):
+            pass
+
+    io.tool_error(f"""
+    This feature requires the following package from the AUR:
+
+        {aur_package}
+"""
+    )
+
+
 def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=False):
     if module:
         try:
-- 
2.48.1


From b39b2c3f5fe8b8d70fd74ec23d3971ab01b94af6 Mon Sep 17 00:00:00 2001
From: Claudia Pellegrino <claui@users.noreply.github.com>
Date: Mon, 10 Mar 2025 21:29:12 +0100
Subject: [PATCH 3/5] AUR-specific: replace google-aiplatform installer

---
 aider/models.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/aider/models.py b/aider/models.py
index 62e82ce1..3483d97a 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -18,7 +18,7 @@ from PIL import Image
 from aider.dump import dump  # noqa: F401
 from aider.llm import litellm
 from aider.sendchat import ensure_alternating_roles, sanity_check_messages
-from aider.utils import check_archlinux_package, check_pip_install_extra
+from aider.utils import check_archlinux_package, check_aur_package
 
 RETRY_TIMEOUT = 60
 
@@ -835,11 +835,10 @@ def check_for_dependencies(io, model_name):
 
     # Check if this is a Vertex AI model and ensure google-cloud-aiplatform is installed
     elif model_name.startswith("vertex_ai/"):
-        check_pip_install_extra(
+        check_aur_package(
             io,
             "google.cloud.aiplatform",
-            "Google Vertex AI models require the google-cloud-aiplatform package.",
-            ["google-cloud-aiplatform"],
+            "python-google-cloud-aiplatform",
         )
 
 
-- 
2.48.1


From 6fc30199bba55f69f47d4ea40fd3f6b5faa43267 Mon Sep 17 00:00:00 2001
From: Claudia Pellegrino <claui@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:15:53 +0100
Subject: [PATCH 4/5] AUR-specific: replace main branch auto-upgrader

Ask user to download and install the `aider-chat-git` package if they
wish to follow the main development branch.
---
 aider/versioncheck.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/aider/versioncheck.py b/aider/versioncheck.py
index bf1490ab..4ca0ecd1 100644
--- a/aider/versioncheck.py
+++ b/aider/versioncheck.py
@@ -17,12 +17,10 @@ def install_from_main_branch(io):
     Install the latest version of aider from the main branch of the GitHub repository.
     """
 
-    return utils.check_pip_install_extra(
+    return utils.check_aur_package(
         io,
         None,
-        "Install the development version of aider from the main branch?",
-        ["git+https://github.com/Aider-AI/aider.git"],
-        self_update=True,
+        "aider-chat-git",
     )
 
 
-- 
2.48.1


From 17742fb3bfa310cafc88246638f66340fe7a9a1a Mon Sep 17 00:00:00 2001
From: Claudia Pellegrino <claui@users.noreply.github.com>
Date: Mon, 10 Mar 2025 13:33:05 +0100
Subject: [PATCH 5/5] AUR-specific: replace GUI feature installer

---
 aider/main.py  |  5 ++---
 aider/utils.py | 54 --------------------------------------------------
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/aider/main.py b/aider/main.py
index a7608e3d..6553d8f7 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -197,11 +197,10 @@ def check_gitignore(git_root, io, ask=True):
 
 
 def check_streamlit_install(io):
-    return utils.check_pip_install_extra(
+    return utils.check_aur_package(
         io,
         "streamlit",
-        "You need to install the aider browser feature",
-        ["aider-chat[browser]"],
+        "python-streamlit",
     )
 
 
diff --git a/aider/utils.py b/aider/utils.py
index f3e10383..a58e0753 100644
--- a/aider/utils.py
+++ b/aider/utils.py
@@ -193,20 +193,6 @@ def split_chat_history_markdown(text, include_tool=False):
     return messages
 
 
-def get_pip_install(args):
-    cmd = [
-        sys.executable,
-        "-m",
-        "pip",
-        "install",
-        "--upgrade",
-        "--upgrade-strategy",
-        "only-if-needed",
-    ]
-    cmd += args
-    return cmd
-
-
 def run_install(cmd):
     print()
     print("Installing:", printable_shell_command(cmd))
@@ -346,46 +332,6 @@ def check_aur_package(io, module, aur_package):
     )
 
 
-def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=False):
-    if module:
-        try:
-            __import__(module)
-            return True
-        except (ImportError, ModuleNotFoundError, RuntimeError):
-            pass
-
-    cmd = get_pip_install(pip_install_cmd)
-
-    if prompt:
-        io.tool_warning(prompt)
-
-    if self_update and platform.system() == "Windows":
-        io.tool_output("Run this command to update:")
-        print()
-        print(printable_shell_command(cmd))  # plain print so it doesn't line-wrap
-        return
-
-    if not io.confirm_ask("Run pip install?", default="y", subject=printable_shell_command(cmd)):
-        return
-
-    success, output = run_install(cmd)
-    if success:
-        if not module:
-            return True
-        try:
-            __import__(module)
-            return True
-        except (ImportError, ModuleNotFoundError, RuntimeError) as err:
-            io.tool_error(str(err))
-            pass
-
-    io.tool_error(output)
-
-    print()
-    print("Install failed, try running this command manually:")
-    print(printable_shell_command(cmd))
-
-
 def check_archlinux_package(io, module, archlinux_package):
     if module:
         try:
-- 
2.48.1