Add per-task image and video cancellation with confirmed worker receipts
This commit is contained in:
+14
-4
@@ -458,6 +458,16 @@ def create_app(config):
|
||||
async def edit_image(request: Request):
|
||||
return await submit_image(await parse_image_edit(request))
|
||||
|
||||
@app.post("/v1/images/task/{jid}/cancel", dependencies=[Depends(auth)])
|
||||
async def cancel_image(jid: str):
|
||||
with closing(sqlite3.connect(db_path)) as db:
|
||||
found = db.execute("SELECT 1 FROM image_jobs WHERE id=?", (jid,)).fetchone()
|
||||
if not found:
|
||||
raise HTTPException(404, "Unknown image task")
|
||||
result = await upstream("POST", "/v1/jobs/" + quote(jid, safe="") + "/cancel", {})
|
||||
return {"task": {"id": jid, "status": result.get("status", "running"),
|
||||
"cancelRequested": result.get("cancelRequested", False)}}
|
||||
|
||||
@app.get("/v1/images/task/{jid}", dependencies=[Depends(auth)])
|
||||
async def poll_image(jid: str):
|
||||
with closing(sqlite3.connect(db_path)) as db:
|
||||
@@ -467,17 +477,17 @@ def create_app(config):
|
||||
result = await upstream("GET", "/v1/huobao/jobs/" + quote(jid, safe=""))
|
||||
state = result.get("status", "running")
|
||||
if state in {"failed", "cancelled"}:
|
||||
return {"status": "failed", "error": {"message": str(result.get("error") or "Image generation failed")[:600]}}
|
||||
return {"task_id": jid, "status": "failed", "cancelled": state == "cancelled", "error": {"message": str(result.get("error") or "Image generation failed")[:600]}}
|
||||
if state != "succeeded":
|
||||
return {"status": "processing", "provider_id": result.get("providerId"), "worker_state": result.get("worker_state"), "queue_position": result.get("queue_position")}
|
||||
return {"task_id": jid, "status": "processing", "provider_id": result.get("providerId"), "worker_state": result.get("worker_state"), "queue_position": result.get("queue_position")}
|
||||
output = next((o for o in result.get("outputs", []) if o.get("kind") == "image"), None)
|
||||
if output is None:
|
||||
return {"status": "failed", "error": {"message": "Task completed without an image output"}}
|
||||
return {"task_id": jid, "status": "failed", "error": {"message": "Task completed without an image output"}}
|
||||
index, expiry = int(output["index"]), int(time.time()) + 86400
|
||||
extension = {"image/png": "png", "image/jpeg": "jpg", "image/webp": "webp"}.get(output.get("mimeType"), "png")
|
||||
# Huobao determines the saved extension from the URL, not Content-Type.
|
||||
url = f"{config['public_url']}/media/{quote(jid, safe='')}/{index}/image.{extension}?expires={expiry}&sig={signature(jid, index, expiry)}"
|
||||
return {"status": "completed", "image_url": url, "data": [{"url": url}], "provider_id": result.get("providerId")}
|
||||
return {"task_id": jid, "status": "completed", "image_url": url, "data": [{"url": url}], "provider_id": result.get("providerId")}
|
||||
|
||||
@app.post("/v2/video_generation/validate", dependencies=[Depends(auth)])
|
||||
async def validate_video(body: dict):
|
||||
|
||||
@@ -31,7 +31,7 @@ for directory in ('prompts', 'skills'):
|
||||
shutil.copytree(root/'huobao-source/backend/workspace'/directory,
|
||||
stage/'resources/workspace-template'/directory,dirs_exist_ok=True)
|
||||
manifest={'upstream_version':'4.0.11','source_commit':'b48e6b2312166e25b1ff141832d2e82e5d63c142',
|
||||
'custom_features':['persistent-data','local-video-pool','multi-gpu-images','vdn-hd-versions','per-model-gpu-selection','fixed-gpu-models','cancel-and-regenerate','per-shot-routing','direct-comfy-panels','confirmed-worker-labels','asset-image-references','durable-local-task-tracking','cross-episode-continuity','tail-frame-dependency-queue','storyboard-timeline-validation','gpu-replacement-inline-references','comfy-live-progress-and-estimates'],
|
||||
'custom_features':['persistent-data','local-video-pool','multi-gpu-images','vdn-hd-versions','per-model-gpu-selection','fixed-gpu-models','cancel-and-regenerate','per-shot-routing','direct-comfy-panels','confirmed-worker-labels','asset-image-references','durable-local-task-tracking','cross-episode-continuity','tail-frame-dependency-queue','storyboard-timeline-validation','gpu-replacement-inline-references','comfy-live-progress-and-estimates','per-task-image-video-cancel'],
|
||||
'archive_sha256':hashlib.sha256(archive.read_bytes()).hexdigest()}
|
||||
(stage/'resources/huobao-local-build.json').write_text(json.dumps(manifest,indent=2))
|
||||
print('Staged 4.0.11 with persistent data and VDN HD:',manifest['archive_sha256'])
|
||||
|
||||
@@ -12,6 +12,28 @@ from bridge import VIDEO_MODELS, create_app, h3_request, video_workflows
|
||||
|
||||
|
||||
class BridgeTests(unittest.TestCase):
|
||||
def test_cancel_image_is_authenticated_owned_and_exact(self):
|
||||
self.assertEqual(self.client.post('/v1/images/task/unknown/cancel').status_code,401)
|
||||
self.assertEqual(self.client.post('/v1/images/task/unknown/cancel',headers=self.headers).status_code,404)
|
||||
video=self.client.post('/v2/video_generation',json=self.payload(),headers=self.headers).json()['task_id']
|
||||
self.assertEqual(self.client.post('/v1/images/task/'+video+'/cancel',headers=self.headers).status_code,404)
|
||||
jid=self.client.post('/v1/images/generations',json=self.image_payload(),headers=self.headers).json()['task_id']
|
||||
self.image_status='cancelled'
|
||||
result=self.client.post('/v1/images/task/'+jid+'/cancel',headers=self.headers)
|
||||
self.assertEqual(result.status_code,200)
|
||||
self.assertEqual(result.json()['task'],{'id':jid,'status':'cancelled','cancelRequested':False})
|
||||
calls=[r for r in self.calls if r.url.path.endswith('/cancel')]
|
||||
self.assertEqual([r.url.path for r in calls],['/v1/jobs/'+jid+'/cancel'])
|
||||
polled=self.client.get('/v1/images/task/'+jid,headers=self.headers).json()
|
||||
self.assertTrue(polled['cancelled']);self.assertEqual(polled['task_id'],jid)
|
||||
|
||||
def test_completed_image_is_not_reported_cancelled(self):
|
||||
jid=self.client.post('/v1/images/generations',json=self.image_payload(),headers=self.headers).json()['task_id']
|
||||
self.image_status='succeeded'
|
||||
result=self.client.post('/v1/images/task/'+jid+'/cancel',headers=self.headers).json()
|
||||
self.assertEqual(result['task']['status'],'succeeded')
|
||||
polled=self.client.get('/v1/images/task/'+jid,headers=self.headers).json()
|
||||
self.assertEqual(polled['status'],'completed');self.assertEqual(polled['task_id'],jid)
|
||||
def test_local_worker_state_is_forwarded_without_claiming_failure(self):
|
||||
video=self.client.post('/v2/video_generation',json=self.payload(),headers=self.headers).json()['task_id']
|
||||
self.client.post('/v1/images/generations',json=self.image_payload(),headers=self.headers)
|
||||
@@ -127,7 +149,7 @@ class BridgeTests(unittest.TestCase):
|
||||
if data["workflow_key"] == "qwen_image_2_1":
|
||||
return httpx.Response(200, json={"id": "image-job"+suffix, "status": "submitted", "providerId": worker})
|
||||
return httpx.Response(200, json={"id": "test-job"+suffix, "status": "submitted", "providerId": worker})
|
||||
if request.url.path == "/v1/huobao/jobs/image-job":
|
||||
if request.url.path in ("/v1/huobao/jobs/image-job", "/v1/jobs/image-job/cancel"):
|
||||
return httpx.Response(200, json={"status": self.image_status, "error": "image sampler failed", "outputs": self.image_outputs, "providerId": "gpu3", "worker_state":getattr(self,'worker_state','running')})
|
||||
if request.url.path == "/v1/jobs/image-job/outputs/0":
|
||||
return httpx.Response(200, content=b"test-image-bytes", headers={"content-type": "image/png"})
|
||||
|
||||
Reference in New Issue
Block a user