Update app.py

app.py

@@ -459,13 +459,12 @@ def execute_workflow(workflow: dict[str, Any]) -> list[str]:
     import sys
     global _timing_store, _terminal_html
     
-    # 👇 核心大招：自己实现一个超级强劲的拦截器
+    # 不用劫持了
     class CustomTqdm(tqdm.std.tqdm):
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
-            # 只要它是 KSampler 的进度条（总步数大于 1），且 T1 还没记录，立刻打点
             if not "T1" in _timing_store and self.total and self.total > 1:
-                _timing_store["T1"] = time.time()
+                _timing_store["T1"] = time.time() # 如果抓到了最好，抓不到就算了
                 _terminal_html = ""
                 _append_log("SYS ", "blue", "🎨 Running KSampler... (Elapsed: 0s)")
 
@@ -485,16 +484,9 @@ def execute_workflow(workflow: dict[str, Any]) -> list[str]:
         prompt_id = str(uuid.uuid4())
         save_id = next(k for k, v in workflow.items() if v.get("class_type") == "SaveImage")
 
-        # 记录开始
-        comfy_start = time.time()
         executor.execute(workflow, prompt_id, extra_data={}, execute_outputs=[save_id])
         
         _timing_store["T2"] = time.time()
-        _timing_store["comfy_total"] = _timing_store["T2"] - comfy_start
-
-        # 兜底：如果拦截器没抓到 T1
-        if "T1" not in _timing_store:
-            _timing_store["T1"] = _timing_store["T2"] - _timing_store["comfy_total"]
 
         if not executor.success:
             message = executor.status_messages[-1] if executor.status_messages else "ComfyUI execution failed"
@@ -629,27 +621,27 @@ def generate_workflow(
         # 执行（阻塞）
         final_images = execute_workflow(workflow)
 
-        # 执行结束，补上 T2
-        _timing_store["T2"] = time.time()
-
-        # 👇 重点：如果 T1 没有被拦截器抓取，说明拦截失效了
-        # 我们用总时间减去真实跑图时间来反推
-
+        # 强制刷新出最后一帧日志
         yield None, _terminal_html, gr.update()
 
+        # 计算各项耗时
         dl_time = _timing_store.get("download_end", _timing_store["T0"]) - _timing_store["T0"]
-        load_time = _timing_store["T1"] - _timing_store.get("load_start", _timing_store["T1"])
-        pure_compute = _timing_store["T2"] - _timing_store["T1"]
-        total_time = _timing_store["T2"] - _timing_store["T0"]
+        total_time = _timing_store.get("T2", time.time()) - _timing_store["T0"]
 
         _append_log("DONE", "green", "Generation successful!")
         _append_log("----", "normal", "----------------------------------------")
         _append_log("METR", "blue", "📊 [Timing Metrics]")
         
         _append_log("METR", "normal", f"    ⬇️ Resource Download: {dl_time:.2f}s")
-        _append_log("METR", "normal", f"    📦 Model Loading & Prep: {load_time:.2f}s")
-        _append_log("METR", "normal", f"    🎨 Pure Compute (Sampler & Decode): {pure_compute:.2f}s")
         _append_log("METR", "normal", f"    ⏱️ Total Time (Post-GPU): {total_time:.2f}s")
+        
+        # 如果你能抓到 T1，那就把纯算图加上，抓不到就只显示总时间
+        if "T1" in _timing_store and "T2" in _timing_store:
+            pure_compute = _timing_store["T2"] - _timing_store["T1"]
+            load_time = _timing_store["T1"] - _timing_store.get("load_start", _timing_store["T1"])
+            _append_log("METR", "normal", f"    📦 Model Loading & Prep: {load_time:.2f}s")
+            _append_log("METR", "normal", f"    🎨 Pure Compute: {pure_compute:.2f}s")
+
         _append_log("----", "normal", "----------------------------------------")
         
         # 👇 最终出图并恢复按钮