Normalize provider-agnostic API config and add Space server endpoints

Dockerfile

@@ -12,38 +12,14 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
-RUN echo '#!/bin/bash\n\
-if [ -z "$API_BASE_URL" ]; then\n\
-    echo "ERROR: API_BASE_URL environment variable is required"\n\
-    echo "Please set:"\n\
-    echo "  API_BASE_URL  - Your API endpoint"\n\
-    echo "  MODEL_NAME    - Model identifier"\n\
-    echo "  HF_TOKEN      - Your Hugging Face / API key"\n\
-    echo ""\n\
-    echo "Examples:"\n\
-    echo "  OpenAI:    API_BASE_URL=https://api.openai.com/v1 MODEL_NAME=gpt-4"\n\
-    echo "  Gemini:    API_BASE_URL=https://generativelanguage.googleapis.com MODEL_NAME=gemini-1.5-pro"\n\
-    echo "  Local:     API_BASE_URL=http://localhost:11434/v1 MODEL_NAME=llama2"\n\
-    exit 1\n\
-fi\n\
-\n\
-if [ -z "$MODEL_NAME" ]; then\n\
-    echo "ERROR: MODEL_NAME environment variable is required"\n\
-    exit 1\n\
-fi\n\
-\n\
-if [ -z "$HF_TOKEN" ] && [ -z "$OPENAI_API_KEY" ] && [ -z "$API_KEY" ]; then\n\
-    echo "ERROR: Missing auth token. Set HF_TOKEN (preferred) or OPENAI_API_KEY"\n\
-    exit 1\n\
-fi\n\
-\n\
-echo "Configuration:"\n\
-echo "  API_BASE_URL: ${API_BASE_URL}"\n\
-echo "  MODEL_NAME: ${MODEL_NAME}"\n\
-echo "  TEMPERATURE: ${TEMPERATURE:-0.7}"\n\
-echo "  MAX_TOKENS: ${MAX_TOKENS:-2000}"\n\
-echo ""\n\
-\n\
-python inference.py "$@"' > /usr/local/bin/run-agent && chmod +x /usr/local/bin/run-agent
+# Runtime API configuration (OpenAI-compatible):
+# - API_BASE_URL is required
+# - MODEL_NAME is required
+# - API_KEY is canonical auth env var
+# - HF_TOKEN and OPENAI_API_KEY are accepted as backward-compatible aliases
+EXPOSE 7860
 
-CMD ["run-agent", "--task-id", "bug_detection_easy_1"]
+ENV HOST=0.0.0.0
+ENV PORT=7860
+
+CMD ["python", "-m", "server.app"]

environment/tasks.py

