Spaces:
Running
Running
File size: 14,438 Bytes
28a08e7 2b29d05 28a08e7 8835ca1 28a08e7 8835ca1 28a08e7 8835ca1 28a08e7 8835ca1 28a08e7 | 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 | """backend/api/persistence.py β Supabase persistence for agent task state (S359).
Design principles:
- ALL writes are fire-and-forget: never block the SSE hot path.
- Reads happen ONLY on lazy restore (when in-memory is empty, i.e. backend restarted).
- Supabase unavailable β silent fallback to in-memory-only (no exception propagation).
- Event buffer capped at MAX_EVENTS per task to avoid runaway storage.
GAP-P40D-FIX: aggiunto retry (max 2 tentativi, 0.3s sleep) per sb_upsert_task e
sb_append_event β stesse operazioni giΓ protette in linter.py (P40-D pattern).
Il gap: su Railway cold-start le prime scritture Supabase cadono nel vuoto senza retry.
Il pattern Γ¨ identico a quello in linter.py (lint_and_store) giΓ confermato stabile.
Required Supabase tables (run backend/migrations/s359_task_persistence.sql once):
agent_tasks β task metadata (task_id, goal, status, max_steps, created_at, updated_at)
agent_task_events β SSE event buffer (task_id, event_index, event_data, created_at)
"""
import asyncio, time, json
from .state import safe_json_dumps as _sjd # B11-FIX: surrogate-safe drop-in
from typing import Optional, Any
import logging
_logger = logging.getLogger("api.persistence")
MAX_EVENTS = 500 # max SSE frames persisted per task
_MAX_RETRY = 2 # GAP-P40D-FIX: tentativi massimi per write Supabase
_RETRY_SLEEP = 0.3 # GAP-P40D-FIX: sleep tra tentativi (secondi)
# P0: per-run locks serialize compatible envelope updates in one worker.
_ENGINEERING_LOCKS: dict[str, asyncio.Lock] = {}
_ENGINEERING_LOCK_LAST_USED: dict[str, float] = {}
_ENGINEERING_LOCK_MAX = 256
def _engineering_lock(task_id: str) -> asyncio.Lock:
lock = _ENGINEERING_LOCKS.get(task_id)
if lock is None:
lock = asyncio.Lock()
_ENGINEERING_LOCKS[task_id] = lock
_ENGINEERING_LOCK_LAST_USED[task_id] = time.monotonic()
if len(_ENGINEERING_LOCKS) > _ENGINEERING_LOCK_MAX:
for stale_id, _ in sorted(_ENGINEERING_LOCK_LAST_USED.items(), key=lambda item: item[1]):
stale_lock = _ENGINEERING_LOCKS.get(stale_id)
if stale_lock is not None and not stale_lock.locked() and stale_id != task_id:
_ENGINEERING_LOCKS.pop(stale_id, None)
_ENGINEERING_LOCK_LAST_USED.pop(stale_id, None)
break
return lock
# ββ Write helpers (fire-and-forget, never raise) βββββββββββββββββββββββββββββββ
async def sb_upsert_task(
task_id: str, goal: str, status: str, max_steps: int,
context: list, created_at: int,
) -> None:
"""Persist or update task metadata. Silent if Supabase not configured.
GAP-P40D-FIX: retry fino a _MAX_RETRY tentativi su errore transitorio."""
from .state import _sb
if not _sb:
return
now = int(time.time() * 1000)
payload = {
'task_id': task_id,
'goal': goal[:1000],
'status': status,
'max_steps': max_steps,
'context': _sjd(context)[:8000],
'created_at': created_at,
'updated_at': now,
}
for _attempt in range(_MAX_RETRY):
try:
await asyncio.to_thread(
lambda: _sb.table('agent_tasks').upsert(payload).execute()
)
return # successo
except Exception as e:
if _attempt < _MAX_RETRY - 1:
await asyncio.sleep(_RETRY_SLEEP)
else:
_logger.warning('[persist] upsert_task %s failed after %d attempts: %s',
task_id, _MAX_RETRY, e)
async def sb_update_status(task_id: str, status: str) -> None:
"""Update only the status column of an existing task."""
from .state import _sb
if not _sb:
return
now = int(time.time() * 1000)
try:
await asyncio.to_thread(
lambda: _sb.table('agent_tasks')
.update({'status': status, 'updated_at': now})
.eq('task_id', task_id)
.execute()
)
except Exception as e:
_logger.warning('[persist] update_status %sβ%s: %s', task_id, status, e)
async def sb_append_event(task_id: str, event_index: int, event_data: str) -> None:
"""Append one SSE event string to the persistent buffer. Capped at MAX_EVENTS.
GAP-P40D-FIX: retry fino a _MAX_RETRY tentativi su errore transitorio."""
from .state import _sb
if not _sb or event_index > MAX_EVENTS:
return
now = int(time.time() * 1000)
payload = {
'task_id': task_id,
'event_index': event_index,
'event_data': event_data,
'created_at': now,
}
for _attempt in range(_MAX_RETRY):
try:
await asyncio.to_thread(
lambda: _sb.table('agent_task_events').upsert(payload).execute()
)
return # successo
except Exception as e:
if _attempt < _MAX_RETRY - 1:
await asyncio.sleep(_RETRY_SLEEP)
else:
_logger.warning('[persist] append_event %s#%d failed after %d attempts: %s',
task_id, event_index, _MAX_RETRY, e)
async def sb_restore_task(task_id: str) -> Optional[dict]:
"""Restore task metadata from Supabase on backend restart."""
from .state import _sb
if not _sb:
return None
try:
res = await asyncio.to_thread(
lambda: _sb.table('agent_tasks').select('*').eq('task_id', task_id).limit(1).execute()
)
return res.data[0] if res.data else None
except Exception as e:
_logger.warning('[persist] restore_task %s: %s', task_id, e)
return None
async def sb_get_events(task_id: str) -> list[str]:
"""Retrieve all persisted SSE events for a task, ordered by index."""
from .state import _sb
if not _sb:
return []
try:
res = await asyncio.to_thread(
lambda: _sb.table('agent_task_events')
.select('event_index, event_data')
.eq('task_id', task_id)
.order('event_index')
.limit(MAX_EVENTS)
.execute()
)
return [r['event_data'] for r in (res.data or [])]
except Exception as e:
_logger.warning('[persist] get_events %s: %s', task_id, e)
return []
async def sb_delete_task_events(task_id: str) -> None:
"""Delete all events for a task (post-replay cleanup)."""
from .state import _sb
if not _sb:
return
try:
await asyncio.to_thread(
lambda: _sb.table('agent_task_events').delete().eq('task_id', task_id).execute()
)
except Exception as e:
_logger.debug('[persist] delete_events %s: %s', task_id, e)
async def sb_list_tasks(limit: int = 50) -> list[dict]:
"""List recent tasks from Supabase."""
from .state import _sb
if not _sb:
return []
try:
res = await asyncio.to_thread(
lambda: _sb.table('agent_tasks')
.select('task_id, goal, status, created_at, updated_at')
.order('created_at', desc=True)
.limit(limit)
.execute()
)
return res.data or []
except Exception as e:
_logger.warning('[persist] list_tasks: %s', e)
return []
# ββ Checkpoint helpers (S359: task state snapshots) βββββββββββββββββββββββββββ
async def sb_save_checkpoint(task_id: str, step: int, checkpoint_data: dict) -> None:
"""Save a legacy checkpoint while preserving a valid EngineeringState envelope."""
from .state import _sb
if not _sb:
return
now = int(time.time() * 1000)
try:
payload = dict(checkpoint_data) if isinstance(checkpoint_data, dict) else {}
# A legacy save must not erase the shadow/canary envelope written by the
# adapter. Read/merge under the same per-task lock used by its writer.
lock = _engineering_lock(task_id)
async with lock:
current = await sb_get_checkpoint(task_id)
current_engineering = current.get('engineering_state') if isinstance(current, dict) else None
if isinstance(current_engineering, dict) and 'engineering_state' not in payload:
payload['engineering_state'] = current_engineering
serialized = _sjd(payload)
if len(serialized) > 16000:
_logger.debug('[persist] save_checkpoint %s#%d skipped: payload exceeds size limit', task_id, step)
return
await asyncio.to_thread(
lambda: _sb.table('agent_tasks')
.update({'checkpoint': serialized, 'updated_at': now})
.eq('task_id', task_id)
.execute()
)
except Exception as e:
_logger.debug('[persist] save_checkpoint %s#%d: %s', task_id, step, e)
_ENGINEERING_DEBOUNCE_CACHE: dict[str, dict[str, Any]] = {}
_ENGINEERING_LAST_FLUSH_TS: dict[str, float] = {}
DEBOUNCE_INTERVAL_SEC = 2.0
async def sb_save_engineering_state(task_id: str, envelope: dict, force: bool = False) -> None:
"""Merge a validated EngineeringState envelope with debouncing and monotone revision check."""
from .state import _sb
if not _sb or not task_id:
return
try:
from agents.engineering_state import EngineeringState
validated = EngineeringState.from_snapshot(envelope).snapshot()
except Exception as exc:
_logger.debug('[persist] engineering state rejected: %s', type(exc).__name__)
return
lock = _engineering_lock(task_id)
async with lock:
current = await sb_get_checkpoint(task_id)
current = current if isinstance(current, dict) else {}
current_engineering = current.get('engineering_state')
try:
current_revision = int(current_engineering.get('revision', -1)) if isinstance(current_engineering, dict) else -1
except (TypeError, ValueError):
current_revision = -1
incoming_revision = int(validated.get('revision', -1))
if current_revision > incoming_revision:
_logger.debug('[persist] engineering state conflict %s: remote revision %d > %d', task_id, current_revision, incoming_revision)
return
now_t = time.time()
_ENGINEERING_DEBOUNCE_CACHE[task_id] = validated
if not force and task_id in _ENGINEERING_LAST_FLUSH_TS:
if now_t - _ENGINEERING_LAST_FLUSH_TS[task_id] < DEBOUNCE_INTERVAL_SEC:
return
_ENGINEERING_LAST_FLUSH_TS[task_id] = now_t
to_flush = _ENGINEERING_DEBOUNCE_CACHE.get(task_id, validated)
async with lock:
current = await sb_get_checkpoint(task_id)
current = current if isinstance(current, dict) else {}
current_engineering = current.get('engineering_state')
try:
current_revision = int(current_engineering.get('revision', -1)) if isinstance(current_engineering, dict) else -1
except (TypeError, ValueError):
current_revision = -1
incoming_revision = int(to_flush.get('revision', -1))
if current_revision > incoming_revision and not force:
return
merged = dict(current)
merged['engineering_state'] = to_flush
serialized = _sjd(merged)
if len(serialized) > 16000:
return
now = int(time.time() * 1000)
try:
await asyncio.to_thread(
lambda: _sb.table('agent_tasks')
.update({'checkpoint': serialized, 'updated_at': now})
.eq('task_id', task_id)
.execute()
)
except Exception as exc:
_logger.debug('[persist] save_engineering_state %s: %s', task_id, exc)
async def sb_get_checkpoint(task_id: str) -> Optional[dict]:
"""Retrieve latest checkpoint for a task."""
from .state import _sb
if not _sb:
return None
try:
res = await asyncio.to_thread(
lambda: _sb.table('agent_tasks')
.select('checkpoint')
.eq('task_id', task_id)
.limit(1)
.execute()
)
if res.data and res.data[0].get('checkpoint'):
raw = res.data[0]['checkpoint']
return json.loads(raw) if isinstance(raw, str) else raw
return None
except Exception as e:
_logger.debug('[persist] get_checkpoint %s: %s', task_id, e)
return None
# ββ Handoff helpers (BG-4: cross-session context handoff) βββββββββββββββββββββ
async def sb_restore_handoff_context(session_id: str) -> Optional[dict]:
"""Restore cross-session handoff context."""
from .state import _sb
if not _sb:
return None
try:
res = await asyncio.to_thread(
lambda: _sb.table('handoff_contexts')
.select('*').limit(500) # BUGFIX: LIMIT 500 β senza limit OOM su stato persistente grande
.eq('session_id', session_id)
.limit(1)
.execute()
)
return res.data[0] if res.data else None
except Exception as e:
_logger.debug('[persist] restore_handoff %s: %s', session_id, e)
return None
async def sb_upsert_handoff(session_id: str, context: dict) -> None:
"""Save handoff context for cross-session resume."""
from .state import _sb
if not _sb:
return
now = int(time.time() * 1000)
try:
await asyncio.to_thread(
lambda: _sb.table('handoff_contexts').upsert({
'session_id': session_id,
'context': _sjd(context)[:16000],
'updated_at': now,
}, on_conflict='session_id').execute()
)
except Exception as e:
_logger.debug('[persist] upsert_handoff %s: %s', session_id, e)
async def sb_delete_handoff(session_id: str) -> None:
"""Remove handoff context after successful resume."""
from .state import _sb
if not _sb:
return
try:
await asyncio.to_thread(
lambda: _sb.table('handoff_contexts').delete().eq('session_id', session_id).execute()
)
except Exception as e:
_logger.debug('[persist] delete_handoff %s: %s', session_id, e)
|