feat(cloud): surface cancellation over the internal Host<->Cloud protocol
- LeaseRenewalResponse gains cancel_requested (populated from the repository's renew_lease result) - TerminalResultRequest.status widened to accept "cancelled" - Add internal API tests for a renewal surfacing cancel_requested=True and a cancelled terminal report being accepted/idempotent
This commit is contained in:
@@ -316,7 +316,7 @@ def create_internal_router(
|
||||
summary=payload.progress.summary[:500],
|
||||
updated_at=now,
|
||||
)
|
||||
renewal_status = pool.store.renew_lease(
|
||||
renewal = pool.store.renew_lease(
|
||||
task_id=task_id,
|
||||
attempt=payload.attempt,
|
||||
lease_id=payload.lease_id,
|
||||
@@ -325,16 +325,17 @@ def create_internal_router(
|
||||
now=now,
|
||||
progress=progress_snapshot,
|
||||
)
|
||||
if renewal_status == "not_found":
|
||||
if renewal.status == "not_found":
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="assignment not found",
|
||||
)
|
||||
if renewal_status != "renewed":
|
||||
if renewal.status != "renewed":
|
||||
return _stale_lease_conflict("assignment lease is stale or expired")
|
||||
return LeaseRenewalResponse(
|
||||
status="renewed",
|
||||
lease_expires_at=lease_expires_at,
|
||||
cancel_requested=renewal.cancel_requested,
|
||||
)
|
||||
|
||||
@router.post(
|
||||
|
||||
@@ -95,6 +95,7 @@ class LeaseRenewalRequest(BaseModel):
|
||||
class LeaseRenewalResponse(BaseModel):
|
||||
status: Literal["renewed"]
|
||||
lease_expires_at: datetime
|
||||
cancel_requested: bool = False
|
||||
|
||||
|
||||
class TerminalResultRequest(BaseModel):
|
||||
@@ -102,7 +103,7 @@ class TerminalResultRequest(BaseModel):
|
||||
task_id: str = Field(min_length=1)
|
||||
attempt: int = Field(ge=1)
|
||||
lease_id: str = Field(min_length=1)
|
||||
status: Literal["done", "failed"]
|
||||
status: Literal["done", "failed", "cancelled"]
|
||||
failure_reason: str | None = None
|
||||
result: dict[str, Any] | None = None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user