Implement plans
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
import uuid
|
||||
|
||||
from asgiref.sync import async_to_sync
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from core.models import ExternalSyncEvent, TaskProviderConfig
|
||||
from core.clients.transport import send_message_raw
|
||||
from core.models import CodexPermissionRequest, CodexRun, ExternalSyncEvent, TaskProviderConfig
|
||||
from core.tasks.providers import get_provider
|
||||
from core.util import logs
|
||||
|
||||
@@ -58,11 +61,36 @@ class Command(BaseCommand):
|
||||
event.status = "failed"
|
||||
event.error = "provider_disabled_or_missing"
|
||||
event.save(update_fields=["status", "error", "updated_at"])
|
||||
provider_payload = dict((event.payload or {}).get("provider_payload") or {})
|
||||
run_id = str(provider_payload.get("codex_run_id") or "").strip()
|
||||
if run_id:
|
||||
CodexRun.objects.filter(id=run_id, user=event.user).update(
|
||||
status="failed",
|
||||
error="provider_disabled_or_missing",
|
||||
)
|
||||
return
|
||||
|
||||
payload = dict(event.payload or {})
|
||||
action = str(payload.get("action") or "append_update").strip().lower()
|
||||
provider_payload = dict(payload.get("provider_payload") or payload)
|
||||
run_id = str(provider_payload.get("codex_run_id") or payload.get("codex_run_id") or "").strip()
|
||||
codex_run = None
|
||||
if run_id:
|
||||
codex_run = CodexRun.objects.filter(id=run_id, user=event.user).first()
|
||||
if codex_run is None and event.task_id:
|
||||
codex_run = (
|
||||
CodexRun.objects.filter(
|
||||
user=event.user,
|
||||
task_id=event.task_id,
|
||||
status__in=["queued", "running", "approved_waiting_resume"],
|
||||
)
|
||||
.order_by("-updated_at")
|
||||
.first()
|
||||
)
|
||||
if codex_run is not None:
|
||||
codex_run.status = "running"
|
||||
codex_run.error = ""
|
||||
codex_run.save(update_fields=["status", "error", "updated_at"])
|
||||
|
||||
if action == "create":
|
||||
result = provider.create_task(dict(cfg.settings or {}), provider_payload)
|
||||
@@ -73,14 +101,106 @@ class Command(BaseCommand):
|
||||
else:
|
||||
result = provider.append_update(dict(cfg.settings or {}), provider_payload)
|
||||
|
||||
result_payload = dict(result.payload or {})
|
||||
requires_approval = bool(result_payload.get("requires_approval"))
|
||||
if requires_approval:
|
||||
approval_key = str(result_payload.get("approval_key") or uuid.uuid4().hex[:12]).strip()
|
||||
permission_request = dict(result_payload.get("permission_request") or {})
|
||||
summary = str(result_payload.get("summary") or permission_request.get("summary") or "").strip()
|
||||
requested_permissions = permission_request.get("requested_permissions")
|
||||
if not isinstance(requested_permissions, (list, dict)):
|
||||
requested_permissions = permission_request or {}
|
||||
resume_payload = result_payload.get("resume_payload")
|
||||
if not isinstance(resume_payload, dict):
|
||||
resume_payload = {}
|
||||
event.status = "waiting_approval"
|
||||
event.error = ""
|
||||
event.payload = dict(payload, worker_processed=True, result=result_payload)
|
||||
event.save(update_fields=["status", "error", "payload", "updated_at"])
|
||||
if codex_run is not None:
|
||||
codex_run.status = "waiting_approval"
|
||||
codex_run.result_payload = dict(result_payload)
|
||||
codex_run.error = ""
|
||||
codex_run.save(update_fields=["status", "result_payload", "error", "updated_at"])
|
||||
CodexPermissionRequest.objects.update_or_create(
|
||||
approval_key=approval_key,
|
||||
defaults={
|
||||
"user": event.user,
|
||||
"codex_run": codex_run if codex_run is not None else CodexRun.objects.create(
|
||||
user=event.user,
|
||||
task=event.task,
|
||||
derived_task_event=event.task_event,
|
||||
source_service=str(provider_payload.get("source_service") or ""),
|
||||
source_channel=str(provider_payload.get("source_channel") or ""),
|
||||
external_chat_id=str(provider_payload.get("external_chat_id") or ""),
|
||||
status="waiting_approval",
|
||||
request_payload=dict(payload or {}),
|
||||
result_payload=dict(result_payload),
|
||||
error="",
|
||||
),
|
||||
"external_sync_event": event,
|
||||
"summary": summary,
|
||||
"requested_permissions": requested_permissions if isinstance(requested_permissions, dict) else {
|
||||
"items": list(requested_permissions or [])
|
||||
},
|
||||
"resume_payload": dict(resume_payload or {}),
|
||||
"status": "pending",
|
||||
"resolved_at": None,
|
||||
"resolved_by_identifier": "",
|
||||
"resolution_note": "",
|
||||
},
|
||||
)
|
||||
approver_service = str((cfg.settings or {}).get("approver_service") or "").strip().lower()
|
||||
approver_identifier = str((cfg.settings or {}).get("approver_identifier") or "").strip()
|
||||
requested_text = result_payload.get("permission_request") or result_payload.get("requested_permissions") or {}
|
||||
if approver_service and approver_identifier:
|
||||
try:
|
||||
async_to_sync(send_message_raw)(
|
||||
approver_service,
|
||||
approver_identifier,
|
||||
text=(
|
||||
f"[codex approval] key={approval_key}\\n"
|
||||
f"summary={summary or 'Codex run requires approval'}\\n"
|
||||
f"requested={requested_text}\\n"
|
||||
f"use: .codex approve {approval_key} or .codex deny {approval_key}"
|
||||
),
|
||||
attachments=[],
|
||||
metadata={"origin_tag": f"codex-approval:{approval_key}"},
|
||||
)
|
||||
except Exception:
|
||||
log.exception("failed to notify approver channel for approval_key=%s", approval_key)
|
||||
else:
|
||||
source_service = str(provider_payload.get("source_service") or "").strip().lower()
|
||||
source_channel = str(provider_payload.get("source_channel") or "").strip()
|
||||
if source_service and source_channel:
|
||||
try:
|
||||
async_to_sync(send_message_raw)(
|
||||
source_service,
|
||||
source_channel,
|
||||
text=(
|
||||
"[codex approval] approval is pending but no approver channel is configured. "
|
||||
"Set approver_service and approver_identifier in Codex settings."
|
||||
),
|
||||
attachments=[],
|
||||
metadata={"origin_tag": "codex-approval-missing-target"},
|
||||
)
|
||||
except Exception:
|
||||
log.exception("failed to notify source channel for missing approver target")
|
||||
return
|
||||
|
||||
event.status = "ok" if result.ok else "failed"
|
||||
event.error = str(result.error or "")
|
||||
event.payload = dict(
|
||||
payload,
|
||||
worker_processed=True,
|
||||
result=dict(result.payload or {}),
|
||||
result=result_payload,
|
||||
)
|
||||
event.save(update_fields=["status", "error", "payload", "updated_at"])
|
||||
if codex_run is not None:
|
||||
codex_run.status = "ok" if result.ok else "failed"
|
||||
codex_run.error = str(result.error or "")
|
||||
codex_run.result_payload = result_payload
|
||||
codex_run.save(update_fields=["status", "error", "result_payload", "updated_at"])
|
||||
|
||||
if result.ok and result.external_key and event.task_id and not str(event.task.external_key or "").strip():
|
||||
event.task.external_key = str(result.external_key)
|
||||
|
||||
Reference in New Issue
Block a user