Audit pass: cookie auth migration, route guards, GP% clamp, CSV export, OCR transaction safety, N+1 fix, and cleanup
- Migrated all 435 frontend fetch calls from Authorization Bearer header to credentials: 'include' (cookie auth) - Removed ?token= from all file/image URLs (browser history exposure) - Added ProtectedRoute wrapper to all capability-gated routes in App.tsx - OCR background task: added transaction boundary, improved error handling and status rollback - DuplicateDetector: wrapped in non-fatal try/except so crashes don't abort invoice processing - File upload: commit DB row before writing to disk to prevent orphaned files - GP% clamped to 100% in GPReport (credit notes can inflate above 100%) - Added CSV export to GPReport (suppliers, daily data, allowances breakdown) - Backend file-serving endpoints: cookie auth with ?token= fallback for backward compatibility - DATA_DIR: moved from hardcoded /app/data to os.getenv in invoices.py and recipes.py - N+1 fix in list_recipes: batch-loads latest cost snapshot in 1 query (was N) - Zero-yield sub-recipe: logs warning instead of silently zeroing cost contribution - Budget spend rate input: rejects negative values - GPReport allowances toggle: persisted to localStorage across page loads - DB pool_size/max_overflow: configurable via DB_POOL_SIZE/DB_MAX_OVERFLOW env vars - Fixed SyntaxWarning from \\d in invoices.py docstring Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6f6e16c88f
commit
ba075276b1
57 changed files with 15427 additions and 15274 deletions
|
|
@ -118,7 +118,7 @@ def get_line_item_page_numbers_by_line_number(invoice: Invoice) -> dict[int, int
|
|||
return {}
|
||||
|
||||
|
||||
DATA_DIR = "/app/data"
|
||||
DATA_DIR = os.getenv("DATA_DIR", "/app/data")
|
||||
|
||||
|
||||
# Response Models
|
||||
|
|
@ -549,7 +549,11 @@ async def upload_invoice(
|
|||
status=InvoiceStatus.PENDING
|
||||
)
|
||||
db.add(invoice)
|
||||
await db.commit()
|
||||
try:
|
||||
await db.commit()
|
||||
except Exception:
|
||||
os.remove(filepath)
|
||||
raise
|
||||
await db.refresh(invoice)
|
||||
|
||||
background_tasks.add_task(
|
||||
|
|
@ -794,19 +798,22 @@ async def process_invoice_background(invoice_id: int, image_path: str, kitchen_i
|
|||
except Exception as e:
|
||||
logger.warning(f"Ingredient price auto-update failed (non-critical): {e}")
|
||||
|
||||
# Run duplicate detection
|
||||
detector = DuplicateDetector(db, kitchen_id)
|
||||
duplicates = await detector.check_duplicates(invoice)
|
||||
# Run duplicate detection (non-critical — log and continue on failure)
|
||||
try:
|
||||
detector = DuplicateDetector(db, kitchen_id)
|
||||
duplicates = await detector.check_duplicates(invoice)
|
||||
|
||||
if duplicates["firm_duplicate"]:
|
||||
invoice.duplicate_status = "firm_duplicate"
|
||||
invoice.duplicate_of_id = duplicates["firm_duplicate"].id
|
||||
elif duplicates["possible_duplicates"]:
|
||||
invoice.duplicate_status = "possible_duplicate"
|
||||
invoice.duplicate_of_id = duplicates["possible_duplicates"][0].id
|
||||
if duplicates["firm_duplicate"]:
|
||||
invoice.duplicate_status = "firm_duplicate"
|
||||
invoice.duplicate_of_id = duplicates["firm_duplicate"].id
|
||||
elif duplicates["possible_duplicates"]:
|
||||
invoice.duplicate_status = "possible_duplicate"
|
||||
invoice.duplicate_of_id = duplicates["possible_duplicates"][0].id
|
||||
|
||||
if duplicates["related_documents"]:
|
||||
invoice.related_document_id = duplicates["related_documents"][0].id
|
||||
if duplicates["related_documents"]:
|
||||
invoice.related_document_id = duplicates["related_documents"][0].id
|
||||
except Exception as e:
|
||||
logger.warning(f"Duplicate detection failed for invoice {invoice_id} (non-critical): {e}")
|
||||
|
||||
invoice.status = InvoiceStatus.PROCESSED
|
||||
await db.commit()
|
||||
|
|
@ -815,13 +822,17 @@ async def process_invoice_background(invoice_id: int, image_path: str, kitchen_i
|
|||
f"duplicate_status={invoice.duplicate_status}")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"OCR processing error for invoice {invoice_id}: {e}")
|
||||
stmt = select(Invoice).where(Invoice.id == invoice_id)
|
||||
db_result = await db.execute(stmt)
|
||||
invoice = db_result.scalar_one()
|
||||
invoice.status = InvoiceStatus.PROCESSED
|
||||
invoice.ocr_raw_text = f"Error: {str(e)}"
|
||||
await db.commit()
|
||||
logger.error(f"OCR processing error for invoice {invoice_id}: {e}", exc_info=True)
|
||||
try:
|
||||
await db.rollback()
|
||||
stmt = select(Invoice).where(Invoice.id == invoice_id)
|
||||
db_result = await db.execute(stmt)
|
||||
invoice = db_result.scalar_one()
|
||||
invoice.status = InvoiceStatus.PROCESSED
|
||||
invoice.ocr_raw_text = f"Error: {str(e)}"
|
||||
await db.commit()
|
||||
except Exception as update_err:
|
||||
logger.error(f"Failed to update invoice {invoice_id} status after OCR error: {update_err}")
|
||||
|
||||
|
||||
@router.get("/", response_model=InvoiceListResponse)
|
||||
|
|
@ -2106,19 +2117,26 @@ async def get_invoice_ocr_data(
|
|||
async def get_line_item_preview(
|
||||
invoice_id: int,
|
||||
line_number: int,
|
||||
token: str,
|
||||
request: Request,
|
||||
token: Optional[str] = Query(None),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""Get a cropped image preview of a specific line item from the invoice OCR bounding box."""
|
||||
import json as json_module
|
||||
import io
|
||||
from auth import get_current_user, require_cap_from_token
|
||||
from starlette.responses import Response
|
||||
from services.file_archival_service import FileArchivalService
|
||||
|
||||
current_user = await get_current_user_from_token(token, db)
|
||||
current_user = None
|
||||
if token:
|
||||
current_user = await get_current_user_from_token(token, db)
|
||||
if not current_user:
|
||||
raise HTTPException(status_code=401, detail="Invalid token")
|
||||
try:
|
||||
current_user = await get_current_user(request)
|
||||
except HTTPException:
|
||||
pass
|
||||
if not current_user:
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
|
||||
invoice = await get_invoice_or_404(invoice_id, current_user, db)
|
||||
|
||||
|
|
@ -2220,13 +2238,13 @@ async def get_line_item_field_preview(
|
|||
invoice_id: int,
|
||||
line_number: int,
|
||||
field_name: str,
|
||||
token: str,
|
||||
request: Request,
|
||||
token: Optional[str] = Query(None),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
"""Get a cropped image preview of a specific field within a line item (e.g. product_code)."""
|
||||
import json as json_module
|
||||
import io
|
||||
from auth import get_current_user, require_cap_from_token
|
||||
from starlette.responses import Response
|
||||
from services.file_archival_service import FileArchivalService
|
||||
|
||||
|
|
@ -2234,9 +2252,16 @@ async def get_line_item_field_preview(
|
|||
if not azure_key:
|
||||
raise HTTPException(status_code=400, detail=f"Unknown field: {field_name}")
|
||||
|
||||
current_user = await get_current_user_from_token(token, db)
|
||||
current_user = None
|
||||
if token:
|
||||
current_user = await get_current_user_from_token(token, db)
|
||||
if not current_user:
|
||||
raise HTTPException(status_code=401, detail="Invalid token")
|
||||
try:
|
||||
current_user = await get_current_user(request)
|
||||
except HTTPException:
|
||||
pass
|
||||
if not current_user:
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
|
||||
invoice = await get_invoice_or_404(invoice_id, current_user, db)
|
||||
|
||||
|
|
@ -2387,11 +2412,11 @@ async def parse_dates_from_ocr(
|
|||
|
||||
|
||||
def _generalize_invoice_number_pattern(sample: str) -> str:
|
||||
"""
|
||||
r"""
|
||||
Convert a known invoice number into a regex that matches similar-shaped numbers.
|
||||
Uses tight ±1 range on digit runs to avoid matching phone/VAT/postcode numbers.
|
||||
e.g. 'ID304574' → r'\bID\d{5,7}\b'
|
||||
'INV-00123' → r'\bINV-\d{4,6}\b'
|
||||
e.g. 'ID304574' -> r'\bID\d{5,7}\b'
|
||||
'INV-00123' -> r'\bINV-\d{4,6}\b'
|
||||
"""
|
||||
parts = []
|
||||
i = 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue