Update app.py

app.py

@@ -1,15 +1,15 @@
 from __future__ import print_function
 from flask import Flask, render_template,request,flash , json, url_for,g , redirect , jsonify , send_file ,make_response
-import json  
-import fitz  
-from PIL import Image  
-import cv2   
-import numpy as np   
+import json
+import fitz
+from PIL import Image
+import cv2  
+import numpy as np
 import pilecaps_adr   
-import base64 
+import base64
 from db import dropbox_connect
 import cv2
-import pandas as pd 
+import pandas as pd
 import time
 from io import BytesIO, StringIO
 import urllib
@@ -514,17 +514,28 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0,pdf_content=0):
         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 
         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
         if pdf_content:
-            annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(dataDocDoorsSchedule, dataDoc, SearchArray,pdf_content)
+            link = urllib.parse.unquote(result[6].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_contentSched = BytesIO(response.content)
+                # pdf_contentSched = fitz.open(stream=pdf_contentSched, filetype="pdf")
+                annotatedimg, pdf_document , list1, repeated_labels , not_found =Doors_Schedule.mainRun(pdf_contentSched, dataDoc, SearchArray,pdf_content,pdf_contentSched)
         else:
+            pdfpathDoors,_=tsadropboxretrieval.getPathtoPDF_File(nameofPDF= str(result[6]))
+            dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+            md, resDoors =dbxTeam.files_download(path=pdfpathDoors)
+            dataDocDoorsSchedule = resDoors.content 
             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/
@@ -1185,7 +1196,6 @@ def cvtSummarytoXML(jsdata):
     xmllink=google_sheet_to_xml.create_xml(documentname=result[1],dbPath=path)
     return jsonify(xmllink)
 
-
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________