Spaces:
Sleeping
Sleeping
File size: 13,390 Bytes
df6cd5e | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 | """
core/diff_utils.py β Visual Before/After diff generator (v4.7).
Purpose
=======
Before the user hits **Download ZIP**, we want to show them *exactly* what
the AI changed. This module:
* Captures a **before snapshot** of every file the AI is about to touch,
keyed by ``relative_path -> str``. The pipeline calls this **before**
``apply_ai_changes`` writes anything to disk.
* After the patch is applied, compares before/after and produces:
* A **unified diff** (Python's ``difflib.unified_diff``) β the raw text
the UI can drop into a monospaced viewer.
* An **HTML side-by-side diff** styled with the studio's pink/purple
palette (drop into ``gr.HTML``).
* A **summary** dict with added / removed / modified line counts so the
Confidence Badge can factor it in later.
We deliberately avoid installing the ``diff-match-patch`` package here β
Python's ``difflib`` gives us character/line/word-level diffs already,
and skipping the extra native dep keeps the Hugging Face Space build fast.
The output shape (``{"diffs": [...], "summary": {...}}``) is 100% compatible
with what a diff-match-patch viewer expects, so a UI upgrade later is
still a drop-in change.
"""
from __future__ import annotations
import difflib
import html
import os
from typing import Any, Dict, List, Optional, Sequence, Tuple
MAX_BEFORE_CHARS = 400_000 # per-file cap on snapshot text (safety guard)
MAX_DIFF_LINES = 4_000 # per-file cap on rendered diff lines
MAX_FILES_IN_HTML = 40 # cap the HTML view so the UI stays fast
# ---------------------------------------------------------------------------
# Snapshot helpers
# ---------------------------------------------------------------------------
def _read_text(path: str, max_chars: int = MAX_BEFORE_CHARS) -> str:
try:
with open(path, "r", encoding="utf-8", errors="replace") as f:
return f.read(max_chars)
except FileNotFoundError:
return ""
except Exception:
return ""
def capture_before_snapshot(
project_root: str,
candidate_files: Sequence[str],
) -> Dict[str, str]:
"""
Read every ``candidate_files`` (relative paths) *before* patching so we
can compute a diff after. Missing files are recorded as empty strings,
which naturally shows up in the diff as pure additions.
"""
if not project_root or not candidate_files:
return {}
snapshot: Dict[str, str] = {}
for rel in candidate_files:
rel = str(rel or "").strip().lstrip("/")
if not rel:
continue
abs_path = os.path.join(project_root, rel)
snapshot[rel] = _read_text(abs_path)
return snapshot
def compute_after_snapshot(
project_root: str,
files: Sequence[str],
) -> Dict[str, str]:
"""Same as ``capture_before_snapshot`` but for the post-patch state."""
return capture_before_snapshot(project_root, files)
# ---------------------------------------------------------------------------
# Diff computation
# ---------------------------------------------------------------------------
def _unified_lines(before: str, after: str, path: str) -> List[str]:
"""Wrap ``difflib.unified_diff`` with a bounded line cap."""
a = (before or "").splitlines(keepends=False)
b = (after or "").splitlines(keepends=False)
diff_iter = difflib.unified_diff(
a,
b,
fromfile=f"a/{path}",
tofile=f"b/{path}",
lineterm="",
n=3,
)
out: List[str] = []
for i, line in enumerate(diff_iter):
if i >= MAX_DIFF_LINES:
out.append(f"... (diff truncated at {MAX_DIFF_LINES} lines)")
break
out.append(line)
return out
def _summarise_diff(diff_lines: Sequence[str]) -> Dict[str, int]:
added = removed = hunks = 0
for line in diff_lines:
if not line:
continue
if line.startswith("+++") or line.startswith("---"):
continue
if line.startswith("+"):
added += 1
elif line.startswith("-"):
removed += 1
elif line.startswith("@@"):
hunks += 1
return {"added_lines": added, "removed_lines": removed, "hunk_count": hunks}
def build_diffs(
before: Dict[str, str],
after: Dict[str, str],
) -> Dict[str, Any]:
"""
Produce a per-file list of diffs + an aggregate summary.
Returns::
{
"diffs": [
{
"path": "core/foo.py",
"status": "modified" | "added" | "deleted" | "unchanged",
"unified_diff": "..." (str),
"added_lines": 12, "removed_lines": 3, "hunk_count": 2,
},
...
],
"summary": {
"file_count": 5,
"modified": 3, "added": 1, "deleted": 0, "unchanged": 1,
"total_added_lines": 42,
"total_removed_lines": 11,
},
}
"""
diffs: List[Dict[str, Any]] = []
paths = sorted(set(before.keys()) | set(after.keys()))
totals = {
"modified": 0, "added": 0, "deleted": 0, "unchanged": 0,
"total_added_lines": 0, "total_removed_lines": 0,
}
for path in paths:
b_txt = before.get(path, "")
a_txt = after.get(path, "")
if b_txt == a_txt:
status = "unchanged"
totals["unchanged"] += 1
diffs.append({
"path": path,
"status": status,
"unified_diff": "",
"added_lines": 0,
"removed_lines": 0,
"hunk_count": 0,
})
continue
if not b_txt and a_txt:
status = "added"
totals["added"] += 1
elif b_txt and not a_txt:
status = "deleted"
totals["deleted"] += 1
else:
status = "modified"
totals["modified"] += 1
lines = _unified_lines(b_txt, a_txt, path)
summary = _summarise_diff(lines)
totals["total_added_lines"] += summary["added_lines"]
totals["total_removed_lines"] += summary["removed_lines"]
diffs.append({
"path": path,
"status": status,
"unified_diff": "\n".join(lines),
"added_lines": summary["added_lines"],
"removed_lines": summary["removed_lines"],
"hunk_count": summary["hunk_count"],
})
summary = {
"file_count": len(paths),
**totals,
}
return {"diffs": diffs, "summary": summary}
# ---------------------------------------------------------------------------
# HTML rendering (pink + purple, matches Studio theme)
# ---------------------------------------------------------------------------
def _render_line_html(line: str) -> str:
"""Style a single unified-diff line as coloured HTML."""
esc = html.escape(line)
if line.startswith("+++") or line.startswith("---"):
return f'<div class="devai-diff-file-line">{esc}</div>'
if line.startswith("@@"):
return f'<div class="devai-diff-hunk">{esc}</div>'
if line.startswith("+"):
return f'<div class="devai-diff-add">{esc}</div>'
if line.startswith("-"):
return f'<div class="devai-diff-del">{esc}</div>'
return f'<div class="devai-diff-ctx">{esc}</div>'
DIFF_CSS = """
<style>
.devai-diff-root {
font-family: 'JetBrains Mono', ui-monospace, SFMono-Regular, Menlo, monospace;
font-size: 12.5px;
color: #4a3a5c;
line-height: 1.5;
}
.devai-diff-summary {
display: flex;
flex-wrap: wrap;
gap: 10px;
margin-bottom: 14px;
}
.devai-diff-pill {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 6px 12px;
border-radius: 999px;
background: linear-gradient(135deg, #ffd1e8 0%, #e6d4ff 100%);
color: #8a5cf0;
font-weight: 600;
font-size: 0.85rem;
border: 1px solid rgba(197, 168, 255, 0.4);
font-family: 'Inter', system-ui, sans-serif;
}
.devai-diff-file-card {
background: rgba(255, 255, 255, 0.85);
border: 1px solid rgba(197, 168, 255, 0.35);
border-radius: 14px;
box-shadow: 0 8px 20px rgba(169, 124, 255, 0.12);
margin-bottom: 16px;
overflow: hidden;
}
.devai-diff-file-header {
background: linear-gradient(135deg, #ff8fc4 0%, #b28cff 100%);
color: white;
padding: 10px 16px;
font-weight: 600;
font-family: 'Inter', system-ui, sans-serif;
font-size: 0.95rem;
display: flex;
justify-content: space-between;
align-items: center;
gap: 10px;
flex-wrap: wrap;
}
.devai-diff-file-status {
font-size: 0.78rem;
text-transform: uppercase;
letter-spacing: 0.6px;
background: rgba(255, 255, 255, 0.25);
padding: 3px 10px;
border-radius: 999px;
}
.devai-diff-body {
padding: 6px 0;
max-height: 520px;
overflow: auto;
background: #fff5fa;
}
.devai-diff-body > div {
padding: 2px 16px;
white-space: pre;
}
.devai-diff-add { background: rgba(150, 220, 170, 0.20); color: #1f6b3b; }
.devai-diff-del { background: rgba(255, 160, 190, 0.25); color: #9a2145; }
.devai-diff-hunk { background: #ece1ff; color: #7541d9; font-weight: 600; }
.devai-diff-file-line { color: #8a5cf0; font-weight: 600; }
.devai-diff-ctx { color: #6b5b7d; }
.devai-diff-empty {
padding: 22px;
text-align: center;
color: #8a7ba0;
font-family: 'Inter', system-ui, sans-serif;
}
</style>
"""
def render_diff_html(bundle: Dict[str, Any]) -> str:
"""Render the ``build_diffs`` output as a full HTML block."""
if not bundle or not bundle.get("diffs"):
return DIFF_CSS + '<div class="devai-diff-root devai-diff-empty">No file changes detected yet β run a patch to see the Before/After diff.</div>'
summary = bundle.get("summary") or {}
parts: List[str] = [DIFF_CSS, '<div class="devai-diff-root">']
# Top summary pills
parts.append('<div class="devai-diff-summary">')
parts.append(f'<span class="devai-diff-pill">π {summary.get("file_count", 0)} files</span>')
parts.append(f'<span class="devai-diff-pill">βοΈ {summary.get("modified", 0)} modified</span>')
parts.append(f'<span class="devai-diff-pill">β {summary.get("added", 0)} added</span>')
parts.append(f'<span class="devai-diff-pill">ποΈ {summary.get("deleted", 0)} deleted</span>')
parts.append(f'<span class="devai-diff-pill">+{summary.get("total_added_lines", 0)} / -{summary.get("total_removed_lines", 0)} lines</span>')
parts.append('</div>')
diffs = bundle["diffs"]
# Only show files that actually changed, up to MAX_FILES_IN_HTML.
changed = [d for d in diffs if d.get("status") != "unchanged"]
truncated = False
if len(changed) > MAX_FILES_IN_HTML:
truncated = True
changed = changed[:MAX_FILES_IN_HTML]
for entry in changed:
path = entry.get("path", "?")
status = entry.get("status", "modified")
adds = entry.get("added_lines", 0)
dels = entry.get("removed_lines", 0)
diff_text = entry.get("unified_diff") or ""
parts.append('<div class="devai-diff-file-card">')
parts.append(
'<div class="devai-diff-file-header">'
f'<span>π {html.escape(path)}</span>'
f'<span class="devai-diff-file-status">{html.escape(status)} Β· +{adds} / -{dels}</span>'
'</div>'
)
parts.append('<div class="devai-diff-body">')
if diff_text:
for line in diff_text.splitlines():
parts.append(_render_line_html(line))
else:
parts.append('<div class="devai-diff-ctx">(no textual changes)</div>')
parts.append('</div>')
parts.append('</div>')
if truncated:
parts.append(
'<div class="devai-diff-empty">'
f'... {len(diffs) - MAX_FILES_IN_HTML} additional changed file(s) hidden β '
'download the ZIP for the complete patch.'
'</div>'
)
parts.append('</div>')
return "".join(parts)
# ---------------------------------------------------------------------------
# One-shot helper the pipeline can call.
# ---------------------------------------------------------------------------
def build_before_after_diff(
project_root: str,
before_snapshot: Dict[str, str],
files: Optional[Sequence[str]] = None,
) -> Dict[str, Any]:
"""
High-level helper β the pipeline captures ``before_snapshot`` via
:func:`capture_before_snapshot` *before* patching. After patching, it
calls this to produce the full bundle::
{
"diffs": [...],
"summary": {...},
"html": "<style>...</style><div ...>...</div>",
}
"""
tracked_paths = list(before_snapshot.keys())
if files:
for f in files:
f = str(f or "").strip().lstrip("/")
if f and f not in tracked_paths:
tracked_paths.append(f)
after = compute_after_snapshot(project_root, tracked_paths)
bundle = build_diffs(before_snapshot, after)
bundle["html"] = render_diff_html(bundle)
return bundle
__all__ = [
"capture_before_snapshot",
"compute_after_snapshot",
"build_diffs",
"render_diff_html",
"build_before_after_diff",
"DIFF_CSS",
]
|