Upload 6 files

app.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+import re
 from pathlib import Path
 from typing import Any
 
@@ -143,22 +144,29 @@ def _event_key(event: dict[str, Any]) -> tuple[str, str, str, str]:
     )
 
 
+ANSI_RE = re.compile(r"\x1b\[[0-9;]*[A-Za-z]")
+
+
 def _events_from_job_logs(log_text: str) -> list[dict[str, Any]]:
-    """Extract worker append_event JSON lines from HF Job logs."""
+    """Extract worker append_event JSON objects from HF Job logs.
+
+    HF Job logs may prefix stdout lines with timestamps, may include ANSI
+    sequences, and may sometimes have text after a JSON object. Use
+    JSONDecoder.raw_decode from each opening brace instead of json.loads(line)
+    so event extraction is not fragile.
+    """
     events: list[dict[str, Any]] = []
+    decoder = json.JSONDecoder()
     for raw in (log_text or "").splitlines():
-        line = raw.strip()
-        start = line.find("{")
-        if start > 0:
-            line = line[start:]
-        if not line.startswith("{"):
-            continue
-        try:
-            payload = json.loads(line)
-        except Exception:
-            continue
-        if isinstance(payload, dict) and payload.get("step") and payload.get("status"):
-            events.append(payload)
+        line = ANSI_RE.sub("", raw).strip()
+        for match in re.finditer(r"\{", line):
+            try:
+                payload, _ = decoder.raw_decode(line[match.start():])
+            except Exception:
+                continue
+            if isinstance(payload, dict) and payload.get("step") and payload.get("status"):
+                events.append(payload)
+                break
     return events
 
 
@@ -213,7 +221,7 @@ def register_custom_routes(fastapi_app: FastAPI) -> None:
         return JSONResponse(
             {
                 "name": "Agentic Space Factory",
-                "version": "v66-clean-qwen-coder-path",
+                "version": "v67-monotonic-progress-events",
                 "bucket_default": settings.bucket_name,
                 "workflows": ["build_from_model_card", "validate_existing_space", "runs_explorer"],
                 "custom_ui_status": "root_custom_ui",
@@ -504,7 +512,7 @@ def register_custom_routes(fastapi_app: FastAPI) -> None:
         if job_id:
             job_info = inspect_job_safe(job_id, token=ctx["token"])
             if include_job_logs:
-                job_logs = fetch_recent_logs_safe(job_id, token=ctx["token"], max_lines=220)
+                job_logs = fetch_recent_logs_safe(job_id, token=ctx["token"], max_lines=1000)
                 job_log_events = _events_from_job_logs(job_logs)
         job_stage = _normalize_job_stage(job_info.get("stage"))
         effective_state = {**launch, **state}