Update app.py

app.py

@@ -18,6 +18,8 @@ from flask import Flask, Response
 from werkzeug.wsgi import wrap_file
 import tameem3_2
 import pypdfium2 as pdfium
+from urllib.parse import urlparse
+import re
 import pixelconversion
 import tameem2_1
 import io
@@ -129,6 +131,10 @@ def getprjpartsfromTestAPI(jsdata):
 @app.route('/getprojectsections/<jsdata>',methods=['GET'])
 def getprjSectionsfromTestAPI(jsdata):
     data=json.loads(jsdata)
+    if data[0]=='testing':
+        sections=API.getprjSections()  
+        print(sections)
+        return jsonify(sections)
     sections=API.getprjSections(data[0],data[1])
     return jsonify(sections)
 
@@ -165,6 +171,11 @@ def searchDocument():
 def TableDetection():
     return render_template('tableDetection.html')
 
+
+@app.route('/TestingMeasurement',methods=["GET", "POST"])
+def TestingMeasurement():
+    return render_template('TestingMeasurement.html')
+
 @app.route('/legends',methods=["GET", "POST"])
 def legendDirectory():
     return render_template('legendDirectory.html')
@@ -278,50 +289,103 @@ def table():
 def stringToRGB():
     vv = eval(request.form.get('answers'))
     print(vv)
-    if ( vv[5][2].startswith('3.2') or vv[5][2].startswith('3.3') or vv[5][2].startswith('2.7')) :
-        print('3.2 section')
-        pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=vv[0])
-        dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
-        md, res =dbxTeam.files_download(path=pdfpath)
-        dataDoc = res.content
-        if 'file' not in request.files:
-            print('error, No file part in the request')
-        else: 
-            file = request.files['file']
-            print('file done, measuring')
-            arr=measureproject(vv,dataDoc,0,file)
-            return jsonify(arr)
-        
-    
-        
-    if vv[5][2].startswith('1.0'):
-        opencv_img,dataDoc = plan2img( str(vv[0]) )
-        if vv[1]==220:
-            imgdata = base64.b64decode(vv[6])
-            img=Image.open(io.BytesIO(imgdata))
-            opencv_img= cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR)
-        arr=measureproject(vv,dataDoc,opencv_img)
+    if vv[0].startswith('http'):
+            if ( vv[5].startswith('3.2') or vv[5].startswith('3.3') or vv[5].startswith('2.7')) :
+                print('3.2 section')
+                # pdflink=vv[0]
+                # encoded_url = request.args.get('url')
+                link = urllib.parse.unquote(vv[0].strip('"'))
+                if link and ('http' in link or 'dropbox' in link):
+                    if 'dl=0' in link:
+                        link = link.replace('dl=0', 'dl=1')
+                    elif 'www.dropbox.com' in link and '?dl=1' not in link:
+                        link += '?dl=1'
+
+                    response = requests.get(link)
+
+                    pdf_content = BytesIO(response.content)
+                    if not pdf_content:
+                        raise ValueError("No valid PDF content found.")
+                    if 'file' not in request.files:
+                        print('error, No file part in the request')
+                    else: 
+                        file = request.files['file']
+                        print('file done, measuring')
+                        arr=measureproject(result=vv,dxffile=file,pdf_content=pdf_content)
+                        
+                        return jsonify(arr)
+
+            if vv[5].startswith('2.8') or vv[5].startswith('2.6')  or vv[5].startswith('2.1'):
+                print(f"el mawgood fe vv[0]: {vv[0]}")
+                # arr_s = []
+                # dataDocs = []
+              
+                # pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(v))
+                link = urllib.parse.unquote(vv[0].strip('"'))
+                if link and ('http' in link or 'dropbox' in link):
+                    if 'dl=0' in link:
+                        link = link.replace('dl=0', 'dl=1')
+                    elif 'www.dropbox.com' in link and '?dl=1' not in link:
+                        link += '?dl=1'
+
+                    response = requests.get(link)
+
+                    pdf_content = BytesIO(response.content)
+                    doc = fitz.open(stream=pdf_content, filetype="pdf")
+                    # 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(result=vv,img=pl,pdf_content=pdf_content)
        
-
-    if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.6')  or vv[5][2].startswith('2.1'):
-        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))
+    else: 
+        if ( vv[5][2].startswith('3.2') or vv[5][2].startswith('3.3') or vv[5][2].startswith('2.7')) :
+            print('3.2 section')
+            pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=vv[0])
             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)
