Enhance AI review process by integrating gptme with Ollama backend and updating model configurations

Signed-off-by: Tiger Kaovilai <[email protected]>

Author: kaovilai

Makefile

@@ -665,7 +665,8 @@ Review this git diff for a project called OADP (OpenShift API for Data Protectio
 3. Go idioms and conventions \
 4. Kubernetes/OpenShift operator patterns \
 5. Security concerns \
-Please provide actionable feedback. Be concise but thorough.
+Please provide actionable feedback. Be concise but thorough. \
+If able, browse linked URLs for context.
 endef
 
 # AI code review using Ollama on Podman
@@ -681,8 +682,8 @@ endef
 # - Stop and remove the container (but preserve the .ollama cache)
 # 
 # Usage:
-#   make ai-review-ollama                    # Uses default model (llama3.2:1b)
-#   make ai-review-ollama OLLAMA_MODEL=phi3:mini    # Uses specified model
+#   make ai-review-gptme-ollama                    # Uses default model (llama3.2:1b)
+#   make ai-review-gptme-ollama OLLAMA_MODEL=phi3:mini    # Uses specified model
 # 
 # Available models (examples):
 #   Small models (< 2GB memory):
@@ -701,25 +702,38 @@ endef
 #     - mistral
 
 # Default Ollama model (using a smaller model that requires less memory)
-OLLAMA_MODEL ?= gemma3n:e4b
-OLLAMA_MEMORY ?= 8 # will require at least this much free mem in your machine or podman machine (non-linux)
-
-.PHONY: ai-review-ollama
-ai-review-ollama: ## Review staged git changes using Ollama AI. Requires changes to be staged with 'git add'
-	@# This target reviews only staged changes. To stage changes, use:
-	@#   git add <files>
-	@# To verify staged changes, run:
-	@#   git status
-	@# Example output showing staged changes:
-	@#   Changes to be committed:
-	@#     (use "git restore --staged <file>..." to unstage)
-	@#       modified:   Makefile
+OLLAMA_MODEL ?= gemma3:12b
+OLLAMA_MEMORY ?= 9 # will require at least this much free mem in your machine or podman machine (non-linux)
+
+# This target reviews staged changes using gptme with Ollama backend
+# Prerequisites:
+#   - gptme installed (pip install gptme)
+#   - Podman installed and running
+# 
+# This target will:
+#   - Create a local .ollama directory for caching models between runs
+#   - Start an Ollama container if not already running
+#   - Pull the model if not already cached
+#   - Run the code review with gptme
+#   - Stop and remove the container (but preserve the .ollama cache)
+#
+# This version enables tools for enhanced review:
+#   - read: Read local files for context (always enabled)
+#   - browser: Browse documentation and references (only if lynx is installed)
+#
+# Usage:
+#   make ai-review-gptme-ollama                           # Uses default Ollama model
+#   make ai-review-gptme-ollama GPTME_OLLAMA_MODEL=phi3   # Uses specific model
+.PHONY: ai-review-gptme-ollama
+ai-review-gptme-ollama: TOOLS = $(shell command -v lynx >/dev/null 2>&1 && echo "read,browser" || echo "read")
+ai-review-gptme-ollama: gptme ## Review staged git changes using gptme with local Ollama models (auto-manages Ollama container)
 	@if [ -z "$$(git diff --cached --name-only)" ]; then \
 		echo "No staged changes to review."; \
 		echo "Please stage your changes first with 'git add <files>'"; \
 		echo "Run 'git status' to see which files are staged."; \
 		exit 0; \
 	fi
+	@# gptme is installed as a dependency, no need to check
 	@# Check if Ollama is already available (either as existing container or local service)
 	@if curl -s http://localhost:11434/api/tags >/dev/null 2>&1; then \
 		echo "Ollama is already running on port 11434"; \
@@ -753,58 +767,51 @@ ai-review-ollama: ## Review staged git changes using Ollama AI. Requires changes
 		fi \
 	fi
 	@# Pull model if not already cached
-	@echo "Ensuring $(OLLAMA_MODEL) model is available..."
+	@echo "Ensuring $(GPTME_OLLAMA_MODEL) model is available..."
 	@if podman ps | grep -q ollama; then \
-		podman exec ollama ollama pull $(OLLAMA_MODEL) || exit 1; \
+		podman exec ollama ollama pull $(GPTME_OLLAMA_MODEL) || exit 1; \
 	else \
-		curl -s -X POST http://localhost:11434/api/pull -d '{"name":"$(OLLAMA_MODEL)"}' | while read line; do \
+		curl -s -X POST http://localhost:11434/api/pull -d '{"name":"$(GPTME_OLLAMA_MODEL)"}' | while read line; do \
 			echo $$line | jq -r .status 2>/dev/null || echo $$line; \
 		done; \
 	fi
-	@echo "Reviewing staged changes with Ollama using $(OLLAMA_MODEL)..."
-	@# Generate the prompt with git diff
-	@echo "Preparing request..."; \
-	FULL_PROMPT="$(AI_REVIEW_PROMPT)\n\nHere is the git diff:\n"; \
-	DIFF=$$(git diff --cached | jq -Rs .); \
-	JSON=$$(jq -n \
-		--arg model "$(OLLAMA_MODEL)" \
-		--arg prompt "$$FULL_PROMPT" \
-		--argjson diff "$$DIFF" \
-		'{model: $$model, prompt: ($$prompt + $$diff), stream: false}'); \
-	if [ -n "$$DEBUG" ]; then \
-		echo "Debug: Request JSON:"; \
-		echo "$$JSON" | jq .; \
-	fi; \
-	echo "Sending request to Ollama API..."; \
-	TEMP_RESPONSE=$$(mktemp .ollama-response.XXXXXX); \
-	curl -s -X POST http://localhost:11434/api/generate \
-		-H "Content-Type: application/json" \
-		--max-time 300 \
-		-d "$$JSON" \
-		-o "$$TEMP_RESPONSE" 2>&1; \
-	if [ -n "$$DEBUG" ]; then \
-		echo "Debug: Response saved to $$TEMP_RESPONSE"; \
-		cp "$$TEMP_RESPONSE" .ollama-debug-response.txt; \
-	fi; \
-	if jq -e . "$$TEMP_RESPONSE" >/dev/null 2>&1; then \
-		jq -r '.response // .error // "No response field"' "$$TEMP_RESPONSE"; \
-		rm -f "$$TEMP_RESPONSE"; \
+	@echo "Reviewing staged changes with gptme using Ollama model: $(GPTME_OLLAMA_MODEL)..."
+	@if [ "$(TOOLS)" = "read,browser" ]; then \
+		echo "gptme will be able to read files and browse documentation for context."; \
 	else \
-		echo "Error: Invalid JSON response from Ollama. Checking for common issues..."; \
-		if grep -q "404 page not found" "$$TEMP_RESPONSE" 2>/dev/null; then \
-			echo "Error: Ollama API endpoint not found. The container may not be ready."; \
-		elif grep -q "Connection refused" "$$TEMP_RESPONSE" 2>/dev/null; then \
-			echo "Error: Cannot connect to Ollama. The container may not be running."; \
-		else \
-			echo "Raw response (first 500 chars):"; \
-			head -c 500 "$$TEMP_RESPONSE" 2>/dev/null || echo "(empty response)"; \
-			echo "..."; \
-			echo "(Run with DEBUG=1 to save full response)"; \
-		fi; \
-		rm -f "$$TEMP_RESPONSE"; \
+		echo "gptme will be able to read files for context (install lynx to enable browser tool)."; \
 	fi
-	@# Only stop and remove container if we started it
+	@# Generate the review using gptme with Ollama backend
+	@git diff --cached | OPENAI_BASE_URL="http://localhost:11434/v1" $(GPTME) "$(AI_REVIEW_PROMPT)" \
+		--model "local/$(GPTME_OLLAMA_MODEL)" \
+		--tools "$(TOOLS)" \
+		--non-interactive
+	# Only stop and remove container if we started it
 	@if podman ps | grep -q ollama; then \
 		echo "Stopping and removing Ollama container..."; \
 		podman stop ollama && podman rm ollama; \
 	fi
+
+# Default Ollama model for gptme (should match one of the models available in your Ollama installation)
+GPTME_OLLAMA_MODEL ?= $(OLLAMA_MODEL)
+
+# gptme installation
+GPTME = $(LOCALBIN)/gptme
+GPTME_VERSION ?= latest
+.PHONY: gptme
+gptme: $(GPTME) ## Install gptme locally if necessary.
+$(GPTME): $(LOCALBIN)
+	@if [ -f $(GPTME) ] && $(GPTME) --version >/dev/null 2>&1; then \
+		echo "gptme is already installed at $(GPTME)"; \
+	else \
+		echo "Installing gptme..."; \
+		python3 -m venv $(LOCALBIN)/gptme-venv || (echo "Error: python3 venv module not found. Please install python3-venv package." && exit 1); \
+		$(LOCALBIN)/gptme-venv/bin/pip install --upgrade pip; \
+		if [ "$(GPTME_VERSION)" = "latest" ]; then \
+			$(LOCALBIN)/gptme-venv/bin/pip install gptme; \
+		else \
+			$(LOCALBIN)/gptme-venv/bin/pip install gptme==$(GPTME_VERSION); \
+		fi; \
+		ln -sf $(LOCALBIN)/gptme-venv/bin/gptme $(GPTME); \
+		echo "gptme installed successfully at $(GPTME)"; \
+	fi