Add throttling to /processall endpoint to prevent overwhelming downstream APIs

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-02-07 14:59:19 +00:00
parent 8fb3998d67
commit 8eea420bc5
5 changed files with 286 additions and 6 deletions
+5
View File
@@ -6,6 +6,11 @@ EXTERNAL_HOSTNAME=docuelevate.example.com
GOTENBERG_URL=http://gotenberg:3000 GOTENBERG_URL=http://gotenberg:3000
ALLOW_FILE_DELETE=true # Allow deletion of file records ALLOW_FILE_DELETE=true # Allow deletion of file records
# **Batch Processing Settings**
# Control throttling behavior for the /processall endpoint to prevent overwhelming downstream APIs
PROCESSALL_THROTTLE_THRESHOLD=20 # Number of files above which throttling is applied (default: 20)
PROCESSALL_THROTTLE_DELAY=3 # Delay in seconds between each task submission when throttling (default: 3)
# **Authentication** # **Authentication**
AUTH_ENABLED=true AUTH_ENABLED=true
# Generate a secure random string, for example: # Generate a secure random string, for example:
+39 -5
View File
@@ -112,7 +112,12 @@ def send_to_all_destinations_endpoint(file_path: str):
@router.post("/processall") @router.post("/processall")
@require_login @require_login
def process_all_pdfs_in_workdir(): def process_all_pdfs_in_workdir():
"""Finds all .pdf files in <workdir> and enqueues them for processing.""" """
Finds all .pdf files in <workdir> and enqueues them for processing.
For large batches (>processall_throttle_threshold files), tasks are staggered
to avoid overwhelming downstream APIs.
"""
target_dir = settings.workdir target_dir = settings.workdir
if not os.path.exists(target_dir): if not os.path.exists(target_dir):
raise HTTPException( raise HTTPException(
@@ -128,13 +133,42 @@ def process_all_pdfs_in_workdir():
return {"message": "No PDF files found in that directory."} return {"message": "No PDF files found in that directory."}
task_ids = [] task_ids = []
for pdf in pdf_files: num_files = len(pdf_files)
# Apply throttling if we have more files than the threshold
apply_throttle = num_files > settings.processall_throttle_threshold
if apply_throttle:
logger.info(
f"Processing {num_files} files with throttling "
f"(threshold: {settings.processall_throttle_threshold}, "
f"delay: {settings.processall_throttle_delay}s per file)"
)
for index, pdf in enumerate(pdf_files):
file_path = os.path.join(target_dir, pdf) file_path = os.path.join(target_dir, pdf)
task = process_document.delay(file_path)
if apply_throttle:
# Stagger task submission with countdown
# First file starts immediately (countdown=0)
# Each subsequent file has an increasing delay
countdown = index * settings.processall_throttle_delay
task = process_document.apply_async(args=[file_path], countdown=countdown)
logger.debug(f"Scheduled {pdf} with {countdown}s delay")
else:
# No throttling - enqueue immediately
task = process_document.delay(file_path)
task_ids.append(task.id) task_ids.append(task.id)
message = f"Enqueued {num_files} PDFs for processing"
if apply_throttle:
total_time = (num_files - 1) * settings.processall_throttle_delay
message += f" (throttled over {total_time} seconds)"
return { return {
"message": f"Enqueued {len(pdf_files)} PDFs to upload_to_s3", "message": message,
"pdf_files": pdf_files, "pdf_files": pdf_files,
"task_ids": task_ids "task_ids": task_ids,
"throttled": apply_throttle
} }
+10
View File
@@ -135,6 +135,16 @@ class Settings(BaseSettings):
# Feature flags # Feature flags
allow_file_delete: bool = True # Default to allowing file deletion from database allow_file_delete: bool = True # Default to allowing file deletion from database
# Batch processing settings
processall_throttle_threshold: int = Field(
default=20,
description="Number of files above which throttling is applied in /processall endpoint"
)
processall_throttle_delay: int = Field(
default=3,
description="Delay in seconds between each task submission when throttling in /processall"
)
# Notification settings # Notification settings
notification_urls: Union[List[str], str] = Field( notification_urls: Union[List[str], str] = Field(
default_factory=list, default_factory=list,
+2 -1
View File
@@ -70,7 +70,8 @@ def client(db_session) -> TestClient:
fastapi_app.dependency_overrides[get_db] = override_get_db fastapi_app.dependency_overrides[get_db] = override_get_db
with TestClient(fastapi_app) as test_client: # Use base_url to satisfy TrustedHostMiddleware
with TestClient(fastapi_app, base_url="http://localhost") as test_client:
yield test_client yield test_client
# Clean up # Clean up
+230
View File
@@ -0,0 +1,230 @@
"""
Tests for /processall endpoint throttling behavior.
"""
import os
import pytest
from unittest.mock import Mock, patch, MagicMock
from fastapi.testclient import TestClient
@pytest.mark.integration
class TestProcessAllThrottling:
"""Tests for processall endpoint with throttling."""
@patch('app.api.process.process_document')
def test_processall_no_throttling_for_small_batch(self, mock_task, client: TestClient, tmp_path, monkeypatch):
"""Test that small batches (<=20 files) are not throttled."""
# Create test directory with 10 PDF files
workdir = tmp_path / "workdir"
workdir.mkdir()
for i in range(10):
(workdir / f"test{i}.pdf").write_text("dummy pdf content")
# Mock the task
mock_task.delay = Mock(return_value=Mock(id="task-id"))
mock_task.apply_async = Mock(return_value=Mock(id="task-id"))
# Use monkeypatch to modify the settings imported in the process module
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
monkeypatch.setattr(process.settings, 'processall_throttle_threshold', 20)
monkeypatch.setattr(process.settings, 'processall_throttle_delay', 3)
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
# Should use .delay() (not throttled)
assert mock_task.delay.call_count == 10
assert mock_task.apply_async.call_count == 0
# Response should indicate no throttling
assert data["throttled"] is False
assert len(data["pdf_files"]) == 10
assert len(data["task_ids"]) == 10
@patch('app.api.process.process_document')
def test_processall_throttling_for_large_batch(self, mock_task, client: TestClient, tmp_path, monkeypatch):
"""Test that large batches (>20 files) are throttled."""
# Create test directory with 25 PDF files
workdir = tmp_path / "workdir"
workdir.mkdir()
for i in range(25):
(workdir / f"test{i}.pdf").write_text("dummy pdf content")
# Mock the task
mock_task_result = Mock(id="task-id")
mock_task.apply_async = Mock(return_value=mock_task_result)
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
monkeypatch.setattr(process.settings, 'processall_throttle_threshold', 20)
monkeypatch.setattr(process.settings, 'processall_throttle_delay', 3)
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
# Should use .apply_async() with countdown (throttled)
assert mock_task.apply_async.call_count == 25
# Verify countdown values are increasing
calls = mock_task.apply_async.call_args_list
for i, call_args in enumerate(calls):
expected_countdown = i * 3 # 3 seconds delay
assert call_args[1]['countdown'] == expected_countdown
# Response should indicate throttling
assert data["throttled"] is True
assert len(data["pdf_files"]) == 25
assert len(data["task_ids"]) == 25
assert "throttled over" in data["message"]
@patch('app.api.process.process_document')
def test_processall_exactly_at_threshold(self, mock_task, client: TestClient, tmp_path, monkeypatch):
"""Test behavior when file count equals threshold."""
# Create test directory with exactly 20 PDF files
workdir = tmp_path / "workdir"
workdir.mkdir()
for i in range(20):
(workdir / f"test{i}.pdf").write_text("dummy pdf content")
# Mock the task
mock_task.delay = Mock(return_value=Mock(id="task-id"))
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
monkeypatch.setattr(process.settings, 'processall_throttle_threshold', 20)
monkeypatch.setattr(process.settings, 'processall_throttle_delay', 3)
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
# At threshold, should NOT throttle (only >threshold)
assert mock_task.delay.call_count == 20
assert data["throttled"] is False
@patch('app.api.process.process_document')
def test_processall_one_over_threshold(self, mock_task, client: TestClient, tmp_path, monkeypatch):
"""Test that throttling activates at threshold + 1."""
# Create test directory with 21 PDF files (threshold is 20)
workdir = tmp_path / "workdir"
workdir.mkdir()
for i in range(21):
(workdir / f"test{i}.pdf").write_text("dummy pdf content")
# Mock the task
mock_task.apply_async = Mock(return_value=Mock(id="task-id"))
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
monkeypatch.setattr(process.settings, 'processall_throttle_threshold', 20)
monkeypatch.setattr(process.settings, 'processall_throttle_delay', 3)
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
# Should be throttled
assert mock_task.apply_async.call_count == 21
assert data["throttled"] is True
def test_processall_empty_directory(self, client: TestClient, tmp_path, monkeypatch):
"""Test processall with no PDF files."""
workdir = tmp_path / "workdir"
workdir.mkdir()
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
assert data["message"] == "No PDF files found in that directory."
def test_processall_nonexistent_directory(self, client: TestClient, tmp_path, monkeypatch):
"""Test processall with non-existent directory."""
workdir = tmp_path / "nonexistent"
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
response = client.post("/api/processall")
assert response.status_code == 400
data = response.json()
assert "does not exist" in data["detail"]
@patch('app.api.process.process_document')
def test_processall_custom_threshold(self, mock_task, client: TestClient, tmp_path, monkeypatch):
"""Test that custom threshold value is respected."""
# Create test directory with 15 PDF files
workdir = tmp_path / "workdir"
workdir.mkdir()
for i in range(15):
(workdir / f"test{i}.pdf").write_text("dummy pdf content")
# Mock the task
mock_task.apply_async = Mock(return_value=Mock(id="task-id"))
from app.api import process
monkeypatch.setattr(process.settings, 'workdir', str(workdir))
monkeypatch.setattr(process.settings, 'processall_throttle_threshold', 10) # Lower threshold
monkeypatch.setattr(process.settings, 'processall_throttle_delay', 2)
response = client.post("/api/processall")
assert response.status_code == 200
data = response.json()
# Should be throttled because 15 > 10
assert mock_task.apply_async.call_count == 15
assert data["throttled"] is True
@pytest.mark.unit
class TestThrottlingConfiguration:
"""Tests for throttling configuration settings."""
def test_default_throttle_threshold(self):
"""Test that default threshold is 20."""
from app.config import Settings
settings = Settings(
database_url="sqlite:///test.db",
redis_url="redis://localhost",
openai_api_key="test-key",
workdir="/tmp",
azure_ai_key="test-key",
azure_region="test-region",
azure_endpoint="https://test.endpoint",
gotenberg_url="http://gotenberg",
session_secret="a" * 32,
)
assert settings.processall_throttle_threshold == 20
def test_default_throttle_delay(self):
"""Test that default delay is 3 seconds."""
from app.config import Settings
settings = Settings(
database_url="sqlite:///test.db",
redis_url="redis://localhost",
openai_api_key="test-key",
workdir="/tmp",
azure_ai_key="test-key",
azure_region="test-region",
azure_endpoint="https://test.endpoint",
gotenberg_url="http://gotenberg",
session_secret="a" * 32,
)
assert settings.processall_throttle_delay == 3