Spaces:

moonlantern1
/

clipforge

Sleeping

App Files Files Community

moonlantern1 commited on 11 days ago

Commit

9c19b67

verified ·

1 Parent(s): e073547

Fix native upload input and YouTube TLS impersonation

Browse files

Files changed (3) hide show

app.py +29 -8
pyproject.toml +1 -0
src/humeo/ingest.py +28 -1

app.py CHANGED Viewed

@@ -470,9 +470,11 @@ INDEX_HTML = r"""<!DOCTYPE html>
   .input-label { font-size: 0.78rem; letter-spacing: 0.08em; text-transform: uppercase; color: var(--ink-muted); margin-bottom: 8px; display: block; font-weight: 500; text-align:left; }
   .yt-input { width: 100%; padding: 14px 16px; border: 1.5px solid var(--border); border-radius: var(--radius); font-family: 'DM Sans', sans-serif; font-size: 0.9rem; background: var(--cream); color: var(--ink); outline: none; transition: border-color 0.2s; }
   .yt-input:focus { border-color: var(--gold); } .yt-input::placeholder { color: var(--ink-muted); }
-  .upload-zone { border: 2px dashed var(--champagne-deep); border-radius: var(--radius); padding: 36px 20px; text-align: center; cursor: pointer; transition: all 0.2s; background: var(--cream); }
   .upload-zone:hover, .upload-zone.dragover { border-color: var(--gold); background: var(--champagne); }
-  .file-input-visually-hidden { position: absolute; inline-size: 1px; block-size: 1px; opacity: 0; pointer-events: none; }
   .upload-icon { width: 44px; height: 44px; background: var(--champagne); border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 12px; font-size: 1.2rem; }
   .upload-text { font-size: 0.9rem; color: var(--ink-soft); font-weight: 400; }
   .upload-sub { font-size: 0.78rem; color: var(--ink-muted); margin-top: 4px; }
@@ -564,12 +566,12 @@ INDEX_HTML = r"""<!DOCTYPE html>
         <input class="yt-input" type="text" placeholder="https://youtube.com/watch?v=..." id="yt-url">
       </div>
       <div class="input-section" id="mode-upload">
-        <input class="file-input-visually-hidden" type="file" id="file-input" accept="video/mp4,video/quicktime,video/*">
-        <label class="upload-zone" id="upload-zone" for="file-input">
           <div class="upload-icon">File</div>
           <div class="upload-text">Click to browse or drag & drop</div>
           <div class="upload-sub">MP4, MOV, AVI - up to your Space limit</div>
-        </label>
       </div>
       <button class="convert-btn" id="convert-btn" onclick="startProcessing()">Convert to Clips -></button>
     </div>
@@ -626,6 +628,7 @@ INDEX_HTML = r"""<!DOCTYPE html>
 <script>
   let currentMode = 'yt';
   let selectedFile = null;
   let currentJobId = null;
   let renderedClips = [];
   const iconLabels = ['Up','Text','Cut','Film','Edit'];
@@ -640,13 +643,22 @@ INDEX_HTML = r"""<!DOCTYPE html>
   function openUpload() { document.getElementById('file-input').click(); }
   function setSelectedFile(file) {
     selectedFile = file;
     const zone = document.getElementById('upload-zone');
     zone.innerHTML = `<div class="upload-icon">OK</div><div class="upload-text" style="color:var(--gold)">File selected: ${escapeHtml(file.name)}</div><div class="upload-sub">Ready to convert</div>`;
   }
   const uploadZone = document.getElementById('upload-zone');
-  document.getElementById('file-input').addEventListener('change', e => { if (e.target.files[0]) setSelectedFile(e.target.files[0]); });
   uploadZone.addEventListener('dragover', e => { e.preventDefault(); uploadZone.classList.add('dragover'); });
   uploadZone.addEventListener('dragleave', () => uploadZone.classList.remove('dragover'));
   uploadZone.addEventListener('drop', e => { e.preventDefault(); uploadZone.classList.remove('dragover'); if (e.dataTransfer.files[0]) setSelectedFile(e.dataTransfer.files[0]); });
