Fix mock server and make it conditional

- Fix UnboundLocalError in mock server when JSON parsing fails
- Make mock server conditional: only start if (TEST_)OPENAI_API_KEY is not set
- Allow users to run tests against real OpenAI API by setting the env vars

Co-authored-by: Shelley <shelley@exe.dev>

Author: tomasol

scripts/mock-openai-server.py

@@ -16,13 +16,15 @@ def do_POST(self):
             content_length = int(self.headers.get('Content-Length', 0))
             body = self.rfile.read(content_length)
 
+            request_data = {}
+            user_prompt = 'unknown'
             try:
                 request_data = json.loads(body)
                 # Extract user message for a more contextual mock response
                 user_messages = [m for m in request_data.get('messages', []) if m.get('role') == 'user']
                 user_prompt = user_messages[-1]['content'] if user_messages else 'unknown'
             except (json.JSONDecodeError, KeyError, IndexError):
-                user_prompt = 'unknown'
+                pass
 
             # Return a mock response
             response = {

scripts/test-e2e.sh

@@ -15,28 +15,37 @@ TRUNCATE="${2:-}"
 STAR_ACCOUNT="someghaccount"
 STAR_REPO="someghrepo"
 MOCK_OPENAI_PORT=18080
+MOCK_PID=""
 
 export GITHUB_WEBHOOK_SECRET="It's a Secret to Everybody"
 
-# Start mock OpenAI server
-python3 ./scripts/mock-openai-server.py $MOCK_OPENAI_PORT &
-MOCK_PID=$!
-echo "Started mock OpenAI server with PID $MOCK_PID"
+# Use mock server unless OPENAI_API_KEY is already set
+if [[ -z "${OPENAI_API_KEY:-}" ]]; then
+    echo "OPENAI_API_KEY not set, using mock OpenAI server"
+    
+    # Start mock OpenAI server
+    python3 ./scripts/mock-openai-server.py $MOCK_OPENAI_PORT &
+    MOCK_PID=$!
+    echo "Started mock OpenAI server with PID $MOCK_PID"
 
-# Set environment variables for mock OpenAI
-export OPENAI_API_KEY="mock-api-key-for-testing"
-export OPENAI_API_BASE_URL="http://127.0.0.1:$MOCK_OPENAI_PORT"
+    # Wait for mock server to be ready
+    SECONDS=0
+    while ! curl -s http://127.0.0.1:$MOCK_OPENAI_PORT/v1/chat/completions -X POST -d '{}' > /dev/null 2>&1; do
+        if [[ $SECONDS -ge 5 ]]; then
+            echo "Mock OpenAI server failed to start"
+            exit 1
+        fi
+        sleep 0.5
+    done
+    echo "Mock OpenAI server is ready"
 
-# Wait for mock server to be ready
-SECONDS=0
-while ! curl -s http://127.0.0.1:$MOCK_OPENAI_PORT/v1/chat/completions -X POST -d '{}' > /dev/null 2>&1; do
-    if [[ $SECONDS -ge 5 ]]; then
-        echo "Mock OpenAI server failed to start"
-        exit 1
-    fi
-    sleep 0.5
-done
-echo "Mock OpenAI server is ready"
+    # Set environment variables for mock OpenAI
+    export OPENAI_API_KEY="mock-api-key-for-testing"
+    export OPENAI_API_BASE_URL="http://127.0.0.1:$MOCK_OPENAI_PORT"
+else
+    echo "OPENAI_API_KEY is set, using real OpenAI API"
+    # OPENAI_API_BASE_URL can optionally be set for custom endpoints
+fi
 
 obelisk server verify --config $OBELISK_TOML
 obelisk server run --config $OBELISK_TOML &
@@ -56,9 +65,11 @@ cleanup() {
         sleep 1
     done
 
-    # Kill mock OpenAI server
-    echo "Stopping mock OpenAI server (PID $MOCK_PID)..."
-    kill $MOCK_PID 2>/dev/null || true
+    # Kill mock OpenAI server if it was started
+    if [[ -n "$MOCK_PID" ]]; then
+        echo "Stopping mock OpenAI server (PID $MOCK_PID)..."
+        kill $MOCK_PID 2>/dev/null || true
+    fi
 }
 
 trap cleanup EXIT

scripts/test-integration.sh

@@ -4,32 +4,43 @@ set -exuo pipefail
 cd "$(dirname "$0")/.."
 
 MOCK_OPENAI_PORT=18080
-
-# Start mock OpenAI server
-python3 ./scripts/mock-openai-server.py $MOCK_OPENAI_PORT &
-MOCK_PID=$!
-echo "Started mock OpenAI server with PID $MOCK_PID"
+MOCK_PID=""
 
 cleanup() {
-    echo "Stopping mock OpenAI server (PID $MOCK_PID)..."
-    kill $MOCK_PID 2>/dev/null || true
+    if [[ -n "$MOCK_PID" ]]; then
+        echo "Stopping mock OpenAI server (PID $MOCK_PID)..."
+        kill $MOCK_PID 2>/dev/null || true
+    fi
 }
 trap cleanup EXIT
 
-# Wait for mock server to be ready
-SECONDS=0
-while ! curl -s http://127.0.0.1:$MOCK_OPENAI_PORT/v1/chat/completions -X POST -d '{}' > /dev/null 2>&1; do
-    if [[ $SECONDS -ge 5 ]]; then
-        echo "Mock OpenAI server failed to start"
-        exit 1
-    fi
-    sleep 0.5
-done
-echo "Mock OpenAI server is ready"
+# Use mock server unless TEST_OPENAI_API_KEY is already set
+if [[ -z "${TEST_OPENAI_API_KEY:-}" ]]; then
+    echo "TEST_OPENAI_API_KEY not set, using mock OpenAI server"
+    
+    # Start mock OpenAI server
+    python3 ./scripts/mock-openai-server.py $MOCK_OPENAI_PORT &
+    MOCK_PID=$!
+    echo "Started mock OpenAI server with PID $MOCK_PID"
+
+    # Wait for mock server to be ready
+    SECONDS=0
+    while ! curl -s http://127.0.0.1:$MOCK_OPENAI_PORT/v1/chat/completions -X POST -d '{}' > /dev/null 2>&1; do
+        if [[ $SECONDS -ge 5 ]]; then
+            echo "Mock OpenAI server failed to start"
+            exit 1
+        fi
+        sleep 0.5
+    done
+    echo "Mock OpenAI server is ready"
 
-# Set environment variables for mock OpenAI
-export TEST_OPENAI_API_KEY="mock-api-key-for-testing"
-export TEST_OPENAI_API_BASE_URL="http://127.0.0.1:$MOCK_OPENAI_PORT"
+    # Set environment variables for mock OpenAI
+    export TEST_OPENAI_API_KEY="mock-api-key-for-testing"
+    export TEST_OPENAI_API_BASE_URL="http://127.0.0.1:$MOCK_OPENAI_PORT"
+else
+    echo "TEST_OPENAI_API_KEY is set, using real OpenAI API"
+    # TEST_OPENAI_API_BASE_URL can optionally be set for custom endpoints
+fi
 
 (
 cd activity/github/impl