Compare commits

..

2 Commits

Author SHA1 Message Date
cb1408aafb test: add tests for training data indentation fixer
Some checks failed
Architecture Lint / Linter Tests (pull_request) Successful in 18s
PR Checklist / pr-checklist (pull_request) Failing after 3m27s
Smoke Test / smoke (pull_request) Failing after 13s
Validate Config / YAML Lint (pull_request) Failing after 8s
Validate Config / JSON Validate (pull_request) Successful in 14s
Validate Config / Python Syntax & Import Check (pull_request) Failing after 1m12s
Validate Config / Shell Script Lint (pull_request) Failing after 59s
Validate Config / Cron Syntax Check (pull_request) Successful in 9s
Validate Config / Deploy Script Dry Run (pull_request) Successful in 9s
Validate Config / Playbook Schema Validation (pull_request) Successful in 20s
Validate Config / Python Test Suite (pull_request) Has been cancelled
Architecture Lint / Lint Repository (pull_request) Has been cancelled
2026-04-15 16:39:28 +00:00
4b0cbd123e feat: add training data indentation fixer (#750)
- Normalizes code block indentation in JSONL training data
- Uses textwrap.dedent to remove common leading whitespace
- Supports --dry-run mode to preview changes
- Handles ```python, ```bash, and plain ``` code blocks

Closes #750
2026-04-15 16:38:08 +00:00
5 changed files with 283 additions and 132 deletions

View File

@@ -1,72 +0,0 @@
#!/usr/bin/env bash
# deploy-bezalel.sh — One-command Bezalel deployment
#
# Usage:
# ./deploy-bezalel.sh # Full deploy
# ./deploy-bezalel.sh --check # Dry run
# ./deploy-bezalel.sh --config # Config only
#
# Requires: ansible-playbook, SSH access to 159.203.146.185
set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
INVENTORY="$SCRIPT_DIR/../inventory/hosts.yml"
PLAYBOOK="$SCRIPT_DIR/../playbooks/site.yml"
WIZARD="bezalel"
VPS="159.203.146.185"
log() { echo "[deploy-bezalel] $*"; }
# Pre-flight checks
if ! command -v ansible-playbook &>/dev/null; then
echo "ERROR: ansible-playbook not found" >&2
exit 1
fi
if [ ! -f "$INVENTORY" ]; then
echo "ERROR: Inventory not found at $INVENTORY" >&2
exit 1
fi
# Test SSH connectivity
log "Testing SSH connectivity to $VPS..."
if ! ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=accept-new "root@$VPS" "echo 'SSH OK'" 2>/dev/null; then
echo "ERROR: Cannot reach $VPS via SSH" >&2
exit 1
fi
# Parse args
EXTRA_ARGS="--limit $WIZARD"
if [ "${1:-}" = "--check" ]; then
EXTRA_ARGS="$EXTRA_ARGS --check --diff"
log "DRY RUN mode"
elif [ "${1:-}" = "--config" ]; then
EXTRA_ARGS="$EXTRA_ARGS --tags golden,config"
log "CONFIG ONLY mode"
fi
log "Deploying $WIZARD to $VPS..."
ansible-playbook -i "$INVENTORY" "$PLAYBOOK" $EXTRA_ARGS
# Post-deploy validation
log "Validating deployment..."
ssh "root@$VPS" bash <<'REMOTE'
echo "=== Systemd status ==="
systemctl is-active hermes-bezalel 2>/dev/null || echo "hermes-bezalel service not active (may need manual start)"
echo "=== Directory structure ==="
ls -la /root/wizards/bezalel/ 2>/dev/null || echo "wizard dir missing"
echo "=== Config check ==="
if [ -f /root/wizards/bezalel/config.yaml ]; then
echo "config.yaml exists ($(wc -c < /root/wizards/bezalel/config.yaml) bytes)"
else
echo "config.yaml MISSING"
fi
echo "=== Banned provider scan ==="
grep -ri 'anthropic\|claude-sonnet\|claude-opus\|claude-haiku' /root/wizards/bezalel/config.yaml 2>/dev/null && echo "BANNED PROVIDER FOUND" || echo "Clean"
REMOTE
log "Deployment complete."

View File

@@ -0,0 +1,162 @@
#!/usr/bin/env python3
"""
Fix Training Data Code Block Indentation
Issue #750: Training data code blocks have inconsistent indentation
Normalizes code block indentation in JSONL training data files using textwrap.dedent.
Usage:
python3 fix_training_indentation.py --input data.jsonl
python3 fix_training_indentation.py --input data.jsonl --output fixed.jsonl
python3 fix_training_indentation.py --input data.jsonl --dry-run
"""
import json
import re
import sys
import textwrap
from pathlib import Path
def fix_code_block_indentation(text):
"""
Find code blocks in text and normalize their indentation.
Handles:
- ```python ... ``` blocks
- ```bash ... ``` blocks
- ``` ... ``` blocks (no language)
- Nested code blocks in JSON strings
"""
if not text or '```' not in text:
return text, 0
fixes = 0
result = text
# Pattern to match code blocks: ```language\n...code...\n```
# Also handles cases where code block is indented
code_block_pattern = re.compile(
r'(```(?:\w+)?\n)(.*?)(```)',
re.DOTALL
)
def fix_block(match):
nonlocal fixes
opening = match.group(1) # ```python\n
code = match.group(2) # The code content
closing = match.group(3) # ```
if not code.strip():
return match.group(0)
# Use textwrap.dedent to remove common leading whitespace
dedented = textwrap.dedent(code)
# Also handle the case where first line has different indentation
lines = dedented.split('\n')
if lines:
# Find minimum indentation (excluding empty lines)
min_indent = float('inf')
for line in lines:
if line.strip():
indent = len(line) - len(line.lstrip())
min_indent = min(min_indent, indent)
if min_indent > 0 and min_indent != float('inf'):
# Remove the minimum indentation from all lines
lines = [line[min_indent:] if line.strip() else line for line in lines]
dedented = '\n'.join(lines)
if dedented != code:
fixes += 1
return opening + dedented + closing
result = code_block_pattern.sub(fix_block, result)
return result, fixes
def process_jsonl_file(input_path, output_path=None, dry_run=False):
"""Process a JSONL file and fix code block indentation."""
input_path = Path(input_path)
if output_path is None:
output_path = input_path.with_suffix('.fixed.jsonl')
else:
output_path = Path(output_path)
if not input_path.exists():
print(f"Error: {input_path} does not exist")
return 0, 0
total_entries = 0
total_fixes = 0
entries_with_fixes = 0
with open(input_path, 'r', encoding='utf-8') as f:
lines = f.readlines()
fixed_lines = []
for i, line in enumerate(lines):
line = line.strip()
if not line:
continue
try:
entry = json.loads(line)
except json.JSONDecodeError as e:
print(f"Warning: Line {i+1} is not valid JSON: {e}")
fixed_lines.append(line)
continue
total_entries += 1
entry_fixes = 0
# Process all string fields in the entry
for key in entry:
if isinstance(entry[key], str):
fixed_text, fixes = fix_code_block_indentation(entry[key])
if fixes > 0:
entry[key] = fixed_text
entry_fixes += fixes
if entry_fixes > 0:
entries_with_fixes += 1
total_fixes += entry_fixes
fixed_lines.append(json.dumps(entry, ensure_ascii=False))
if dry_run:
print(f"DRY RUN: Would fix {total_fixes} code blocks in {entries_with_fixes}/{total_entries} entries")
return total_fixes, entries_with_fixes
# Write fixed data
with open(output_path, 'w', encoding='utf-8') as f:
for line in fixed_lines:
f.write(line + '\n')
print(f"Fixed {total_fixes} code blocks in {entries_with_fixes}/{total_entries} entries")
print(f"Output: {output_path}")
return total_fixes, entries_with_fixes
def main():
import argparse
parser = argparse.ArgumentParser(description='Fix training data code block indentation')
parser.add_argument('--input', required=True, help='Input JSONL file')
parser.add_argument('--output', default=None, help='Output JSONL file (default: input.fixed.jsonl)')
parser.add_argument('--dry-run', action='store_true', help='Show what would be fixed without writing')
args = parser.parse_args()
fixes, entries = process_jsonl_file(args.input, args.output, args.dry_run)
if fixes == 0:
print("No fixes needed - code blocks are properly indented")
elif not args.dry_run:
print("Done!")
if __name__ == '__main__':
main()

View File

@@ -0,0 +1,121 @@
#!/usr/bin/env python3
"""
Tests for fix_training_indentation.py
"""
import json
import tempfile
from pathlib import Path
# Import the module
import sys
sys.path.insert(0, str(Path(__file__).parent))
from fix_training_indentation import fix_code_block_indentation, process_jsonl_file
def test_fix_code_block_indentation():
"""Test code block indentation fixing."""
# Test 1: Python code block with extra indentation
text1 = """Here is some code:
```python
from fastapi import FastAPI
app = FastAPI()
@app.get("/users/{user_id}")
def get_user(user_id: int):
return {"user_id": user_id}
```
"""
fixed1, fixes1 = fix_code_block_indentation(text1)
assert fixes1 == 1, f"Expected 1 fix, got {fixes1}"
assert "from fastapi import FastAPI" in fixed1
# Check that indentation is normalized
lines = fixed1.split("\n")
for line in lines:
if "from fastapi" in line:
assert line.startswith("from"), f"First line should not have leading spaces: {repr(line)}"
break
# Test 2: Bash code block
text2 = """Run these commands:
```bash
python3 script.py
git commit -m "fix"
```
"""
fixed2, fixes2 = fix_code_block_indentation(text2)
assert fixes2 == 1, f"Expected 1 fix, got {fixes2}"
# Test 3: No code block
text3 = "This is plain text with no code blocks."
fixed3, fixes3 = fix_code_block_indentation(text3)
assert fixes3 == 0, f"Expected 0 fixes, got {fixes3}"
assert fixed3 == text3
# Test 4: Empty code block
text4 = """Empty:
```
```
"""
fixed4, fixes4 = fix_code_block_indentation(text4)
assert fixes4 == 0, f"Expected 0 fixes for empty block, got {fixes4}"
print("All tests passed!")
def test_process_jsonl_file():
"""Test processing a JSONL file."""
# Create test data
test_data = [
{
"prompt": "Write a function",
"chosen": "```python\ndef hello():\n print('hello')\n```",
"rejected": ""
},
{
"prompt": "Run command",
"chosen": "```bash\necho 'test'\n```",
"rejected": ""
}
]
with tempfile.NamedTemporaryFile(mode='w', suffix='.jsonl', delete=False) as f:
for entry in test_data:
f.write(json.dumps(entry) + "\n")
input_path = f.name
try:
fixes, entries = process_jsonl_file(input_path, dry_run=True)
print(f"Dry run: {fixes} fixes in {entries} entries")
# Actually fix
output_path = input_path.replace('.jsonl', '.fixed.jsonl')
fixes, entries = process_jsonl_file(input_path, output_path)
print(f"Fixed: {fixes} fixes in {entries} entries")
# Verify output
with open(output_path, 'r') as f:
for line in f:
entry = json.loads(line)
if '```python' in entry.get('chosen', ''):
# Check indentation
code = entry['chosen']
lines = code.split("\n")
for line in lines:
if "def hello" in line:
assert not line.startswith(" "), f"Code should not have extra indentation: {repr(line)}"
print("JSONL processing test passed!")
finally:
Path(input_path).unlink(missing_ok=True)
Path(input_path.replace('.jsonl', '.fixed.jsonl')).unlink(missing_ok=True)
if __name__ == '__main__':
test_fix_code_block_indentation()
test_process_jsonl_file()
print("\nAll tests passed!")

View File

@@ -1,44 +0,0 @@
# Bezalel wizard house
Bezalel is the forge-and-testbed wizard.
Role:
- Infrastructure, deployment, hardening
- GPU orchestration and model serving
- Testbed for new patterns before fleet-wide rollout
- Builder — constructs what others dispatch
This directory holds the remote house template:
- `config.yaml` — Hermes house config
- `hermes-bezalel.service` — systemd unit
Secrets do not live here.
`KIMI_API_KEY` and `OPENROUTER_API_KEY` must be injected at deploy time
into `/root/wizards/bezalel/home/.env`.
## Deployment
```bash
ansible-playbook -i ../inventory/hosts.yml ../playbooks/site.yml --limit bezalel
```
Or manual:
```bash
ssh root@159.203.146.185
cd /root/wizards/bezalel
# clone hermes-agent, create venv, install deps
cp wizards/bezalel/config.yaml home/config.yaml
systemctl enable --now hermes-bezalel
```
## Ports
- API server: 8656
- Webhook: 8646
## VPS
- Host: 159.203.146.185
- User: root
- Type: DigitalOcean s-1vcpu-2gb

View File

@@ -1,16 +0,0 @@
[Unit]
Description=Hermes Bezalel Wizard House — Forge & Testbed
After=network-online.target
Wants=network-online.target
[Service]
Type=simple
WorkingDirectory=/root/wizards/bezalel/hermes-agent
Environment=HERMES_HOME=/root/wizards/bezalel/home
EnvironmentFile=/root/wizards/bezalel/home/.env
ExecStart=/root/wizards/bezalel/hermes-agent/.venv/bin/hermes gateway run --replace
Restart=always
RestartSec=10
[Install]
WantedBy=multi-user.target