Upload app.py

app.py

@@ -10,7 +10,7 @@ GITHUB_REPO = "https://github.com/OpenImagingLab/FlashVSR"
 ROOT = Path(__file__).parent.resolve()
 CODE_DIR = ROOT / "FlashVSR"
 EXAMPLES_DIR = CODE_DIR / "examples" / "WanVSR"
-WEIGHTS_DIR = EXAMPLES_DIR / "FlashVSR"   # Where example scripts usually look
+WEIGHTS_DIR = EXAMPLES_DIR / "FlashVSR"   # where example scripts usually look
 OUT_DIR = ROOT / "outputs"
 OUT_DIR.mkdir(exist_ok=True, parents=True)
 
@@ -18,7 +18,7 @@ OUT_DIR.mkdir(exist_ok=True, parents=True)
 
 def _run(cmd, cwd=None, env=None, allow_fail=False):
     """
-    Run a command; if it fails, include stdout/stderr in the error so you can see
+    Run a command; if it fails, include stdout/stderr in the error so we see
     the real cause in Space logs and the Gradio toast.
     """
     print(">>", " ".join(map(str, cmd)))
@@ -44,6 +44,9 @@ def _ffmpeg():
     return get_ffmpeg_exe()
 
 def _coerce_to_path(video_input) -> Path:
+    """
+    Gradio 5 may pass: str path, dict with 'path'/'name', or obj with .name
+    """
     if not video_input:
         raise gr.Error("Upload a video first.")
     if isinstance(video_input, str) and Path(video_input).exists():
@@ -58,11 +61,24 @@ def _coerce_to_path(video_input) -> Path:
         return Path(name)
     raise gr.Error("Could not read uploaded video path. Please re-upload as a file (mp4/avi/mkv).")
 
+def _python_env():
+    """
+    Build an env where the repo root is importable without 'pip install -e .'
+    """
+    env = os.environ.copy()
+    extra = [str(CODE_DIR), str(CODE_DIR / "diffsynth")]
+    existing = env.get("PYTHONPATH", "")
+    env["PYTHONPATH"] = os.pathsep.join([p for p in (os.pathsep.join(extra), existing) if p])
+    env.setdefault("HF_HOME", str(ROOT / ".hf_home"))
+    return env
+
 # -------------------- io normalization --------------------
 
 def normalize_to_mp4(src_path: Path) -> Path:
     """
-    Make a safe, even-dims, CFR file for the runner (H.264 High@4.1, 30fps, yuv420p).
+    Convert ANY uploaded file to a safe MP4 for the FlashVSR runner:
+      - H.264 (yuv420p), High@4.1, even dimensions, CFR 30fps, +faststart
+      - Keep audio if present (AAC), otherwise no-audio.
     """
     dst_dir = Path(tempfile.mkdtemp(prefix="norm_"))
     dst = dst_dir / "input_norm.mp4"
