Refactor document processing endpoint to accept file_id as a path parameter and update related logic; modify DocumentProcessRequest to make file_id optional; add clarification to tax processing rules in DocumentProcessor.
This commit is contained in:
+9
-9
@@ -365,11 +365,11 @@ async def upload_multiple_documents(
|
||||
|
||||
|
||||
@app.post(
|
||||
"/process",
|
||||
"/process/{file_id}",
|
||||
response_model=DocumentProcessResponse,
|
||||
tags=["Document Processing"],
|
||||
)
|
||||
async def process_document(request: DocumentProcessRequest, db: db_dependency):
|
||||
async def process_document(file_id: str, request: DocumentProcessRequest, db: db_dependency):
|
||||
"""
|
||||
Process a previously uploaded document to extract receipt information.
|
||||
|
||||
@@ -381,10 +381,10 @@ async def process_document(request: DocumentProcessRequest, db: db_dependency):
|
||||
"""
|
||||
try:
|
||||
# Get file info from database
|
||||
db_uploaded_file = get_uploaded_file_from_db(db, request.file_id)
|
||||
db_uploaded_file = get_uploaded_file_from_db(db, file_id)
|
||||
if not db_uploaded_file:
|
||||
raise HTTPException(
|
||||
status_code=404, detail=f"File {request.file_id} not found"
|
||||
status_code=404, detail=f"File {file_id} not found"
|
||||
)
|
||||
|
||||
# Process the file using the stored file path
|
||||
@@ -406,8 +406,8 @@ async def process_document(request: DocumentProcessRequest, db: db_dependency):
|
||||
|
||||
# Create database receipt object
|
||||
db_receipt = DBReceipt(
|
||||
receipt_id=f"receipt_{request.file_id}",
|
||||
file_id=request.file_id,
|
||||
receipt_id=f"receipt_{file_id}",
|
||||
file_id=file_id,
|
||||
amount=receipt_data.get("total_amount", 0.0),
|
||||
date=receipt_date,
|
||||
vendor=receipt_data.get("vendor", ""),
|
||||
@@ -433,7 +433,7 @@ async def process_document(request: DocumentProcessRequest, db: db_dependency):
|
||||
db.commit()
|
||||
|
||||
return DocumentProcessResponse(
|
||||
file_id=request.file_id,
|
||||
file_id=file_id,
|
||||
receipt_id=db_receipt.receipt_id,
|
||||
extraction_success=receipt_data.get("extraction_success", False),
|
||||
vendor=receipt_data.get("vendor", ""),
|
||||
@@ -579,8 +579,8 @@ async def match_specific_receipts(request: MatchSpecificRequest, db: db_dependen
|
||||
for result in matching_results:
|
||||
# Get final tax amount from LLM analysis if available, otherwise use receipt's stated tax
|
||||
final_tax = result.receipt.tax
|
||||
if result.tax_analysis and "final_tax_amount" in result.tax_analysis:
|
||||
final_tax = result.tax_analysis["final_tax_amount"]
|
||||
# if result.tax_analysis and "final_tax_amount" in result.tax_analysis:
|
||||
# final_tax = result.tax_analysis["final_tax_amount"]
|
||||
|
||||
match_response = MatchResponse(
|
||||
receipt_id=result.receipt.id,
|
||||
|
||||
Reference in New Issue
Block a user