auto-code-fixer 0.3.4__tar.gz → 0.3.5__tar.gz

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-code-fixer
-Version: 0.3.4
+Version: 0.3.5
 Summary: Automatically fix Python code using ChatGPT
 Author-email: Arif Shah <ashah7775@gmail.com>
 License: MIT
@@ -121,6 +121,21 @@ auto-code-fixer main.py --ai-plan
 ```
 This enables a helper that can suggest which local file to edit. It is best-effort.
 
+### Optional structured patch protocol (JSON + sha256)
+```bash
+auto-code-fixer main.py --patch-protocol
+```
+When enabled, the model is asked to return strict JSON with `{files:[{path,new_content,sha256}]}`.
+The tool verifies the SHA-256 hash of `new_content` before applying edits, and falls back to the
+legacy full-text mode if parsing/validation fails.
+
+### Optional formatting / linting (best-effort)
+```bash
+auto-code-fixer main.py --format black
+auto-code-fixer main.py --lint ruff --fix
+```
+These run inside the sandbox venv and are skipped if the tools are not installed.
+
 ---
 
 ## Environment variables

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/README.md

@@ -100,6 +100,21 @@ auto-code-fixer main.py --ai-plan
 ```
 This enables a helper that can suggest which local file to edit. It is best-effort.
 
+### Optional structured patch protocol (JSON + sha256)
+```bash
+auto-code-fixer main.py --patch-protocol
+```
+When enabled, the model is asked to return strict JSON with `{files:[{path,new_content,sha256}]}`.
+The tool verifies the SHA-256 hash of `new_content` before applying edits, and falls back to the
+legacy full-text mode if parsing/validation fails.
+
+### Optional formatting / linting (best-effort)
+```bash
+auto-code-fixer main.py --format black
+auto-code-fixer main.py --lint ruff --fix
+```
+These run inside the sandbox venv and are skipped if the tools are not installed.
+
 ---
 
 ## Environment variables

auto_code_fixer-0.3.5/auto_code_fixer/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.5"

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/auto_code_fixer/cli.py

@@ -19,7 +19,23 @@ from auto_code_fixer import __version__
 DEFAULT_MAX_RETRIES = 8  # can be overridden via CLI
 
 
-def fix_file(file_path, project_root, api_key, ask, verbose, *, dry_run: bool, model: str | None, timeout_s: int, max_retries: int, run_cmd: str | None) -> bool:
+def fix_file(
+    file_path,
+    project_root,
+    api_key,
+    ask,
+    verbose,
+    *,
+    dry_run: bool,
+    model: str | None,
+    timeout_s: int,
+    max_retries: int,
+    run_cmd: str | None,
+    patch_protocol: bool,
+    fmt: str | None,
+    lint: str | None,
+    lint_fix: bool,
+) -> bool:
     log(f"Processing entry file: {file_path}")
 
     project_root = os.path.abspath(project_root)
