Compare commits
7 Commits
fix/617-va
...
burn/659-1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
848640f9f0 | ||
|
|
0fcef1839e | ||
| ad751a6de6 | |||
| 130fa40f0c | |||
| 82f9810081 | |||
| 2548277137 | |||
| 2b234fde79 |
9
cron/pipeline-scheduler.yml
Normal file
9
cron/pipeline-scheduler.yml
Normal file
@@ -0,0 +1,9 @@
|
||||
- name: Nightly Pipeline Scheduler
|
||||
schedule: '*/30 18-23,0-8 * * *' # Every 30 min, off-peak hours only
|
||||
tasks:
|
||||
- name: Check and start pipelines
|
||||
shell: "bash scripts/nightly-pipeline-scheduler.sh"
|
||||
env:
|
||||
PIPELINE_TOKEN_LIMIT: "500000"
|
||||
PIPELINE_PEAK_START: "9"
|
||||
PIPELINE_PEAK_END: "18"
|
||||
50
scripts/nightly-pipeline-scheduler.md
Normal file
50
scripts/nightly-pipeline-scheduler.md
Normal file
@@ -0,0 +1,50 @@
|
||||
# Nightly Pipeline Scheduler
|
||||
|
||||
Auto-starts batch pipelines when inference is available.
|
||||
|
||||
## What It Does
|
||||
|
||||
1. Checks inference provider health (OpenRouter, Ollama, RunPod)
|
||||
2. Checks if it's off-peak hours (configurable, default: after 6PM)
|
||||
3. Checks interactive session load (don't fight with live users)
|
||||
4. Checks daily token budget (configurable limit)
|
||||
5. Starts the highest-priority incomplete pipeline
|
||||
|
||||
## Pipeline Priority Order
|
||||
|
||||
| Priority | Pipeline | Deps | Max Tokens |
|
||||
|----------|----------|------|------------|
|
||||
| 1 | playground-factory | none | 100,000 |
|
||||
| 2 | training-factory | none | 150,000 |
|
||||
| 3 | knowledge-mine | training-factory running | 80,000 |
|
||||
| 4 | adversary | knowledge-mine running | 50,000 |
|
||||
| 5 | codebase-genome | none | 120,000 |
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
# Normal run (used by cron)
|
||||
./scripts/nightly-pipeline-scheduler.sh
|
||||
|
||||
# Dry run (show what would start)
|
||||
./scripts/nightly-pipeline-scheduler.sh --dry-run
|
||||
|
||||
# Status report
|
||||
./scripts/nightly-pipeline-scheduler.sh --status
|
||||
|
||||
# Force start during peak hours
|
||||
./scripts/nightly-pipeline-scheduler.sh --force
|
||||
```
|
||||
|
||||
## Configuration
|
||||
|
||||
Set via environment variables:
|
||||
- `PIPELINE_TOKEN_LIMIT`: Daily token budget (default: 500,000)
|
||||
- `PIPELINE_PEAK_START`: Peak hours start (default: 9)
|
||||
- `PIPELINE_PEAK_END`: Peak hours end (default: 18)
|
||||
- `HERMES_HOME`: Hermes home directory (default: ~/.hermes)
|
||||
|
||||
## Cron
|
||||
|
||||
Runs every 30 minutes. Off-peak only (unless --force).
|
||||
See `cron/pipeline-scheduler.yml`.
|
||||
383
scripts/nightly-pipeline-scheduler.sh
Normal file
383
scripts/nightly-pipeline-scheduler.sh
Normal file
@@ -0,0 +1,383 @@
|
||||
#!/usr/bin/env bash
|
||||
# nightly-pipeline-scheduler.sh — Auto-start batch pipelines when inference is available.
|
||||
#
|
||||
# Checks provider health, pipeline progress, token budget, and interactive load.
|
||||
# Starts the highest-priority incomplete pipeline that can run.
|
||||
#
|
||||
# Usage:
|
||||
# ./scripts/nightly-pipeline-scheduler.sh # Normal run
|
||||
# ./scripts/nightly-pipeline-scheduler.sh --dry-run # Show what would start
|
||||
# ./scripts/nightly-pipeline-scheduler.sh --status # Pipeline status report
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# --- Configuration ---
|
||||
HERMES_HOME="${HERMES_HOME:-$HOME/.hermes}"
|
||||
BUDGET_FILE="${HERMES_HOME}/pipeline_budget.json"
|
||||
STATE_FILE="${HERMES_HOME}/pipeline_state.json"
|
||||
LOG_FILE="${HERMES_HOME}/logs/pipeline-scheduler.log"
|
||||
TOKEN_DAILY_LIMIT="${PIPELINE_TOKEN_LIMIT:-500000}"
|
||||
PEAK_HOURS_START="${PIPELINE_PEAK_START:-9}"
|
||||
PEAK_HOURS_END="${PIPELINE_PEAK_END:-18}"
|
||||
|
||||
# Pipeline definitions (priority order)
|
||||
# Each pipeline: name, script, max_tokens, dependencies
|
||||
PIPELINES=(
|
||||
"playground-factory|scripts/pipeline_playground_factory.sh|100000|none"
|
||||
"training-factory|scripts/pipeline_training_factory.sh|150000|none"
|
||||
"knowledge-mine|scripts/pipeline_knowledge_mine.sh|80000|training-factory"
|
||||
"adversary|scripts/pipeline_adversary.sh|50000|knowledge-mine"
|
||||
"codebase-genome|scripts/pipeline_codebase_genome.sh|120000|none"
|
||||
)
|
||||
|
||||
# --- Colors ---
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[0;33m'
|
||||
CYAN='\033[0;36m'
|
||||
NC='\033[0m'
|
||||
|
||||
# --- Helpers ---
|
||||
now_hour() { date +%-H; }
|
||||
is_peak_hours() {
|
||||
local h=$(now_hour)
|
||||
[[ $h -ge $PEAK_HOURS_START && $h -lt $PEAK_HOURS_END ]]
|
||||
}
|
||||
|
||||
ensure_dirs() {
|
||||
mkdir -p "$(dirname "$LOG_FILE")" "$(dirname "$BUDGET_FILE")" "$(dirname "$STATE_FILE")"
|
||||
}
|
||||
|
||||
log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" | tee -a "$LOG_FILE"; }
|
||||
|
||||
get_budget_used_today() {
|
||||
if [[ -f "$BUDGET_FILE" ]]; then
|
||||
local today=$(date +%Y-%m-%d)
|
||||
python3 -c "
|
||||
import json, sys
|
||||
with open('$BUDGET_FILE') as f:
|
||||
d = json.load(f)
|
||||
print(d.get('daily', {}).get('$today', {}).get('tokens_used', 0))
|
||||
" 2>/dev/null || echo 0
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
}
|
||||
|
||||
get_budget_remaining() {
|
||||
local used=$(get_budget_used_today)
|
||||
echo $((TOKEN_DAILY_LIMIT - used))
|
||||
}
|
||||
|
||||
update_budget() {
|
||||
local pipeline="$1"
|
||||
local tokens="$2"
|
||||
local today=$(date +%Y-%m-%d)
|
||||
python3 -c "
|
||||
import json, os
|
||||
path = '$BUDGET_FILE'
|
||||
d = {}
|
||||
if os.path.exists(path):
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
daily = d.setdefault('daily', {})
|
||||
day = daily.setdefault('$today', {'tokens_used': 0, 'pipelines': {}})
|
||||
day['tokens_used'] = day.get('tokens_used', 0) + $tokens
|
||||
day['pipelines']['$pipeline'] = day['pipelines'].get('$pipeline', 0) + $tokens
|
||||
with open(path, 'w') as f:
|
||||
json.dump(d, f, indent=2)
|
||||
"
|
||||
}
|
||||
|
||||
get_pipeline_state() {
|
||||
if [[ -f "$STATE_FILE" ]]; then
|
||||
cat "$STATE_FILE"
|
||||
else
|
||||
echo "{}"
|
||||
fi
|
||||
}
|
||||
|
||||
set_pipeline_state() {
|
||||
local pipeline="$1"
|
||||
local state="$2" # running, complete, failed, skipped
|
||||
python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
d = {}
|
||||
if os.path.exists(path):
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
d['$pipeline'] = {'state': '$state', 'updated': '$(date -Iseconds)'}
|
||||
with open(path, 'w') as f:
|
||||
json.dump(d, f, indent=2)
|
||||
"
|
||||
}
|
||||
|
||||
is_pipeline_complete() {
|
||||
local pipeline="$1"
|
||||
python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
if not os.path.exists(path):
|
||||
print('false')
|
||||
else:
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
state = d.get('$pipeline', {}).get('state', 'not_started')
|
||||
print('true' if state == 'complete' else 'false')
|
||||
" 2>/dev/null || echo false
|
||||
}
|
||||
|
||||
is_pipeline_running() {
|
||||
local pipeline="$1"
|
||||
python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
if not os.path.exists(path):
|
||||
print('false')
|
||||
else:
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
state = d.get('$pipeline', {}).get('state', 'not_started')
|
||||
print('true' if state == 'running' else 'false')
|
||||
" 2>/dev/null || echo false
|
||||
}
|
||||
|
||||
check_dependency() {
|
||||
local dep="$1"
|
||||
if [[ "$dep" == "none" ]]; then
|
||||
return 0
|
||||
fi
|
||||
# For knowledge-mine: training-factory must be running or complete
|
||||
if [[ "$dep" == "training-factory" ]]; then
|
||||
local state=$(python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
if not os.path.exists(path):
|
||||
print('not_started')
|
||||
else:
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
print(d.get('training-factory', {}).get('state', 'not_started'))
|
||||
" 2>/dev/null || echo "not_started")
|
||||
[[ "$state" == "running" || "$state" == "complete" ]]
|
||||
return $?
|
||||
fi
|
||||
# For adversary: knowledge-mine must be at least 50% done
|
||||
# Simplified: check if it's running (we'd need progress tracking for 50%)
|
||||
if [[ "$dep" == "knowledge-mine" ]]; then
|
||||
local state=$(python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
if not os.path.exists(path):
|
||||
print('not_started')
|
||||
else:
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
print(d.get('knowledge-mine', {}).get('state', 'not_started'))
|
||||
" 2>/dev/null || echo "not_started")
|
||||
[[ "$state" == "running" || "$state" == "complete" ]]
|
||||
return $?
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
check_inference_available() {
|
||||
# Check if any inference provider is responding
|
||||
# 1. Check OpenRouter
|
||||
local or_ok=$(curl -s -o /dev/null -w "%{http_code}" \
|
||||
--connect-timeout 5 "https://openrouter.ai/api/v1/models" 2>/dev/null || echo "000")
|
||||
|
||||
# 2. Check local Ollama
|
||||
local ollama_ok=$(curl -s -o /dev/null -w "%{http_code}" \
|
||||
--connect-timeout 5 "http://localhost:11434/api/tags" 2>/dev/null || echo "000")
|
||||
|
||||
# 3. Check RunPod (if configured)
|
||||
local runpod_ok="000"
|
||||
if [[ -n "${RUNPOD_ENDPOINT:-}" ]]; then
|
||||
runpod_ok=$(curl -s -o /dev/null -w "%{http_code}" \
|
||||
--connect-timeout 5 "$RUNPOD_ENDPOINT/health" 2>/dev/null || echo "000")
|
||||
fi
|
||||
|
||||
if [[ "$or_ok" == "200" || "$ollama_ok" == "200" || "$runpod_ok" == "200" ]]; then
|
||||
return 0
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
check_interactive_load() {
|
||||
# Check if there are active interactive sessions (don't fight with live users)
|
||||
# Look for tmux panes with active hermes sessions
|
||||
local active=$(tmux list-panes -a -F '#{pane_pid} #{pane_current_command}' 2>/dev/null \
|
||||
| grep -c "hermes\|python3" || echo 0)
|
||||
|
||||
# If more than 3 interactive sessions, skip pipeline start
|
||||
if [[ $active -gt 3 ]]; then
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start_pipeline() {
|
||||
local name="$1"
|
||||
local script="$2"
|
||||
local max_tokens="$3"
|
||||
local budget_remaining="$4"
|
||||
local mode="${5:-run}"
|
||||
|
||||
if [[ "$budget_remaining" -lt "$max_tokens" ]]; then
|
||||
log "SKIP $name: insufficient budget ($budget_remaining < $max_tokens tokens)"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ ! -f "$script" ]]; then
|
||||
log "SKIP $name: script not found ($script)"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ "$mode" == "dry-run" ]]; then
|
||||
log "DRY-RUN: Would start $name (budget: $budget_remaining, needs: $max_tokens)"
|
||||
return 0
|
||||
fi
|
||||
|
||||
log "START $name (budget: $budget_remaining, max_tokens: $max_tokens)"
|
||||
set_pipeline_state "$name" "running"
|
||||
|
||||
# Run in background, capture output
|
||||
local log_path="${HERMES_HOME}/logs/pipeline-${name}.log"
|
||||
bash "$script" --max-tokens "$max_tokens" >> "$log_path" 2>&1 &
|
||||
local pid=$!
|
||||
|
||||
# Wait a moment to check if it started OK
|
||||
sleep 2
|
||||
if kill -0 $pid 2>/dev/null; then
|
||||
log "RUNNING $name (PID: $pid, log: $log_path)"
|
||||
# Record the PID
|
||||
python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
d = {}
|
||||
if os.path.exists(path):
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
d['$name']['pid'] = $pid
|
||||
with open(path, 'w') as f:
|
||||
json.dump(d, f, indent=2)
|
||||
"
|
||||
return 0
|
||||
else
|
||||
log "FAIL $name: script exited immediately"
|
||||
set_pipeline_state "$name" "failed"
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# --- Main ---
|
||||
main() {
|
||||
local mode="${1:-run}"
|
||||
ensure_dirs
|
||||
|
||||
log "=== Pipeline Scheduler ($mode) ==="
|
||||
|
||||
# Check 1: Is inference available?
|
||||
if ! check_inference_available; then
|
||||
log "No inference provider available. Skipping all pipelines."
|
||||
exit 0
|
||||
fi
|
||||
log "Inference: AVAILABLE"
|
||||
|
||||
# Check 2: Is it peak hours?
|
||||
if is_peak_hours && [[ "$mode" != "--force" ]]; then
|
||||
local h=$(now_hour)
|
||||
log "Peak hours ($h:00). Skipping pipeline start. Use --force to override."
|
||||
exit 0
|
||||
fi
|
||||
log "Off-peak: OK"
|
||||
|
||||
# Check 3: Interactive load
|
||||
if ! check_interactive_load && [[ "$mode" != "--force" ]]; then
|
||||
log "High interactive load. Skipping pipeline start."
|
||||
exit 0
|
||||
fi
|
||||
log "Interactive load: OK"
|
||||
|
||||
# Check 4: Token budget
|
||||
local budget=$(get_budget_remaining)
|
||||
log "Token budget remaining: $budget / $TOKEN_DAILY_LIMIT"
|
||||
|
||||
if [[ $budget -le 0 ]]; then
|
||||
log "Daily token budget exhausted. Stopping."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Check 5: Pipeline status
|
||||
if [[ "$mode" == "--status" ]]; then
|
||||
echo -e "${CYAN}Pipeline Status:${NC}"
|
||||
echo "────────────────────────────────────────────────────"
|
||||
for entry in "${PIPELINES[@]}"; do
|
||||
IFS='|' read -r name script max_tokens dep <<< "$entry"
|
||||
local state=$(python3 -c "
|
||||
import json, os
|
||||
path = '$STATE_FILE'
|
||||
if not os.path.exists(path):
|
||||
print('not_started')
|
||||
else:
|
||||
with open(path) as f:
|
||||
d = json.load(f)
|
||||
print(d.get('$name', {}).get('state', 'not_started'))
|
||||
" 2>/dev/null || echo "not_started")
|
||||
|
||||
local color=$NC
|
||||
case "$state" in
|
||||
running) color=$YELLOW ;;
|
||||
complete) color=$GREEN ;;
|
||||
failed) color=$RED ;;
|
||||
esac
|
||||
printf " %-25s %b%s%b (max: %s tokens, dep: %s)\n" "$name" "$color" "$state" "$NC" "$max_tokens" "$dep"
|
||||
done
|
||||
echo "────────────────────────────────────────────────────"
|
||||
echo " Budget: $budget / $TOKEN_DAILY_LIMIT tokens remaining"
|
||||
echo " Peak hours: $PEAK_HOURS_START:00 - $PEAK_HOURS_END:00"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Find and start the highest-priority incomplete pipeline
|
||||
local started=0
|
||||
for entry in "${PIPELINES[@]}"; do
|
||||
IFS='|' read -r name script max_tokens dep <<< "$entry"
|
||||
|
||||
# Skip if already running or complete
|
||||
if [[ "$(is_pipeline_running $name)" == "true" ]]; then
|
||||
log "SKIP $name: already running"
|
||||
continue
|
||||
fi
|
||||
if [[ "$(is_pipeline_complete $name)" == "true" ]]; then
|
||||
log "SKIP $name: already complete"
|
||||
continue
|
||||
fi
|
||||
|
||||
# Check dependency
|
||||
if ! check_dependency "$dep"; then
|
||||
log "SKIP $name: dependency $dep not met"
|
||||
continue
|
||||
fi
|
||||
|
||||
# Try to start
|
||||
if start_pipeline "$name" "$script" "$max_tokens" "$budget" "$mode"; then
|
||||
started=1
|
||||
# Only start one pipeline per run (let it claim tokens before next check)
|
||||
# Exception: playground-factory and training-factory can run in parallel
|
||||
if [[ "$name" != "playground-factory" && "$name" != "training-factory" ]]; then
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ $started -eq 0 ]]; then
|
||||
log "No pipelines to start (all complete, running, or blocked)."
|
||||
fi
|
||||
|
||||
log "=== Pipeline Scheduler done ==="
|
||||
}
|
||||
|
||||
main "$@"
|
||||
362
scripts/pr_triage.py
Executable file
362
scripts/pr_triage.py
Executable file
@@ -0,0 +1,362 @@
|
||||
#!/usr/bin/env python3
|
||||
"""PR Triage Automation -- Categorize, deduplicate, report, auto-merge (#659).
|
||||
|
||||
Enhancements over base implementation:
|
||||
- Auto-merge for safe PRs (training data with passing tests)
|
||||
- --all-repos flag for org-wide triage
|
||||
- JSON output with structured data
|
||||
- Age-based risk scoring
|
||||
- Better duplicate detection (title similarity)
|
||||
- Tests in tests/test_pr_triage.py
|
||||
|
||||
Usage:
|
||||
python scripts/pr_triage.py --repo hermes-agent
|
||||
python scripts/pr_triage.py --repo hermes-agent --json
|
||||
python scripts/pr_triage.py --repo hermes-agent --auto-merge --dry-run
|
||||
python scripts/pr_triage.py --all-repos --owner Timmy_Foundation
|
||||
"""
|
||||
import argparse
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import subprocess
|
||||
from collections import Counter, defaultdict
|
||||
from datetime import datetime, timezone
|
||||
from difflib import SequenceMatcher
|
||||
from urllib.request import Request, urlopen
|
||||
from urllib.error import HTTPError
|
||||
|
||||
|
||||
def _token():
|
||||
t = os.environ.get("GITEA_TOKEN", "")
|
||||
if not t:
|
||||
p = os.path.expanduser("~/.config/gitea/token")
|
||||
if os.path.exists(p):
|
||||
t = open(p).read().strip()
|
||||
return t
|
||||
|
||||
|
||||
def _api(url, token, method="GET", data=None):
|
||||
h = {"Authorization": "token " + token, "Accept": "application/json"}
|
||||
body = json.dumps(data).encode() if data else None
|
||||
if data:
|
||||
h["Content-Type"] = "application/json"
|
||||
req = Request(url, data=body, headers=h, method=method)
|
||||
try:
|
||||
return json.loads(urlopen(req, timeout=30).read())
|
||||
except HTTPError:
|
||||
return None
|
||||
|
||||
|
||||
def fetch_prs(base, token, owner, repo):
|
||||
prs, page = [], 1
|
||||
while True:
|
||||
b = _api(f"{base}/api/v1/repos/{owner}/{repo}/pulls?state=open&limit=50&page={page}", token)
|
||||
if not b:
|
||||
break
|
||||
prs.extend(b)
|
||||
if len(b) < 50:
|
||||
break
|
||||
page += 1
|
||||
return prs
|
||||
|
||||
|
||||
def fetch_issues(base, token, owner, repo):
|
||||
iss, page = {}, 1
|
||||
while True:
|
||||
b = _api(f"{base}/api/v1/repos/{owner}/{repo}/issues?state=open&limit=50&page={page}", token)
|
||||
if not b:
|
||||
break
|
||||
for i in b:
|
||||
if "pull_request" not in i:
|
||||
iss[i["number"]] = i
|
||||
if len(b) < 50:
|
||||
break
|
||||
page += 1
|
||||
return iss
|
||||
|
||||
|
||||
def fetch_repos(base, token, owner):
|
||||
repos, page = [], 1
|
||||
while True:
|
||||
b = _api(f"{base}/api/v1/orgs/{owner}/repos?limit=50&page={page}", token)
|
||||
if not b:
|
||||
break
|
||||
repos.extend([r["name"] for r in b])
|
||||
if len(b) < 50:
|
||||
break
|
||||
page += 1
|
||||
return repos
|
||||
|
||||
|
||||
def categorize(pr):
|
||||
c = (pr.get("title", "") + " " + pr.get("body", "") + " " +
|
||||
" ".join(l.get("name", "") for l in pr.get("labels", []))).lower()
|
||||
for kw, cat in [
|
||||
("training data", "training-data"), ("dpo", "training-data"), ("grpo", "training-data"),
|
||||
("fix:", "bug-fix"), ("bug", "bug-fix"), ("hotfix", "bug-fix"),
|
||||
("feat:", "feature"), ("feature", "feature"), ("enhancement", "feature"),
|
||||
("refactor", "maintenance"), ("cleanup", "maintenance"), ("chore:", "maintenance"),
|
||||
("doc", "documentation"), ("test", "testing"), ("ci", "infrastructure"),
|
||||
("infra", "infrastructure"), ("deploy", "infrastructure"),
|
||||
]:
|
||||
if kw in c:
|
||||
return cat
|
||||
return "other"
|
||||
|
||||
|
||||
def refs(pr):
|
||||
return [int(m) for m in re.findall(r"#(\d+)", pr.get("title", "") + " " + pr.get("body", ""))]
|
||||
|
||||
|
||||
def find_duplicates(prs):
|
||||
by_ref = defaultdict(list)
|
||||
for p in prs:
|
||||
for r in refs(p):
|
||||
by_ref[r].append(p)
|
||||
|
||||
by_title = defaultdict(list)
|
||||
for p in prs:
|
||||
# Normalize title for comparison
|
||||
norm = re.sub(r"^(fix|feat|chore|docs|test|refactor)[\(:].*?[\):]\s*", "", p.get("title", "").lower())
|
||||
norm = re.sub(r"#\d+", "", norm).strip()
|
||||
by_title[norm].append(p)
|
||||
|
||||
dup_groups = []
|
||||
seen = set()
|
||||
|
||||
# Ref-based duplicates
|
||||
for r, group in by_ref.items():
|
||||
if len(group) > 1:
|
||||
key = tuple(sorted(p["number"] for p in group))
|
||||
if key not in seen:
|
||||
seen.add(key)
|
||||
dup_groups.append({"type": "ref", "ref": r, "prs": group})
|
||||
|
||||
# Title-similarity duplicates (threshold 0.85)
|
||||
for i, p1 in enumerate(prs):
|
||||
for p2 in prs[i + 1:]:
|
||||
key = tuple(sorted([p1["number"], p2["number"]]))
|
||||
if key in seen:
|
||||
continue
|
||||
sim = SequenceMatcher(None, p1.get("title", "").lower(), p2.get("title", "").lower()).ratio()
|
||||
if sim > 0.85:
|
||||
seen.add(key)
|
||||
dup_groups.append({"type": "similarity", "similarity": round(sim, 2), "prs": [p1, p2]})
|
||||
|
||||
return dup_groups
|
||||
|
||||
|
||||
def health(pr, issues):
|
||||
r = refs(pr)
|
||||
created = datetime.fromisoformat(pr["created_at"].replace("Z", "+00:00"))
|
||||
updated = datetime.fromisoformat(pr["updated_at"].replace("Z", "+00:00"))
|
||||
now = datetime.now(timezone.utc)
|
||||
age_days = (now - created).days
|
||||
stale_days = (now - updated).days
|
||||
|
||||
# Risk score: age + staleness + no refs + not mergeable
|
||||
risk = 0
|
||||
risk += min(age_days, 30) # max 30 for age
|
||||
risk += min(stale_days * 2, 40) # max 40 for staleness
|
||||
risk += 10 if not r else 0 # no issue refs
|
||||
risk += 15 if pr.get("mergeable") is False else 0 # conflicts
|
||||
risk = min(risk, 100)
|
||||
|
||||
return {
|
||||
"pr": pr["number"],
|
||||
"title": pr["title"],
|
||||
"head": pr["head"]["ref"],
|
||||
"category": categorize(pr),
|
||||
"refs": r,
|
||||
"open_issues": [x for x in r if x in issues],
|
||||
"closed_issues": [x for x in r if x not in issues],
|
||||
"age_days": age_days,
|
||||
"stale_days": stale_days,
|
||||
"risk_score": risk,
|
||||
"mergeable": pr.get("mergeable"),
|
||||
"author": pr.get("user", {}).get("login", ""),
|
||||
"labels": [l.get("name", "") for l in pr.get("labels", [])],
|
||||
}
|
||||
|
||||
|
||||
def is_safe_to_merge(h):
|
||||
"""Determine if a PR is safe to auto-merge."""
|
||||
if h["category"] != "training-data":
|
||||
return False, "not training-data"
|
||||
if h["mergeable"] is False:
|
||||
return False, "has conflicts"
|
||||
if h["mergeable"] is None:
|
||||
return False, "mergeable status unknown"
|
||||
if h["stale_days"] > 30:
|
||||
return False, f"too stale ({h['stale_days']}d)"
|
||||
if h["risk_score"] > 50:
|
||||
return False, f"risk too high ({h['risk_score']})"
|
||||
return True, "safe"
|
||||
|
||||
|
||||
def auto_merge(base, token, owner, repo, pr_num, dry_run=True):
|
||||
"""Attempt to merge a PR."""
|
||||
if dry_run:
|
||||
return {"merged": False, "dry_run": True, "pr": pr_num}
|
||||
|
||||
url = f"{base}/api/v1/repos/{owner}/{repo}/pulls/{pr_num}/merge"
|
||||
result = _api(url, token, method="POST", data={
|
||||
"MergeTitleField": "auto",
|
||||
"MergeMessageField": "auto",
|
||||
"Do": "merge",
|
||||
})
|
||||
return {"merged": result is not None, "pr": pr_num, "result": result}
|
||||
|
||||
|
||||
def report(repo, checks, dups):
|
||||
lines = [
|
||||
f"# PR Triage -- {repo}",
|
||||
f"Generated: {datetime.now().strftime('%Y-%m-%d %H:%M')}",
|
||||
f"Open PRs: {len(checks)}",
|
||||
"",
|
||||
"## Summary",
|
||||
"",
|
||||
]
|
||||
|
||||
cats = Counter(h["category"] for h in checks)
|
||||
lines.append("| Category | Count |")
|
||||
lines.append("|----------|-------|")
|
||||
for c, n in cats.most_common():
|
||||
lines.append(f"| {c} | {n} |")
|
||||
|
||||
stale = [h for h in checks if h["stale_days"] > 7]
|
||||
high_risk = [h for h in checks if h["risk_score"] > 50]
|
||||
safe_merge = [h for h in checks if is_safe_to_merge(h)[0]]
|
||||
|
||||
lines.extend([
|
||||
"",
|
||||
f"Stale (>7d): {len(stale)}",
|
||||
f"High risk (>50): {len(high_risk)}",
|
||||
f"Safe to merge: {len(safe_merge)}",
|
||||
f"Duplicate groups: {len(dups)}",
|
||||
"",
|
||||
])
|
||||
|
||||
if safe_merge:
|
||||
lines.append("## Safe to Auto-Merge")
|
||||
for h in safe_merge:
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
lines.append(f"- #{h['pr']}: {h['title'][:60]} ({reason})")
|
||||
lines.append("")
|
||||
|
||||
if dups:
|
||||
lines.append("## Duplicates")
|
||||
for g in dups:
|
||||
pr_nums = [str(p["number"]) for p in g["prs"]]
|
||||
lines.append(f"[{g['type']}] PRs {', '.join('#' + n for n in pr_nums)}:")
|
||||
for p in g["prs"]:
|
||||
lines.append(f" - #{p['number']}: {p['title']}")
|
||||
lines.append("")
|
||||
|
||||
if stale:
|
||||
lines.append("## Stale (>7d)")
|
||||
for h in sorted(stale, key=lambda x: x["stale_days"], reverse=True):
|
||||
lines.append(f"- #{h['pr']}: {h['title'][:50]} -- {h['stale_days']}d (risk: {h['risk_score']})")
|
||||
lines.append("")
|
||||
|
||||
lines.append("## All PRs")
|
||||
lines.append("| # | Title | Category | Age | Stale | Risk | Merge |")
|
||||
lines.append("|---|-------|----------|-----|-------|------|-------|")
|
||||
for h in sorted(checks, key=lambda x: x["pr"]):
|
||||
m = "Y" if h["mergeable"] else ("N" if h["mergeable"] is False else "?")
|
||||
s = f"{h['stale_days']}d" if h["stale_days"] > 7 else "-"
|
||||
lines.append(f"| {h['pr']} | {h['title'][:45]} | {h['category']} | {h['age_days']}d | {s} | {h['risk_score']} | {m} |")
|
||||
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def main():
|
||||
p = argparse.ArgumentParser(description="PR Triage Automation")
|
||||
p.add_argument("--base-url", default="https://forge.alexanderwhitestone.com")
|
||||
p.add_argument("--owner", default="Timmy_Foundation")
|
||||
p.add_argument("--repo", default="")
|
||||
p.add_argument("--all-repos", action="store_true", help="Triage all org repos")
|
||||
p.add_argument("--json", action="store_true", dest="js")
|
||||
p.add_argument("--output", default="")
|
||||
p.add_argument("--auto-merge", action="store_true", help="Auto-merge safe PRs")
|
||||
p.add_argument("--dry-run", action="store_true", help="Show what would be merged without merging")
|
||||
a = p.parse_args()
|
||||
|
||||
token = _token()
|
||||
if not token:
|
||||
print("No token"); sys.exit(1)
|
||||
|
||||
if a.all_repos:
|
||||
repos = fetch_repos(a.base_url, token, a.owner)
|
||||
all_checks = []
|
||||
all_dups = []
|
||||
for repo in repos:
|
||||
prs = fetch_prs(a.base_url, token, a.owner, repo)
|
||||
issues = fetch_issues(a.base_url, token, a.owner, repo)
|
||||
checks = [health(pr, issues) for pr in prs]
|
||||
dups = find_duplicates(prs)
|
||||
for c in checks:
|
||||
c["repo"] = repo
|
||||
all_checks.extend(checks)
|
||||
all_dups.extend(dups)
|
||||
if a.js:
|
||||
print(json.dumps({"repos": repos, "prs": all_checks, "duplicates_count": len(all_dups)}, indent=2))
|
||||
else:
|
||||
print(f"Org-wide triage: {len(repos)} repos, {len(all_checks)} PRs, {len(all_dups)} duplicate groups")
|
||||
cats = Counter(h["category"] for h in all_checks)
|
||||
for c, n in cats.most_common():
|
||||
print(f" {c}: {n}")
|
||||
return
|
||||
|
||||
repo = a.repo
|
||||
if not repo:
|
||||
try:
|
||||
remote = subprocess.check_output(["git", "remote", "get-url", "origin"], text=True).strip()
|
||||
m = re.search(r"[/:](\w[\w-]*)/(\w[\w-]*?)(?:\.git)?$", remote)
|
||||
if m:
|
||||
a.owner, repo = m.group(1), m.group(2)
|
||||
except Exception:
|
||||
pass
|
||||
if not repo:
|
||||
print("No repo specified"); sys.exit(1)
|
||||
|
||||
print(f"Triaging {a.owner}/{repo}...", file=sys.stderr)
|
||||
prs = fetch_prs(a.base_url, token, a.owner, repo)
|
||||
issues = fetch_issues(a.base_url, token, a.owner, repo)
|
||||
checks = [health(pr, issues) for pr in prs]
|
||||
dups = find_duplicates(prs)
|
||||
|
||||
# Auto-merge
|
||||
merge_results = []
|
||||
if a.auto_merge or a.dry_run:
|
||||
safe = [h for h in checks if is_safe_to_merge(h)[0]]
|
||||
if safe:
|
||||
print(f"Auto-merge: {len(safe)} safe PRs ({'dry-run' if a.dry_run else 'live'})", file=sys.stderr)
|
||||
for h in safe:
|
||||
result = auto_merge(a.base_url, token, a.owner, repo, h["pr"], dry_run=a.dry_run)
|
||||
merge_results.append(result)
|
||||
status = "WOULD MERGE" if a.dry_run else ("MERGED" if result["merged"] else "FAILED")
|
||||
print(f" #{h['pr']}: {status}", file=sys.stderr)
|
||||
|
||||
if a.js:
|
||||
out = {
|
||||
"repo": repo, "prs": checks,
|
||||
"duplicates": [{"type": g["type"], "prs": [p["number"] for p in g["prs"]]} for g in dups],
|
||||
"merge_results": merge_results,
|
||||
}
|
||||
print(json.dumps(out, indent=2))
|
||||
else:
|
||||
r = report(repo, checks, dups)
|
||||
print(r)
|
||||
if a.output:
|
||||
with open(a.output, "w") as f:
|
||||
f.write(r)
|
||||
|
||||
print(f"\n{len(checks)} PRs, {len(dups)} duplicate groups, {len(merge_results)} merges",
|
||||
file=sys.stderr)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
161
tests/test_pr_triage.py
Normal file
161
tests/test_pr_triage.py
Normal file
@@ -0,0 +1,161 @@
|
||||
"""Tests for PR triage automation (#659)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import pytest
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from scripts.pr_triage import categorize, refs, find_duplicates, health, is_safe_to_merge
|
||||
|
||||
|
||||
class TestCategorize:
|
||||
"""PR categorization from title/body/labels."""
|
||||
|
||||
def test_training_data(self):
|
||||
pr = {"title": "Add DPO training data", "body": "", "labels": []}
|
||||
assert categorize(pr) == "training-data"
|
||||
|
||||
def test_bug_fix(self):
|
||||
pr = {"title": "fix: resolve crash on startup", "body": "", "labels": []}
|
||||
assert categorize(pr) == "bug-fix"
|
||||
|
||||
def test_feature(self):
|
||||
pr = {"title": "feat: add dark mode", "body": "", "labels": []}
|
||||
assert categorize(pr) == "feature"
|
||||
|
||||
def test_maintenance(self):
|
||||
pr = {"title": "refactor: simplify auth flow", "body": "", "labels": []}
|
||||
assert categorize(pr) == "maintenance"
|
||||
|
||||
def test_other(self):
|
||||
pr = {"title": "Update readme", "body": "", "labels": []}
|
||||
assert categorize(pr) == "other"
|
||||
|
||||
|
||||
class TestRefs:
|
||||
"""Issue reference extraction."""
|
||||
|
||||
def test_extracts_from_title(self):
|
||||
pr = {"title": "fix: resolve #123", "body": ""}
|
||||
assert refs(pr) == [123]
|
||||
|
||||
def test_extracts_from_body(self):
|
||||
pr = {"title": "Fix", "body": "Closes #456, refs #789"}
|
||||
assert refs(pr) == [456, 789]
|
||||
|
||||
def test_no_refs(self):
|
||||
pr = {"title": "Fix", "body": "No issue refs"}
|
||||
assert refs(pr) == []
|
||||
|
||||
def test_multiple_refs(self):
|
||||
pr = {"title": "#1 and #2", "body": "Also #3"}
|
||||
assert refs(pr) == [1, 2, 3]
|
||||
|
||||
|
||||
class TestFindDuplicates:
|
||||
"""Duplicate PR detection."""
|
||||
|
||||
def test_ref_based_duplicates(self):
|
||||
prs = [
|
||||
{"number": 1, "title": "Fix #100", "body": "Closes #100"},
|
||||
{"number": 2, "title": "Fix #100 too", "body": "Closes #100"},
|
||||
]
|
||||
dups = find_duplicates(prs)
|
||||
assert len(dups) == 1
|
||||
assert dups[0]["type"] == "ref"
|
||||
|
||||
def test_title_similarity_duplicates(self):
|
||||
prs = [
|
||||
{"number": 1, "title": "feat: add dark mode support", "body": ""},
|
||||
{"number": 2, "title": "feat: add dark mode support", "body": "different body"},
|
||||
]
|
||||
dups = find_duplicates(prs)
|
||||
assert len(dups) >= 1
|
||||
assert any(d["type"] == "similarity" for d in dups)
|
||||
|
||||
def test_no_duplicates(self):
|
||||
prs = [
|
||||
{"number": 1, "title": "Fix auth bug", "body": "Closes #100"},
|
||||
{"number": 2, "title": "Add dark mode", "body": "Closes #200"},
|
||||
]
|
||||
dups = find_duplicates(prs)
|
||||
assert len(dups) == 0
|
||||
|
||||
|
||||
class TestHealth:
|
||||
"""PR health assessment."""
|
||||
|
||||
def _make_pr(self, **overrides):
|
||||
now = datetime.now(timezone.utc).isoformat()
|
||||
pr = {
|
||||
"number": 1,
|
||||
"title": "test",
|
||||
"body": "Closes #100",
|
||||
"created_at": now,
|
||||
"updated_at": now,
|
||||
"head": {"ref": "fix/test"},
|
||||
"mergeable": True,
|
||||
"user": {"login": "agent"},
|
||||
"labels": [],
|
||||
}
|
||||
pr.update(overrides)
|
||||
return pr
|
||||
|
||||
def test_basic_health(self):
|
||||
pr = self._make_pr()
|
||||
h = health(pr, {100: {"number": 100}})
|
||||
assert h["pr"] == 1
|
||||
assert h["refs"] == [100]
|
||||
assert h["open_issues"] == [100]
|
||||
assert h["age_days"] == 0
|
||||
|
||||
def test_stale_detection(self):
|
||||
old = (datetime.now(timezone.utc) - timedelta(days=30)).isoformat()
|
||||
pr = self._make_pr(created_at=old, updated_at=old)
|
||||
h = health(pr, {})
|
||||
assert h["stale_days"] >= 29
|
||||
assert h["risk_score"] > 30
|
||||
|
||||
|
||||
class TestIsSafeToMerge:
|
||||
"""Auto-merge safety checks."""
|
||||
|
||||
def _make_health(self, **overrides):
|
||||
h = {
|
||||
"pr": 1, "title": "test", "head": "fix/test",
|
||||
"category": "training-data", "refs": [100],
|
||||
"open_issues": [100], "closed_issues": [],
|
||||
"age_days": 1, "stale_days": 1,
|
||||
"risk_score": 10, "mergeable": True,
|
||||
"author": "agent", "labels": [],
|
||||
}
|
||||
h.update(overrides)
|
||||
return h
|
||||
|
||||
def test_safe_training_data(self):
|
||||
h = self._make_health()
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
assert ok
|
||||
|
||||
def test_unsafe_not_training(self):
|
||||
h = self._make_health(category="bug-fix")
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
assert not ok
|
||||
assert "not training-data" in reason
|
||||
|
||||
def test_unsafe_conflicts(self):
|
||||
h = self._make_health(mergeable=False)
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
assert not ok
|
||||
assert "conflicts" in reason
|
||||
|
||||
def test_unsafe_too_stale(self):
|
||||
h = self._make_health(stale_days=31)
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
assert not ok
|
||||
assert "stale" in reason
|
||||
|
||||
def test_unsafe_high_risk(self):
|
||||
h = self._make_health(risk_score=60)
|
||||
ok, reason = is_safe_to_merge(h)
|
||||
assert not ok
|
||||
assert "risk" in reason
|
||||
Reference in New Issue
Block a user