952e27b339
- Add tests for get_unique_filepath_with_counter collision handling - Add tests for immutable original storage - Add tests for metadata augmentation with file paths - Add tests for force_cloud_ocr parameter - Verify existing process_document tests still pass Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
330 lines
13 KiB
Python
330 lines
13 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import logging
|
|
import mimetypes
|
|
import os
|
|
import shutil
|
|
import uuid
|
|
|
|
import PyPDF2 # Replace fitz with PyPDF2
|
|
|
|
from app.celery_app import celery
|
|
from app.config import settings
|
|
from app.database import SessionLocal
|
|
from app.models import FileRecord
|
|
from app.tasks.extract_metadata_with_gpt import extract_metadata_with_gpt
|
|
from app.tasks.process_with_azure_document_intelligence import (
|
|
process_with_azure_document_intelligence,
|
|
)
|
|
from app.tasks.retry_config import BaseTaskWithRetry
|
|
from app.utils import get_unique_filepath_with_counter, hash_file, log_task_progress
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@celery.task(base=BaseTaskWithRetry, bind=True)
|
|
def process_document(self, original_local_file: str, original_filename: str = None, file_id: int = None, force_cloud_ocr: bool = False):
|
|
"""
|
|
Process a document file and trigger appropriate text extraction.
|
|
|
|
Args:
|
|
original_local_file: Path to the file on disk
|
|
original_filename: Optional original filename (if different from path basename)
|
|
file_id: Optional existing file record ID. When provided, skips duplicate
|
|
detection and reuses the existing record (used for reprocessing).
|
|
force_cloud_ocr: If True, forces Azure Document Intelligence OCR processing
|
|
regardless of embedded text quality. Used for re-processing.
|
|
|
|
Steps:
|
|
1. Check if we have a FileRecord entry (via SHA-256 hash). If found, skip re-processing.
|
|
(Skipped when file_id is provided for reprocessing.)
|
|
2. If not found, insert a new DB row and continue with the pipeline:
|
|
- Save immutable copy to /workdir/original
|
|
- Copy file to /workdir/tmp for processing
|
|
- Check for embedded text. If present, run local GPT extraction
|
|
- Otherwise, queue Azure Document Intelligence processing
|
|
3. If force_cloud_ocr is True, skip local text extraction and use cloud OCR
|
|
"""
|
|
task_id = self.request.id
|
|
logger.info(f"[{task_id}] Starting document processing: {original_local_file}")
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"in_progress",
|
|
f"Processing file: {original_local_file}",
|
|
)
|
|
|
|
if not os.path.exists(original_local_file):
|
|
logger.error(f"[{task_id}] File {original_local_file} not found.")
|
|
log_task_progress(
|
|
task_id, "process_document", "failure", "File not found",
|
|
detail=f"File not found on disk: {original_local_file}",
|
|
)
|
|
return {"error": "File not found"}
|
|
|
|
# 0. Compute the file hash and check for duplicates
|
|
logger.info(f"[{task_id}] Computing file hash...")
|
|
log_task_progress(task_id, "hash_file", "in_progress", "Computing file hash")
|
|
filehash = hash_file(original_local_file)
|
|
# Use provided original_filename or fall back to basename of path
|
|
if original_filename is None:
|
|
original_filename = os.path.basename(original_local_file)
|
|
file_size = os.path.getsize(original_local_file)
|
|
mime_type, _ = mimetypes.guess_type(original_local_file)
|
|
if not mime_type:
|
|
mime_type = "application/octet-stream"
|
|
|
|
logger.info(f"[{task_id}] File hash: {filehash[:10]}..., Size: {file_size} bytes, MIME: {mime_type}")
|
|
log_task_progress(
|
|
task_id,
|
|
"hash_file",
|
|
"success",
|
|
f"Hash: {filehash[:10]}..., Size: {file_size} bytes",
|
|
)
|
|
|
|
# Acquire DB session in the task
|
|
with SessionLocal() as db:
|
|
# When file_id is provided, we are reprocessing an existing file.
|
|
# Skip the duplicate check and reuse the existing record.
|
|
if file_id is not None:
|
|
existing_record = db.query(FileRecord).filter_by(id=file_id).one_or_none()
|
|
if existing_record is None:
|
|
logger.error(f"[{task_id}] File record with ID {file_id} not found for reprocessing.")
|
|
log_task_progress(task_id, "process_document", "failure", "File record not found", file_id=file_id)
|
|
return {"error": "File record not found", "file_id": file_id}
|
|
logger.info(f"[{task_id}] Reprocessing existing file record ID: {file_id}, skipping duplicate check.")
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"in_progress",
|
|
f"Reprocessing file record ID: {file_id}",
|
|
file_id=file_id,
|
|
)
|
|
new_record = existing_record
|
|
else:
|
|
existing = db.query(FileRecord).filter_by(filehash=filehash).one_or_none()
|
|
if existing:
|
|
logger.info(f"[{task_id}] Duplicate file detected (hash={filehash[:10]}...) Skipping processing.")
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"success",
|
|
"Duplicate file detected, skipping",
|
|
file_id=existing.id,
|
|
detail=(
|
|
f"Duplicate file detected.\n"
|
|
f"File hash: {filehash}\n"
|
|
f"Existing file record ID: {existing.id}\n"
|
|
f"Original filename: {original_filename}"
|
|
),
|
|
)
|
|
return {
|
|
"status": "duplicate_file",
|
|
"file_id": existing.id,
|
|
"detail": "File already processed.",
|
|
}
|
|
|
|
# Not a duplicate -> insert a new record
|
|
logger.info(f"[{task_id}] Creating new file record in database")
|
|
log_task_progress(task_id, "create_file_record", "in_progress", "Creating file record")
|
|
new_record = FileRecord(
|
|
filehash=filehash,
|
|
original_filename=original_filename,
|
|
local_filename="", # Will fill in after we move it
|
|
file_size=file_size,
|
|
mime_type=mime_type,
|
|
)
|
|
db.add(new_record)
|
|
db.commit()
|
|
db.refresh(new_record)
|
|
logger.info(f"[{task_id}] File record created with ID: {new_record.id}")
|
|
log_task_progress(
|
|
task_id,
|
|
"create_file_record",
|
|
"success",
|
|
f"File record ID: {new_record.id}",
|
|
file_id=new_record.id,
|
|
)
|
|
|
|
# 1. Generate a UUID-based filename for storage
|
|
file_ext = os.path.splitext(original_local_file)[1]
|
|
file_uuid = str(uuid.uuid4())
|
|
new_filename = f"{file_uuid}{file_ext}"
|
|
|
|
# 2. Save immutable copy to /workdir/original (only for new files, not reprocessing)
|
|
# For reprocessing, the original_file_path should already exist in the database
|
|
if file_id is None: # New file - save original copy
|
|
# This copy serves as the permanent, untouched reference of the ingested file
|
|
original_dir = os.path.join(settings.workdir, "original")
|
|
os.makedirs(original_dir, exist_ok=True)
|
|
|
|
# Use collision-resistant naming with -0001, -0002 suffixes
|
|
base_name = os.path.splitext(new_filename)[0]
|
|
original_file_path = get_unique_filepath_with_counter(original_dir, base_name, file_ext)
|
|
|
|
logger.info(f"[{task_id}] Saving immutable original to: {original_file_path}")
|
|
log_task_progress(
|
|
task_id,
|
|
"save_original",
|
|
"in_progress",
|
|
f"Saving original to {os.path.basename(original_file_path)}",
|
|
file_id=new_record.id,
|
|
)
|
|
shutil.copy(original_local_file, original_file_path)
|
|
log_task_progress(
|
|
task_id,
|
|
"save_original",
|
|
"success",
|
|
f"Original saved: {os.path.basename(original_file_path)}",
|
|
file_id=new_record.id,
|
|
)
|
|
|
|
# Update the DB with original_file_path
|
|
new_record.original_file_path = original_file_path
|
|
else:
|
|
# Reprocessing - original should already exist
|
|
logger.info(f"[{task_id}] Reprocessing: original file already saved at {new_record.original_file_path}")
|
|
log_task_progress(
|
|
task_id,
|
|
"save_original",
|
|
"success",
|
|
"Reprocessing: using existing original",
|
|
file_id=new_record.id,
|
|
)
|
|
|
|
# 3. Copy to /workdir/tmp for processing
|
|
tmp_dir = os.path.join(settings.workdir, "tmp")
|
|
os.makedirs(tmp_dir, exist_ok=True)
|
|
new_local_path = os.path.join(tmp_dir, new_filename)
|
|
|
|
logger.info(f"[{task_id}] Copying file to processing area: {new_local_path}")
|
|
log_task_progress(
|
|
task_id,
|
|
"copy_file",
|
|
"in_progress",
|
|
f"Copying file to {new_filename}",
|
|
file_id=new_record.id,
|
|
)
|
|
# Copy the file instead of moving it
|
|
shutil.copy(original_local_file, new_local_path)
|
|
log_task_progress(
|
|
task_id,
|
|
"copy_file",
|
|
"success",
|
|
f"File copied to {new_filename}",
|
|
file_id=new_record.id,
|
|
)
|
|
|
|
# Update the DB with local_filename
|
|
new_record.local_filename = new_local_path
|
|
db.commit()
|
|
|
|
# Store file_id before session closes to avoid DetachedInstanceError
|
|
file_id = new_record.id
|
|
|
|
# 2. Check for embedded text (outside the DB session to avoid long open transactions)
|
|
# Skip local text extraction if force_cloud_ocr is True
|
|
if force_cloud_ocr:
|
|
logger.info(f"[{task_id}] Force Cloud OCR requested, skipping embedded text check")
|
|
log_task_progress(
|
|
task_id,
|
|
"check_text",
|
|
"success",
|
|
"Force Cloud OCR requested, queuing OCR",
|
|
file_id=file_id,
|
|
)
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"success",
|
|
"Queued for forced OCR processing",
|
|
file_id=file_id,
|
|
)
|
|
process_with_azure_document_intelligence.delay(new_filename, file_id)
|
|
return {"file": new_local_path, "status": "Queued for forced OCR", "file_id": file_id}
|
|
|
|
logger.info(f"[{task_id}] Checking for embedded text in PDF")
|
|
log_task_progress(
|
|
task_id,
|
|
"check_text",
|
|
"in_progress",
|
|
"Checking for embedded text",
|
|
file_id=file_id,
|
|
)
|
|
with open(new_local_path, "rb") as file:
|
|
pdf_reader = PyPDF2.PdfReader(file)
|
|
has_text = False
|
|
for page in pdf_reader.pages:
|
|
if page.extract_text().strip():
|
|
has_text = True
|
|
break
|
|
|
|
if has_text:
|
|
logger.info(f"[{task_id}] PDF {original_local_file} contains embedded text. Processing locally.")
|
|
log_task_progress(
|
|
task_id,
|
|
"check_text",
|
|
"success",
|
|
"Embedded text found, extracting locally",
|
|
file_id=file_id,
|
|
)
|
|
|
|
# Extract text locally
|
|
logger.info(f"[{task_id}] Extracting text from PDF")
|
|
log_task_progress(
|
|
task_id,
|
|
"extract_text",
|
|
"in_progress",
|
|
"Extracting text locally",
|
|
file_id=file_id,
|
|
)
|
|
extracted_text = ""
|
|
with open(new_local_path, "rb") as file:
|
|
pdf_reader = PyPDF2.PdfReader(file)
|
|
for page in pdf_reader.pages:
|
|
extracted_text += page.extract_text() + "\n"
|
|
|
|
logger.info(f"[{task_id}] Extracted {len(extracted_text)} characters")
|
|
log_task_progress(
|
|
task_id,
|
|
"extract_text",
|
|
"success",
|
|
f"Extracted {len(extracted_text)} characters",
|
|
file_id=file_id,
|
|
)
|
|
|
|
# Call metadata extraction directly
|
|
logger.info(f"[{task_id}] Queueing metadata extraction")
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"success",
|
|
"Queued for metadata extraction",
|
|
file_id=file_id,
|
|
)
|
|
extract_metadata_with_gpt.delay(new_filename, extracted_text, file_id)
|
|
return {
|
|
"file": new_local_path,
|
|
"status": "Text extracted locally",
|
|
"file_id": file_id,
|
|
}
|
|
|
|
# 3. If no embedded text, queue Azure Document Intelligence processing
|
|
logger.info(f"[{task_id}] No embedded text found. Queueing Azure Document Intelligence processing")
|
|
log_task_progress(
|
|
task_id,
|
|
"check_text",
|
|
"success",
|
|
"No embedded text, queuing OCR",
|
|
file_id=file_id,
|
|
)
|
|
log_task_progress(
|
|
task_id,
|
|
"process_document",
|
|
"success",
|
|
"Queued for OCR processing",
|
|
file_id=file_id,
|
|
)
|
|
process_with_azure_document_intelligence.delay(new_filename, file_id)
|
|
return {"file": new_local_path, "status": "Queued for OCR", "file_id": file_id}
|