+            if 'file' not in request.files:
+                print('error, No file part in the request')
+            else: 
+                file = request.files['file']
+                print('file done, measuring')
+                arr=measureproject(vv,dataDoc,0,file)
+                return jsonify(arr)
+            
+        
+            
+        if vv[5][2].startswith('1.0'):
+            opencv_img,dataDoc = plan2img( str(vv[0]) )
+            if vv[1]==220:
+                imgdata = base64.b64decode(vv[6])
+                img=Image.open(io.BytesIO(imgdata))
+                opencv_img= cv2.cvtColor(np.array(img), cv2.COLOR_RGB2BGR)
+            arr=measureproject(vv,dataDoc,opencv_img)
+        
+
+        if vv[5][2].startswith('2.8') or vv[5][2].startswith('2.6')  or vv[5][2].startswith('2.1'):
+            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)
@@ -343,18 +407,26 @@ def measure2_1():
     return arr
 #MAIN FUNCTION -- calls python code to measure the chosen plan from the interface
 # @app.route('/projecttomeasure/<jsdata>',methods=["GET","POST"])
-def measureproject(result,dataDoc=0,img=0,dxffile=0):
+def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
     colorarr=[]
     global pdflink
-    # result = json.loads(jsdata) 
     pdfpath='/'
+    # result = json.loads(jsdata) 
+    if pdf_content:
+        section=result[5]
+        pdfpath+='testinglink/'
+    else:
+        section=result[5][2]
+        for word in result[5]:
+            pdfpath+=word +'/'
+    
+   
     #################################  -1.0- #################################
     
-    for word in result[5]:
-        pdfpath+=word +'/'
+
     arr=[]
 
-    if result[5][2].startswith('1.0'): #section value - 1.0 substructure- pile caps
+    if section.startswith('1.0'): #section value - 1.0 substructure- pile caps
         for item in result[2]:
             # item1 ='#'+item 
             c=hexRGB(item)
@@ -380,26 +452,31 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
     #         _, buffer = cv2.imencode('.png', outputimg)
     #         arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
    #################################  -3.3 or 3.2- #################################
-    elif result[5][2].startswith('3.3') or result[5][2].startswith('3.2'): #section value - 3.2 floor finishes
+    elif section.startswith('3.3') or section.startswith('3.2'): #section value - 3.2 floor finishes
             print('code of 3.3 and 3.2')
             dxfpath=dxffile.read()
             with tempfile.NamedTemporaryFile(suffix='.dxf', delete=False) as temp_file:
                 temp_file.write(dxfpath)
                 temp_filename = temp_file.name
                 print(temp_filename)
-                
-                doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
+                if pdf_content:
+                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0],pdf_content)
+                else:
+                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=deploying_3_3.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4] , pdfpath,result[0])
                 global colorsused
                 colorsused=list(SimilarAreaDictionary['Color'])
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
-                # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+                parsed_url = urlparse(result[0])
+                filename = parsed_url.path.split('/')[-1]
+                print(filename)
+                nameofpdf=filename
+                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=nameofpdf)
 
                 _, buffer = cv2.imencode('.png', outputimg)
                 arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  2.7- #################################
-    elif result[5][2].startswith('2.7') : #section value - 2.7 floor finishes
+    elif section.startswith('2.7') : #section value - 2.7 floor finishes
             print('code of 2.7')
             dxfpath=dxffile.read()
             with tempfile.NamedTemporaryFile(suffix='.dxf', delete=False) as temp_file:
@@ -412,34 +489,43 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 print(result)
                 print("SearchArray = ",SearchArray)
                 global hatched_areas2_7
-                doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0])
+                if pdf_content:
+                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0],pdf_content)
+                else:
+                    doc,outputimg, SimilarAreaDictionary ,spreadsheetId, spreadsheet_url , namepathArr , list1,hatched_areas=Code_2_7.mainFunctionDrawImgPdf(dataDoc,temp_filename,result[4],SearchArray,Thickness, pdfpath,result[0])
                 # global colorsused
                 hatched_areas2_7=hatched_areas 
                 colorsused=list(SimilarAreaDictionary['Color'])
                 dbPath='/TSA JOBS/ADR Test'+pdfpath+'Measured Plan/'
                 print(dbPath,result[0]) 
-                # 
-                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
+                parsed_url = urlparse(result[0])
+                filename = parsed_url.path.split('/')[-1]
+                print(filename)
+                nameofpdf=filename
+                pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=nameofpdf) #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/'
 
                 _, buffer = cv2.imencode('.png', outputimg)
                 arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,[],namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
                 # arr=[ base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(), spreadsheet_url,spreadsheetId,[],list1.to_dict(),pdflink,hatched_areas,namepathArr]#,hatched_areas,namepathArr]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  -2.8- #################################
