From de9b4002f428c206c22191dfe949e207a4db7c7d Mon Sep 17 00:00:00 2001
From: Mersad Abbasi <mersadabbasi3@gmail.com>
Date: Fri, 24 Apr 2026 17:13:04 -0700
Subject: [PATCH] Repin vllm and inspect_evals so the Dockerfile builds

Two upstream-shifted dependencies were preventing the harbor_adapter
Dockerfile from building on Modal:

- vllm==0.11.0 requires xformers==0.0.32.post1, which is no longer on
  PyPI for manylinux_x86_64. Repinned to 0.19.1, which builds and
  runs end-to-end on Modal.

- inspect_evals was cloned --depth=1 from main, but main HEAD now
  requires Python>=3.11 while the image installs python3.10. Switched
  to `uv pip install "inspect_evals @ git+...@<sha>"` pinned to commit
  03cb4bc2 (2026-03-15), the last commit on main still declaring
  requires-python = ">=3.10". Also removes the manual git clone step.

Also adds local-only artifacts to .gitignore so they don't sneak in.
---
 .gitignore                                      |  4 ++++
 .../template/environment/Dockerfile             | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6962ef6..745ddf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,3 +231,7 @@ __marimo__/
 
 # testing parsed agent traces 
 output.txt
+
+# PR-related local artifacts (not part of the codebase)
+logs_harbor/
+docs/pr-33-reopen.md
diff --git a/src/harbor_adapter/template/environment/Dockerfile b/src/harbor_adapter/template/environment/Dockerfile
index 216aebd..8864ffc 100644
--- a/src/harbor_adapter/template/environment/Dockerfile
+++ b/src/harbor_adapter/template/environment/Dockerfile
@@ -27,8 +27,9 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
 # Install uv
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 
-# Install vllm
-RUN uv pip install --system --no-cache vllm==0.11.0 --torch-backend=auto
+# Install vllm. Repinned from 0.11.0 → 0.19.1: 0.11.0 required
+# xformers==0.0.32.post1 which is no longer on PyPI for manylinux_x86_64.
+RUN uv pip install --system --no-cache vllm==0.19.1 --torch-backend=auto
 
 # Install AI CLI tools via npm (agents can use these)
 RUN npm install -g \
@@ -62,12 +63,12 @@ RUN uv pip install --system --no-cache \
 # Note: flash_attn requires GPU to compile - install at runtime if needed:
 # pip install flash_attn --no-build-isolation
 
-# Install inspect evals
-RUN mkdir -p /opt && \
-    cd /opt && \
-    git clone --depth=1 https://github.com/UKGovernmentBEIS/inspect_evals.git && \
-    cd /opt/inspect_evals && \
-    uv pip install --system --no-cache .
+# Install inspect_evals pinned to commit 03cb4bc2 (2026-03-15), the last
+# commit on `main` that still declares `requires-python = ">=3.10"`. The
+# next commit (b4d1356a) bumps to >=3.11, which clashes with the
+# python3.10 we install above.
+RUN uv pip install --system --no-cache \
+    "inspect_evals @ git+https://github.com/UKGovernmentBEIS/inspect_evals.git@03cb4bc212890a828d9cc73c17e6c491ec24fbee"
 
 # Setup workspace
 RUN mkdir -p /home/agent/workspace