auto-code-fixer 0.3.6__py3-none-any.whl → 0.4.0__py3-none-any.whl

auto_code_fixer/reporting.py

@@ -0,0 +1,61 @@
+import dataclasses
+import datetime as _dt
+import difflib
+import json
+import os
+from typing import Any
+
+
+def utc_now_iso() -> str:
+    return _dt.datetime.now(tz=_dt.timezone.utc).isoformat()
+
+
+def unified_diff(*, old: str, new: str, fromfile: str, tofile: str) -> str:
+    return "".join(
+        difflib.unified_diff(
+            (old or "").splitlines(keepends=True),
+            (new or "").splitlines(keepends=True),
+            fromfile=fromfile,
+            tofile=tofile,
+        )
+    )
+
+
+@dataclasses.dataclass
+class ReportAttempt:
+    index: int
+    run_cmd: str
+    return_code: int = 0
+    stdout: str | None = None
+    stderr: str | None = None
+    selected_file: str | None = None
+    ruff_first_applied: bool = False
+    changed_files: list[str] = dataclasses.field(default_factory=list)
+
+
+@dataclasses.dataclass
+class FixReport:
+    tool: str = "auto-code-fixer"
+    version: str | None = None
+    mode: str = "file"  # file|fixpack
+    project_root: str | None = None
+    sandbox_root: str | None = None
+    target: str | None = None
+    run_cmd: str | None = None
+    started_at: str = dataclasses.field(default_factory=utc_now_iso)
+    finished_at: str | None = None
+    ok: bool | None = None
+    attempts: list[ReportAttempt] = dataclasses.field(default_factory=list)
+    files_touched: list[str] = dataclasses.field(default_factory=list)
+    diffs: dict[str, str] = dataclasses.field(default_factory=dict)  # relpath -> unified diff
+
+    def to_dict(self) -> dict[str, Any]:
+        d = dataclasses.asdict(self)
+        # dataclasses.asdict converts nested dataclasses, OK
+        return d
+
+    def write_json(self, path: str) -> None:
+        os.makedirs(os.path.dirname(os.path.abspath(path)) or ".", exist_ok=True)
+        with open(path, "w", encoding="utf-8") as f:
+            json.dump(self.to_dict(), f, indent=2, sort_keys=False)
+            f.write("\n")

auto_code_fixer/sandbox.py

@@ -35,6 +35,41 @@ def make_sandbox(*, entry_file: str, project_root: str) -> tuple[str, str]:
     return sandbox_root, sandbox_entry
 
 
+def make_sandbox_project(*, project_root: str) -> str:
+    """Create a sandbox directory with a full copy of project_root.
+
+    This is used for "Fixpack" runs where we execute a command (e.g., pytest) across
+    a package/folder and iteratively fix failures.
+    """
+
+    project_root = os.path.abspath(project_root)
+    sandbox_root = tempfile.mkdtemp(prefix="codefix_sandbox_")
+
+    def _ignore(_dir: str, names: list[str]):
+        skip = {".git",
+            ".venv",
+            "__pycache__",
+            "build",
+            "dist",
+            ".mypy_cache",
+            ".ruff_cache",
+            ".pytest_cache",
+        }
+        return {n for n in names if n in skip}
+
+    # Copy everything into sandbox_root.
+    # Note: copytree requires dest not to exist; copy contents manually.
+    for item in os.listdir(project_root):
+        src = os.path.join(project_root, item)
+        dst = os.path.join(sandbox_root, item)
+        if os.path.isdir(src):
+            shutil.copytree(src, dst, ignore=_ignore)
+        else:
+            shutil.copy2(src, dst)
+
+    return sandbox_root
+
+
 def apply_sandbox_back(*, sandbox_root: str, project_root: str, changed_paths: list[str]) -> None:
     """Copy changed sandbox files back into project_root."""
 

auto_code_fixer/utils.py

@@ -104,3 +104,45 @@ def discover_all_files(entry_file: str) -> list[str]:
 
 def is_in_project(file_path: str, project_root: str) -> bool:
     return os.path.abspath(file_path).startswith(os.path.abspath(project_root))
