Update app.py

app.py

@@ -437,7 +437,7 @@ class UnifiedProgressTqdm(tqdm_lib.tqdm):
     # ==========================================================================
 def execute_workflow(workflow: dict[str, Any]) -> list[str]:
     import tqdm.std
-    global _timing_store
+    global _timing_store, _terminal_html
     original_tqdm = tqdm.std.tqdm
     tqdm.std.tqdm = UnifiedProgressTqdm
     
@@ -454,6 +454,7 @@ 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")
 
+        # 直接调用，删掉不存在的 on_node_start
         executor.execute(workflow, prompt_id, extra_data={}, execute_outputs=[save_id])
         
         _timing_store["T2"] = time.time()
@@ -514,8 +515,6 @@ def generate_workflow(
     *lora_states,
 ):
     global _terminal_html, _last_used_engine, _last_used_unet, _timing_store
-    global _workflow_done, _workflow_error, _workflow_result
-
     _terminal_html = "" 
     _timing_store = {}
     
@@ -534,13 +533,16 @@ def generate_workflow(
             yield None, _terminal_html
             _last_used_engine = engine
             _last_used_unet = unet_name
+            load_hint = "Initializing heavy weights (approx. 15-20s)..."
         elif _last_used_unet != unet_name:
             _append_log("SYS ", "orange", "Swapping UNet weights...")
             yield None, _terminal_html
             _last_used_unet = unet_name
+            load_hint = "Swapping model checkpoint (approx. 5-10s)..."
         else:
             _append_log("SYS ", "green", "Base model cached. Fast inference.")
             yield None, _terminal_html
+            load_hint = "Model cached. Warming up (approx. 1-2s)..."
 
         _timing_store["T0"] = time.time()
 
@@ -581,35 +583,25 @@ def generate_workflow(
         # 初始化 loading 状态
         _timing_store["phase"] = "loading"
         _timing_store["load_start"] = time.time()
-        _timing_store["last_elapsed"] = 0
-        _append_log("SYS ", "blue", "📦 Loading tensors to VRAM... (Elapsed: 0s)")
+        _append_log("SYS ", "blue", f"📦 Loading tensors to VRAM... {load_hint}")
         yield None, _terminal_html
 
         # ==========================================
-        # 🌟 终极方案：用原生 Threading 异步执行，主线程死循环 yield
+        # 🌟 核心：直接同步执行，放弃后台线程
         # ==========================================
-        _workflow_done = False
-        _workflow_error = None
-        _workflow_result = None
-
-        t = threading.Thread(target=_run_comfy_background, args=(workflow,))
-        t.daemon = True
-        t.start()
-
-        # 🌟 主线程以 0.5 秒的间隔疯狂往外吐状态，绝不卡死
-        while not _workflow_done:
-            time.sleep(0.5)
-            yield None, _terminal_html
-
-        # 检查后台线程是否有报错
-        if _workflow_error:
-            raise RuntimeError(_workflow_error)
+        
+        # 执行（阻塞）
+        final_images = execute_workflow(workflow)
 
-        final_images = _workflow_result
+        # 执行结束，补上 T2
+        _timing_store["T2"] = time.time()
 
+        # 如果 T1 没有被拦截器覆盖，就说明秒出图
         if "T1" not in _timing_store:
-            _timing_store["T1"] = _timing_store["T2"] - 0.1 
-            _append_log("SYS ", "blue", "🎨 Running KSampler... (Elapsed: 0s)")
+            _timing_store["T1"] = _timing_store["T2"] - 0.1
+
+        _append_log("SYS ", "blue", "🎨 Running KSampler... (Elapsed: 0s)")  # 补一行视觉
+        yield None, _terminal_html
 
         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"])
@@ -1232,11 +1224,7 @@ a:hover { opacity: 0.8 !important; text-decoration: underline !important; }
     flex-wrap: nowrap !important;
     width: 100% !important;
 }
-/* ========================================= */
-/* 去掉图片输出区域gradio output标签 */
-.column:nth-child(2) .html-container {
-    padding: 0 0 var(--block-padding) 0 !important;
-}
+
 
 /* 强行破除 Gradio 默认的 1280/1536 宽度限制，让它永远占满全屏 */
 .fillable {
@@ -1244,20 +1232,16 @@ a:hover { opacity: 0.8 !important; text-decoration: underline !important; }
     width: 100% !important;
 }
 
-/* 干掉右侧输出图片组件自带的标签栏和背景框 */
-.column:nth-child(3) .gr-image > .label-wrap,
-.column:nth-child(3) .gr-image > div:first-child {
+/* ========================================= */
+/* 去掉图片输出区域gradio output标签 */
+.column:nth-child(3) .gr-image > div:first-child,
+.column:nth-child(3) .gr-image .label-wrap,
+.column:nth-child(3) .gr-image [data-testid="block-label"],
+.column:nth-child(3) .gr-image span[data-testid="block-info"] {
     display: none !important;
+    opacity: 0 !important;
+    visibility: hidden !important;
 }
-
-/* 确保图片区域撑满��个组件 */
-.column:nth-child(3) .gr-image {
-    padding: 0 !important;
-    background: transparent !important;
-    border: none !important;
-    overflow: hidden !important;
-}
-
 /* ========================================= */
 /* 🖥️ 极简终端框样式 */
 .terminal-wrapper {
@@ -1273,26 +1257,31 @@ a:hover { opacity: 0.8 !important; text-decoration: underline !important; }
     margin-bottom: 12px;
     margin-top: 12px;
 }
-.terminal-content { color: #c9d1d9 !important; word-break: break-all !important; white-space: pre-wrap !important; }
-.terminal-content .t-green { color: #3fb950 !important; }
-.terminal-content .t-blue { color: #58a6ff !important; }
-.terminal-content .t-orange { color: #d29922 !important; }
-/* 把终端框的滚动条换成细细的半透明样式 */
+
+/* 👇 关键：默认完全隐藏滚动条，不占位置 */
 .terminal-wrapper::-webkit-scrollbar { 
-    width: 6px !important; 
+    width: 0px !important; 
     background: transparent !important; 
 }
 
-.terminal-wrapper::-webkit-scrollbar-thumb { 
-    background: rgba(150, 150, 150, 0.4) !important; /* 👈 删掉了那个多余的 f */
-    border-radius: 10px !important; 
+/* 👇 关键：只有当鼠标悬浮在终端上时，才显示 6px 的半透明滚动条 */
+.terminal-wrapper:hover::-webkit-scrollbar { 
+    width: 6px !important; 
 }
-
 .terminal-wrapper:hover::-webkit-scrollbar-thumb { 
-    background: rgba(150, 150, 150, 0.8) !important; /* 鼠标放上去时变亮，提示用户可以拖拽 */
+    background: rgba(150, 150, 150, 0.4) !important;
+    border-radius: 10px !important; 
+}
+.terminal-wrapper:hover::-webkit-scrollbar-thumb:hover { 
+    background: rgba(150, 150, 150, 0.8) !important; 
 }
 
-/* 扒掉终端内部的所有包裹层背景和边框 */
+.terminal-content { color: #c9d1d9 !important; word-break: break-all !important; white-space: pre-wrap !important; }
+.terminal-content .t-green { color: #3fb950 !important; }
+.terminal-content .t-blue { color: #58a6ff !important; }
+.terminal-content .t-orange { color: #d29922 !important; }
+
+/* 扒掉终端内部的所有包裹层背景和边框，并强制隐藏内部的滚动条 */
 .terminal-wrapper .prose,
 .terminal-wrapper .html-container,
 .terminal-wrapper > div {
@@ -1301,6 +1290,7 @@ a:hover { opacity: 0.8 !important; text-decoration: underline !important; }
     box-shadow: none !important;
     padding: 0 !important;
     margin: 0 !important;
+    overflow: hidden !important; /* 防止内部再弹出一个滚动条 */
 }
 """