From 9c4ec38182ceec70ae1b4b141fc19b3c2dfd0436 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Thu, 21 Aug 2025 15:06:32 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/Routes/SunoRoute.py                |  82 +++++++++---------
 .../__pycache__/SunoRoute.cpython-310.pyc     | Bin 6168 -> 6194 bytes
 dsLightRag/static/Suno/music_progress.html    |  54 ++++++++----
 3 files changed, 81 insertions(+), 55 deletions(-)

diff --git a/dsLightRag/Routes/SunoRoute.py b/dsLightRag/Routes/SunoRoute.py
index 64dde133..3437c267 100644
--- a/dsLightRag/Routes/SunoRoute.py
+++ b/dsLightRag/Routes/SunoRoute.py
@@ -203,51 +203,53 @@ async def check_task_status(task_id: str = Query(..., description="音乐生成
                         task_info["audio_url"] = audio_url
                         logger.info("音乐生成已完成!")
                         logger.info(f"音频URL: {audio_url}")
-                        
-                        # 新增：下载音频文件并上传到OBS
-                        try:
-                            # 使用UUID生成唯一文件名
-                            unique_id = uuid.uuid4()
-                            object_key = f"HuangHai/JiMeng/{unique_id}.mp3"
+                         
+                        # 新增：检查是否已经上传到OBS
+                        if "obs_url" not in task_info or not task_info["obs_url"]:
+                            # 新增：下载音频文件并上传到OBS
+                            try:
+                                # 使用UUID生成唯一文件名
+                                unique_id = uuid.uuid4()
+                                object_key = f"HuangHai/JiMeng/{unique_id}.mp3"
 
-                            # 临时文件保存路径
-                            temp_file_path = os.path.join(os.path.dirname(__file__), f"{unique_id}.mp3")
+                                # 临时文件保存路径
+                                temp_file_path = os.path.join(os.path.dirname(__file__), f"{unique_id}.mp3")
 
-                            # 下载URL内容到临时文件
-                            logger.info(f"开始下载URL内容: {audio_url}")
-                            with requests.get(audio_url, stream=True, timeout=3600) as r:
-                                r.raise_for_status()
-                                with open(temp_file_path, 'wb') as f:
-                                    for chunk in r.iter_content(chunk_size=8192):
-                                        f.write(chunk)
-                            logger.info(f"URL内容下载完成，保存至: {temp_file_path}")
+                                # 下载URL内容到临时文件
+                                logger.info(f"开始下载URL内容: {audio_url}")
+                                with requests.get(audio_url, stream=True, timeout=3600) as r:
+                                    r.raise_for_status()
+                                    with open(temp_file_path, 'wb') as f:
+                                        for chunk in r.iter_content(chunk_size=8192):
+                                            f.write(chunk)
+                                logger.info(f"URL内容下载完成，保存至: {temp_file_path}")
 
-                            # 上传文件到OBS
-                            from Util.ObsUtil import ObsUploader  # 导入ObsUploader
-                            obs_uploader = ObsUploader()
-                            logger.info(f"开始上传文件到OBS: {temp_file_path}\n对象键: {object_key}")
+                                # 上传文件到OBS
+                                from Util.ObsUtil import ObsUploader  # 导入ObsUploader
+                                obs_uploader = ObsUploader()
+                                logger.info(f"开始上传文件到OBS: {temp_file_path}\n对象键: {object_key}")
 
-                            # 正确处理元组返回值
-                            success, response_info = obs_uploader.upload_file(
-                                file_path=temp_file_path,
-                                object_key=object_key
-                            )
+                                # 正确处理元组返回值
+                                success, response_info = obs_uploader.upload_file(
+                                    file_path=temp_file_path,
+                                    object_key=object_key
+                                )
 
-                            if success:
-                                # 构造OBS URL
-                                from Config.Config import OBS_SERVER, OBS_BUCKET
-                                obs_url = f"https://{OBS_BUCKET}.{OBS_SERVER}/{object_key}"
-                                logger.info(f"文件上传成功，OBS URL: {obs_url}")
-                                task_info["obs_url"] = obs_url
-                                task_info["object_key"] = object_key
-                            else:
-                                error_msg = f"上传失败: {str(response_info)}"
-                                logger.error(error_msg)
-                        finally:
-                            # 清理临时文件
-                            if os.path.exists(temp_file_path):
-                                os.remove(temp_file_path)
-                                logger.info(f"临时文件已删除: {temp_file_path}")
+                                if success:
+                                    # 构造OBS URL
+                                    from Config.Config import OBS_SERVER, OBS_BUCKET
+                                    obs_url = f"https://{OBS_BUCKET}.{OBS_SERVER}/{object_key}"
+                                    logger.info(f"文件上传成功，OBS URL: {obs_url}")
+                                    task_info["obs_url"] = obs_url
+                                    task_info["object_key"] = object_key
+                                else:
+                                    error_msg = f"上传失败: {str(response_info)}"
+                                    logger.error(error_msg)
+                            finally:
+                                # 清理临时文件
+                                if os.path.exists(temp_file_path):
+                                    os.remove(temp_file_path)
+                                    logger.info(f"临时文件已删除: {temp_file_path}")
                         # 新增结束
 
                     else:
diff --git a/dsLightRag/Routes/__pycache__/SunoRoute.cpython-310.pyc b/dsLightRag/Routes/__pycache__/SunoRoute.cpython-310.pyc
index b4462c6fe34c00d8c7e69090c750e0833988ffef..46b5d8ce3a20a06dba7fe50388a019df053b7b13 100644
GIT binary patch
delta 696
zcmZvaPiPZC6vpRGLgMDn=Fje?*`{e~+Eh(blP0!;7SXDRK}*$x2rX8fgT^F<ZQ7!|
z)k6-RN&^E@XbV{oZz47bp7h|+i+J$hB`5D*swdIejYSX6Faz^@-@N(wn9ag&L0$?5
zeMF4Y@1Nh@8-FF2B&hNksR+}Z6-ff=3<l1T7A)-WC%z5uPYk!f_`#F@;wVcatU?Qx
zLkKLb3(@lThaVf!wqg-8!iF)jMc4?x<=4-T>`;rEN`tmtEQ8@KBF+G$Ays@BW~1y7
zJG}1Nm@rjT+kT6PN*on-q)9jWObykF&a!Nbzw>L4FJ31s=O%8_bOEVL6ZWeMYoeDu
zZ;17udhOr3<6#_?eGlv?%U2V%0kaPX_BDwacN7I%!6q;&bZ*-##w$rwW--c&>vW!)
zy4jDq$l|SNP^u2rQf8tyWDWpf$8bPgoy3ILr<?{JGwC!vj>-LJF=>a!tw0I7{8ykq
zT+cVuiq;-R#S)nsdjbx|>$aH;J82uJM^R?e_i2k7AzlhjUPxiM4lF0=phL3=Z68Zp
z@Q3!alMX%Aqikl|!_IEIs1wvRCoKLlsCjeDnfyaghgJSHn2+Sl)T7iIxJe^W$+qZ&
zr#vI)Lx1U*V6XWdIS;uGmt`t_@h;t7zPVylJ65;^)R^Pl$R{XwcB4&zSw5u>d9H|m
zW?bd->Nl9<m$iceFKJnS58Jgef2N&)1H7x<bE_^&c{z5;O+N<;d^47Gz3?q|-ozH+
EH;N*;<p2Nx

delta 754
zcmZvaO-vI(6vyXHH-+79*LJttQc5ZErFN0FRKNi76AvaR8i>Y3)W96HK#65ZgPD;-
zV@x!J#<`dflJ;Vv7X$U=Nj!NpBwoCEG<q;5Tr?)mZXtMZU*=<f|M!)b*-Af8YYTqA
zg2eY^`^DYuo=q()!!>?R?t@HiNtQt#pz0_p!_+hWSXpcMNdsjleCKgr-{l7%ZM|Yt
z5et%b8eB)DW5dIAJCrjk4elPcBURW_a1}Gd#uX3gq=9v`fvW(>mU9XXkS@|qj_^&N
zv2wJ8*CNcMp<I+4Bgs`5MN^F|OwCF&4LcEKxPSUOB9??CRPq4I%NfBICyGLI?1otX
z(P#eE-7b2lvEKzbPI~8J^DQj00*FRRh&8z`DaVDRsV*EPr#NlO#i>Dcl3B$!F^jTh
z8Wq!cBNFt@wazD4Y`%@P03uo1A|g-FnArQ>crS~)IR|KbzbuVYAcG@_>f$^(g7PZi
z@6~Sj#J{Ss^S$l_JE&0wQR15&s&qPcF*9d|LkHa#QPE*tWY|&jI@QR?EH2}M#4q~$
zvmqMD1F-~cb!mb^MInP#*rRpdq)SiLDc|%PaciPpY1GL|&XBVdkqgAC8~@^u!Yu#o
zPX#TOc$g@HglsjJEaT;;d{|2zI-r(dulTZ-0;~2?({SxwAPc_F4GYtYx0ecYg>k+c
z+=0p32fYMviI0WayjR3)EL`P<&<_~rGv;A|ADKyC9Xr}2e`^kb#COem7<>41c&uIZ
fDp-L4G<vWH1IA*Bzpyarm-@&1TDeu*3EzRgi{ix}

diff --git a/dsLightRag/static/Suno/music_progress.html b/dsLightRag/static/Suno/music_progress.html
index 91d3fc03..0a91ee28 100644
--- a/dsLightRag/static/Suno/music_progress.html
+++ b/dsLightRag/static/Suno/music_progress.html
@@ -22,6 +22,8 @@
         .audio-player { width: 100%; margin-top: 20px; }
         .back-button { display: block; margin: 30px auto 0; padding: 12px 30px; background-color: #3498db; color: white; border: none; border-radius: 6px; cursor: pointer; font-size: 16px; transition: background 0.3s; text-align: center; text-decoration: none; max-width: 200px; }
         .back-button:hover { background-color: #2980b9; }
+        /* 添加按钮容器样式 */
+        .button-container { display: flex; justify-content: center; gap: 15px; margin-top: 30px; }
     </style>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
 </head>
@@ -49,7 +51,9 @@
             </audio>
         </div>
 
-        <a href="index.html" class="back-button"><i class="fas fa-arrow-left"></i> 返回创作页</a>
+        <div class="button-container">
+            <a href="index.html" class="action-button back-button"><i class="fas fa-arrow-left"></i> 返回创作页</a>
+        </div>
     </div>
 
     <script>
@@ -63,14 +67,26 @@
                 return;
             }
 
-            // 轮询任务状态
-            let progressInterval;
+            // 轮询任务状态配置
+            const queryInterval = 3000;  // 3秒查询一次
+            const maxQueries = 120;      // 最多查询120次（6分钟）
+            let queryCount = 0;          // 当前查询次数
+            const startTime = new Date().getTime();  // 开始时间
             let progress = 0;
+            let timerId = null;  // 用于存储setTimeout的ID
 
             function checkTaskStatus() {
+                if (queryCount >= maxQueries) {
+                    const elapsedTime = Math.round((new Date().getTime() - startTime) / 1000);
+                    document.getElementById('statusMessage').innerHTML = `<i class="fas fa-exclamation-circle"></i> 音乐生成超时（已等待${elapsedTime}秒），您可以稍后在历史记录中查看，或重新生成。`;
+                    document.getElementById('progressText').textContent = '生成超时';
+                    return;
+                }
+
                 fetch(`/api/suno/check_task_status?task_id=${taskId}`)
                     .then(response => response.json())
                     .then(data => {
+                        queryCount++;
                         // 更新状态信息
                         const statusMessage = document.getElementById('statusMessage');
                         const progressFill = document.getElementById('progressFill');
@@ -80,7 +96,6 @@
                         const responseData = data.data || data;
 
                         if (responseData.status === 'error') {
-                            clearInterval(progressInterval);
                             statusMessage.innerHTML = `<i class="fas fa-exclamation-circle"></i> 生成失败: ${responseData.error || responseData.error_message || '未知错误'}`;
                             statusMessage.style.backgroundColor = '#ffebee';
                             statusMessage.style.borderColor = '#ef9a9a';
@@ -94,21 +109,22 @@
                             progress = Math.min(responseData.progress, 100);
                         } else if (responseData.status === 'completed') {
                             progress = 100;
-                        } else if (responseData.status === 'processing') {
-                            // 改进模拟进度增加逻辑
-                            if (progress < 95) {
-                                progress += 0.5;
-                            } else if (progress < 100) {
-                                progress += 0.1;
-                            }
+                        } else {
+                            // 扩展：任何非完成/非错误状态都更新模拟进度
+                            // 计算进度比例 (查询次数/最大查询次数)，限制在98%以内
+                            const progressRatio = Math.min(0.98, queryCount / maxQueries);
+                            // 使用平滑增长函数而不是线性增长
+                            progress = 100 * (1 - Math.exp(-3 * progressRatio));
                         }
 
+                        // 计算已等待时间
+                        const elapsedTime = Math.round((new Date().getTime() - startTime) / 1000);
                         progressFill.style.width = `${progress}%`;
                         progressText.textContent = `${Math.round(progress)}%`;
+                        statusMessage.innerHTML += ` (已等待${elapsedTime}秒)`;
 
                         // 任务完成
                         if (responseData.status === 'completed') {
-                            clearInterval(progressInterval);
                             statusMessage.innerHTML = '<i class="fas fa-check-circle"></i> 音乐生成完成！';
                             statusMessage.style.backgroundColor = '#e8f5e9';
                             statusMessage.style.borderColor = '#a5d6a7';
@@ -122,18 +138,26 @@
                             const audioSource = document.getElementById('audioSource');
                             audioSource.src = responseData.audio_url || '';
                             document.getElementById('audioPlayer').load();
+
+                            // 清除定时器，确保不会有更多请求
+                            if (timerId) {
+                                clearTimeout(timerId);
+                                timerId = null;
+                            }
+                        } else {
+                            // 继续查询
+                            timerId = setTimeout(checkTaskStatus, queryInterval);
                         }
                     })
                     .catch(error => {
                         console.error('检查任务状态失败:', error);
+                        // 出现错误时也继续查询
+                        timerId = setTimeout(checkTaskStatus, queryInterval);
                     });
             }
 
             // 立即检查一次
             checkTaskStatus();
-
-            // 然后每3秒检查一次
-            progressInterval = setInterval(checkTaskStatus, 3000);
         });
     </script>
 </body>