@@ -48,6 +64,46 @@ def fix_file(file_path, project_root, api_key, ask, verbose, *, dry_run: bool, m
 
     venv_python = create_venv(sandbox_root)
 
+    def _run_optional_formatters_and_linters() -> None:
+        # Best-effort formatting/linting (only if tools are installed in the sandbox venv).
+        from auto_code_fixer.command_runner import run_command
+
+        if fmt == "black":
+            rc, out, err = run_command(
+                "python -m black .",
+                timeout_s=max(timeout_s, 60),
+                python_exe=venv_python,
+                cwd=sandbox_root,
+                extra_env={"PYTHONPATH": sandbox_root},
+            )
+            if rc == 0:
+                log("Formatted with black", "DEBUG")
+            else:
+                # If black isn't installed, ignore.
+                if "No module named" in (err or "") and "black" in (err or ""):
+                    log("black not installed in sandbox venv; skipping format", "DEBUG")
+                else:
+                    log(f"black failed (rc={rc}): {err}", "DEBUG")
+
+        if lint == "ruff":
+            cmd = "python -m ruff check ."
+            if lint_fix:
+                cmd += " --fix"
+            rc, out, err = run_command(
+                cmd,
+                timeout_s=max(timeout_s, 60),
+                python_exe=venv_python,
+                cwd=sandbox_root,
+                extra_env={"PYTHONPATH": sandbox_root},
+            )
+            if rc == 0:
+                log("ruff check passed", "DEBUG")
+            else:
+                if "No module named" in (err or "") and "ruff" in (err or ""):
+                    log("ruff not installed in sandbox venv; skipping lint", "DEBUG")
+                else:
+                    log(f"ruff reported issues (rc={rc}): {err}", "DEBUG")
+
     changed_sandbox_files: set[str] = set()
 
     for attempt in range(max_retries):
@@ -187,24 +243,65 @@ def fix_file(file_path, project_root, api_key, ask, verbose, *, dry_run: bool, m
 
         log(f"Sending {os.path.relpath(target_file, sandbox_root)} + error to GPT 🧠", "DEBUG")
 
-        fixed_code = fix_code_with_gpt(
-            original_code=open(target_file, encoding="utf-8").read(),
-            error_log=stderr,
-            api_key=api_key,
-            model=model,
-        )
+        applied_any = False
+
+        if patch_protocol:
+            try:
+                from auto_code_fixer.fixer import fix_code_with_gpt_patch_protocol
+                from auto_code_fixer.patch_protocol import (
+                    parse_patch_protocol_response,
+                    validate_and_resolve_patch_files,
+                )
+                from auto_code_fixer.patcher import safe_read, safe_write
+
+                hint_paths = [os.path.relpath(target_file, sandbox_root)]
+                raw = fix_code_with_gpt_patch_protocol(
+                    sandbox_root=sandbox_root,
+                    error_log=stderr,
+                    api_key=api_key,
+                    model=model,
+                    hint_paths=hint_paths,
+                )
+
+                patch_files = parse_patch_protocol_response(raw)
+                resolved = validate_and_resolve_patch_files(patch_files, sandbox_root=sandbox_root)
+
+                # Apply patches (only if they change content)
+                for abs_path, new_content in resolved:
+                    old = ""
+                    if os.path.exists(abs_path):
+                        old = safe_read(abs_path)
+                    if new_content.strip() == (old or "").strip():
+                        continue
+                    safe_write(abs_path, new_content)
+                    changed_sandbox_files.add(os.path.abspath(abs_path))
+                    applied_any = True
+
+            except Exception as e:
+                log(f"Patch protocol failed ({e}); falling back to full-text mode", "WARN")
+
+        if not applied_any:
+            fixed_code = fix_code_with_gpt(
+                original_code=open(target_file, encoding="utf-8").read(),
+                error_log=stderr,
+                api_key=api_key,
+                model=model,
+            )
 
-        if fixed_code.strip() == open(target_file, encoding="utf-8").read().strip():
-            log("GPT returned no changes. Stopping.", "WARN")
-            break
+            if fixed_code.strip() == open(target_file, encoding="utf-8").read().strip():
+                log("GPT returned no changes. Stopping.", "WARN")
+                break
 
-        with open(target_file, "w", encoding="utf-8") as f:
-            f.write(fixed_code)
+            with open(target_file, "w", encoding="utf-8") as f:
+                f.write(fixed_code)
 
-        changed_sandbox_files.add(os.path.abspath(target_file))
+            changed_sandbox_files.add(os.path.abspath(target_file))
+            applied_any = True
 
-        log("Code updated by GPT ✏️")
-        time.sleep(1)
+        if applied_any:
+            _run_optional_formatters_and_linters()
+            log("Code updated by GPT ✏️")
+            time.sleep(1)
 
     log("Failed to auto-fix file after max retries ❌", "ERROR")
     cleanup_sandbox()
@@ -248,6 +345,33 @@ def main():
         help="Optional: use AI to suggest which file to edit (AUTO_CODE_FIXER_AI_PLAN=1)",
     )
 
+    parser.add_argument(
+        "--patch-protocol",
+        action="store_true",
+        help=(
+            "Optional: ask the model for a strict JSON patch protocol with sha256 verification "
+            "(falls back to full-text mode if parsing/validation fails)"
+        ),
+    )
+
+    parser.add_argument(
+        "--format",
+        default=None,
+        choices=["black"],
+        help="Optional: run formatter in sandbox (best-effort). Currently supported: black",
+    )
+    parser.add_argument(
+        "--lint",
+        default=None,
+        choices=["ruff"],
+        help="Optional: run linter in sandbox (best-effort). Currently supported: ruff",
+    )
+    parser.add_argument(
+        "--fix",
+        action="store_true",
+        help="If used with --lint ruff, apply fixes (ruff --fix) (best-effort)",
+    )
+
     # ✅ Proper boolean flags
     ask_group = parser.add_mutually_exclusive_group()
     ask_group.add_argument(
@@ -302,6 +426,10 @@ def main():
         timeout_s=args.timeout,
         max_retries=args.max_retries,
         run_cmd=args.run,
+        patch_protocol=args.patch_protocol,
+        fmt=args.format,
+        lint=args.lint,
+        lint_fix=args.fix,
     )
 
     raise SystemExit(0 if ok else 2)

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/auto_code_fixer/fixer.py

@@ -77,3 +77,67 @@ def fix_code_with_gpt(
                 text += getattr(c, "text", "") or ""
 
     return _strip_code_fences(text)
+
+
+def fix_code_with_gpt_patch_protocol(
+    *,
+    sandbox_root: str,
+    error_log: str,
+    api_key: str | None = None,
+    model: str | None = None,
+    hint_paths: list[str] | None = None,
+) -> str:
+    """Ask the model for structured edits (patch protocol).
+
+    Returns raw model text (expected JSON). Parsing/validation happens elsewhere.
+
+    The protocol is optional and should be enabled explicitly by the caller.
+    """
+
+    client = get_openai_client(api_key)
+    model = model or os.getenv("AUTO_CODE_FIXER_MODEL") or "gpt-4.1-mini"
+
+    schema = {
+        "files": [
+            {
+                "path": "relative/path/from/sandbox_root.py",
+                "new_content": "FULL new file contents",
+                "sha256": "sha256 hex of new_content encoded as utf-8",
+            }
+        ]
+    }
+
+    hints = ""
+    if hint_paths:
+        hints = "\n\nCANDIDATE FILES (relative paths; edit one or more if needed):\n" + "\n".join(
+            f"- {p}" for p in hint_paths
+        )
+
+    prompt = (
+        "You are a senior Python engineer. Fix the project so it runs without errors.\n"
+        "Return ONLY valid JSON that matches this schema (no markdown, no commentary):\n"
+        + json.dumps(schema)
+        + hints
+        + "\n\nSANDBOX ROOT:\n"
+        + sandbox_root
+        + "\n\nERROR LOG:\n"
+        + error_log
+    )
+
+    resp = client.responses.create(
+        model=model,
+        input=[
+            {"role": "system", "content": "You output strict JSON patches for code fixes."},
+            {"role": "user", "content": prompt},
+        ],
+        temperature=0.2,
+        max_output_tokens=3000,
+    )
+
+    text = ""
+    for item in resp.output or []:
+        for c in item.content or []:
+            if getattr(c, "type", None) in ("output_text", "text"):
+                text += getattr(c, "text", "") or ""
+
+    return _strip_code_fences(text)

auto_code_fixer-0.3.5/auto_code_fixer/patch_protocol.py

@@ -0,0 +1,102 @@
+import hashlib
+import json
+import os
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class PatchFile:
+    """A single file edit from the structured patch protocol."""
+
+    path: str
+    new_content: str
+    sha256: str
+
+
+def strip_code_fences(text: str) -> str:
+    text = (text or "").strip()
+    if text.startswith("```"):
+        text = "\n".join(text.split("\n")[1:])
+    if text.endswith("```"):
+        text = "\n".join(text.split("\n")[:-1])
+    return text.strip()
+
+
+def compute_sha256_utf8(content: str) -> str:
+    return hashlib.sha256((content or "").encode("utf-8")).hexdigest()
+
+
+def parse_patch_protocol_response(text: str) -> list[PatchFile]:
+    """Parse model output for the patch protocol.
+
+    Expected JSON schema:
+      {"files": [{"path": "...", "new_content": "...", "sha256": "..."}, ...]}
+
+    Raises ValueError on invalid input.
+    """
+
+    cleaned = strip_code_fences(text)
+
+    try:
+        payload = json.loads(cleaned)
+    except Exception as e:  # pragma: no cover
+        raise ValueError(f"Invalid JSON: {e}")
+
+    if not isinstance(payload, dict):
+        raise ValueError("Patch protocol JSON must be an object")
+
+    files = payload.get("files")
+    if not isinstance(files, list) or not files:
+        raise ValueError("Patch protocol JSON must contain non-empty 'files' list")
+
+    out: list[PatchFile] = []
+    for i, f in enumerate(files):
+        if not isinstance(f, dict):
+            raise ValueError(f"files[{i}] must be an object")
+
+        path = f.get("path")
+        new_content = f.get("new_content")
+        sha256 = f.get("sha256")
+
+        if not isinstance(path, str) or not path.strip():
+            raise ValueError(f"files[{i}].path must be a non-empty string")
+        if not isinstance(new_content, str):
+            raise ValueError(f"files[{i}].new_content must be a string")
+        if not isinstance(sha256, str) or len(sha256.strip()) != 64:
+            raise ValueError(f"files[{i}].sha256 must be a 64-char hex string")
+
+        out.append(PatchFile(path=path, new_content=new_content, sha256=sha256.strip().lower()))
+
+    return out
+
+
+def validate_and_resolve_patch_files(
+    patch_files: list[PatchFile], *, sandbox_root: str
+) -> list[tuple[str, str]]:
+    """Validate patch files and return a list of (abs_path, new_content).
+
+    Safety:
+    - paths must be relative and remain within sandbox_root
+    - sha256 must match new_content (utf-8)
+    """
+
+    sr = os.path.realpath(os.path.abspath(sandbox_root))
+    resolved: list[tuple[str, str]] = []
+
+    for pf in patch_files:
+        if os.path.isabs(pf.path):
+            raise ValueError(f"Absolute path not allowed in patch protocol: {pf.path}")
+
+        # Normalize and resolve against sandbox_root
+        abs_path = os.path.realpath(os.path.abspath(os.path.join(sr, pf.path)))
+
+        if not (abs_path.startswith(sr + os.sep) or abs_path == sr):
+            raise ValueError(f"Patch path escapes sandbox root: {pf.path}")
+
+        got = compute_sha256_utf8(pf.new_content)
+        if got != pf.sha256:
+            raise ValueError(f"sha256 mismatch for {pf.path}: expected {pf.sha256}, got {got}")
+
+        resolved.append((abs_path, pf.new_content))
+
+    return resolved

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/auto_code_fixer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-code-fixer
-Version: 0.3.4
+Version: 0.3.5
 Summary: Automatically fix Python code using ChatGPT
 Author-email: Arif Shah <ashah7775@gmail.com>
 License: MIT
@@ -121,6 +121,21 @@ auto-code-fixer main.py --ai-plan
 ```
 This enables a helper that can suggest which local file to edit. It is best-effort.
 
+### Optional structured patch protocol (JSON + sha256)
+```bash
+auto-code-fixer main.py --patch-protocol
+```
+When enabled, the model is asked to return strict JSON with `{files:[{path,new_content,sha256}]}`.
+The tool verifies the SHA-256 hash of `new_content` before applying edits, and falls back to the
+legacy full-text mode if parsing/validation fails.
+
+### Optional formatting / linting (best-effort)
+```bash
+auto-code-fixer main.py --format black
+auto-code-fixer main.py --lint ruff --fix
+```
+These run inside the sandbox venv and are skipped if the tools are not installed.
+
 ---
 
 ## Environment variables

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/auto_code_fixer.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ auto_code_fixer/command_runner.py
 auto_code_fixer/fixer.py
 auto_code_fixer/installer.py
 auto_code_fixer/models.py
+auto_code_fixer/patch_protocol.py
 auto_code_fixer/patcher.py
 auto_code_fixer/plan.py
 auto_code_fixer/runner.py
@@ -21,4 +22,5 @@ auto_code_fixer.egg-info/entry_points.txt
 auto_code_fixer.egg-info/requires.txt
 auto_code_fixer.egg-info/top_level.txt
 tests/test_fix_imported_file.py
-tests/test_internal_imports.py
+tests/test_internal_imports.py
+tests/test_patch_protocol.py

{auto_code_fixer-0.3.4 → auto_code_fixer-0.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "auto-code-fixer"
-version = "0.3.4"
+version = "0.3.5"
 description = "Automatically fix Python code using ChatGPT"
 readme = "README.md"
 

auto_code_fixer-0.3.5/tests/test_patch_protocol.py

@@ -0,0 +1,46 @@
+import pytest
+
+from auto_code_fixer.patch_protocol import (
+    compute_sha256_utf8,
+    parse_patch_protocol_response,
+    validate_and_resolve_patch_files,
+)
+
+
+def test_parse_patch_protocol_happy_path_with_code_fences(tmp_path):
+    import json
+
+    content = "print('hi')\n"
+    sha = compute_sha256_utf8(content)
+    payload = {"files": [{"path": "a.py", "new_content": content, "sha256": sha}]}
+    text = "```json\n" + json.dumps(payload) + "\n```"
+
+    files = parse_patch_protocol_response(text)
+    assert len(files) == 1
+    assert files[0].path == "a.py"
+    assert files[0].sha256 == sha
+
+    resolved = validate_and_resolve_patch_files(files, sandbox_root=str(tmp_path))
+    assert resolved[0][0].endswith("a.py")
+    assert resolved[0][1] == content
+
+
+def test_validate_rejects_sha_mismatch(tmp_path):
+    text = '{"files": [{"path": "a.py", "new_content": "x", "sha256": "' + ("0" * 64) + '"}]}'
+    files = parse_patch_protocol_response(text)
+    with pytest.raises(ValueError, match="sha256 mismatch"):
+        validate_and_resolve_patch_files(files, sandbox_root=str(tmp_path))
+
+
+def test_validate_rejects_path_traversal(tmp_path):
+    content = "x"
+    sha = compute_sha256_utf8(content)
+    text = '{"files": [{"path": "../evil.py", "new_content": "x", "sha256": "' + sha + '"}]}'
+    files = parse_patch_protocol_response(text)
+    with pytest.raises(ValueError, match="escapes sandbox"):
+        validate_and_resolve_patch_files(files, sandbox_root=str(tmp_path))
+
+
+def test_parse_rejects_missing_files_list():
+    with pytest.raises(ValueError, match="files"):
+        parse_patch_protocol_response("{}")

auto_code_fixer-0.3.4/auto_code_fixer/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.4"