feat(core): add task queue, retry loop, and basic approval gate
This commit is contained in:
@@ -3,6 +3,8 @@ import argparse
|
||||
import json
|
||||
import subprocess
|
||||
from .router import dispatch
|
||||
from .queue import enqueue, list_items, next_item, update
|
||||
from .policy import needs_approval
|
||||
from .vault import load_tokens, VaultError
|
||||
|
||||
|
||||
@@ -59,6 +61,41 @@ def cmd_auth(args: argparse.Namespace) -> int:
|
||||
return 2
|
||||
|
||||
|
||||
def cmd_queue_add(args: argparse.Namespace) -> int:
|
||||
it = enqueue(args.task_type, args.task, args.max_retries)
|
||||
print(json.dumps(it, indent=2))
|
||||
return 0
|
||||
|
||||
|
||||
def cmd_queue_list(_: argparse.Namespace) -> int:
|
||||
print(json.dumps(list_items(), indent=2))
|
||||
return 0
|
||||
|
||||
|
||||
def cmd_queue_run_once(_: argparse.Namespace) -> int:
|
||||
it = next_item()
|
||||
if not it:
|
||||
print(json.dumps({'queue': 'empty'}, indent=2))
|
||||
return 0
|
||||
if needs_approval(it['task']):
|
||||
update(it['id'], status='blocked_approval', blocked_reason='sensitive_task')
|
||||
print(json.dumps({'id': it['id'], 'status': 'blocked_approval'}, indent=2))
|
||||
return 0
|
||||
out = dispatch(it['task_type'], it['task'])
|
||||
if isinstance(out, dict) and ('error' in out or (isinstance(out.get('coder'), dict) and out['coder'].get('error'))):
|
||||
retries = it['retries'] + 1
|
||||
if retries <= it['max_retries']:
|
||||
update(it['id'], status='queued', retries=retries, last_error='execution_error')
|
||||
print(json.dumps({'id': it['id'], 'status': 'requeued', 'retries': retries}, indent=2))
|
||||
else:
|
||||
update(it['id'], status='failed', retries=retries, last_error='execution_error')
|
||||
print(json.dumps({'id': it['id'], 'status': 'failed', 'retries': retries}, indent=2))
|
||||
return 1
|
||||
update(it['id'], status='done', result=out)
|
||||
print(json.dumps({'id': it['id'], 'status': 'done'}, indent=2))
|
||||
return 0
|
||||
|
||||
|
||||
def main() -> int:
|
||||
p = argparse.ArgumentParser(prog='prime')
|
||||
sub = p.add_subparsers(dest='cmd', required=True)
|
||||
@@ -82,6 +119,21 @@ def main() -> int:
|
||||
a.add_argument('provider')
|
||||
a.set_defaults(fn=cmd_auth)
|
||||
|
||||
q = sub.add_parser('queue')
|
||||
qsub = q.add_subparsers(dest='qcmd', required=True)
|
||||
|
||||
qa = qsub.add_parser('add')
|
||||
qa.add_argument('task_type')
|
||||
qa.add_argument('task')
|
||||
qa.add_argument('--max-retries', type=int, default=3)
|
||||
qa.set_defaults(fn=cmd_queue_add)
|
||||
|
||||
ql = qsub.add_parser('list')
|
||||
ql.set_defaults(fn=cmd_queue_list)
|
||||
|
||||
qr = qsub.add_parser('run-once')
|
||||
qr.set_defaults(fn=cmd_queue_run_once)
|
||||
|
||||
args = p.parse_args()
|
||||
return args.fn(args)
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
SENSITIVE_KEYWORDS = [
|
||||
'delete', 'drop', 'destroy', 'shutdown', 'reboot', 'rm -rf',
|
||||
'userdel', 'passwd', 'firewall', 'iptables', 'ufw deny', 'format'
|
||||
]
|
||||
|
||||
|
||||
def needs_approval(task: str) -> bool:
|
||||
t = task.lower()
|
||||
return any(k in t for k in SENSITIVE_KEYWORDS)
|
||||
@@ -0,0 +1,56 @@
|
||||
from __future__ import annotations
|
||||
import json
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
QF = Path('/srv/prime-core/state/task-queue.json')
|
||||
|
||||
|
||||
def _load() -> list[dict]:
|
||||
if not QF.exists():
|
||||
return []
|
||||
return json.loads(QF.read_text())
|
||||
|
||||
|
||||
def _save(items: list[dict]) -> None:
|
||||
QF.parent.mkdir(parents=True, exist_ok=True)
|
||||
QF.write_text(json.dumps(items, indent=2))
|
||||
|
||||
|
||||
def enqueue(task_type: str, task: str, max_retries: int = 3) -> dict:
|
||||
items = _load()
|
||||
item = {
|
||||
'id': f"t{int(time.time()*1000)}",
|
||||
'task_type': task_type,
|
||||
'task': task,
|
||||
'status': 'queued',
|
||||
'retries': 0,
|
||||
'max_retries': max_retries,
|
||||
'created_at': int(time.time())
|
||||
}
|
||||
items.append(item)
|
||||
_save(items)
|
||||
return item
|
||||
|
||||
|
||||
def list_items() -> list[dict]:
|
||||
return _load()
|
||||
|
||||
|
||||
def next_item() -> dict | None:
|
||||
items = _load()
|
||||
for it in items:
|
||||
if it['status'] == 'queued':
|
||||
it['status'] = 'running'
|
||||
_save(items)
|
||||
return it
|
||||
return None
|
||||
|
||||
|
||||
def update(item_id: str, **fields):
|
||||
items = _load()
|
||||
for it in items:
|
||||
if it['id'] == item_id:
|
||||
it.update(fields)
|
||||
break
|
||||
_save(items)
|
||||
Reference in New Issue
Block a user