Update app.py

app.py

@@ -355,11 +355,134 @@ async def check_user_doc(user_id: str = Form(...)):
 # update user sheet           
 # update firebase transaction
 # privatize the image and move the image to appropriate folder(s)
+# @app.post("/process-image")
+# async def process_photo(image_id: str  = Form(...), user_id: str = Form(...)):
+#     transaction_ref = transactions_collection_ref.document(user_id)
+#     transaction = transaction_ref.get()
+#     # If transaction does not exist, create a new one
+#     if not transaction.exists:
+#         transaction_ref.set({
+#             "no_sms": 0,
+#             "no_contacts": 0,
+#             "no_receipts": 0,
+#             "no_business_cards": 0,
+#             "purchased_credit": {
+#                 "image_detection": 100,
+#                 "sync_data": 500,
+#             }
+#         })
+#         transaction = transaction_ref.get()
+        
+#     transaction_data = transaction.to_dict()
+    
+#     # check if any of the limits have been reached
+#     if transaction_data['no_receipts'] + transaction_data['no_business_cards'] >= transaction_data['purchased_credit']['image_detection']:
+#         return {"error": "You have reached the limit of the number of items you can process. Please upgrade your plan."}
+    
+#     user_ref = users_collection_ref.document(user_id)
+#     user = user_ref.get()
+#     user_data = user.to_dict()
+
+    
+#     try:
+#         parent_folders = [user_data['gDrive_metadata']['yungsoogi'], user_data['gDrive_metadata']['uploaded']]
+#         dataJson = await request_gpt4o_completion(image_id, transaction_data['purchased_credit']['image_detection'])
+#         if dataJson is None:
+#             return {"error": "An error occurred while processing the image"}
+        
+#         data = json.loads(dataJson)
+#         # Check if 'receipts' key exists and the length
+#         found_receipt_no = len(data['receipts']) if 'receipts' in data else 0
+#         found_business_cards_no = len(data['busi_cards']) if 'busi_cards' in data else 0
+#         new_folders = []
+#         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+#         # https://drive.google.com/file/d/1cFIA09PBqFjM8YvIz1D60p7HMGk1uBvo/view?usp=sharing
+#         download_image_url = f"https://drive.google.com/uc?id={image_id}&export=download"
+#         image_url = f"https://drive.google.com/file/d/{image_id}/view?usp=sharing"
+#         #  이미지를 보여주어야 할때 =image({image_url})를 사용하고 갈 수 있는 경로를 만들때는 =HYPERLINK({image_url}, '바로가기')를 사용하세요.
+#         if found_receipt_no > 0:
+#             new_folders.append(user_data['gDrive_metadata']['receipts'])
+#             receipts_data = convert_dicts_to_list(
+#                 data['receipts'], 
+#                 add_link=True, 
+#                 image_id=image_id, 
+#                 link_text="바로가기",
+#                 link_position=1        # Link third
+#             )
+#             print(receipts_data)
+#             await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], receipts_ss, "영수증", receipts_data)
+#         if found_business_cards_no > 0:
+#             new_folders.append(user_data['gDrive_metadata']['business_cards'])
+#             business_cards_data = convert_dicts_to_list(
+#                 data['busi_cards'], 
+#                 add_link=True, 
+#                 image_id=image_id, 
+#                 link_text="명함보기",
+#                 link_position=-1       # Link at the end
+#             )
+#             await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], business_cards_ss, "명함", business_cards_data)
+    
+#         print(f"{found_receipt_no}, {found_business_cards_no}")
+    
+#         status = await update_fb_transaction(
+#             transaction_ref,
+#             no_receipts=found_receipt_no,
+#             no_business_cards=found_business_cards_no
+#         )
+    
+        
+#         if status['status'] == "Success":
+#             await move_file_to_folder(image_id, parent_folders, new_folders)
+#             return {"success": True}
+#         else:
+#             logging.error(f"Transaction update failed with status: {status['status']}")
+#             return {"error": "An error has occurred while updating the transaction"}
+#     except Exception as e:
+#         logging.error(f"An error occurred: {e}")
+#         # Move the image file to the error folder
+#         await move_file_to_folder(image_id, parent_folders, user_data['gDrive_metadata']['error'])
+#         return {"error": str(e)}
+
+async def update_user_sheets_and_folders(user_data, image_id, found_receipt_no, found_business_cards_no, data, transaction_ref):
+    new_folders = []
+    try:
+        # Process receipts and business cards
+        if found_receipt_no > 0:
+            new_folders.append(user_data['gDrive_metadata']['receipts'])
+            receipts_data = convert_dicts_to_list(
+                data['receipts'], 
+                add_link=True, 
+                image_id=image_id, 
+                link_text="바로가기",
+                link_position=1        # Link third
+            )
+            await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], receipts_ss, "영수증", receipts_data)
+        
+        if found_business_cards_no > 0:
+            new_folders.append(user_data['gDrive_metadata']['business_cards'])
+            business_cards_data = convert_dicts_to_list(
+                data['busi_cards'], 
+                add_link=True, 
+                image_id=image_id, 
+                link_text="명함보기",
+                link_position=-1       # Link at the end
+            )
+            await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], business_cards_ss, "명함", business_cards_data)
+        
+        await move_file_to_folder(image_id, parent_folders, new_folders)
+        await update_fb_transaction(
+            transaction_ref,
+            no_receipts=found_receipt_no,
+            no_business_cards=found_business_cards_no
+        )
+    except Exception as e:
+        logging.error(f"An error occurred in background task: {e}")
+        await move_file_to_folder(image_id, parent_folders, user_data['gDrive_metadata']['error'])
 @app.post("/process-image")
