feat: Python syntax validation before execute_code (#913)
This commit is contained in:
@@ -28,6 +28,7 @@ Platform: Linux / macOS only (Unix domain sockets for local). Disabled on Window
|
||||
Remote execution additionally requires Python 3 in the terminal backend.
|
||||
"""
|
||||
|
||||
import ast
|
||||
import base64
|
||||
import json
|
||||
import logging
|
||||
@@ -883,6 +884,42 @@ def _execute_remote(
|
||||
return json.dumps(result, ensure_ascii=False)
|
||||
|
||||
|
||||
|
||||
def _validate_python_syntax(code: str) -> Optional[str]:
|
||||
"""Validate Python syntax before subprocess spawn.
|
||||
|
||||
Runs ast.parse() in-process (sub-millisecond) to catch syntax errors
|
||||
before wasting time spawning a sandboxed subprocess.
|
||||
|
||||
Returns:
|
||||
JSON error string with line, offset, message if syntax is invalid.
|
||||
None if syntax is valid.
|
||||
"""
|
||||
try:
|
||||
ast.parse(code)
|
||||
return None
|
||||
except SyntaxError as exc:
|
||||
# Build context: show offending line with caret
|
||||
lines = code.split("\n")
|
||||
error_line = lines[exc.lineno - 1] if exc.lineno and exc.lineno <= len(lines) else ""
|
||||
context = ""
|
||||
if error_line:
|
||||
context = f"\n {error_line}"
|
||||
if exc.offset:
|
||||
context += f"\n {' ' * (exc.offset - 1)}^"
|
||||
|
||||
return json.dumps({
|
||||
"error": f"Python syntax error on line {exc.lineno}: {exc.msg}{context}",
|
||||
"syntax_error": True,
|
||||
"line": exc.lineno,
|
||||
"offset": exc.offset,
|
||||
"message": exc.msg,
|
||||
})
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Main entry point
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -916,6 +953,11 @@ def execute_code(
|
||||
if not code or not code.strip():
|
||||
return tool_error("No code provided.")
|
||||
|
||||
# Syntax check before subprocess spawn (catches ~15% of errors in <1ms)
|
||||
syntax_error = _validate_python_syntax(code)
|
||||
if syntax_error:
|
||||
return syntax_error
|
||||
|
||||
# Dispatch: remote backends use file-based RPC, local uses UDS
|
||||
from tools.terminal_tool import _get_env_config
|
||||
env_type = _get_env_config()["env_type"]
|
||||
|
||||
Reference in New Issue
Block a user