diff --git a/docker-compose.yml b/docker-compose.yml index 4fc44f6..759e7b0 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,11 +4,11 @@ services: image: loredcast/filewizard:latest build: . #env_file: - # - .env + #- .env environment: - - LOCAL_ONLY=True # set to False to enable OIDC auth (requires configuration in settings.yml) + - LOCAL_ONLY=False # set to False to enable OIDC auth (requires configuration in settings.yml) - SECRET_KEY= # if using auth - - UPLOADS_DIR=/app/uploads + - UPLOADS_DIR=/app/uploads # directory structure INSIDE the container, not on host - PROCESSED_DIR=/app/processed - OMP_NUM_THREADS=1 #user: "1000:1000" diff --git a/main.py b/main.py index a00ffd8..f8d1dca 100755 --- a/main.py +++ b/main.py @@ -1349,6 +1349,11 @@ def run_pdf_ocr_task(job_id: str, input_path_str: str, output_path_str: str, ocr job = get_job(db, job_id) if not job or job.status == 'cancelled': return + + # Re-check for cancellation right before starting the heavy work + if get_job(db, job_id).status == 'cancelled': + logger.info(f"PDF OCR job {job_id} cancelled before starting. Aborting.") + return update_job_status(db, job_id, "processing") logger.info(f"Starting PDF OCR for job {job_id}") ocrmypdf.ocr(str(input_path), str(output_path_str), @@ -1395,6 +1400,11 @@ def run_image_ocr_task(job_id: str, input_path_str: str, output_path_str: str, a if not job or job.status == "cancelled": return + # Re-check for cancellation right before starting the heavy work + if get_job(db, job_id).status == 'cancelled': + logger.info(f"Image OCR job {job_id} cancelled before starting. Aborting.") + return + update_job_status(db, job_id, "processing", progress=10) logger.info(f"Starting Image OCR for job {job_id} - {input_path}") diff --git a/run.sh b/run.sh index 73b3e69..48e688d 100755 --- a/run.sh +++ b/run.sh @@ -9,7 +9,7 @@ SECRET_KEY= UPLOADS_DIR=./uploads PROCESSED_DIR=./processed # Start Gunicorn in the background -gunicorn -w 4 --threads 2 -k uvicorn.workers.UvicornWorker --forwarded-allow-ips='*' --error-logfile - --access-logfile - main:app -b 0.0.0.0:8008 & +gunicorn -w 4 --threads 2 -k uvicorn.workers.UvicornWorker --forwarded-allow-ips='*' --error-logfile - --access-logfile - main:app -b 0.0.0.0:8000 & echo "Started Gunicorn..." # Store the Gunicorn process ID GUNICORN_PID=$! diff --git a/settings.default.yml b/settings.default.yml index 2168a2d..d3cf908 100755 --- a/settings.default.yml +++ b/settings.default.yml @@ -109,6 +109,8 @@ academic_settings: transcription_settings: whisper: compute_type: int8 + # device: cuda + # device_index: 0 allowed_models: - tiny - base diff --git a/static/js/script.js b/static/js/script.js index 89262d7..ddba560 100755 --- a/static/js/script.js +++ b/static/js/script.js @@ -549,8 +549,8 @@ function initializeSelectors() { } function showLoginView() { - if (appContainer) appContainer.style.display = 'block'; - if (loginContainer) loginContainer.style.display = 'none'; + if (appContainer) appContainer.style.display = 'none'; + if (loginContainer) loginContainer.style.display = 'flex'; if (loginButton) loginButton.addEventListener('click', () => { window.location.href = apiUrl('/login'); }); } @@ -560,4 +560,4 @@ function initializeSelectors() { } else { showLoginView(); } -}) \ No newline at end of file +})