Update app.py

app.py

@@ -2,7 +2,7 @@
 # FILE: app.py
 # Description: Image-to-Video generation server with Gradio UI and FastAPI for Hugging Face Spaces
 # Version: 1.2.8
-# Timestamp: 2025-07-01 20:34 CDT
+# Timestamp: 2025-07-01 20:41 CDT
 # Author: Grok 3, built by xAI (based on GhostAI's ghostpack_gradio_f1.py)
 # NOTE: Optimized for Hugging Face Spaces with H200 GPU, 25 min/day render time
 #       Loads models from Hugging Face Hub to avoid HDD costs
@@ -623,7 +623,7 @@ async def stop_render(job_id: str, api_key: str = Depends(verify_api_key)):
     stream.stop()
     active_jobs.pop(job_id, None)
     job_status[job_id]["status"] = "stopped"
-    job_status[job_id]["progress"] = 0.0
+    job_status[jid]["progress"] = 0.0
     logger.info(f"Stopped job {job_id}")
     print(f"{yellow(f'Stopped job {job_id}')}")
     return JSONResponse(content={"message": f"Job {job_id} stopped"})
@@ -1024,4 +1024,357 @@ def process(img, prm, npr, sd, sec, win, stp, cfg, gsc, rsc, kee, tea, crf, disa
     yield None, None, "", "", gr.update(interactive=False), gr.update(interactive=True)
     stream = AsyncStream()
     jid = str(uuid.uuid4())
-    async_run(worker, img, prm, npr, sd, sec, win,
+    async_run(worker, img, prm, npr, sd, sec, win, stp, cfg, gsc, rsc, kee, tea, crf, disable_prompt_mods, link_steps_window, stream, jid)
+    out, log = None, ""
+    try:
+        while True:
+            flag, data = stream.output_queue.next()
+            if job_status.get(jid, {}).get("status") == "complete":
+                break
+            if flag == "file":
+                out = data
+                yield out, gr.update(), gr.update(), log, gr.update(interactive=False), gr.update(interactive=True)
+            if flag == "progress":
+                pv, desc, html = data
+                log = desc
+                yield gr.update(), gr.update(visible=True, value=pv), desc, html, gr.update(interactive=False), gr.update(interactive=True)
+            if flag == "complete":
+                yield data, gr.update(visible=False), "Generation complete", "", gr.update(interactive=True), gr.update(interactive=False)
+                break
+            if flag == "end":
+                yield out, gr.update(visible=False), f"Error: {data}", "", gr.update(interactive=True), gr.update(interactive=False)
+                break
+    except Exception as e:
+        logger.error(f"Process loop failed: {e}")
+        yield out, gr.update(visible=False), f"Error: {str(e)}", "", gr.update(interactive=True), gr.update(interactive=False)
+        job_status[jid]["status"] = "error"
+    finally:
+        clear_queue(stream.input_queue)
+        clear_queue(stream.output_queue)
+        torch.cuda.empty_cache()
+
+def end_process():
+    global stream
+    if stream:
+        stream.input_queue.push("end")
+        logger.info("Gradio: Render stop requested")
+        print(f"{red('Gradio: Render stop requested')}")
+
+# Gradio UI (same as original)
+quick_prompts = [
+    ["Smooth animation: A character waves for 3 seconds, then stands still for 2 seconds, static camera, silent."],
+    ["Smooth animation: A character moves for 5 seconds, static camera, silent."]
+]
+css = make_progress_bar_css() + """
+.orange-button{background:#ff6200;color:#fff;border-color:#ff6200;}
+.load-button{background:#4CAF50;color:#fff;border-color:#4CAF50;margin-left:10px;}
+.big-setting-button{background:#0066cc;color:#fff;border:none;padding:14px 24px;font-size:18px;width:100%;border-radius:6px;margin:8px 0;}
+.styled-dropdown{width:250px;padding:5px;border-radius:4px;}
+.viewer-column{width:100%;max-width:900px;margin:0 auto;}
+.media-preview img,.media-preview video{max-width:100%;height:380px;object-fit:contain;border:1px solid #444;border-radius:6px;}
+.media-container{display:flex;gap:20px;align-items:flex-start;}
+.control-box{min-width:220px;}
+.control-grid{display:grid;grid-template-columns:1fr 1fr;gap:10px;}
+.image-gallery{display:grid!important;grid-template-columns:repeat(auto-fit,minmax(300px,1fr))!important;gap:10px;padding:10px!important;overflow-y:auto!important;max-height:360px!important;}
+.image-gallery .gallery-item{padding:10px;height:360px!important;width:300px!important;}
+.image-gallery img{object-fit:contain;height:360px!important;width:300px!important;}
+.video-gallery{display:grid!important;grid-template-columns:repeat(auto-fit,minmax(300px,1fr))!important;gap:10px;padding:10px!important;overflow-y:auto!important;max-height:360px!important;}
+.video-gallery .gallery-item{padding:10px;height:360px!important;width:300px!important;}
+.video-gallery video{object-fit:contain;height:360px!important;width:300px!important;}
+.stop-button {background-color: #ff4d4d !important; color: white !important;}
+"""
+
+blk = gr.Blocks(css=css, title="GhostPack F1 Pro").queue()
+with blk:
+    gr.Markdown("# 👻 GhostPack F1 Pro")
+    with gr.Tabs():
+        with gr.TabItem("👻 Generate"):
+            with gr.Row():
+                with gr.Column():
+                    img_in = gr.Image(sources="upload", type="numpy", label="Image", height=320)
+                    generate_button = gr.Button("Generate Video", elem_id="generate_button")
+                    stop_button = gr.Button("Stop Generation", elem_id="stop_button", elem_classes="stop-button")
+                    prm = gr.Textbox(
+                        label="Prompt",
+                        value="Smooth animation: A female stands with subtle, sensual micro-movements, breathing gently, slight head tilt, static camera, silent",
+                        elem_id="prompt_input",
+                    )
+                    npr = gr.Textbox(
+                        label="Negative Prompt",
+                        value="low quality, blurry, speaking, talking, moaning, vocalizing, lip movement, mouth animation, sound, dialogue, speech, whispering, shouting, lip sync, facial animation, expressive face, verbal expression, animated mouth",
+                        elem_id="negative_prompt_input",
+                    )
+                    save_msg = gr.Markdown("")
+                    disable_prompt_mods = gr.Checkbox(label="Disable Prompt Modifications", value=False)
+                    link_steps_window = gr.Checkbox(label="Link Steps and Latent Window", value=True)
+                    btn_save = gr.Button("Save Prompt")
+                    btn1, btn2, btn3 = (
+                        gr.Button("Load Most Recent"),
+                        gr.Button("Load 2nd Recent"),
+                        gr.Button("Load 3rd Recent"),
+                    )
+                    ds = gr.Dataset(samples=quick_prompts, label="Quick List", components=[prm])
+                    ds.click(lambda x: x[0], [ds], [prm])
+                    btn_save.click(save_prompt_fn, [prm, npr], [save_msg])
+                    btn1.click(lambda: load_prompt_fn(0), [], [prm])
+                    btn2.click(lambda: load_prompt_fn(1), [], [prm])
+                    btn3.click(lambda: load_prompt_fn(2), [], [prm])
+                    camera_action_input = gr.Dropdown(
+                        choices=[
+                            "Static Camera", "Slight Orbit Left", "Slight Orbit Right",
+                            "Slight Orbit Up", "Slight Orbit Down", "Top-Down View",
+                            "Slight Zoom In", "Slight Zoom Out",
+                        ],
+                        label="Camera Action",
+                        value="Static Camera",
+                        elem_id="camera_action_input",
+                        info="Select a camera movement to append to the prompt.",
+                    )
+                    camera_action_input.change(
+                        fn=lambda prompt, camera_action: update_prompt(prompt, camera_action),
+                        inputs=[prm, camera_action_input],
+                        outputs=prm,
+                    )
+                with gr.Column():
+                    pv = gr.Image(label="Next Latents", height=200, visible=False)
+                    vid = gr.Video(label="Finished", autoplay=True, height=500, loop=True, show_share_button=False)
+                    log_md = gr.Markdown("")
+                    bar = gr.HTML("")
+            with gr.Column():
+                se = gr.Number(label="Seed", value=31337, precision=0, elem_id="seed_input")
+                sec = gr.Slider(label="Video Length (s)", minimum=1, maximum=10, value=8.0, step=0.1, elem_id="video_length_input")
+                win = gr.Slider(label="Latent Window", minimum=1, maximum=10, value=3, step=1, elem_id="latent_window_input")
+                stp = gr.Slider(label="Steps", minimum=1, maximum=100, value=12, step=1, elem_id="steps_input")
+                cfg = gr.Slider(label="CFG", minimum=1, maximum=32, value=1.7, step=0.01, elem_id="cfg_input")
+                gsc = gr.Slider(label="Distilled CFG", minimum=1, maximum=32, value=4.0, step=0.01, elem_id="distilled_cfg_input")
+                rsc = gr.Slider(label="CFG Re-Scale", minimum=0, maximum=1, value=0.5, step=0.01, elem_id="cfg_rescale_input")
+                kee = gr.Slider(label="GPU Keep (GB)", minimum=6, maximum=free_mem, value=6.5, step=0.1, elem_id="gpu_keep_input")
+                crf = gr.Slider(label="MP4 CRF", minimum=0, maximum=100, value=20, step=1, elem_id="mp4_crf_input")
+                tea = gr.Checkbox(label="Use TeaCache", value=True, elem_id="use_teacache_input")
+            generate_button.click(
+                fn=process,
+                inputs=[img_in, prm, npr, se, sec, win, stp, cfg, gsc, rsc, kee, tea, crf, disable_prompt_mods, link_steps_window],
+                outputs=[vid, pv, log_md, bar, generate_button, stop_button],
+            )
+            stop_button.click(fn=end_process)
+            gr.Button("Update Progress").click(fn=lambda: get_progress(), outputs=[log_md, bar])
+
+        with gr.TabItem("🖼️ Image Gallery"):
+            with gr.Row(elem_classes="media-container"):
+                with gr.Column(scale=3):
+                    image_preview = gr.Image(
+                        label="Viewer", value=(list_images()[0] if list_images() else None),
+                        interactive=False, elem_classes="media-preview",
+                    )
+                with gr.Column(elem_classes="control-box"):
+                    image_dropdown = gr.Dropdown(
+                        choices=[os.path.basename(i) for i in list_images()],
+                        value=(os.path.basename(list_images()[0]) if list_images() else None),
+                        label="Select", elem_classes="styled-dropdown",
+                    )
+                    with gr.Row(elem_classes="control-grid"):
+                        load_btn = gr.Button("Load", elem_classes="load-button")
+                        next_btn = gr.Button("Next", elem_classes="load-button")
+                    with gr.Row(elem_classes="control-grid"):
+                        refresh_btn = gr.Button("Refresh")
+                        delete_btn = gr.Button("Delete", elem_classes="orange-button")
+            image_gallery = gr.Gallery(
+                value=list_images(), label="Thumbnails", columns=6, height=360,
+                allow_preview=False, type="filepath", elem_classes="image-gallery",
+            )
+            load_btn.click(load_image, [image_dropdown], [image_preview, image_dropdown])
+            next_btn.click(next_image_and_load, [image_dropdown], [image_preview, image_dropdown])
+            refresh_btn.click(
+                lambda: (
+                    gr.update(choices=[os.path.basename(i) for i in list_images()], value=os.path.basename(list_images()[0]) if list_images() else None),
+                    gr.update(value=list_images()[0] if list_images() else None),
+                    gr.update(value=list_images()),
+                ),
+                [], [image_dropdown, image_preview, image_gallery],
+            )
+            delete_btn.click(
+                lambda sel: (
+                    os.remove(os.path.join(VIDEO_IMG_DIR, sel)) if sel and os.path.exists(os.path.join(VIDEO_IMG_DIR, sel)) else None
+                ) or load_image(""),
+                [image_dropdown], [image_preview, image_dropdown],
+            )
+            image_gallery.select(gallery_image_select, [], [image_preview, image_dropdown])
+
+        with gr.TabItem("🎬 Video Gallery"):
+            with gr.Row(elem_classes="media-container"):
+                with gr.Column(scale=3):
+                    video_preview = gr.Video(
+                        label="Viewer", value=(list_videos()[0] if list_videos() else None),
+                        autoplay=True, loop=True, interactive=False, elem_classes="media-preview",
+                    )
+                with gr.Column(elem_classes="control-box"):
+                    video_dropdown = gr.Dropdown(
+                        choices=[os.path.basename(v) for v in list_videos()],
+                        value=(os.path.basename(list_videos()[0]) if list_videos() else None),
+                        label="Select", elem_classes="styled-dropdown",
+                    )
+                    with gr.Row(elem_classes="control-grid"):
+                        load_vbtn = gr.Button("Load", elem_classes="load-button")
+                        next_vbtn = gr.Button("Next", elem_classes="load-button")
+                    with gr.Row(elem_classes="control-grid"):
+                        refresh_v = gr.Button("Refresh")
+                        delete_v = gr.Button("Delete", elem_classes="orange-button")
+            video_gallery = gr.Gallery(
+                value=list_videos(), label="Thumbnails", columns=6, height=360,
+                allow_preview=False, type="filepath", elem_classes="video-gallery",
+            )
+            load_vbtn.click(load_video, [video_dropdown], [video_preview, video_dropdown])
+            next_vbtn.click(next_video_and_load, [video_dropdown], [video_preview, video_dropdown])
+            refresh_v.click(
+                lambda: (
+                    gr.update(choices=[os.path.basename(v) for v in list_videos()], value=os.path.basename(list_videos()[0]) if list_videos() else None),
+                    gr.update(value=list_videos()[0] if list_videos() else None),
+                    gr.update(value=list_videos()),
+                ),
+                [], [video_dropdown, video_preview, video_gallery],
+            )
+            delete_v.click(
+                lambda sel: (
+                    os.remove(os.path.join(VIDEO_OUTPUT_DIR, sel)) if sel and os.path.exists(os.path.join(VIDEO_OUTPUT_DIR, sel)) else None
+                ) or load_video(""),
+                [video_dropdown], [video_preview, video_dropdown],
+            )
+            video_gallery.select(gallery_video_select, [], [video_preview, video_dropdown])
+
+        with gr.TabItem("👻 About"):
+            gr.Markdown("## GhostPack F1 Pro")
+            with gr.Row():
+                with gr.Column():
+                    gr.Markdown("**🛠️ Description**\nImage-to-Video toolkit powered by HunyuanVideo & FramePack-F1")
+                with gr.Column():
+                    gr.Markdown(f"**📦 Version**\n{VERSION}")
+                with gr.Column():
+                    gr.Markdown("**✍️ Author**\nGhostAI")
+                with gr.Column():
+                    gr.Markdown("**🔗 Repo**\nhttps://huggingface.co/spaces/ghostai1/GhostPack")
+
+        with gr.TabItem("⚙️ Settings"):
+            ct = gr.Button("Clear Temp", elem_classes="big-setting-button")
+            ctmsg = gr.Markdown("")
+            co = gr.Button("Clear Old", elem_classes="big-setting-button")
+            comsg = gr.Markdown("")
+            ci = gr.Button("Clear Images", elem_classes="big-setting-button")
+            cimg = gr.Markdown("")
+            cv = gr.Button("Clear Videos", elem_classes="big-setting-button")
+            cvid = gr.Markdown("")
+            ct.click(clear_temp_videos, [], ctmsg)
+            co.click(clear_old_files, [], comsg)
+            ci.click(clear_images, [], cimg)
+            cv.click(clear_videos, [], cvid)
+
+        with gr.TabItem("🛠️ Install"):
+            xs = gr.Textbox(value=status_xformers(), interactive=False, label="xformers")
+            bx = gr.Button("Install xformers", elem_classes="big-setting-button")
+            ss = gr.Textbox(value=status_sage(), interactive=False, label="sage-attn")
+            bs = gr.Button("Install sage-attn", elem_classes="big-setting-button")
+            fs = gr.Textbox(value=status_flash(), interactive=False, label="flash-attn")
+            bf = gr.Button("Install flash-attn", elem_classes="big-setting-button")
+            cs = gr.Textbox(value=status_colorama(), interactive=False, label="colorama")
+            bc = gr.Button("Install colorama", elem_classes="big-setting-button")
+            bx.click(install_xformers, [], xs)
+            bs.click(install_sage_attn, [], ss)
+            bf.click(install_flash_attn, [], fs)
+            bc.click(install_colorama, [], cs)
+
+        with gr.TabItem("📜 Logs"):
+            logs = gr.Textbox(lines=20, interactive=False, label="Install Logs")
+            rl = gr.Button("Refresh", elem_classes="big-setting-button")
+            cl = gr.Button("Clear", elem_classes="big-setting-button")
+            rl.click(refresh_logs, [], logs)
+            cl.click(clear_logs, [], logs)
+
+    gr.HTML(
+        """
+<script>
+document.querySelectorAll('.video-gallery video').forEach(v => {
+  v.addEventListener('loadedmetadata', () => {
+    if (v.duration > 2) v.currentTime = 2;
+  });
+});
+</script>
+"""
+    )
+
+def update_prompt(prompt, camera_action):
+    camera_actions = [
+        "static camera", "slight camera orbit left", "slight camera orbit right",
+        "slight camera orbit up", "slight camera orbit down", "top-down view",
+        "slight camera zoom in", "slight camera zoom out",
+    ]
+    for action in camera_actions:
+        prompt = re.sub(rf",\s*{re.escape(action)}\b", "", prompt, flags=re.IGNORECASE).strip()
+    if camera_action and camera_action != "None":
+        camera_phrase = f", {camera_action.lower()}"
+        if len(prompt.split()) + len(camera_phrase.split()) <= 50:
+            return prompt + camera_phrase
+        else:
+            logger.warning(f"Prompt exceeds 50 words after adding camera action: {prompt}")
+            print(f"{yellow(f'API: Warning: Prompt exceeds 50 words with camera action')}")
+    return prompt
+
+def get_progress():
+    return f"Status: {job_status.get('latest', {'status': 'idle'})['status']}\nProgress: {job_status.get('latest', {'progress': 0.0})['progress']:.1f}%\nLast Render Time: {job_status.get('latest', {'render_time': 0})['render_time']:.1f}s"
+
+# Check for port conflicts
+if is_port_in_use(args.port):
+    logger.error(f"Port {args.port} is already in use")
+    print(f"{red(f'Error: Port {args.port} is already in use. Please stop other instances or change ports.')}")
+    sys.exit(1)
+
+# Run FastAPI and optional Gradio
+def run_api():
+    try:
+        logger.info(f"Starting FastAPI on {args.server}:{args.port}")
+        print(f"{green(f'Starting FastAPI on {args.server}:{args.port}')}")
+        uvicorn.run(app, host=args.server, port=args.port)
+    except Exception as e:
+        logger.error(f"Failed to start FastAPI: {e}", exc_info=True)
+        print(f"{red(f'Error: Failed to start FastAPI: {e}')}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    try:
+        logger.info(f"Starting GhostPack F1 Pro Server version {VERSION}")
+        print(f"Starting GhostPack F1 Pro Server version {VERSION}")
+        api_thread = Thread(target=run_api)
+        api_thread.daemon = True
+        api_thread.start()
+        time.sleep(5)
+        try:
+            response = requests.get(f"http://{args.server}:{args.port}/health", timeout=10)
+            if response.status_code != 200:
+                raise RuntimeError("FastAPI health check failed")
+            logger.info("FastAPI health check passed")
+            print(f"{green('FastAPI health check passed')}")
+        except Exception as e:
+            logger.error(f"FastAPI not ready: {e}")
+            print(f"{red(f'Error: FastAPI not ready: {e}')}")
+            sys.exit(1)
+
+        if args.gradio:
+            logger.info(f"Starting Gradio UI on {args.server}:7860")
+            print(f"{green(f'Starting Gradio UI on {args.server}:7860')}")
+            server = blk.launch(
+                server_name=args.server,
+                server_port=7860,
+                share=args.share,
+                inbrowser=args.inbrowser,
+                prevent_thread_lock=True,
+                allowed_paths=["/"]
+            )
+            if args.share and server.share_url:
+                logger.info(f"Public Gradio URL: {server.share_url}")
+                print(f"{yellow(f'Public Gradio URL: {server.share_url}')}")
+            logger.info(f"Gradio UI running on http://{args.server}:7860")
+            print(f"{green(f'Gradio UI running on http://{args.server}:7860')}")
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        logger.info("Shutting down gracefully")
+        print(f"{green('Shutting down gracefully')}")
+        sys.exit(0)