ytp-dl 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

scripts/api.py

@@ -5,9 +5,9 @@ import os
 import shutil
 import tempfile
 import time
+from threading import BoundedSemaphore, Lock
 
 from flask import Flask, request, send_file, jsonify
-from gevent.lock import Semaphore
 
 from .downloader import validate_environment, download_video
 
@@ -17,10 +17,15 @@ BASE_DOWNLOAD_DIR = os.environ.get("YTPDL_JOB_BASE_DIR", "/root/ytpdl_jobs")
 os.makedirs(BASE_DOWNLOAD_DIR, exist_ok=True)
 
 MAX_CONCURRENT = int(os.environ.get("YTPDL_MAX_CONCURRENT", "1"))
-_sem = Semaphore(MAX_CONCURRENT)
+
+# Thread-safe concurrency gate (caps actual download jobs).
+_sem = BoundedSemaphore(MAX_CONCURRENT)
+
+# Track in-flight jobs for /healthz reporting.
+_in_use = 0
+_in_use_lock = Lock()
 
 # Failsafe: delete abandoned job dirs older than this many seconds.
-# (keep 21600 if you prefer; 3600 is fine too)
 STALE_JOB_TTL_S = int(os.environ.get("YTPDL_STALE_JOB_TTL_S", "3600"))
 
 _ALLOWED_EXTENSIONS = {"mp3", "mp4", "best"}
@@ -43,11 +48,28 @@ def _cleanup_stale_jobs() -> None:
         pass
 
 
+def _try_acquire_job_slot() -> bool:
+    global _in_use
+    if not _sem.acquire(blocking=False):
+        return False
+    with _in_use_lock:
+        _in_use += 1
+    return True
+
+
+def _release_job_slot() -> None:
+    global _in_use
+    with _in_use_lock:
+        if _in_use > 0:
+            _in_use -= 1
+    _sem.release()
+
+
 @app.route("/api/download", methods=["POST"])
 def handle_download():
     _cleanup_stale_jobs()
 
-    if not _sem.acquire(blocking=False):
+    if not _try_acquire_job_slot():
         return jsonify(error="Server busy, try again later"), 503
 
     job_dir: str | None = None
@@ -57,7 +79,7 @@ def handle_download():
         nonlocal released
         if not released:
             released = True
-            _sem.release()
+            _release_job_slot()
 
     try:
         data = request.get_json(force=True)
@@ -90,8 +112,7 @@ def handle_download():
         if not (filename and os.path.exists(filename)):
             raise RuntimeError("Download failed")
 
-        # Release semaphore as soon as yt-dlp is done.
-        # Streaming the file should not block the next download job.
+        # Release slot as soon as yt-dlp is done.
         _release_once()
 
         response = send_file(filename, as_attachment=True)
@@ -126,7 +147,9 @@ def handle_download():
 
 @app.route("/healthz", methods=["GET"])
 def healthz():
-    return jsonify(ok=True, in_use=(MAX_CONCURRENT - _sem.counter), capacity=MAX_CONCURRENT), 200
+    with _in_use_lock:
+        in_use = _in_use
+    return jsonify(ok=True, in_use=in_use, capacity=MAX_CONCURRENT), 200
 
 
 def main():

