Update app.py

app.py

@@ -6,7 +6,7 @@ import fitz
 from PIL import Image
 import cv2
 import numpy as np
-import pilecaps_adr 
+import pilecaps_adr
 import base64
 from db import dropbox_connect
 import db
@@ -106,12 +106,12 @@ def getSearchinFolder():
 def measurementConsoleFn():
     return render_template("proposed-GUI.html")
 
-@app.route('/RetrieveMCTNames/<jsdata>',methods=['GET'])
-def CallAPIforMCTNames(jsdata):
+@app.route('/RetrieveMCTNames/',methods=['GET'])
+def CallAPIforMCTNames():
     # print(jsdata)
     DictionaryOfTemplates=MC_Templates_API.RetrieveMC_Templates_API()
-    jsdata=jsdata.replace('"', '')
-    return jsonify(DictionaryOfTemplates[str(jsdata).lower()])
+    # jsdata=jsdata.replace('"', '')
+    return jsonify(DictionaryOfTemplates) #[str(jsdata).lower()]
 
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
@@ -410,18 +410,22 @@ def returnAPITables():
 
 @app.route('/refreshAPI',methods=["GET", "POST"])
 def checktables():
-    print('innn')
+    # sectionData =  request.args.get('sectionData') 
+    # sectionData = request.args.get('sectionData')
+    # print(sectionData)
     table1,table2,table3=API.GenerateTables()
+    # if sectionData!='noSectionYet':
+    #     DictionaryOfTemplates=MC_Templates_API.RetrieveMC_Templates_API()
+    #     sectionData=sectionData.replace('"', '')
+    #     DictionaryOfTemplates[str(sectionData).lower()]
     url_1 = prjnamesURL.replace('/edit#gid=', '/export?format=csv&gid=')
     url_2 = prjpartsURL.replace('/edit#gid=', '/export?format=csv&gid=')
     url_3 = prjsectionsURL.replace('/edit#gid=', '/export?format=csv&gid=')
 
     table1N = pd.read_csv(url_1)
     table2N = pd.read_csv(url_2)
-    table3N = pd.read_csv(url_3)
-    # t1Diff=table1N[~table1N.apply(tuple,1).isin(table1.apply(tuple,1))]
-    # t2Diff=table2N[~table2N.apply(tuple,1).isin(table2.apply(tuple,1))]
-    # t3Diff=table3N[~table3N.apply(tuple,1).isin(table3.apply(tuple,1))]
+    table3N = pd.read_csv(url_3) 
+
     t1Diff=table1N[~table1N.isin(table1)].dropna()
     t1Diff1=table1[~table1.isin(table1N)].dropna()
 
@@ -430,6 +434,10 @@ def checktables():
 
     t3Diff=table3N[~table3N.isin(table3)].dropna()
     t3Diff1=table3[~table3.isin(table3N)].dropna()
+    
+    # print(t1Diff,t1Diff1)
+    # print(t2Diff,t2Diff1)
+    # print(t3Diff,t3Diff1)
     returnString=''
     if (not t1Diff.empty) or (not t1Diff1.empty) :
       returnString=''
@@ -439,6 +447,7 @@ def checktables():
       returnString=['Changes have been made in Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','part']
     elif (not t3Diff.empty) or (not t3Diff1.empty):
       returnString=''
+      
       returnString=['Changes have been made in Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','section']
     elif ((not t1Diff.empty) or (not t1Diff1.empty)) and ((not t2Diff.empty) or ( not t2Diff1.empty)):
       returnString=''
@@ -453,35 +462,39 @@ def checktables():
       returnString=''
       returnString=['Changes have been made in Projects, Parts and Sections. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','project']
     else:
-        print('wala hagaaa')
-    print(t1Diff,t1Diff1)
-    print(returnString)
+        print('No updates in the API')
+    # if sectionData!='noSectionYet':
+    #     return jsonify([returnString,DictionaryOfTemplates])
+    # else:
     return jsonify(returnString)
 
+
 @app.route('/refreshDropbox',methods=["GET", "POST"])
 def checkdropbox():
     print('checkingggdf')
     dfFromDropbox=tsadropboxretrieval.DropboxItemstoDF()
     dfParquet=tsadropboxretrieval.GetParquetDF()
-    t1Diff=dfFromDropbox[~dfFromDropbox.isin(dfParquet)].dropna()
-    t1Diff1=dfParquet[~dfParquet.isin(dfFromDropbox)].dropna()
-    returnString=''
-    
-    if (not t1Diff.empty) or (not t1Diff1.empty) :
-      print('changess')
-      returnString='Some changes have been made in the dropbox. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).'
+
+    dfParquet1 = dfParquet[['name', 'path_display', 'client_modified', 'server_modified']]
+    deletedrows = pd.concat([dfFromDropbox, dfParquet1]).drop_duplicates(keep=False)
+    deletedrows = deletedrows.reset_index(drop=True)
+    deletedrows.columns = ['name', 'path_display', 'client_modified', 'server_modified']
+    differences = deletedrows[~deletedrows.isin(dfFromDropbox)].dropna()
+    if (len(differences)>0):   
+        print(differences)
+        dbxTeam=tsadropboxretrieval.dropbox_upload_file(dfFromDropbox)
+        stringReturned= 'Updated Sucessfully.' 
     else:
-        print('nochangess')
-    return jsonify([returnString,dfFromDropbox.to_dict()])
+        stringReturned= 'Nothing to update.' 
+    return stringReturned
+
+
 
 @app.route('/postdropboxprojects',methods=["GET", "POST"])
 def postDropboxprojectsinConsole():
-    dfDropbox = request.args.get('dict')
-    dfDropbox=pd.DataFrame(dfDropbox)
-    print(dfDropbox)
-    print('uploading')
-    # dbxTeam=API.dropbox_upload_file(dfDropbox)
-    return jsonify('posted')
+    stringReturned=checkdropbox()
+    print(stringReturned)
+    return stringReturned
 
 
 
@@ -501,6 +514,5 @@ def appendNewTables():
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 
-    
 if  __name__  == "__main__":
     app.run(host="0.0.0.0", port=7860)