Update app.py

app.py

@@ -6,14 +6,12 @@ import fitz
 from PIL import Image
 import cv2
 import numpy as np
-import sys
 import pilecaps_adr
 import base64
 from db import dropbox_connect
 import db
 import cv2
 import pandas as pd
-import ast
 import time
 from io import BytesIO
 from flask import Flask, Response
@@ -22,14 +20,16 @@ import tameem3_2
 import pypdfium2 as pdfium
 import pixelconversion
 import tameem2_1
-import urllib.request
 import base64
 import io
 from urllib.parse import unquote
 import API
+import MC_Templates_API
+import tsadropboxretrieval
+
 app = Flask(__name__)
 
-# out_file = open("static/data/myfile.json", "w")
+
 @app.route('/getprojectnames/',methods=['GET'])
 def getprjnamesfromTestAPI():
     prjnames=API.getPrjNames()
@@ -51,33 +51,22 @@ def getprjSectionsfromTestAPI(jsdata):
 @app.route('/getmethod/<jsdata>',methods=['GET','POST'])
 def get_javascript_data(jsdata):
     #get project from the first dropdown
-    print(jsdata)
-    matches=update_dropdown(jsdata) #list f of projects
-    print(matches)
-    return jsonify (list(matches))
+    # jsdata=eval(jsdata)
+    documnetsToMeasure,RelevantDocuments=tsadropboxretrieval.retrieveProjects(jsdata)
+    if documnetsToMeasure:
+        return jsonify ([documnetsToMeasure, RelevantDocuments])
+    else: 
+        return ['No projects found']
 #---------------------------------------------------------------
 
+@app.route('/RetrieveMCTNames/<jsdata>',methods=['GET'])
+def CallAPIforMCTNames(jsdata):
+    # print(jsdata)
+    DictionaryOfTemplates=MC_Templates_API.RetrieveMC_Templates_API()
+    jsdata=jsdata.replace('"', '')
+    return jsonify(DictionaryOfTemplates[str(jsdata).lower()])
 #get projects of 'project name'
-def update_dropdown(section):
-    if section.startswith('1.0'):
-        plans_inrepo=os.listdir('dropbox_plans/1.0')
-    elif section.startswith('3.2'):
-        plans_inrepo=os.listdir('dropbox_plans/3.2')
-    elif section.startswith('2.2'):
-        plans_inrepo=os.listdir('dropbox_plans/2.2') 
-    elif section.startswith('2.1'):
-        plans_inrepo=os.listdir('dropbox_plans/2.1') 
-    else:
-        return ''
-    #if 'foundation' in radio and project in plans_inrepo
-    matches=[] 
-    if section==None:
-        print('no proj')
-    else:
-        for x in plans_inrepo:
-                matches.append(x)
-        print(matches)  
-    return matches
+
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 #NOT IMP NOW
@@ -101,16 +90,16 @@ def hexRGB(color):
 def stringToRGB():
     name = request.get_json()
     vv=name.get('allvalues')
+    dataDoc = plan2img( str(vv[0]) )[1]
+    # vv[0] ->proj name, vv[1] (0/220),vv[2] ->colors , vv[3]->ratio1 , vv[4]->ratio2 , vv[5] -> pdfpath , vv[6] ->imgDrawnOn
     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)
     else:
-        opencv_img = plan2img('dropbox_plans/1.0/'+str(vv[0]) )
-    arr=measureproject(vv,opencv_img)
-    # # print(opencv_img)
-    # cv2.imwrite('img.png', opencv_img)
-    # return opencv_img 
+    # vv[0] ->proj name, vv[1] (0/220),vv[2] ->colors , vv[3]->ratio1 , vv[4]->ratio2 , vv[5] -> pdfpath
+        opencv_img = plan2img( str(vv[0]) )[0]
+    arr=measureproject(vv,dataDoc,opencv_img)
     return jsonify(arr)
 
 @app.route('/2.1Trial/',methods=["POST"])
@@ -121,7 +110,7 @@ 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,img=0):
+def measureproject(result,dataDoc,img=0):
     colorarr=[]
     # result = json.loads(jsdata) 
     pdfpath='/'
