Update main.py

main.py

@@ -107,19 +107,40 @@ def process_receipt_endpoint():
         auth_header = request.headers.get('Authorization')
         token = auth_header.split('Bearer ')[1] if auth_header else None
         uid = verify_token(token) if token else None
-        
+
         if not uid:
             return jsonify({'error': 'Invalid token'}), 401
 
         user_ref = db.reference(f'users/{uid}')
         user_data = user_ref.get()
-        # Removed: check_daily_reset(user_ref)
-
-        # Handle manual entry
+        
+        # If the confirmation flag is set, then use the form fields (and hidden file_hash/image_url)
+        # to create the transaction. (Note: image_bytes is None because the image was already uploaded.)
+        if request.form.get('confirmed') == 'true':
+            data = {
+                'total': float(request.form.get('total')),
+                'items': [item.strip() for item in request.form.get('items', '').split(',')],
+                'date': request.form.get('date'),
+                'receipt_number': request.form.get('receipt_number'),
+                'is_receipt': True,
+                'image_url': request.form.get('image_url')  # provided by the first submission
+            }
+            file_hash = request.form.get('file_hash', '')
+            # In this confirmation branch, we pass image_bytes as None.
+            return validate_and_save_transaction(
+                uid=uid,
+                user_data=user_data,
+                data=data,
+                file_hash=file_hash,
+                image_bytes=None,
+                manual=False
+            )
+
+        # Handle manual entry (if the user explicitly selects manual entry)
         if request.form.get('manual_entry') == 'true':
             return handle_manual_entry(uid, user_ref, user_data)
 
-        # Handle image processing
+        # Handle image processing (first submission)
         file = request.files.get('receipt')
         if not file:
             return jsonify({'error': 'No file uploaded'}), 400
@@ -132,6 +153,13 @@ def process_receipt_endpoint():
         if existing:
             return jsonify({'error': 'Receipt already processed'}), 400
 
+        # Immediately upload the image so that it is stored regardless of review outcome.
+        timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+        blob = bucket.blob(f'receipts/{uid}/{timestamp}_{file_hash}.jpg')
+        blob.upload_from_string(image_bytes, content_type='image/jpeg')
+        image_url = blob.public_url
+
+        # Process the image with Gemini
         image = Image.open(io.BytesIO(image_bytes))
         model = configure_gemini()
         result_text = process_receipt(model, image)
@@ -145,14 +173,15 @@ def process_receipt_endpoint():
         if not data.get('is_receipt', False):
             return jsonify({'error': 'Not a valid receipt'}), 400
 
-        return validate_and_save_transaction(
-            uid=uid,
-            user_data=user_data,
-            data=data,
-            file_hash=file_hash,
-            image_bytes=image_bytes,
-            manual=False
-        )
+        # Instead of saving immediately, return the extracted data along with the image info for review.
+        data['file_hash'] = file_hash
+        data['image_url'] = image_url
+        return jsonify({
+            'success': True,
+            'extracted': True,
+            'data': data,
+            'message': 'Review extracted information before confirming.'
+        })
 
     except Exception as e:
         print(e)