Update app.py

app.py

@@ -6,7 +6,7 @@ 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
@@ -35,10 +35,13 @@ import mainDBAlaa
 import datetime
 import doors_fasterrcnn
 import deploying_3_3
+import Doors_Schedule
 import Code_2_7
 import Counting_Columns_2_1
 import Find_Hyperlinking_text
 import ezdxf
+from flask import Flask, render_template, session, redirect, url_for
+
 app = Flask(__name__)
 
 
@@ -51,20 +54,67 @@ global pdflink
 #for 2.7
 global hatched_areas2_7
   
+
+app.secret_key = 'your_secret_key'  # Make sure you have a secret key for session management
+
+
+# Password page route
+@app.route("/password", methods=["GET", "POST"])
+def password_page():
+    return render_template("gui2.html")  # Render the password page (gui2.html)
+
+# Password check route
+@app.route("/check_password", methods=["POST"])
+def check_password():
+    password = request.form.get('password')  # Get the password entered by the user
+    correct_password = 'c900'  # Password for validation
+
+    if password == correct_password:  # Validate the password
+        session['authenticated'] = True  # Set the authenticated flag in the session
+        return {"authenticated": True}, 200  # Respond with success
+    else:
+        return {"authenticated": False}, 200  # Respond with failure
+
+# Main GUI page route
+@app.route("/mainGUI", methods=["GET", "POST"])
+def main_gui():
+    if 'authenticated' not in session or not session['authenticated']:
+        return redirect(url_for('password_page'))  # Redirect to the password page if not authenticated
+    return render_template("proposed-GUI.html")  # Main page content after successful password check
+
+
+
 @app.route("/",methods=["GET", "POST"])
 def getInfotoMeasure():
-    API.AppendtablestoSheets()
-    return render_template("proposed-GUI.html")
+    # API.AppendtablestoSheets()
+    return render_template("gui2.html")
 @app.route("/WordSearch",methods=["GET", "POST"])
 def getInfo2toMeasure():
-    API.AppendtablestoSheets()
+    # API.AppendtablestoSheets()
     return render_template("wordSearch.html")
 
+
+
 @app.route('/getprojectnames/',methods=['GET'])
 def getprjnamesfromTestAPI():
-    prjnames,prjids=API.getPrjNames()
-    # API.AppendtablestoSheets()
-    return jsonify([prjnames,prjids])
+    progress_updates = []  # Shared list to store progress
+
+    def generate_progressProjnames():
+        yield f"data: 10\n\n"  # Initial progress
+        # Call retrieveProjects and pass a callback to update the shared list
+        prjnames,prjids=API.getPrjNames( progress_callback=lambda p: progress_updates.append(p))
+        # Continuously yield progress updates from the shared list
+
+        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([prjnames,prjids])
+        yield f"data: {result}\n\n"
+    return Response(generate_progressProjnames(), content_type='text/event-stream')
+
 
 @app.route('/getprojectparts/<jsdata>',methods=['GET'])
 def getprjpartsfromTestAPI(jsdata):
@@ -78,18 +128,30 @@ def getprjSectionsfromTestAPI(jsdata):
     sections=API.getprjSections(data[0],data[1])
     return jsonify(sections)
 
-
-#retrieves projects
-@app.route('/getmethod/<jsdata>',methods=['GET','POST'])
+@app.route('/getmethod/<jsdata>', methods=['GET'])
 def get_javascript_data(jsdata):
-    #get project from the first dropdown
-    # jsdata=eval(jsdata)
-    print('tsa')
-    documnetsToMeasure,RelevantDocuments,extracted_path=tsadropboxretrieval.retrieveProjects(jsdata)
-    if RelevantDocuments:
-        return jsonify ([documnetsToMeasure, RelevantDocuments,extracted_path])
-    else: 
-        return ['No projects found']
+    progress_updates = []  # Shared list to store progress
+
+    def generate_progress():
+        yield f"data: 5\n\n"  # Initial progress
+        yield f"data: 10\n\n"  # Initial progress
+        # Call retrieveProjects and pass a callback to update the shared list
+        documentsToMeasure, RelevantDocuments, extracted_path = tsadropboxretrieval.retrieveProjects(
+            jsdata, 
+            progress_callback=lambda p: progress_updates.append(p)
+        )
+
+        # Continuously yield progress updates from the shared list
+        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: 100\n\n"
+        result = json.dumps([documentsToMeasure, RelevantDocuments, extracted_path])
+        yield f"data: {result}\n\n"
+
+    return Response(generate_progress(), content_type='text/event-stream')
+
 #---------------------------------------------------------------
 @app.route('/WordSearch',methods=["GET", "POST"])
 def searchDocument():