@@ -137,7 +126,7 @@ def measureproject(result,img=0):
             c=hexRGB(item)
             colorarr.append(c)
         print('RATIOS=',result[3], result[4])
-        imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(img,result[1],colorarr, result[3], result[4],'area', result[0],pdfpath)
+        imgPerimeter1,image_new1,SimilarAreaDictionary , colorsUsed,spreadsheet_url, spreadsheetId,list1, pdflink, areas_Perimeters, namepathArr =pilecaps_adr.drawAllContours(dataDoc,img,result[1],colorarr, result[3], result[4],'area', result[0],pdfpath)
         _, buffer = cv2.imencode('.png', image_new1)
         arr=[base64.b64encode(buffer).decode('utf-8'),SimilarAreaDictionary.to_dict(),spreadsheet_url , spreadsheetId,colorsUsed,list1.to_dict(), pdflink, areas_Perimeters, namepathArr]
    #################################  -3.2- #################################
@@ -170,26 +159,26 @@ def measureproject(result,img=0):
 
 @app.route("/canvaspdftoimgBackground/<jsdata>",methods=["GET", "POST"])
 def pdftoimgCanvas(jsdata):
-    img=plan2img('dropbox_plans/1.0/'+jsdata)
-    # img=cv2.resize(img, (0, 0), fx = 0.5, fy = 0.5)
-    # print('imgdone','dropbox_plans/1.0/'+jsdata )
-
+    img=plan2img(jsdata)[0]
     _, buffer = cv2.imencode('.png', img)
     arr=[base64.b64encode(buffer).decode('utf-8')  , img.shape[0],img.shape[1]]
     return jsonify(arr)
 
 
 #pdf to img
-def plan2img(path):
-    
-    doc = fitz.open(path)
+def plan2img(nameofpdf):
+
+    pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=nameofpdf)
+    dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+    md, res =dbxTeam.files_download(path=pdfpath)
+    data = res.content
+    doc = fitz.open("pdf",data)
     page=doc[0]
     pix = page.get_pixmap(dpi=300)  # render page to an image
     pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
     img=np.array(pl)
-    print(img.shape)
     img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
-    return img 
+    return img ,data
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 
@@ -209,8 +198,8 @@ def convert2img(path):
 def sendmctnametoLegend(jsdata):
     result = json.loads(jsdata)
     print(result)
-    summaryid,guessednamesfinal=pilecaps_adr.mapnametoLegend(result)
-    allreturns=[summaryid,guessednamesfinal]
+    summaryid=pilecaps_adr.mapnametoLegend(result)
+    allreturns=[summaryid]
     return jsonify(allreturns)
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
@@ -273,39 +262,17 @@ def modifyingcalcRefDynamic(img):
 #PIXEL CONVERSION METHOD -- SAVES DOC ON DROPBOX TO BE MEASURED BY USER 
 @app.route("/pixelimg/<jsdata>",methods=["GET", "POST"])
 def getimg(jsdata):
-    db.create_folder()
-    print(jsdata)
+
     jsdata=eval(jsdata)
