kovinape commited on
Commit
bdddf73
·
verified ·
1 Parent(s): 87692b3

Upload app.py with huggingface_hub

Browse files
Files changed (1) hide show
  1. app.py +23 -17
app.py CHANGED
@@ -525,27 +525,33 @@ def _mf_resolve_file(quickkey, filename):
525
  return None
526
 
527
  def _mf_dl_and_upload(job_id, dl_url, fname, base_status):
 
528
  tmp_base=f"/tmp/mf_{job_id}"
529
  os.makedirs(tmp_base, exist_ok=True)
530
  tmp_path=os.path.join(tmp_base, fname)
531
  try:
532
- cmd=["aria2c","-x","16","-s","16","-k","1M","-o",tmp_path,dl_url,"--allow-overwrite=true","--auto-file-renaming=false","--console-log-level=warn"]
533
- proc=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
534
- except FileNotFoundError:
535
- cmd=["curl","-L","-o",tmp_path,dl_url]
536
- proc=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
537
- while proc.poll() is None:
538
- try:
539
- cur=os.path.getsize(tmp_path) if os.path.exists(tmp_path) else 0
540
- jobs[job_id]=dict(jobs.get(job_id,{}))
541
- jobs[job_id]["status"]=f"{base_status} {cur//1024//1024}MB"
542
- except Exception:
543
- pass
544
- time.sleep(1)
545
- try: err=(proc.stderr.read() or b"")[:400].decode("utf-8","ignore")
546
- except Exception: err=""
547
- if proc.returncode!=0 or not os.path.exists(tmp_path) or os.path.getsize(tmp_path)==0:
548
- jobs[job_id]["status"]=f"{base_status} → Failed({proc.returncode}) {err.strip()[-160:]}"
 
 
 
 
 
549
  try: shutil.rmtree(tmp_base)
550
  except: pass
551
  return False
 
525
  return None
526
 
527
  def _mf_dl_and_upload(job_id, dl_url, fname, base_status):
528
+ import requests
529
  tmp_base=f"/tmp/mf_{job_id}"
530
  os.makedirs(tmp_base, exist_ok=True)
531
  tmp_path=os.path.join(tmp_base, fname)
532
  try:
533
+ r=requests.get(dl_url, headers={"User-Agent":MF_UA}, stream=True, timeout=60, allow_redirects=True)
534
+ if r.status_code!=200:
535
+ jobs[job_id]["status"]=f"{base_status} → HTTP {r.status_code} {r.headers.get('content-type','')[:40]} len={r.headers.get('content-length','?')}"
536
+ try: r.close()
537
+ except: pass
538
+ return False
539
+ clen=int(r.headers.get("content-length",0) or 0)
540
+ written=0
541
+ with open(tmp_path,"wb") as out:
542
+ for chunk in r.iter_content(chunk_size=8*1024*1024):
543
+ if not chunk: continue
544
+ out.write(chunk); written+=len(chunk)
545
+ if written%(64*1024*1024)==0:
546
+ jobs[job_id]=dict(jobs.get(job_id,{}))
547
+ jobs[job_id]["status"]=f"{base_status} {written//1024//1024}MB"+(f"/{clen//1024//1024}MB" if clen else "")
548
+ try: r.close()
549
+ except: pass
550
+ if written==0:
551
+ jobs[job_id]["status"]=f"{base_status} → empty body (0 bytes)"
552
+ return False
553
+ except Exception as e:
554
+ jobs[job_id]["status"]=f"{base_status} → requests err: {str(e)[:160]}"
555
  try: shutil.rmtree(tmp_base)
556
  except: pass
557
  return False