Update app.py

app.py

@@ -56,6 +56,12 @@ global colorsused
 global pdflink
 # For 2.7
 global hatched_areas2_7
+# Global cache to store last known tables
+cached_tables = {
+    "projects": None,
+    "parts": None,
+    "sections": None
+}
 
 # Configure Flask-Session for server-side session storage
 app.config["SESSION_TYPE"] = "filesystem"
@@ -101,43 +107,63 @@ def getInfo2toMeasure():
 
 
 
-@app.route('/getprojectnames/',methods=['GET'])
+@app.route('/getprojectnames/', methods=['GET'])
 def getprjnamesfromTestAPI():
     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
+        yield f"data: 10\n\n"
+        prjnames, prjids = API.getPrjNames(
+            progress_callback=lambda p: progress_updates.append(p)
+        )
+
+        # save in memory
+        global cached_tables
+        cached_tables["projects"] = pd.DataFrame({
+            "ProjectName": prjnames,
+            "ProjectId": prjids
+        })
 
         while progress_updates:
-            progress = progress_updates.pop(0)  # Get the next progress value
+            progress = progress_updates.pop(0)
             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])
+        result = json.dumps([prjnames, prjids])
         yield f"data: {result}\n\n"
-    return Response(generate_progressProjnames(), content_type='text/event-stream')
 
+    return Response(generate_progressProjnames(), content_type='text/event-stream')
 
-@app.route('/getprojectparts/<jsdata>',methods=['GET'])
+@app.route('/getprojectparts/<jsdata>', methods=['GET'])
 def getprjpartsfromTestAPI(jsdata):
-    print('kkkk',jsdata)
-    prjparts,partsIds=API.getprjParts(jsdata)
-    return jsonify([prjparts,partsIds])
+    prjparts, partsIds = API.getprjParts(jsdata)
+
+    global cached_tables
+    df = pd.DataFrame({"ProjectPart": prjparts, "ProjectPartId": partsIds, "ProjectId": [int(jsdata)] * len(prjparts)})
+    cached_tables["parts"] = df
 
-@app.route('/getprojectsections/<jsdata>',methods=['GET'])
+    return jsonify([prjparts, partsIds])
+
+@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])
+    data = json.loads(jsdata)
+    if data[0] == 'testing':
+        sections = API.getprjSections()
+    else:
+        sections = API.getprjSections(data[0], data[1])
+
+    global cached_tables
+    df = pd.DataFrame({
+        "ProjectSection": sections,
+        "ProjectId": [data[0]] * len(sections),
+        "ProjectPartId": [data[1]] * len(sections)
+    })
+    cached_tables["sections"] = df
+
     return jsonify(sections)
 
+
+
 @app.route('/getmethod/<jsdata>', methods=['GET'])
 def get_javascript_data(jsdata):
     progress_updates = []  # Shared list to store progress
@@ -1104,78 +1130,61 @@ def returnAPITables():
     table1,table2,table3=API.GenerateTables()
     return  jsonify([table1.to_dict(),table2.to_dict(),table3.to_dict()])
 
-
-@app.route('/refreshAPI',methods=["GET", "POST"])
+@app.route('/refreshAPI', methods=["GET", "POST"])
 def checktables():