-    if jsdata[2].startswith('1.0'):
-        doc = fitz.open('dropbox_plans/1.0/'+str(jsdata[3]) )
-    elif jsdata[2].startswith('3.2'):
-        doc = fitz.open('dropbox_plans/3.2/'+str(jsdata[3]) )
-    elif jsdata[2].startswith('2.2'):
-        doc = fitz.open('dropbox_plans/2.2/'+str(jsdata[3]) )
-    elif jsdata[2].startswith('2.1'):
-        doc = fitz.open('dropbox_plans/2.1/'+str(jsdata[3]) )
-    else: 
-        return ''
-    for page in doc:
-        
-        pix = page.get_pixmap()  # render page to an image
-        pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
-        img=np.array(pl)
-        print(img.shape)
-        img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
-    if jsdata[2].startswith('1.0'):
-        doc=pixelconversion.openDrawPDF(path='dropbox_plans/1.0/'+str(jsdata[3]))
-    elif jsdata[2].startswith('3.2'):
-        doc=pixelconversion.openDrawPDF(path='dropbox_plans/3.2/'+str(jsdata[3]))
-    elif jsdata[2].startswith('2.2'):
-        doc=pixelconversion.openDrawPDF(path='dropbox_plans/2.2/'+str(jsdata[3]))
-    elif jsdata[2].startswith('2.1'):
-        doc=pixelconversion.openDrawPDF(path='dropbox_plans/2.1/'+str(jsdata[3]))
-    pdfpath='/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
-    dburl=db.dropbox_upload_file(doc=doc,pdfname=str(jsdata[3]) ,pdfpath=pdfpath,flag=1)
-    areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(pdfpath, str(jsdata[3]))
-
-    print(areaPixel,perimeterPixel)
+    pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata[3])
+    dbxTeam= tsadropboxretrieval.ADR_Access_DropboxTeam('user')
+    md, res =dbxTeam.files_download(path=pdfpath)
+    data = res.content
+    doc=pixelconversion.openDrawPDF(data)
+    dbPath='/TSA Team Folder/ADR Test/'+jsdata[0]+'/'+jsdata[1]+'/'+jsdata[2]+'/'+'Scale Document' +'/'
+    dburl=tsadropboxretrieval.uploadanyFile(doc=doc,pdfname=str(jsdata[3]) ,path=dbPath)
+    areaPixel,perimeterPixel= pixelconversion.getAreaPerimeter(dbPath, str(jsdata[3]))
+
     outputs=[areaPixel,perimeterPixel , dburl]
     return jsonify(outputs)
 
@@ -323,8 +290,8 @@ def getnewlegend():
     for word in eval(pdfpathpath):
         pdfpth+='/' +word
     pdfpth+='/'
-    deletedrows1=pilecaps_adr.deletemarkups(list1=list1,pdfpath=pdfpth,path=path) 
-    print(deletedrows1)
+    dbPath='/TSA Team Folder/ADR Test'+pdfpth+'Measured Plan/' 
+    deletedrows1=pilecaps_adr.deletemarkups(list1=list1,dbPath=dbPath,path=path) 
     arr1=[deletedrows1.to_dict()]
     return jsonify(arr1)
 #---------------------------------------------------------------------------
@@ -363,11 +330,7 @@ def dltmarkupslegend():
 #get pdf dropbox url after measurement is done
 @app.route('/getdropboxurl/<jsdata>',methods=["GET", "POST"])
 def calldropboxurl(jsdata):
-    pdfpth=''
-    for word in eval(jsdata):
-        pdfpth+='/' +word
-    print(pdfpth)
-    pdfurl=db.dropbox_shareableLink(pdfpth)
+    pdfurl=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata)[1]
     return jsonify(pdfurl)
 
 #_________________________________________________________________________________________________________________________
@@ -378,7 +341,6 @@ def getlinkscreated(jsdata):
     spreadsheet_service,drive_service,gc= pilecaps_adr.authorizeLegend()
     ids=gc.spreadsheet_ids()
     titles=gc.spreadsheet_titles()
-
     allpaths=[]
     # for title in titles:
     for i in range(0,len(titles)):
@@ -387,7 +349,13 @@ def getlinkscreated(jsdata):
             allpaths.append([titles[i], ws.get_developer_metadata('path')[0].value , drive_service.files().get(fileId=ids[i],fields="createdTime, modifiedTime").execute() ,ids[i] ])
     
     return jsonify(allpaths)
-
+#_________________________________________________________________________________________________________________________
+#_________________________________________________________________________________________________________________________
+@app.route('/getAPITables/',methods=["GET", "POST"])
+def returnAPITables():
+    # API.update_df()
+    table1,table2,table3=API.GenerateTables()
+    return  jsonify([table1.to_dict(),table2.to_dict(),table3.to_dict()])
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 
@@ -396,8 +364,7 @@ def getlinkscreated(jsdata):
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
+if __name__ == "__main__":
+    app.run(debug=True)
 
-if  __name__  == "__main__":
-    app.run(host="0.0.0.0", port=7860)
 
-