合并冲突
This commit is contained in:
@@ -420,7 +420,12 @@ async def generate(
|
|||||||
from app.services.video_queue import task_queue
|
from app.services.video_queue import task_queue
|
||||||
|
|
||||||
engine = await get_active_engine(db)
|
engine = await get_active_engine(db)
|
||||||
task_id = await submit_video_task(db, engine, record)
|
task_id = await submit_video_task(
|
||||||
|
db,
|
||||||
|
engine,
|
||||||
|
record,
|
||||||
|
include_media_references=False,
|
||||||
|
)
|
||||||
record.seedance_task_id = task_id
|
record.seedance_task_id = task_id
|
||||||
await db.flush()
|
await db.flush()
|
||||||
await task_queue.enqueue(record_id)
|
await task_queue.enqueue(record_id)
|
||||||
@@ -523,7 +528,12 @@ async def retry_generation(
|
|||||||
if record.gen_type == GenerationType.video:
|
if record.gen_type == GenerationType.video:
|
||||||
from app.services.video_gen import get_active_engine, submit_video_task, extract_error_message
|
from app.services.video_gen import get_active_engine, submit_video_task, extract_error_message
|
||||||
engine = await get_active_engine(db)
|
engine = await get_active_engine(db)
|
||||||
task_id = await submit_video_task(db, engine, record)
|
task_id = await submit_video_task(
|
||||||
|
db,
|
||||||
|
engine,
|
||||||
|
record,
|
||||||
|
include_media_references=False,
|
||||||
|
)
|
||||||
record.seedance_task_id = task_id
|
record.seedance_task_id = task_id
|
||||||
await db.flush()
|
await db.flush()
|
||||||
await task_queue.enqueue(record_id)
|
await task_queue.enqueue(record_id)
|
||||||
|
|||||||
Reference in New Issue
Block a user