@@ -661,8 +673,9 @@ INDEX_HTML = r"""<!DOCTYPE html>
       form.append('source_job_id', currentJobId);
       form.append('regen_prompt', extraPrompt);
     } else if (currentMode === 'upload') {
-      if (!selectedFile) throw new Error('Choose a video file first.');
-      form.append('file', selectedFile);
     } else {
       const url = document.getElementById('yt-url').value.trim();
       if (!url) throw new Error('Paste a video URL first.');
@@ -677,6 +690,14 @@ INDEX_HTML = r"""<!DOCTYPE html>
   async function startProcessing() {
     const btn = document.getElementById('convert-btn');
     try {
       btn.disabled = true;
       btn.textContent = 'Starting...';
       const job = await createJob();

   .input-label { font-size: 0.78rem; letter-spacing: 0.08em; text-transform: uppercase; color: var(--ink-muted); margin-bottom: 8px; display: block; font-weight: 500; text-align:left; }
   .yt-input { width: 100%; padding: 14px 16px; border: 1.5px solid var(--border); border-radius: var(--radius); font-family: 'DM Sans', sans-serif; font-size: 0.9rem; background: var(--cream); color: var(--ink); outline: none; transition: border-color 0.2s; }
   .yt-input:focus { border-color: var(--gold); } .yt-input::placeholder { color: var(--ink-muted); }
+  .native-file-input { width: 100%; padding: 12px; margin-bottom: 12px; border: 1.5px solid var(--border); border-radius: var(--radius); background: var(--cream); color: var(--ink-soft); font-family: 'DM Sans', sans-serif; font-size: 0.86rem; }
+  .native-file-input::file-selector-button { margin-right: 12px; padding: 9px 14px; border: 1px solid var(--border); border-radius: 8px; background: var(--white); color: var(--ink); font-family: 'DM Sans', sans-serif; cursor: pointer; }
+  .native-file-input::file-selector-button:hover { background: var(--champagne); }
+  .upload-zone { border: 2px dashed var(--champagne-deep); border-radius: var(--radius); padding: 28px 20px; text-align: center; cursor: pointer; transition: all 0.2s; background: var(--cream); }
   .upload-zone:hover, .upload-zone.dragover { border-color: var(--gold); background: var(--champagne); }
   .upload-icon { width: 44px; height: 44px; background: var(--champagne); border-radius: 50%; display: flex; align-items: center; justify-content: center; margin: 0 auto 12px; font-size: 1.2rem; }
   .upload-text { font-size: 0.9rem; color: var(--ink-soft); font-weight: 400; }
   .upload-sub { font-size: 0.78rem; color: var(--ink-muted); margin-top: 4px; }
         <input class="yt-input" type="text" placeholder="https://youtube.com/watch?v=..." id="yt-url">
       </div>
       <div class="input-section" id="mode-upload">
+        <input class="native-file-input" type="file" id="file-input" accept="video/mp4,video/quicktime,video/*">
+        <div class="upload-zone" id="upload-zone" onclick="openUpload()">
           <div class="upload-icon">File</div>
           <div class="upload-text">Click to browse or drag & drop</div>
           <div class="upload-sub">MP4, MOV, AVI - up to your Space limit</div>
+        </div>
       </div>
       <button class="convert-btn" id="convert-btn" onclick="startProcessing()">Convert to Clips -></button>
     </div>
 <script>
   let currentMode = 'yt';
   let selectedFile = null;
+  let autoStartAfterFilePick = false;
   let currentJobId = null;
   let renderedClips = [];
   const iconLabels = ['Up','Text','Cut','Film','Edit'];
   function openUpload() { document.getElementById('file-input').click(); }
   function setSelectedFile(file) {
+    if (!file) return;
     selectedFile = file;
     const zone = document.getElementById('upload-zone');
     zone.innerHTML = `<div class="upload-icon">OK</div><div class="upload-text" style="color:var(--gold)">File selected: ${escapeHtml(file.name)}</div><div class="upload-sub">Ready to convert</div>`;
   }
   const uploadZone = document.getElementById('upload-zone');
+  document.getElementById('file-input').addEventListener('change', e => {
+    if (e.target.files[0]) {
+      setSelectedFile(e.target.files[0]);
+      if (autoStartAfterFilePick) {
+        autoStartAfterFilePick = false;
+        startProcessing();
+      }
+    }
+  });
   uploadZone.addEventListener('dragover', e => { e.preventDefault(); uploadZone.classList.add('dragover'); });
   uploadZone.addEventListener('dragleave', () => uploadZone.classList.remove('dragover'));
   uploadZone.addEventListener('drop', e => { e.preventDefault(); uploadZone.classList.remove('dragover'); if (e.dataTransfer.files[0]) setSelectedFile(e.dataTransfer.files[0]); });
       form.append('source_job_id', currentJobId);
       form.append('regen_prompt', extraPrompt);
     } else if (currentMode === 'upload') {
+      const file = selectedFile || document.getElementById('file-input').files[0];
+      if (!file) throw new Error('Choose a video file first.');
+      form.append('file', file);
     } else {
       const url = document.getElementById('yt-url').value.trim();
       if (!url) throw new Error('Paste a video URL first.');
   async function startProcessing() {
     const btn = document.getElementById('convert-btn');
     try {
+      if (currentMode === 'upload') {
+        selectedFile = selectedFile || document.getElementById('file-input').files[0] || null;
+        if (!selectedFile) {
+          autoStartAfterFilePick = true;
+          openUpload();
+          return;
+        }
+      }
       btn.disabled = true;
       btn.textContent = 'Starting...';
       const job = await createJob();

pyproject.toml CHANGED Viewed

@@ -14,6 +14,7 @@ dependencies = [
     "openai>=1.0",
     "google-genai>=1.0",
     "httpx>=0.28",
     "jinja2>=3.1",
     "numpy>=1.24",
     "Pillow>=10.0",

     "openai>=1.0",
     "google-genai>=1.0",
     "httpx>=0.28",
+    "curl_cffi>=0.10,<0.15",
     "jinja2>=3.1",
     "numpy>=1.24",
     "Pillow>=10.0",

src/humeo/ingest.py CHANGED Viewed

@@ -72,6 +72,22 @@ def _yt_dlp_cookie_file(output_dir: Path) -> Path | None:
     return cookie_path
 def _yt_dlp_error(exc: subprocess.CalledProcessError) -> RuntimeError:
     stdout = (exc.stdout or "").strip()
     stderr = (exc.stderr or "").strip()
@@ -84,6 +100,12 @@ def _yt_dlp_error(exc: subprocess.CalledProcessError) -> RuntimeError:
             "YTDLP_COOKIES_B64 containing a base64 encoded Netscape cookies.txt export "
             "from a logged-in browser, or upload the MP4 directly."
         )
     return RuntimeError(f"yt-dlp failed to download the YouTube video:\n{details}{hint}")
@@ -146,13 +168,18 @@ def download_video(youtube_url: str, output_dir: Path) -> Path:
         "3",
         "--socket-timeout",
         "30",
-        "--force-ipv4",
         "--user-agent",
         YTDLP_BROWSER_USER_AGENT,
         "--extractor-args",
         (os.environ.get("YTDLP_EXTRACTOR_ARGS") or "youtube:player_client=default,web_creator"),
         "--quiet",
     ]
     if shutil.which("node"):
         cmd.extend(["--js-runtimes", "node", "--remote-components", "ejs:github"])
     cookie_path = _yt_dlp_cookie_file(output_dir)

     return cookie_path
+def _yt_dlp_impersonate_target() -> str | None:
+    target = (os.environ.get("YTDLP_IMPERSONATE") or "chrome").strip()
+    if target.lower() in {"", "0", "false", "no", "off", "none"}:
+        return None
+    return target
+def _yt_dlp_ip_family_flag() -> str | None:
+    value = (os.environ.get("YTDLP_IP_FAMILY") or "").strip().lower()
+    if value in {"4", "ipv4"}:
+        return "--force-ipv4"
+    if value in {"6", "ipv6"}:
+        return "--force-ipv6"
+    return None
 def _yt_dlp_error(exc: subprocess.CalledProcessError) -> RuntimeError:
     stdout = (exc.stdout or "").strip()
     stderr = (exc.stderr or "").strip()
             "YTDLP_COOKIES_B64 containing a base64 encoded Netscape cookies.txt export "
             "from a logged-in browser, or upload the MP4 directly."
         )
+    elif "unexpected_eof_while_reading" in lowered or "ssl" in lowered:
+        hint = (
+            "\n\nYouTube closed the TLS connection from Hugging Face. The app will use "
+            "browser TLS impersonation when curl_cffi is installed; if this persists, "
+            "upload the MP4 directly or add YTDLP_COOKIES_B64."
+        )
     return RuntimeError(f"yt-dlp failed to download the YouTube video:\n{details}{hint}")
         "3",
         "--socket-timeout",
         "30",
         "--user-agent",
         YTDLP_BROWSER_USER_AGENT,
         "--extractor-args",
         (os.environ.get("YTDLP_EXTRACTOR_ARGS") or "youtube:player_client=default,web_creator"),
         "--quiet",
     ]
+    ip_family_flag = _yt_dlp_ip_family_flag()
+    if ip_family_flag:
+        cmd.append(ip_family_flag)
+    impersonate_target = _yt_dlp_impersonate_target()
+    if impersonate_target:
+        cmd.extend(["--impersonate", impersonate_target])
     if shutil.which("node"):
         cmd.extend(["--js-runtimes", "node", "--remote-components", "ejs:github"])
     cookie_path = _yt_dlp_cookie_file(output_dir)