@@ -71,7 +87,7 @@ def normalize_to_mp4(src_path: Path) -> Path:
         _run([
             _ffmpeg(), "-y",
             "-i", str(src_path),
-            "-map", "0:v:0", "-map", "0:a:0?",
+            "-map", "0:v:0", "-map", "0:a:0?",          # audio only if exists
             "-vf", vf,
             "-c:v", "libx264", "-pix_fmt", "yuv420p",
             "-profile:v", "high", "-level", "4.1",
@@ -102,7 +118,9 @@ def normalize_to_mp4(src_path: Path) -> Path:
 
 def make_web_playable(src: Path, dst: Path):
     """
-    Transcode the model output to a browser-friendly MP4 (H.264 High@4.1, 30fps).
+    Transcode the model output to a browser-friendly MP4:
+      - H.264 (yuv420p), High@4.1, even dimensions, CFR 30fps, +faststart
+      - Keep/convert audio to AAC if present; otherwise no audio.
     """
     vf = "scale=trunc(iw/2)*2:trunc(ih/2)*2,fps=30"
     try:
@@ -138,6 +156,9 @@ def make_web_playable(src: Path, dst: Path):
 # ------------------------ setup ------------------------
 
 def _pip_install_requirements():
+    """
+    Install any requirements files present in the repo tree, without editable install.
+    """
     any_found = False
     for req in [
         CODE_DIR / "requirements.txt",
@@ -158,19 +179,17 @@ def _git_submodules():
 def _verify_weights(tiny: bool | None = None):
     """
     Ensure at least some weights exist under WEIGHTS_DIR.
-    If tiny/full is provided, try to find a matching file name.
+    If tiny/full is provided, try to find a matching file name (best-effort).
     """
     if not WEIGHTS_DIR.exists():
         raise RuntimeError(f"Weights folder missing: {WEIGHTS_DIR}")
     files = list(WEIGHTS_DIR.rglob("*"))
     if not files:
         raise RuntimeError(
-            f"No files found in {WEIGHTS_DIR}.\n"
-            f"Expected weights snapshot from {HF_MODEL_ID} to be here."
+            f"No files found in {WEIGHTS_DIR}. Expected weights snapshot from {HF_MODEL_ID}."
         )
     if tiny is None:
         return
-    # Heuristic check: look for 'tiny'/'full' keywords or common extensions
     names = [p.name.lower() for p in files]
     if tiny and not any(("tiny" in n or n.endswith((".pth", ".pt", ".safetensors"))) for n in names):
         print("[warn] Could not confirm Tiny weights by name; proceeding anyway.")
@@ -224,9 +243,10 @@ def prepare_once(build_sparse=False, progress: gr.Progress | None = None):
 def _try_runner_variants(runner: Path, inp: Path, raw_out: Path, scale: int) -> None:
     """
     Try several CLI shapes in case upstream changed arg names.
+    Always pass PYTHONPATH so 'import' works without pip install -e .
     """
     variants = [
-        # 1) Basic (what we tried first)
+        # 1) Basic (expected)
         [sys.executable, str(runner), "--input", str(inp), "--output", str(raw_out), "--scale", str(scale)],
         # 2) With explicit weights dir
         [sys.executable, str(runner), "--input", str(inp), "--output", str(raw_out), "--scale", str(scale),
@@ -243,19 +263,18 @@ def _try_runner_variants(runner: Path, inp: Path, raw_out: Path, scale: int) ->
     for i, cmd in enumerate(variants, 1):
         try:
             print(f"[runner] Trying variant {i}/{len(variants)}: {' '.join(cmd)}")
-            _run(cmd, cwd=str(EXAMPLES_DIR))
+            _run(cmd, cwd=str(EXAMPLES_DIR), env=_python_env())
             return
         except Exception as e:
             last_err = e
             print(f"[runner] Variant {i} failed: {e}")
-    # If all variants failed, re-raise the last error so it shows up in the UI.
     raise last_err or RuntimeError("All runner variants failed.")
 
 def flashvsr_infer(video_input, scale: int = 4, tiny: bool = True, use_sparse: bool = False,
                    progress: gr.Progress | None = None) -> str:
     prepare_once(build_sparse=use_sparse, progress=progress)
 
-    # Pick runner
+    # Choose runner
     runner = EXAMPLES_DIR / ("infer_flashvsr_tiny.py" if tiny else "infer_flashvsr_full.py")
     if not runner.exists():
         raise FileNotFoundError(
@@ -263,7 +282,6 @@ def flashvsr_infer(video_input, scale: int = 4, tiny: bool = True, use_sparse: b
             f"Check repo structure; if they renamed scripts, update this app."
         )
 
-    # Re-check weights (with size hint)
     _verify_weights(tiny=tiny)
 
     # 1) Normalize input
@@ -321,6 +339,7 @@ with gr.Blocks(title="FlashVSR (Unofficial)", fill_height=True) as demo:
         "- Optional: Enable **Block-Sparse-Attention** (GPU) for potential speedups on some GPUs."
     )
     with gr.Row():
+        # No `type` kwarg in Gradio 5; backend coerces path
         inp = gr.Video(label="Input video (MP4/AVI/MKV, etc.)", sources=["upload"])
     with gr.Row():
         tiny = gr.Checkbox(label="Use Tiny model (faster)", value=True)
@@ -330,6 +349,7 @@ with gr.Blocks(title="FlashVSR (Unofficial)", fill_height=True) as demo:
     out = gr.Video(label="Upscaled output", format="mp4")
     btn.click(ui_run, inputs=[inp, tiny, scale, sparse], outputs=out)
 
+# Queue (defaults only; Gradio 5 removed concurrency_count arg)
 demo.queue(max_size=8)
 
 if __name__ == "__main__":