@@ -300,7 +362,7 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
                 pdflink= tsadropboxretrieval.uploadanyFile(doc=doc,path=dbPath,pdfname=result[0]) #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'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
@@ -309,13 +371,24 @@ def measureproject(result,dataDoc=0,img=0,dxffile=0):
         legendLinks=[]
         listofmarkups=[]
 
-        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
-        
+        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,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)
         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/
         _, buffer = cv2.imencode('.png', annotatedimg)
-        arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,spreadsheet_url,list1.to_dict(), df_doors.to_dict()]# , spreadsheetId, spreadsheet_url , list1.to_dict()]
-
+        repeatedLabelsReturn=''
+        NotFoundReturn=''
+        if len(repeated_labels)>0:
+            repeatedLabelsReturn=repeated_labels
+        if len(not_found)>0:
+            NotFoundReturn=not_found # , spreadsheetId, spreadsheet_url , list1.to_dict()]
+        else:
+            arr=[base64.b64encode(buffer).decode('utf-8') ,pdflink,list1.to_dict(),repeatedLabelsReturn, NotFoundReturn] # , spreadsheetId, spreadsheet_url , list1.to_dict()]
     #################################  -2.1- #################################
     elif result[5][2].startswith('2.1'): #section value - 2.8 floor finishes
             #vv[0] array of pdf names
@@ -484,27 +557,37 @@ def get_pdf(jsdata):
 #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)
-    pdfpath,pdflink=tsadropboxretrieval.getPathtoPDF_File(nameofPDF=jsdata[3])
-    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)
-    else:
-        doc,areaPixel,perimeterPixel,pdfdata=pixelconversion.drawisrotated(data) #  .openDrawPDF(data)
-    dbPath='/TSA JOBS/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]
-    # pdf_data = io.BytesIO(res.content)
-    # pdf_data.seek(0)
-
-    return jsonify(outputs) #, send_file(pdf_data, as_attachment=True, mimetype='application/pdf', download_name='downloaded_file.pdf')
+    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)
+        else:
+            doc,areaPixel,perimeterPixel,pdfdata=pixelconversion.drawisrotated(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)
+        # 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')
 #_________________________________________________________________________________________________________________________
 #_________________________________________________________________________________________________________________________
 #get sunburst from doc_search
@@ -806,33 +889,8 @@ def checktables():
             if len(differentSections)>0:
                 returnString=['Changes have been made in Sections. Would you like to retrieve them in the console?','section',differentSections]
 
-    #     if not t2Diff.empty:
-    #         newvalues= t2Diff['ProjectName'].values
-    #     else:
-    #         newvalues= t2Diff1['ProjectName'].values
-    #     returnString=''
-    #     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=''
-    #   returnString=['Changes have been made in Projects and Parts. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','projectpart']
-    # elif ((not t1Diff.empty) or (not t1Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty) ):
-    #   returnString=''
-    #   returnString=['Changes have been made in Projects 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).','projectsection']
-    # elif ((not t2Diff.empty) or (not t2Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty)):
-    #   returnString='' 
-    #   returnString=['Changes have been made in 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).','partsection']
-    # elif ((not t1Diff.empty) or (not t1Diff1.empty)) and  ((not t2Diff.empty) or (not t2Diff1.empty)) and ((not t3Diff.empty) or (not t3Diff1.empty)):
-    #   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']
     print(returnString)
-    # if sectionData!='noSectionYet':
-    #     return jsonify([returnString,DictionaryOfTemplates])
-    # else:
-    # returnString=prjpartsRefreshAPItable2(table2,projectname)
+
 
     return jsonify(returnString)