Update app.py

app.py

@@ -295,17 +295,40 @@ def stringToRGB():
        
 
     if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.6')  or vv[5][2].startswith('2.1'):
-        pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
-        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-        md, res =dbxTeam.files_download(path=pdfpath)
-        dataDoc = res.content
-        doc = fitz.open("pdf",dataDoc)
-        page=doc[0]
-        if page.rotation!=0:
-            page.set_rotation(0)
-        pix = page.get_pixmap(dpi=300)  # render page to an image
-        pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
-        arr=measureproject(vv,dataDoc,pl)
+        print(f"el mawgood fe vv[0]: {vv[0]}")
+        arr_s = []
+        dataDocs = []
+        pls = []
+        for v in vv[0]:
+        print(f"el mawgood fe vv[0]: {vv[0]}")
+        arr_s = []
+        dataDocs = []
+        pls = []
+        for v in vv[0]:
+            pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(v))
+            dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+            md, res =dbxTeam.files_download(path=pdfpath)
+            dataDoc = res.content
+            dataDocs.append(dataDoc)
+            doc = fitz.open("pdf",dataDoc)
+            page=doc[0]
+            if page.rotation!=0:
+                page.set_rotation(0)
+            pix = page.get_pixmap(dpi=300)  # render page to an image
+            pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
+            pls.append(pl)
+        arr=measureproject(vv,dataDocs,pls)
+        #pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(vv[0]))
+        #dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+        #md, res =dbxTeam.files_download(path=pdfpath)
+        #dataDoc = res.content
+        #doc = fitz.open("pdf",dataDoc)
+        #page=doc[0]
+        #if page.rotation!=0:
+         #   page.set_rotation(0)
+        #pix = page.get_pixmap(dpi=300)  # render page to an image
+        #pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
+        #arr=measureproject(vv,dataDoc,pl)
     return jsonify(arr)
 
 @app.route('/2.1Trial/',methods=["POST"])
@@ -414,7 +437,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         # 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
         annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray)
         dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/' 
-        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
+        pdflink= tsadropboxretrieval.uploadanyFile(doc=pdf_document,path=dbPath,pdfname="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
         _, buffer = cv2.imencode('.png', annotatedimg)
         repeatedLabelsReturn=''
         NotFoundReturn=''