+
+
+def sha256_text(text: str) -> str:
+    import hashlib
+
+    return hashlib.sha256((text or "").encode("utf-8")).hexdigest()
+
+
+def snapshot_py_hashes(root: str) -> dict[str, str]:
+    """Return mapping of absolute .py path -> sha256 of contents."""
+
+    import hashlib
+
+    out: dict[str, str] = {}
+    for dirpath, dirnames, filenames in os.walk(root):
+        # Keep the walk light.
+        dirnames[:] = [
+            d
+            for d in dirnames
+            if d not in {".git", ".venv", "__pycache__", "build", "dist", ".mypy_cache", ".ruff_cache"}
+        ]
+        for fn in filenames:
+            if not fn.endswith(".py"):
+                continue
+            ap = os.path.join(dirpath, fn)
+            try:
+                data = Path(ap).read_bytes()
+            except Exception:
+                continue
+            out[os.path.abspath(ap)] = hashlib.sha256(data).hexdigest()
+    return out
+
+
+def changed_py_files(before: dict[str, str], after: dict[str, str]) -> set[str]:
+    """Return absolute paths for .py files whose hash changed or were added/removed."""
+
+    changed: set[str] = set()
+    all_paths = set(before) | set(after)
+    for p in all_paths:
+        if before.get(p) != after.get(p):
+            changed.add(os.path.abspath(p))
+    return changed