-    projectname =  request.args.get('prjname') 
-    projectpart =  request.args.get('prjpart') 
-    projectpartid =  request.args.get('prjpartid') 
-    print('hgh',projectname , projectpart)
-    table1,table2,table3=API.GenerateTables()
-    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.isin(table1)].dropna()
-    t1Diff1=table1[~table1.isin(table1N)].dropna()
-
-    t2Diff=pd.DataFrame()
-    t2Diff1=pd.DataFrame()
-
-    t3Diff=pd.DataFrame()
-    t3Diff1=pd.DataFrame()
-    
-    
-    if projectname:
-        print('here')
-        differentParts=[]
-        a = table1N.to_numpy()
-        row = np.where(a == projectname)
-        print(projectname,row)
-        returnString=''
-        t2Diff1=table2[~table2.isin(table2N)].dropna()
-        t2Diff=table2N[~table2N.isin(table2)].dropna()
-        
-    if projectpart and projectname:
-        
-        a1 = table1N.to_numpy()
-        row1 = np.where(a1 == projectname)
-        prjid=a1[row1[0]][0][0]
-        t3Diff1=table3[~table3.isin(table3N)].dropna()
-        t3Diff=table3N[~table3N.isin(table3)].dropna()
-     
-    returnString=''
-    if not t1Diff.empty  or not t1Diff1.empty :
-        if not t1Diff.empty:
-            newvalues= t1Diff['ProjectName'].values
-        else:
-            newvalues= t1Diff1['ProjectName'].values
-        returnString=''
-        returnString=['Changes have been made in Projects. Would you like to retrieve them in the console? By saying yes, you may need to repeat the website related processes(if any).','project',(newvalues).tolist(),table2.to_dict()]
-    
-    if (not t2Diff.empty)or( not t2Diff1.empty) :
-        if projectname:
-            for i in range(len(t2Diff1['ProjectId'].values)):           
-                if int(t2Diff1['ProjectId'].values[i]) ==int(a[row[0]][0][0]):
-                    differentParts.append(t2Diff1['ProjectPart'].iloc[i])
-            if len(differentParts)>0:
-                returnString=['Changes have been made in Parts. Would you like to retrieve them in the console?','part',differentParts]
-
-    if (not t3Diff.empty)  or (not t3Diff1.empty) :
-        differentSections=[] 
-        if projectpart and projectname:           
-            roww=t3Diff1.iloc[np.where((t3Diff1['ProjectId']==int(prjid)  ) & (t3Diff1['ProjectPartId']==int(projectpartid)) ) ] 
-            for i in range(len(roww['ProjectId'].values)):
-                differentSections.append(str(roww['ProjectSection'].iloc[i])) 
-            if len(differentSections)>0:
-                returnString=['Changes have been made in Sections. Would you like to retrieve them in the console?','section',differentSections]
-
-    print(returnString)
-
+    projectname = request.args.get('prjname')
+    projectpart = request.args.get('prjpart')
+    projectpartid = request.args.get('prjpartid')
+
+    global cached_tables
+
+    # ✅ Fix: check properly for missing/empty DataFrame
+    if cached_tables["projects"] is None or cached_tables["projects"].empty:
+        return jsonify(["No cached data available yet. Please fetch projects first."])
+
+    # Get fresh values from API
+    new_projects, new_parts, new_sections = API.GenerateTables()
+
+    returnString = None
+
+    # 1) Compare project names
+    old_names = cached_tables["projects"]["ProjectName"].tolist()
+    new_names = new_projects["ProjectName"].tolist()
+    if set(old_names) != set(new_names):
+        added = list(set(new_names) - set(old_names))
+        removed = list(set(old_names) - set(new_names))
+        returnString = ["Changes in Projects", "project", {"added": added, "removed": removed}]
+
+    # 2) Compare parts
+    elif projectname and cached_tables["parts"] is not None and not cached_tables["parts"].empty:
+        prjid = new_projects.loc[new_projects['ProjectName'] == projectname, 'ProjectId'].values[0]
+        old_parts = cached_tables["parts"].loc[cached_tables["parts"]["ProjectId"] == prjid, "ProjectPart"].tolist()
+        new_parts_list = new_parts.loc[new_parts["ProjectId"] == prjid, "ProjectPart"].tolist()
+        if set(old_parts) != set(new_parts_list):
+            added = list(set(new_parts_list) - set(old_parts))
+            removed = list(set(old_parts) - set(new_parts_list))
+            returnString = ["Changes in Parts", "part", {"added": added, "removed": removed}]
+
+    # 3) Compare sections
+    elif projectname and projectpart and projectpartid and cached_tables["sections"] is not None and not cached_tables["sections"].empty:
+        prjid = new_projects.loc[new_projects['ProjectName'] == projectname, 'ProjectId'].values[0]
+        old_sections = cached_tables["sections"]["ProjectSection"].tolist()
+        new_sections_list = new_sections[
+            (new_sections["ProjectId"] == prjid) &
+            (new_sections["ProjectPartId"] == int(projectpartid))
+        ]["ProjectSection"].tolist()
+        if set(old_sections) != set(new_sections_list):
+            added = list(set(new_sections_list) - set(old_sections))
+            removed = list(set(old_sections) - set(new_sections_list))
+            returnString = ["Changes in Sections", "section", {"added": added, "removed": removed}]
+
+    if not returnString:
+        returnString = ["No changes detected"]
+
+    # ✅ update cache
+    cached_tables["projects"] = new_projects
+    cached_tables["parts"] = new_parts
+    cached_tables["sections"] = new_sections
 
     return jsonify(returnString)
 
@@ -1302,4 +1311,4 @@ while 1:
 if __name__ == "__main__": 
     runn() 
     
-      
+