@@ -60,7 +60,7 @@ class TaskDefinitions:
             "line_count": 4,
             "expected_issues": [
                 {
-                    "line": 3,
+                    "line": 4,
                     "type": "index_error",
                     "severity": "medium",
                     "description": "Index out of bounds when i is the last element"
@@ -128,7 +128,7 @@ def format_output(data):
             "line_count": 4,
             "expected_issues": [
                 {
-                    "line": 3,
+                    "line": 4,
                     "type": "performance",
                     "severity": "medium",
                     "description": "Inefficient string concatenation in loop"

inference.py

@@ -9,9 +9,19 @@ import sys
 from typing import Dict, Any
 from openai import OpenAI
 
+
+def resolve_api_key() -> str:
+    # Canonical env var is API_KEY, aliases are supported for compatibility.
+    return (
+        (os.environ.get("API_KEY") or "").strip()
+        or (os.environ.get("HF_TOKEN") or "").strip()
+        or (os.environ.get("OPENAI_API_KEY") or "").strip()
+    )
+
+
 API_BASE_URL = os.environ.get("API_BASE_URL", "")
 MODEL_NAME = os.environ.get("MODEL_NAME", "")
-API_KEY = os.environ.get("HF_TOKEN") or os.environ.get("OPENAI_API_KEY") or os.environ.get("API_KEY", "")
+API_KEY = resolve_api_key()
 TEMPERATURE = float(os.environ.get("TEMPERATURE", "0.7"))
 MAX_TOKENS = int(os.environ.get("MAX_TOKENS", "2000"))
 REQUEST_TIMEOUT = int(os.environ.get("REQUEST_TIMEOUT", "60"))
@@ -21,18 +31,25 @@ if not API_BASE_URL:
     print("API Configuration Required")
     print("=" * 60)
     print("\nPlease set the following environment variables:\n")
-    print("  API_BASE_URL  - Your API endpoint")
+    print("  API_BASE_URL  - OpenAI-compatible API endpoint")
     print("  MODEL_NAME    - Model identifier")
-    print("  HF_TOKEN      - Your API key\n")
+    print("  API_KEY       - API key (canonical)\n")
+    print("Supported auth aliases (backward compatibility):")
+    print("  HF_TOKEN")
+    print("  OPENAI_API_KEY\n")
     print("Examples:\n")
+    print("  OpenAI:")
+    print("    export API_BASE_URL=https://api.openai.com/v1")
+    print("    export MODEL_NAME=gpt-4o-mini")
+    print("    export API_KEY=sk-xxxxx\n")
     print("  Groq:")
     print("    export API_BASE_URL=https://api.groq.com/openai/v1")
     print("    export MODEL_NAME=llama-3.3-70b-versatile")
-    print("    export HF_TOKEN=gsk_xxxxx\n")
+    print("    export API_KEY=gsk_xxxxx\n")
     print("  Local Ollama:")
     print("    export API_BASE_URL=http://localhost:11434/v1")
     print("    export MODEL_NAME=llama3")
-    print("    export HF_TOKEN=not-needed\n")
+    print("    export API_KEY=not-needed\n")
     print("=" * 60)
     sys.exit(1)
 
@@ -41,7 +58,7 @@ if not MODEL_NAME:
     sys.exit(1)
 
 if not API_KEY:
-    print("ERROR: Missing auth token. Set HF_TOKEN (preferred) or OPENAI_API_KEY.")
+    print("ERROR: Missing auth token. Set API_KEY (preferred), or HF_TOKEN/OPENAI_API_KEY.")
     sys.exit(1)
 
 FALLBACK_ACTION = json.dumps({

openenv.yaml

@@ -63,6 +63,7 @@ reward_range:
 max_episode_steps: 50
 
 requires_api_keys:
+  - API_KEY
   - HF_TOKEN
   - OPENAI_API_KEY
   - API_BASE_URL

requirements.txt

@@ -7,4 +7,5 @@ pytest-cov>=4.0.0
 numpy>=1.24.0
 typing-extensions>=4.5.0
 requests>=2.31.0
-python-dotenv>=1.0.0
+python-dotenv>=1.0.0
+flask>=3.0.0

server/app.py

@@ -0,0 +1,76 @@
+"""HTTP server for running the code-review environment in a Space/container."""
+
+from __future__ import annotations
+
+import os
+from threading import Lock
+from typing import Any, Dict
+
+from flask import Flask, jsonify, request
+
+from environment.env import CodeReviewEnv
+
+
+app = Flask(__name__)
+_env = CodeReviewEnv()
+_lock = Lock()
+
+
+@app.get("/")
+def root() -> Any:
+    return jsonify({
+        "status": "ok",
+        "service": "code-review-agent-env",
+        "endpoints": ["/health", "/reset", "/step", "/state"],
+    })
+
+
+@app.get("/health")
+def health() -> Any:
+    return jsonify({"status": "healthy"})
+
+
+@app.route("/reset", methods=["GET", "POST"])
+def reset() -> Any:
+    payload: Dict[str, Any] = request.get_json(silent=True) or {}
+    task_id = payload.get("task_id") or request.args.get("task_id")
+    with _lock:
+        obs = _env.reset(task_id=task_id)
+    return jsonify({"observation": obs})
+
+
+@app.post("/step")
+def step() -> Any:
+    payload = request.get_json(silent=True) or {}
+    action = payload.get("action")
+    if not isinstance(action, dict):
+        return jsonify({"error": "Request body must include an 'action' object"}), 400
+
+    with _lock:
+        observation, reward, done, info = _env.step(action)
+
+    return jsonify(
+        {
+            "observation": observation,
+            "reward": reward,
+            "done": done,
+            "info": info,
+        }
+    )
+
+
+@app.get("/state")
+def state() -> Any:
+    with _lock:
+        current_state = _env.state()
+    return jsonify(current_state)
+
+
+def main() -> None:
+    host = os.getenv("HOST", "0.0.0.0")
+    port = int(os.getenv("PORT", "7860"))
+    app.run(host=host, port=port)
+
+
+if __name__ == "__main__":
+    main()

submit.py

@@ -25,7 +25,13 @@ CORE_TASKS = [
 
 def _run_cmd(command: List[str]) -> Tuple[int, str, str]:
     """Run a command and return (returncode, stdout, stderr)."""
-    result = subprocess.run(command, capture_output=True, text=True)
+    result = subprocess.run(
+        command,
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+    )
     return result.returncode, result.stdout, result.stderr
 
 
@@ -118,9 +124,9 @@ def _inference_env_ready() -> Tuple[bool, str]:
         return False, "API_BASE_URL is not set"
     if not (os.getenv("MODEL_NAME") or "").strip():
         return False, "MODEL_NAME is not set"
-    token = (os.getenv("HF_TOKEN") or os.getenv("OPENAI_API_KEY") or os.getenv("API_KEY") or "").strip()
+    token = (os.getenv("API_KEY") or os.getenv("HF_TOKEN") or os.getenv("OPENAI_API_KEY") or "").strip()
     if not token:
-        return False, "HF_TOKEN or OPENAI_API_KEY (or API_KEY fallback) is not set"
+        return False, "API_KEY is not set (supported aliases: HF_TOKEN, OPENAI_API_KEY)"
     return True, ""