{auto_code_fixer-0.3.6.dist-info → auto_code_fixer-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-code-fixer
-Version: 0.3.6
+Version: 0.4.0
 Summary: Automatically fix Python code using ChatGPT
 Author-email: Arif Shah <ashah7775@gmail.com>
 License: MIT
@@ -87,6 +87,18 @@ pip install requests
 Before overwriting any file, it creates a backup:
 - `file.py.bak` (or `.bak1`, `.bak2`, ...)
 
+### Approval mode (diff review)
+```bash
+auto-code-fixer path/to/main.py --project-root . --approve
+```
+In patch-protocol mode, approvals are **file-by-file** (apply/skip).
+
+### Diff / size guards
+To prevent huge edits from being applied accidentally:
+- `--max-diff-lines` limits unified-diff size per file
+- `--max-file-bytes` limits the proposed new content size per file
+- `--max-total-bytes` limits total proposed new content across all files
+
 ### Dry run
 ```bash
 auto-code-fixer path/to/main.py --project-root . --dry-run
@@ -96,6 +108,15 @@ auto-code-fixer path/to/main.py --project-root . --dry-run
 
 ## Advanced options
 
+### Fixpack mode (folder/package runner)
+Fixpack runs a command (default: `pytest -q`) against a **full-project sandbox**, then iteratively fixes the failing file(s) until green or you hit `--max-retries`.
+
+```bash
+auto-code-fixer path/to/package --project-root . --fixpack --no-ask
+# equivalent explicit command:
+auto-code-fixer path/to/package --project-root . --fixpack --run "pytest -q" --no-ask
+```
+
 ### Run a custom command (pytest, etc.)
 Instead of `python main.py`, run tests:
 
@@ -103,6 +124,16 @@ Instead of `python main.py`, run tests:
 auto-code-fixer . --project-root . --run "pytest -q" --no-ask
 ```
 
+When you use `--run`, the tool (by default) also performs a **post-apply check**:
+after copying fixes back to your project, it re-runs the same command against the real project files
+(using the sandbox venv for dependencies).
+
+You can disable that extra check with:
+
+```bash
+auto-code-fixer . --project-root . --run "pytest -q" --no-post-apply-check
+```
+
 ### Model selection
 ```bash
 export AUTO_CODE_FIXER_MODEL=gpt-4.1-mini
@@ -121,13 +152,25 @@ 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)
+### Structured patch protocol (JSON + sha256) (default)
+By default, Auto Code Fixer uses a structured **patch protocol** where the model returns strict JSON:
+
+`{ "files": [ {"path": "...", "new_content": "...", "sha256": "..."}, ... ] }`
+
+The tool verifies the SHA-256 hash of `new_content` before applying edits.
+
+To disable this and use legacy full-text mode only:
+
 ```bash
-auto-code-fixer main.py --patch-protocol
+auto-code-fixer main.py --legacy-mode
+```
+
+### Ruff-first mode (best-effort)
+Before calling the LLM, you can try Ruff auto-fixes (including import sorting) and Ruff formatting:
+
+```bash
+auto-code-fixer path/to/package --project-root . --fixpack --ruff-first
 ```
-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
@@ -136,6 +179,15 @@ auto-code-fixer main.py --lint ruff --fix
 ```
 These run inside the sandbox venv and are skipped if the tools are not installed.
 
+### JSON report (explain)
+Write a machine-readable report with attempts, files touched, and unified diffs:
+
+```bash
+auto-code-fixer main.py --explain
+# or
+auto-code-fixer main.py --report /tmp/report.json
+```
+
 ---
 
 ## Environment variables

{auto_code_fixer-0.3.6.dist-info → auto_code_fixer-0.4.0.dist-info}/RECORD

@@ -1,5 +1,6 @@
-auto_code_fixer/__init__.py,sha256=W_9dCm49nLvZulVAvvsafxLJjVBSKDBHz9K7szFZllo,22
-auto_code_fixer/cli.py,sha256=lFIGgrMQaqAoNtGRlkKXE1Lzk4l74XwsYjdxnrlF6lI,20304
+auto_code_fixer/__init__.py,sha256=42STGor_9nKYXumfeV5tiyD_M8VdcddX7CEexmibPBk,22
+auto_code_fixer/approval.py,sha256=NPSLu54maAK2RAJF_t4fq7Bs_M8K026DhDwqBFJtiwQ,2832
+auto_code_fixer/cli.py,sha256=Dn9A2geL58lvVWLt6K0whZfZVcBN3zpWEM5OS38Q4Ik,47713
 auto_code_fixer/command_runner.py,sha256=6P8hGRavN5C39x-e03p02Vc805NnZH9U7e48ngb5jJI,1104
 auto_code_fixer/fixer.py,sha256=zcgw56pRTuOLvna09lTXatD0VWwjjzBVk0OyEKfgxDM,4691
 auto_code_fixer/installer.py,sha256=LC0jasSsPI7eHMeDxa622OoMCR1951HAXUZWp-kcmVY,1522
@@ -7,14 +8,15 @@ auto_code_fixer/models.py,sha256=JLBJutOoiOjjlT_RMPUPhWlmm1yc_nGcQqv5tY72Al0,317
 auto_code_fixer/patch_protocol.py,sha256=8l1E9o-3jkO4VAI7Ulrf-1MbAshNzjQXtUkmH-0hYio,3216
 auto_code_fixer/patcher.py,sha256=BcQTnjWazdpuEXyR2AlumFBzIk_yIrO3fGTaIqpHuiU,1811
 auto_code_fixer/plan.py,sha256=jrZdG-f1RDxVB0tBLlTwKbCSEiOYI_RMetdzfBcyE4s,1762
+auto_code_fixer/reporting.py,sha256=bulUsP0DIfLBmtVjZ1YdTV7RAk8Aiy81ASavcr4iano,1887
 auto_code_fixer/runner.py,sha256=BvQm3CrwkQEDOw0tpiamSTcdu3OjbOgA801xW2zWdP8,970
-auto_code_fixer/sandbox.py,sha256=FWQcCxNDI4i7ckTKHuARSSIHCopBRqG16MVtx9s75R8,1628
+auto_code_fixer/sandbox.py,sha256=s36i7mzZFjuAWRUEumxtYfVwasFa8TehobzH-rE_kKA,2721
 auto_code_fixer/traceback_utils.py,sha256=sbSuLO-2UBk5QPJZYJunTK9WGOpEY8mxR6WRKbtCIoM,935
-auto_code_fixer/utils.py,sha256=YXCv3PcDo5NBM1odksBTWkHTEELRtEXfPDIORA5iYaM,3090
+auto_code_fixer/utils.py,sha256=JLagGVnUj67zZdpkKSHhVcqwob30f62SyS7IbH20sHs,4369
 auto_code_fixer/venv_manager.py,sha256=2ww8reYgLbLohh-moAD5YKM09qv_mC5yYzJRwm3XiXc,1202
-auto_code_fixer-0.3.6.dist-info/licenses/LICENSE,sha256=hgchJNa26tjXuLztwSUDbYQxNLnAPnLk6kDXNIkC8xc,1066
-auto_code_fixer-0.3.6.dist-info/METADATA,sha256=R6geFjh2cpLvAzuR1KQRcAJyryQgClYYB1wWmD1o2Qk,3870
-auto_code_fixer-0.3.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-auto_code_fixer-0.3.6.dist-info/entry_points.txt,sha256=a-j2rkfwkrhXZ5Qbz_6_gwk6Bj7nijYR1DALjWp5Myk,61
-auto_code_fixer-0.3.6.dist-info/top_level.txt,sha256=qUk1qznb6Qxqmxy2A3z_5dpOZlmNKHwUiLuJwH-CrAk,16
-auto_code_fixer-0.3.6.dist-info/RECORD,,
+auto_code_fixer-0.4.0.dist-info/licenses/LICENSE,sha256=hgchJNa26tjXuLztwSUDbYQxNLnAPnLk6kDXNIkC8xc,1066
+auto_code_fixer-0.4.0.dist-info/METADATA,sha256=qyjUMCYrF1_wRp_4LQSa6t1btgwTNslKTl9rBNhSdZo,5570
+auto_code_fixer-0.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+auto_code_fixer-0.4.0.dist-info/entry_points.txt,sha256=a-j2rkfwkrhXZ5Qbz_6_gwk6Bj7nijYR1DALjWp5Myk,61
+auto_code_fixer-0.4.0.dist-info/top_level.txt,sha256=qUk1qznb6Qxqmxy2A3z_5dpOZlmNKHwUiLuJwH-CrAk,16
+auto_code_fixer-0.4.0.dist-info/RECORD,,