-    elif result[5][2].startswith('2.8') or result[5][2].startswith('2.6'): #section value - 2.8 floor finishes
+    elif section.startswith('2.8') or section.startswith('2.6'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
         imgss=[] 
         dpxlinks=[]
         legendLinks=[]
         listofmarkups=[]
-
+      
         pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(result[6]))
         dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
         md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
-        dataDocDoorsSchedule = resDoors.content
+        dataDocDoorsSchedule = resDoors.content 
         SearchArray=result[7]
         print('searchhh:',SearchArray)
         # 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)
+        if pdf_content:
+            annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray,pdf_content)
+        else:
+            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="combined_output.pdf") #doc=doc,pdfname=path,pdfpath=pdfpath+'Measured Plan/
         _, buffer = cv2.imencode('.png', annotatedimg)
@@ -451,7 +537,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
             NotFoundReturn=not_found # , spreadsheetId, spreadsheet_url , list1.to_dict()]
         arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,list1.to_dict(),str(repeatedLabelsReturn), str(NotFoundReturn)] # , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  -2.1- #################################
-    elif result[5][2].startswith('2.1'): #section value - 2.8 floor finishes
+    elif section.startswith('2.1'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
         imgss=[] 
         dpxlinks=[]
@@ -634,24 +720,66 @@ def get_pdf(jsdata):
     return response
 
 
+@app.route('/pixeltestingimg')
+def pixeltesting():
+    encoded_url = request.args.get('url')
+    link = urllib.parse.unquote(encoded_url.strip('"'))
+    if link and ('http' in link or 'dropbox' in link):
+        if 'dl=0' in link:
+            link = link.replace('dl=0', 'dl=1')
+        elif 'www.dropbox.com' in link and '?dl=1' not in link:
+            link += '?dl=1'
+
+        pdf_path=link
+        response = requests.get(pdf_path)
+        pdf_content = BytesIO(response.content)
+        if not pdf_content:
+            raise ValueError("No valid PDF content found.")
+        progress_updates = []  # Shared list to store progress
+        def generate_progressPixel():
+            
+            yield f"data: 10\n\n"  # Initial progress
+
+            doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(pdf_content=pdf_content) #  .openDrawPDF(data)
+        
+            yield f"data: 20\n\n"  # Initial progress
+            dbPath='/TSA JOBS/ADR Test/'+'TestingLinks'+'/'+'Scale Document' +'/'
+            dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str('testinglink') ,path=dbPath) #PixelConv_
+            # areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(dbPath, str(jsdata[3]))
+            yield f"data: 40\n\n"  # Initial progress
+            outputs=[areaPixel,perimeterPixel , dburl]
+            while progress_updates:
+                progress = progress_updates.pop(0)  # Get the next progress value
+                yield f"data: {progress}\n\n"
+            # Final progress and result
+            yield  f"data: 80\n\n"
+            yield f"data: 100\n\n"
+            result = json.dumps(outputs)
+            yield f"data: {result}\n\n"
+
+    return Response(generate_progressPixel(), content_type='text/event-stream')
 #PIXEL CONVERSION METHOD -- SAVES DOC ON DROPBOX TO BE MEASURED BY USER 
 @app.route("/pixelimg/<jsdata>",methods=["GET", "POST"])
 def getimg(jsdata):
     progress_updates = []  # Shared list to store progress
     jsdata=eval(jsdata)
+    print('piexxxeell',jsdata)
     def generate_progressPixel():
         
         yield f"data: 10\n\n"  # Initial progress
 
         pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata[3], progress_callback=lambda p: progress_updates.append(p))
+
         dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
         md, res =dbxTeam.files_download(path=pdfpath)
         data = res.content
-        print('jsdata',jsdata)
+    
+
         if str(jsdata[2]).startswith('1.0'):
-            doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(data,300) #  .openDrawPDF(data)
+            doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(data=data,dpi=300) #  .openDrawPDF(data)
         else:
-            doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(data) #  .openDrawPDF(data)
+            doc,areaPixel,perimeterPixel=pixelconversion.drawisrotated(data=data) #  .openDrawPDF(data)
+       
         yield f"data: 20\n\n"  # Initial progress
         dbPath='/TSA JOBS/ADR Test/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
         dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str(jsdata[3]) ,path=dbPath) #PixelConv_