Install aider --no-deps to escape pillow/litellm pin conflicts

Aider 0.86.2 hard-pins pillow==12.1.1 (conflicts with gradio<12) and litellm==1.75.0 (broken module surface). Move aider out of requirements.txt and into a Dockerfile --no-deps install, then provide a curated set of runtime deps and a patched litellm.

Dockerfile

@@ -20,12 +20,22 @@ COPY requirements.txt .
 # that require special compile-time tooling (e.g. atheris/libFuzzer).
 # atheris has been removed from requirements.txt; Hypothesis is the fallback.
 RUN pip install --no-cache-dir -r requirements.txt mcp-server-fetch && \
-    # Aider 0.86.2 hard-pins litellm==1.75.0 which has a broken module
-    # surface (missing APIConnectionError, _logging, encode, token_counter
-    # at module level). Force-upgrade to a patched litellm after aider
-    # is installed — pip's --no-deps lets us override aider's pin, and
-    # aider only uses litellm via getattr so a newer release works fine.
-    pip install --no-cache-dir --upgrade --no-deps "litellm==1.78.5"
+    # Aider's strict pins (pillow==12.1.1, litellm==1.75.0) conflict with
+    # gradio (pillow<12) and ship a broken litellm module surface
+    # (missing APIConnectionError, _logging, encode, token_counter).
+    # We install aider WITHOUT its deps and then provide a known-good
+    # set of its actual runtime imports — letting gradio's pillow 11
+    # win, and a patched litellm replace the broken 1.75.0.
+    pip install --no-cache-dir --no-deps "aider-chat==0.86.2" && \
+    pip install --no-cache-dir --upgrade --no-deps "litellm==1.78.5" && \
+    pip install --no-cache-dir \
+        "configargparse" "jsonschema" "rich" "prompt_toolkit" "pyyaml" \
+        "packaging" "pathspec" "diskcache" "networkx" "scipy" \
+        "beautifulsoup4" "pypandoc" "flake8" "importlib_resources" \
+        "pyperclip" "pexpect" "json5" "psutil" "watchfiles" "socksio" \
+        "mixpanel" "posthog" "tree-sitter" "grep_ast" "oslex" \
+        "tokenizers" "google-generativeai" "openai" "diff-match-patch" \
+        "soundfile" "sounddevice"
 
 
 # Stage 2: Runtime — inherits installed packages from base

requirements.txt

@@ -4,12 +4,11 @@ uv>=0.7.0
 gitpython==3.1.46
 gradio>=5.49.0,<6
 jinja2==3.1.6
-# aider 0.86.2 is the latest published version. It hard-pins
-# litellm==1.75.0, but that release has a broken module surface — every
-# call dies with `module 'litellm' has no attribute 'APIConnectionError'`
-# (and `_logging`). The Dockerfile force-upgrades litellm AFTER aider so
-# the runtime gets a litellm with the missing attributes restored.
-aider-chat==0.86.2
+# aider-chat is intentionally NOT listed here — it hard-pins
+# pillow==12.1.1 which conflicts with gradio (pillow<12) and litellm==1.75.0
+# which has a broken module surface (missing APIConnectionError, _logging).
+# The Dockerfile installs aider with --no-deps after this requirements file
+# resolves, plus a patched litellm and aider's actual runtime deps.
 ruff
 tenacity
 bandit[toml]