Update app.py

app.py

@@ -47,6 +47,7 @@ import Azure_api
 from flask import Flask, render_template, session, redirect, url_for
 from flask_session import Session  # Capital "S"
 import os, traceback
+from werkzeug.utils import secure_filename
 
 ######################################################### FLASK APP #################################################################################################################################
 app = Flask(__name__)
@@ -1087,6 +1088,8 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0,csvfile=0):
             SearchArray=result[7]
             print('searchhh:',SearchArray)
             print('csv',csvfile)
+            CSV_UPLOAD_DIR = os.path.join(os.path.dirname(__file__), "uploaded_csv")
+
             # annotatedimg,pdf_document,spreadsheet_url, list1 , df_doors=doors_fasterrcnn.main_run(img,dataDoc,'separated_classes_all.pth',result[0],pdfpath, result[4]) #single_double.pth
             if pdf_content:
                 link = urllib.parse.unquote(result[6].strip('"'))
@@ -1102,14 +1105,49 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0,csvfile=0):
                     # pdf_contentSched = fitz.open(stream=pdf_contentSched, filetype="pdf")
                     annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
             else:
-                dataDocDoorsSchedule = []
-                for r in result[6]:
-                    pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= r)
-                    dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-                    md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
-                    dataDocDoorsSchedule.append(resDoors.content) 
-                annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
-                
+                sch_csv_pdf = False
+                file_names = result[6]   # ["7376....csv", "something.csv"] in CSV mode or PDF names in PDF mode
+                if not file_names:
+                    raise ValueError("No schedule files provided in result[6].")
+
+                first_name = str(file_names[0]).lower()
+
+                if first_name.endswith(".csv"):
+                    # 🔹 CSV MODE
+
+                    # Ensure folder exists
+                    os.makedirs(CSV_UPLOAD_DIR, exist_ok=True)
+
+                    # Grab uploaded CSV files from the request
+                    # name="csvFilename" from your <input type="file">
+                    uploaded_csvs = request.files.getlist("csvFilename")
+
+                    saved_paths = []
+
+                    for f in uploaded_csvs:
+                        if not f.filename:
+                            continue
+                        safe_name = secure_filename(f.filename)
+                        save_path = os.path.join(CSV_UPLOAD_DIR, safe_name)
+                        f.save(save_path)
+                        saved_paths.append(save_path)
+
+                    annotatedimgs, pdf_document, list1, repeated_labels, not_found, bax_pretty_xml, column_xml = Doors_Schedule.mainRun(
+                        saved_paths,   # 👉 ["file1.csv", "file2.csv"]
+                        dataDoc,
+                        SearchArray,
+                        sch_csv_pdf
+                    )
+                else:           
+                    dataDocDoorsSchedule = []
+                    sch_csv_pdf = True
+                    for r in result[6]:
+                        pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= r)
+                        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+                        md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
+                        dataDocDoorsSchedule.append(resDoors.content) 
+                    annotatedimgs, pdf_document , list1, repeated_labels , not_found, bax_pretty_xml, column_xml =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray, sch_csv_pdf)
+                    
             dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
             pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/