Spaces:
Running
Running
File size: 19,952 Bytes
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 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 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | """
backend/api/job_queue.py β Redis coordination BRAINβHANDS (S-DUAL-2)
Questo modulo implementa tre livelli di coordinamento via Upstash Redis:
1. LOAD EXCHANGE β entrambi gli Space pubblicano metriche ogni 30s su Redis.
Il CF router legge via /api/jq/load/{role} senza HTTP probe costosi.
Chiavi: jq:load:brain jq:load:hands (TTL 90s)
2. WAKE-UP β BRAIN segnala HANDS di scaldarsi prima che il circuito si chiuda.
HANDS consumer legge i segnali e chiama /health su se stesso.
Chiave: jq:wake (LIST, RPOP, TTL 30s per elemento)
3. TASK DELEGATION β BRAIN accoda task, HANDS consuma ed esegue.
Chiave: jq:tasks:pending (LIST, LPUSH/RPOP)
Chiave: jq:result:{taskId} (STRING, TTL 300s)
Chiave: jq:events:{taskId} (LIST, TTL 300s)
Chiave: jq:consumer:alive (STRING, TTL 30s β heartbeat HANDS consumer)
Abilitazione:
JQ_ENABLED=1 + UPSTASH_REDIS_REST_URL + UPSTASH_REDIS_REST_TOKEN + SPACE_ROLE
Se JQ_ENABLED non Γ¨ impostato β modulo in standby (load publish attivo, queue no)
Endpoints:
GET /api/jq/status β diagnostica queue
GET /api/jq/load/{role} β metriche load da Redis (brain|hands)
POST /api/jq/wake β segnala wake-up HANDS (solo BRAIN)
POST /api/jq/submit β sottometti job a HANDS via Redis (solo BRAIN)
GET /api/jq/result/{taskId} β leggi risultato job da Redis
GET /api/jq/events/{taskId} β leggi eventi SSE da Redis
"""
import os, asyncio, json, time, uuid, logging
from fastapi import APIRouter, Depends, Request, HTTPException
from .auth_guard import require_role, AuthRole
from pydantic import BaseModel
from api.priority import PRIORITY_CONTEXT_MANAGERS
_logger = logging.getLogger("api.job_queue")
router = APIRouter(prefix="/api/jq", tags=["job-queue"], dependencies=[Depends(require_role(AuthRole.MACHINE))]) # GAP-1-fix: router-level auth
# ββ Config βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
_SPACE_ROLE = os.getenv("SPACE_ROLE", "unknown") # gateway | brain-planner | brain-executor | worker-exec | worker-browser | unknown
_JQ_ENABLED = os.getenv("JQ_ENABLED", "0").strip() == "1"
_LOAD_TTL = 90 # s β TTL metriche load su Redis
_RESULT_TTL = 300 # s β TTL risultato job su Redis
_EVENTS_TTL = 300 # s β TTL lista eventi SSE su Redis
_WAKE_TTL = 30 # s β TTL singolo wake signal
_CONSUMER_HB_TTL = 30 # s β TTL heartbeat consumer HANDS
# ββ Redis keys βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
_K_LOAD = lambda role: f"jq:load:{role}" # STRING β metriche load
_K_WAKE = "jq:wake" # LIST β wake signals
_K_PENDING = "jq:tasks:pending" # LIST β job queue
_K_RESULT = lambda tid: f"jq:result:{tid}" # STRING β risultato job
_K_EVENTS = lambda tid: f"jq:events:{tid}" # LIST β eventi SSE
_K_CONSUMER = "jq:consumer:alive" # STRING β HB consumer
# ββ Bootstrap check ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
def _redis_ok() -> bool:
"""Verifica che Redis sia configurato (non controlla la connettivitΓ )."""
return bool(
os.getenv("UPSTASH_REDIS_REST_URL") and
os.getenv("UPSTASH_REDIS_REST_TOKEN")
)
async def _rcmd(command: list, timeout: float = 3.0) -> dict | None:
"""Esegue comando Redis via modulo centralizzato backend/redis.py."""
try:
from redis import redis_cmd
return await redis_cmd(command, timeout=timeout)
except Exception as exc:
_logger.debug("[jq] redis_cmd error: %s", exc)
return None
async def _rpush(key: str, value: str, ttl: int | None = None) -> bool:
"""LPUSH key value + EXPIRE key ttl (se ttl != None)."""
r = await _rcmd(["LPUSH", key, value])
if r and ttl:
await _rcmd(["EXPIRE", key, ttl])
return r is not None
async def _rpop(key: str) -> str | None:
"""RPOP key. Ritorna None se lista vuota o errore."""
r = await _rcmd(["RPOP", key])
if r and r.get("result") is not None:
return r["result"]
return None
async def _llen(key: str) -> int:
"""LLEN key."""
r = await _rcmd(["LLEN", key])
return int(r.get("result", 0)) if r else 0
async def _lrange(key: str, start: int = 0, stop: int = -1) -> list[str]:
"""LRANGE key start stop."""
r = await _rcmd(["LRANGE", key, start, stop])
return r.get("result", []) if r else []
# ββ Load metric exchange βββββββββββββββββββββββββββββββββββββββββββββββββββββββ
async def publish_load_metrics(role: str | None = None) -> bool:
"""
Pubblica le metriche di carico di questo Space su Redis.
Chiamato ogni 30s dal background loop _load_publisher_loop().
Complementa /api/health/load (HTTP) con uno snapshot Redis consultabile
senza HTTP call dall'altro Space.
"""
if not _redis_ok():
return False
_role = role or _SPACE_ROLE
try:
from api.priority import get_load_metrics as _glm
metrics = _glm()
except Exception:
metrics = {}
try:
from api.state import _agent_tasks
active = sum(1 for t in _agent_tasks.values() if t.get("status") in ("RUNNING", "running"))
except Exception:
active = 0
payload = json.dumps({
"space_role": _role,
"active_agent_tasks": active,
"high_active": metrics.get("high_active", 0),
"normal_active": metrics.get("normal_active", 0),
"low_active": metrics.get("low_active", 0),
"background_active": metrics.get("background_active", 0),
"high_available": metrics.get("high_available", 6),
"normal_available": metrics.get("normal_available", 4),
"low_available": metrics.get("low_available", 2),
"consumer_enabled": _JQ_ENABLED,
"ts": int(time.time() * 1000),
})
r = await _rcmd(["SET", _K_LOAD(_role), payload, "EX", _LOAD_TTL])
return r is not None
async def get_remote_load(role: str) -> dict | None:
"""Legge le metriche load dell'altro Space da Redis. Ritorna None se stale."""
if not _redis_ok():
return None
r = await _rcmd(["GET", _K_LOAD(role)])
if not r or r.get("result") is None:
return None
try:
return json.loads(r["result"])
except Exception:
return None
# ββ Wake-up signaling ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
async def publish_wake_signal(reason: str = "circuit_open") -> bool:
"""
BRAIN pubblica un segnale di wake-up per HANDS.
HANDS consumer legge il segnale e chiama /health su se stesso
per prevenire il cold start di HF Space free tier.
"""
if not _redis_ok():
return False
payload = json.dumps({"reason": reason, "ts": int(time.time() * 1000), "from": _SPACE_ROLE})
return await _rpush(_K_WAKE, payload, ttl=_WAKE_TTL)
async def _consume_wake_signals() -> int:
"""HANDS: legge e processa tutti i wake signal in coda. Ritorna il count."""
count = 0
while True:
raw = await _rpop(_K_WAKE)
if raw is None:
break
try:
sig = json.loads(raw)
_logger.info("[jq] wake signal from %s β reason: %s", sig.get("from"), sig.get("reason"))
except Exception:
pass
count += 1
return count
# ββ Task delegation ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
class JobPayload(BaseModel):
goal: str
session_id: str = ""
context: dict = {}
priority: str = "normal" # high | normal | low | background
max_steps: int = 20
task_id: str = "" # se vuoto β generato da BRAIN
async def submit_job(job: JobPayload) -> dict:
"""
BRAIN: accoda un task per HANDS via Redis.
Ritorna {taskId, status, stream_url, queue_depth}.
Il client usa stream_url per connettersi direttamente a HANDS (via CF routing)
e ricevere gli eventi SSE una volta che HANDS ha consumato il job.
"""
if not _redis_ok():
raise HTTPException(503, "Redis non configurato β job queue non disponibile")
task_id = job.task_id or str(uuid.uuid4())
payload = json.dumps({
"taskId": task_id,
"goal": job.goal,
"session_id": job.session_id,
"context": job.context,
"priority": job.priority,
"max_steps": job.max_steps,
"submitted_at": time.time(),
"submitted_by": _SPACE_ROLE,
})
ok = await _rpush(_K_PENDING, payload)
if not ok:
raise HTTPException(503, "Impossibile accodare il task su Redis")
depth = await _llen(_K_PENDING)
_logger.info("[jq] job queued taskId=%s depth=%d", task_id, depth)
return {
"taskId": task_id,
"status": "queued",
"queue_depth": depth,
"stream_url": f"/api/agent/tasks/{task_id}/stream",
}
async def _execute_queued_job(job: dict) -> None:
"""
HANDS: esegue un job prelevato dalla coda Redis.
Crea il task nel registro locale e avvia unified_loop.
Gli eventi SSE vengono scritti sia nel registro locale (per streaming diretto)
sia su Redis (per relay da BRAIN).
"""
task_id = job.get("taskId", str(uuid.uuid4()))
goal = job.get("goal", "")
_logger.info("[jq] executing queued job taskId=%s goal=%.60s", task_id, goal)
try:
from api.state import _agent_tasks
_agent_tasks[task_id] = {
"status": "QUEUED",
"goal": goal,
"session_id": job.get("session_id", ""),
"created_at": time.time() * 1000,
"source": "jq",
}
# Pubblica evento di start su Redis
await _rcmd(["LPUSH", _K_EVENTS(task_id), json.dumps({
"type": "task_queued", "taskId": task_id, "ts": int(time.time() * 1000)
})])
await _rcmd(["EXPIRE", _K_EVENTS(task_id), _EVENTS_TTL])
# Lancia il loop tramite agent.py create_agent_task
try:
from api.agent import _create_task_internal
from api.priority import PRIORITY_CONTEXT_MANAGERS
priority_manager = PRIORITY_CONTEXT_MANAGERS.get(job.get("priority", "normal"), PRIORITY_CONTEXT_MANAGERS["normal"])
async with priority_manager():
await _create_task_internal(task_id=task_id, goal=goal, job=job)
except (ImportError, AttributeError):
# Fallback: usa unified_loop direttamente
from agents.unified_loop import UnifiedAgentLoop # GAP-2-fix
from api.priority import PRIORITY_CONTEXT_MANAGERS
priority_manager = PRIORITY_CONTEXT_MANAGERS.get(job.get("priority", "normal"), PRIORITY_CONTEXT_MANAGERS["normal"])
async with priority_manager():
loop = UnifiedAgentLoop()
result = await loop.run(
goal=goal,
context=json.dumps(job.get("context", {})),
max_steps=job.get("max_steps", 20),
session_id=job.get("session_id", ""),
)
# Pubblica risultato
await _rcmd(["SET", _K_RESULT(task_id), json.dumps({
"taskId": task_id,
"status": "success" if result.get("success") else "error",
"output": result.get("output", ""),
"error": result.get("error"),
"completed_at": time.time(),
}), "EX", _RESULT_TTL])
_agent_tasks[task_id]["status"] = "SUCCESS" if result.get("success") else "ERROR"
except Exception as exc:
_logger.error("[jq] job execution failed taskId=%s: %s", task_id, exc, exc_info=True)
await _rcmd(["SET", _K_RESULT(task_id), json.dumps({
"taskId": task_id,
"status": "error",
"error": str(exc),
"completed_at": time.time(),
}), "EX", _RESULT_TTL])
try:
from api.state import _agent_tasks
_agent_tasks[task_id]["status"] = "ERROR"
except Exception:
pass
# ββ Background loops βββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
async def _load_publisher_loop() -> None:
"""Background loop: pubblica metriche load ogni 30s su Redis."""
_logger.info("[jq] load publisher avviato (role=%s)", _SPACE_ROLE)
while True:
await asyncio.sleep(30)
try:
await publish_load_metrics()
except Exception as exc:
_logger.debug("[jq] load publish error: %s", exc)
async def _hands_consumer_loop() -> None:
"""
Background loop HANDS: ogni 1s legge dalla queue Redis.
- Consuma wake signals (log + no-op β siamo giΓ svegli)
- Consuma job dalla coda e li esegue in background
- Pubblica heartbeat consumer ogni 10s
"""
_logger.info("[jq] HANDS job consumer avviato")
_hb_tick = 0
while True:
await asyncio.sleep(1)
try:
# Wake signals β siamo giΓ svegli ma logghiamo
await _consume_wake_signals()
# Heartbeat consumer ogni ~10s
_hb_tick += 1
if _hb_tick % 10 == 0:
await _rcmd(["SET", _K_CONSUMER, str(int(time.time())), "EX", _CONSUMER_HB_TTL])
if not _JQ_ENABLED:
continue # load publisher attivo, job consumer no
# Preleva job dalla coda
raw = await _rpop(_K_PENDING)
if raw is None:
continue
try:
job = json.loads(raw)
except Exception:
_logger.warning("[jq] invalid job payload β skipping")
continue
# Esegui in background β non blocca il loop consumer
t = asyncio.create_task(_execute_queued_job(job))
t.add_done_callback(lambda task: (
_logger.error("[jq] job task crashed: %s", task.exception(), exc_info=task.exception())
if not task.cancelled() and task.exception() else None
))
except Exception as exc:
_logger.debug("[jq] consumer tick error: %s", exc)
async def start_job_queue_consumer() -> None:
"""
Punto di ingresso per main.py _on_startup().
Avvia:
- _load_publisher_loop() (sempre, su tutti gli Space)
- _hands_consumer_loop() (se il ruolo Γ¨ un worker o unknown)
"""
if not _redis_ok():
_logger.warning("[jq] Redis non configurato β job queue disabilitato")
return
# Load publisher su tutti gli Space
def _log_jq_exc(t):
if not t.cancelled() and t.exception():
_logger.warning("[job_queue] bg loop raised: %s", t.exception())
asyncio.create_task(_load_publisher_loop()).add_done_callback(_log_jq_exc)
# Consumer per tutti i ruoli worker o legacy 'hands'
_IS_WORKER = _SPACE_ROLE.startswith("worker-") or _SPACE_ROLE in ("hands", "unknown")
if _IS_WORKER:
_logger.info("[jq] Avvio consumer loop per ruolo worker: %s", _SPACE_ROLE)
asyncio.create_task(_hands_consumer_loop()).add_done_callback(_log_jq_exc)
else:
_logger.info("[jq] SPACE_ROLE=%s β consumer non avviato (ruolo non worker)", _SPACE_ROLE)
# Pubblica subito le metriche al boot
await publish_load_metrics()
# ββ FastAPI endpoints ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
@router.get("/status")
async def jq_status():
"""Diagnostica completa della job queue."""
_redis_configured = _redis_ok()
result = {
"space_role": _SPACE_ROLE,
"jq_enabled": _JQ_ENABLED,
"redis_configured": _redis_configured,
"ts": int(time.time() * 1000),
}
if _redis_configured:
result["queue_depth"] = await _llen(_K_PENDING)
result["wake_pending"] = await _llen(_K_WAKE)
_hb = await _rcmd(["GET", _K_CONSUMER])
result["consumer_alive"] = bool(_hb and _hb.get("result"))
result["brain_load"] = await get_remote_load("brain")
result["hands_load"] = await get_remote_load("hands")
return result
@router.get("/load/{role}")
async def jq_load(role: str):
"""Legge le metriche load di uno Space da Redis. role: brain | hands"""
if role not in ("brain", "hands"):
raise HTTPException(400, "role deve essere 'brain' o 'hands'")
data = await get_remote_load(role)
if data is None:
raise HTTPException(404, f"Metriche {role} non disponibili (stale o Redis non configurato)")
return data
@router.post("/wake")
async def jq_wake(request: Request):
"""BRAIN: invia segnale wake-up a HANDS. Solo da BRAIN o con X-Internal-Token."""
_tok = os.getenv("INTERNAL_TOKEN", "")
if _tok and request.headers.get("X-Internal-Token", "") != _tok:
raise HTTPException(401, "Unauthorized")
ok = await publish_wake_signal(reason="manual_wake")
return {"sent": ok, "ts": int(time.time() * 1000)}
@router.post("/submit")
async def jq_submit(job: JobPayload, request: Request):
"""
BRAIN: sottomette un job a HANDS via Redis.
Richiede X-Internal-Token.
Ritorna {taskId, status, stream_url} β il client usa stream_url per SSE.
"""
_tok = os.getenv("INTERNAL_TOKEN", "")
if _tok and request.headers.get("X-Internal-Token", "") != _tok:
raise HTTPException(401, "Unauthorized")
if not _JQ_ENABLED:
raise HTTPException(503, "JQ_ENABLED non impostato β job queue disabilitato")
return await submit_job(job)
@router.get("/result/{task_id}")
async def jq_result(task_id: str):
"""Legge il risultato di un job delegato da Redis. Disponibile per ~5 min post-completamento."""
if not _redis_ok():
raise HTTPException(503, "Redis non configurato")
r = await _rcmd(["GET", _K_RESULT(task_id)])
if not r or r.get("result") is None:
raise HTTPException(404, f"Risultato per {task_id} non trovato (non ancora pronto o scaduto)")
try:
return json.loads(r["result"])
except Exception:
raise HTTPException(500, "Risultato malformato in Redis")
@router.get("/events/{task_id}")
async def jq_events(task_id: str, from_idx: int = 0):
"""
Legge gli eventi SSE di un task da Redis (per relay da BRAIN).
from_idx: indice da cui iniziare (0 = tutti).
"""
if not _redis_ok():
raise HTTPException(503, "Redis non configurato")
events_raw = await _lrange(_K_EVENTS(task_id), from_idx)
events = []
for e in events_raw:
try:
events.append(json.loads(e))
except Exception:
events.append({"raw": e})
return {"taskId": task_id, "events": events, "count": len(events), "from_idx": from_idx}
|