-async def process_photo(image_id: str  = Form(...), user_id: str = Form(...)):
+async def process_photo(image_id: str = Form(...), user_id: str = Form(...), background_tasks: BackgroundTasks):
     transaction_ref = transactions_collection_ref.document(user_id)
     transaction = transaction_ref.get()
-    # If transaction does not exist, create a new one
+    
     if not transaction.exists:
         transaction_ref.set({
             "no_sms": 0,
@@ -372,17 +495,15 @@ async def process_photo(image_id: str  = Form(...), user_id: str = Form(...)):
             }
         })
         transaction = transaction_ref.get()
-        
+    
     transaction_data = transaction.to_dict()
     
-    # check if any of the limits have been reached
     if transaction_data['no_receipts'] + transaction_data['no_business_cards'] >= transaction_data['purchased_credit']['image_detection']:
         return {"error": "You have reached the limit of the number of items you can process. Please upgrade your plan."}
     
     user_ref = users_collection_ref.document(user_id)
     user = user_ref.get()
     user_data = user.to_dict()
-
     
     try:
         parent_folders = [user_data['gDrive_metadata']['yungsoogi'], user_data['gDrive_metadata']['uploaded']]
@@ -391,57 +512,18 @@ async def process_photo(image_id: str  = Form(...), user_id: str = Form(...)):
             return {"error": "An error occurred while processing the image"}
         
         data = json.loads(dataJson)
-        # Check if 'receipts' key exists and the length
         found_receipt_no = len(data['receipts']) if 'receipts' in data else 0
         found_business_cards_no = len(data['busi_cards']) if 'busi_cards' in data else 0
-        new_folders = []
-        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        # https://drive.google.com/file/d/1cFIA09PBqFjM8YvIz1D60p7HMGk1uBvo/view?usp=sharing
-        download_image_url = f"https://drive.google.com/uc?id={image_id}&export=download"
-        image_url = f"https://drive.google.com/file/d/{image_id}/view?usp=sharing"
-        #  이미지를 보여주어야 할때 =image({image_url})를 사용하고 갈 수 있는 경로를 만들때는 =HYPERLINK({image_url}, '바로가기')를 사용하세요.
-        if found_receipt_no > 0:
-            new_folders.append(user_data['gDrive_metadata']['receipts'])
-            receipts_data = convert_dicts_to_list(
-                data['receipts'], 
-                add_link=True, 
-                image_id=image_id, 
-                link_text="바로가기",
-                link_position=1        # Link third
-            )
-            print(receipts_data)
-            await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], receipts_ss, "영수증", receipts_data)
-        if found_business_cards_no > 0:
-            new_folders.append(user_data['gDrive_metadata']['business_cards'])
-            business_cards_data = convert_dicts_to_list(
-                data['busi_cards'], 
-                add_link=True, 
-                image_id=image_id, 
-                link_text="명함보기",
-                link_position=-1       # Link at the end
-            )
-            await update_user_sheet(user_data['gDrive_metadata']['spreadsheet'], business_cards_ss, "명함", business_cards_data)
-    
-        print(f"{found_receipt_no}, {found_business_cards_no}")
-    
-        status = await update_fb_transaction(
-            transaction_ref,
-            no_receipts=found_receipt_no,
-            no_business_cards=found_business_cards_no
-        )
-    
-        
-        if status['status'] == "Success":
-            await move_file_to_folder(image_id, parent_folders, new_folders)
-            return {"success": True}
-        else:
-            logging.error(f"Transaction update failed with status: {status['status']}")
-            return {"error": "An error has occurred while updating the transaction"}
+
+        # Schedule background tasks
+        background_tasks.add_task(update_user_sheets_and_folders, user_data, image_id, found_receipt_no, found_business_cards_no, data, transaction_ref)
+
+        return {"success": True}
     except Exception as e:
         logging.error(f"An error occurred: {e}")
-        # Move the image file to the error folder
         await move_file_to_folder(image_id, parent_folders, user_data['gDrive_metadata']['error'])
         return {"error": str(e)}
+
     
 @app.post("/sync-data")
 async def process_photo(data_json: str = Form(...), user_id: str = Form(...)):