From b68431828c01203f79224656faf3f16ac9d49e9c Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Mon, 25 Aug 2025 15:36:15 +0800 Subject: [PATCH] 'commit' --- dsLightRag/Routes/MjRoute.py | 37 +- .../__pycache__/MjRoute.cpython-310.pyc | Bin 4059 -> 4010 bytes dsLightRag/static/Midjourney/mj.html | 1528 +++++++++-------- 3 files changed, 869 insertions(+), 696 deletions(-) diff --git a/dsLightRag/Routes/MjRoute.py b/dsLightRag/Routes/MjRoute.py index fbf4653b..c6bd6142 100644 --- a/dsLightRag/Routes/MjRoute.py +++ b/dsLightRag/Routes/MjRoute.py @@ -13,7 +13,7 @@ from Config import Config import asyncio import threading from fastapi.responses import StreamingResponse - +from fastapi import APIRouter, Request, HTTPException, BackgroundTasks # 创建路由路由器 router = APIRouter(prefix="/api/mj", tags=["文生图"]) @@ -144,24 +144,21 @@ async def submit_imagine(request: ImagineRequest, background_tasks: BackgroundTa raise HTTPException(status_code=500, detail=f"提交文生图请求失败: {str(e)}") -@router.get("/task_status", response_model=TaskStatusResponse) -async def get_task_status(task_id: str = Query(..., description="任务ID")): - """ - 查询文生图任务状态 +# 在文件顶部确保已定义任务状态缓存 +task_status_cache = {} +@router.get("/task_status") +async def get_task_status(task_id: str): + if not task_id: + raise HTTPException(status_code=400, detail="task_id 参数缺失") - Args: - task_id: 任务ID - - Returns: - 任务状态信息 - """ - if task_id not in TASK_STATUS: + # 将所有 task_status_store 替换为 task_status_cache + if task_id not in task_status_cache: raise HTTPException(status_code=404, detail="任务ID不存在") - - return TaskStatusResponse( - task_id=task_id, - status=TASK_STATUS[task_id]["status"], - image_url=TASK_STATUS[task_id]["image_url"], - progress=TASK_STATUS[task_id]["progress"], - error=TASK_STATUS[task_id]["error"] - ) + + return { + "task_id": task_id, + "status": task_status_cache[task_id]["status"], + "progress": task_status_cache[task_id]["progress"] , + "result": task_status_cache[task_id]["result"], + "error": task_status_cache[task_id]["error"] + } diff --git a/dsLightRag/Routes/__pycache__/MjRoute.cpython-310.pyc b/dsLightRag/Routes/__pycache__/MjRoute.cpython-310.pyc index 3ffd6196785c36ed2d086f6c59b3271c6d14134f..5305056860cfd98ff616df316561a0bd8e523bc3 100644 GIT binary patch delta 1288 zcmZuw&2Q665ck@S<2a6!(DWl8O_~6u5eE)H-#Zi#Qq_tlct{{2x}6=4nCNc2ROtsTaj%a-&e! zc?>EF<0sg;F7pF!fW}P#VW^+Shfq_|L0|R2ngj8v!i%_F6lHCCGz%iCKE_yzNirly zcvhUz{_72++X%ua!WcpxVFCe<;Gw3hO2>50XCTDBtAL`w%N5dH6KE4k__an#~X2geN-iYog9D8#9S2W31;X~Eqd?#*9 zB1BnHItUON!7^tJ$`9bq_rA)O&WVfmq23%=F4%j5hJR+k4;n$&muD;z*#G*WjG11; z@=pO=C6^RG5h#>Um1^ti8t4HzPxuh*=`{9z?~(%aH1c4TQv91_Mp6&V30T&n7|=2K zyLShYb&+B6MjoB$-(Gun|JnOjFZz%F<%hxG-9s0o+}6vN{ac$yX1D%d@BjU<|L6&q zPgeyKpFzML)nidper8g6597;&kXDWQJ01A~fh%a0=LMZn7pkU*A(ObE>xn3V1+ jI|z+cd^{N@O#G8Bj*JmUwX~9!(K1HP%n^OXgvtH_zH<^- delta 1282 zcmZuw&1)1%6z}Tpnd#~IOfvbHOi$9|CxfD**$5%~rO_zJ9@dM_C5)-c*qWJ%)zuz$ zg%}gqB`^!2mId+PW25hCgU0~-r7&D|2MFf^~euvM;4jC{0Zo(*{k`%!)xXtY_J(`LNH@9PD#?Utz@?`)FQ!j-VIq>6o;a`LvJa=4@J^ z{VVn|sqF{5BM0aJtDphP(m^^ziyd>0&|wCSv_!p?7#JR; z?V^bcRY@+TO43X{A!WIdn))6cl^sO^RWZadehM^v3_(-HD>>GP%7)RkW*}yQX1x)# z*r!LxvGk$o(`cl#5(lZ8;0I7~5TQ#6rLO^0TwLd@PWdEiKBrJ;@0?suf4g`NPJT)s z7xnPwOepFi3XetjVVlpNzgu0uI8`MoMOiq@g9Q<^Tl#`o0tVXyDq#pXKDde48yTsyJ^) z0%|r1S6;D diff --git a/dsLightRag/static/Midjourney/mj.html b/dsLightRag/static/Midjourney/mj.html index e9d0df9a..d984e6ed 100644 --- a/dsLightRag/static/Midjourney/mj.html +++ b/dsLightRag/static/Midjourney/mj.html @@ -7,7 +7,7 @@ - + + + // 添加历史记录项点击事件 + document.querySelectorAll('.view-history-item').forEach(button => { + button.addEventListener('click', function () { + const imageUrl = this.getAttribute('data-image-url'); + // 显示结果区域 + const resultSection = document.getElementById('resultSection'); + resultSection.classList.remove('hidden'); + // 设置结果图像 + const resultImage = document.getElementById('resultImage'); + resultImage.src = imageUrl; + }); + }); + + // 初始化历史记录网格 + updateHistoryGrid(); + } + + + + \ No newline at end of file