{ytp_dl-0.6.3.dist-info → ytp_dl-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ytp-dl
-Version: 0.6.3
+Version: 0.6.4
 Summary: YouTube video downloader with Mullvad VPN integration and Flask API
 Home-page: https://github.com/yourusername/ytp-dl
 Author: dumgum82
@@ -20,7 +20,6 @@ Description-Content-Type: text/markdown
 Requires-Dist: yt-dlp[default]
 Requires-Dist: flask
 Requires-Dist: requests
-Requires-Dist: gevent
 Requires-Dist: gunicorn
 Dynamic: author
 Dynamic: author-email
@@ -58,7 +57,7 @@ Dynamic: summary
 ## 📦 Installation
 
 ```bash
-pip install ytp-dl==0.6.3 yt-dlp[default]
+pip install ytp-dl==0.6.4 yt-dlp[default]
 ```
 
 **Requirements:**
@@ -249,9 +248,9 @@ sudo systemctl start ytp-dl-api
 * ✅ Installs Python, FFmpeg, and Mullvad CLI
 * ✅ Installs Deno system-wide (required by yt-dlp for modern YouTube extraction)
 * ✅ Creates virtualenv at `/opt/yt-dlp-mullvad/venv`
-* ✅ Installs `ytp-dl==0.6.3` + `yt-dlp[default]` into the virtualenv
+* ✅ Installs `ytp-dl==0.6.4` + `yt-dlp[default]` into the virtualenv
 * ✅ Sets up systemd service on port 5000
-* ✅ Configures Gunicorn with gevent workers
+* ✅ Configures Gunicorn with gthread (threaded) workers
 
 ```bash
 #!/usr/bin/env bash
@@ -261,7 +260,7 @@ sudo systemctl start ytp-dl-api
 #   - Installs Python, ffmpeg, Mullvad CLI
 #   - Installs Deno system-wide (JS runtime required for modern YouTube extraction via yt-dlp)
 #   - Creates a virtualenv at /opt/yt-dlp-mullvad/venv
-#   - Installs ytp-dl==0.6.3 + yt-dlp[default] + gunicorn + gevent in that venv
+#   - Installs ytp-dl==0.6.4 + yt-dlp[default] + gunicorn + gevent in that venv
 #   - Creates a simple systemd service ytp-dl-api.service on port 5000
 #
 # Mullvad connect/disconnect is handled per-job by downloader.py.
@@ -276,6 +275,7 @@ VENV_DIR="${VENV_DIR:-${APP_DIR}/venv}"        # python venv
 MV_ACCOUNT="${MV_ACCOUNT:-}"                   # Mullvad account (put number after -)
 YTPDL_MAX_CONCURRENT="${YTPDL_MAX_CONCURRENT:-1}"        # API concurrency cap
 YTPDL_MULLVAD_LOCATION="${YTPDL_MULLVAD_LOCATION:-us}"   # default Mullvad relay hint
+GUNICORN_THREADS="${GUNICORN_THREADS:-4}"             # keep API responsive on tiny VPS
 ### -------------------------------------------------------------------------
 
 [[ "${EUID}" -eq 0 ]] || { echo "Please run as root"; exit 1; }
@@ -297,6 +297,11 @@ fi
 
 mullvad status || true
 
+# Keep the public API reachable even if Mullvad disconnects between jobs.
+# (Lockdown mode can block all traffic while disconnected.)
+mullvad lockdown-mode set off || true
+mullvad lan set allow || true
+
 echo "==> 1.5) Install Deno (system-wide, for yt-dlp YouTube extraction)"
 # Install into /usr/local/bin/deno so systemd PATH can see it.
 # Official installer supports system-wide install via DENO_INSTALL=/usr/local.
@@ -310,7 +315,7 @@ mkdir -p "${APP_DIR}"
 python3 -m venv "${VENV_DIR}"
 source "${VENV_DIR}/bin/activate"
 pip install --upgrade pip
-pip install "ytp-dl==0.6.3" "yt-dlp[default]" gunicorn gevent
+pip install "ytp-dl==0.6.4" "yt-dlp[default]" gunicorn
 deactivate
 
 echo "==> 3) API environment file (/etc/default/ytp-dl-api)"
@@ -334,7 +339,7 @@ EnvironmentFile=/etc/default/ytp-dl-api
 Environment=VIRTUAL_ENV=${VENV_DIR}
 Environment=PATH=${VENV_DIR}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
 
-ExecStart=${VENV_DIR}/bin/gunicorn -k gevent -w 1   --worker-connections 200 --timeout 0 --graceful-timeout 15 --keep-alive 20   --bind 0.0.0.0:${PORT} scripts.api:app
+ExecStart=${VENV_DIR}/bin/gunicorn -k gthread -w 1 --threads ${GUNICORN_THREADS}   --timeout 0 --graceful-timeout 15 --keep-alive 20   --bind 0.0.0.0:${PORT} scripts.api:app
 
 Restart=always
 RestartSec=3

ytp_dl-0.6.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+scripts/__init__.py,sha256=EbAplfCcyLD3Q_9sxemm6owCc5_UJv53vmlxy810p2s,152
+scripts/api.py,sha256=cyLjHmelLwzh8-GOjqXsQdhm6wLX8bOkADZ_qU1naRQ,4331
+scripts/downloader.py,sha256=vvHasu-41DGPDUzOTA4kz52tijTkaii1NnuU4cHQxg8,10825
+ytp_dl-0.6.4.dist-info/METADATA,sha256=Euvl-2zd5I4uh-6RVV1xGp-E8VQan7DvGXWOO5LXh6Q,11627
+ytp_dl-0.6.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ytp_dl-0.6.4.dist-info/entry_points.txt,sha256=QqjqZZAEt3Y7RGrleqZ312sjjboUpbMLdo7qFxuCH30,48
+ytp_dl-0.6.4.dist-info/top_level.txt,sha256=rmzd5mewlrJy4sT608KPib7sM7edoY75AeqJeY3SPB4,8
+ytp_dl-0.6.4.dist-info/RECORD,,

ytp_dl-0.6.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-scripts/__init__.py,sha256=EbAplfCcyLD3Q_9sxemm6owCc5_UJv53vmlxy810p2s,152
-scripts/api.py,sha256=EmTmzhpElx5QaJJ5z8GiimJTVZOHRoKhcReIRUCShBg,3943
-scripts/downloader.py,sha256=vvHasu-41DGPDUzOTA4kz52tijTkaii1NnuU4cHQxg8,10825
-ytp_dl-0.6.3.dist-info/METADATA,sha256=Rloz8LictcjPy_qXwkUtYWjAKyefSAGbxQ3GvmSyBv8,11342
-ytp_dl-0.6.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ytp_dl-0.6.3.dist-info/entry_points.txt,sha256=QqjqZZAEt3Y7RGrleqZ312sjjboUpbMLdo7qFxuCH30,48
-ytp_dl-0.6.3.dist-info/top_level.txt,sha256=rmzd5mewlrJy4sT608KPib7sM7edoY75AeqJeY3SPB4,8
-ytp_dl-0.6.3.dist-info/RECORD,,