Update API.py

API.py

@@ -25,6 +25,9 @@ import numpy as np
 prjnamesURL= 'https://docs.google.com/spreadsheets/d/1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc/export?format=csv&gid=0'
 prjpartsURL= 'https://docs.google.com/spreadsheets/d/1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc/export?format=csv&gid=1481952020'
 prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc/export?format=csv&gid=175272726'
+global table1
+global table2
+global table3
 
 dfNames=pd.DataFrame()
 dfParts=pd.DataFrame()
@@ -98,114 +101,105 @@ def APIValues():
 # %% [markdown]
 # ### Generate Tables
 
-# %%
-def GenerateTables():
- 
-  dict1=APIValues()
-
-  ##First table should ONLY contain: All project Ids and names
-  #Second table should contain ProjId,ProjectPartId,ProjectPart
-  #Third table should contain ProjId,ProjectPartId,ProjectSection
-  table1=pd.DataFrame(columns= ['ProjectId','ProjectName'])
-  table2=pd.DataFrame(columns= ['ProjectId','ProjectPartId','ProjectPart'])
-  table3=pd.DataFrame(columns= ['ProjectId','ProjectPartId','ProjectSection'])
-  for item in dict1:
-      table1 = pd.concat([table1, pd.DataFrame([[item.get('id'),item.get('projectname')]], columns=table1.columns)], ignore_index=True)
-      projectPartsList=item.get('projectparts')
-      for part in projectPartsList:
-        table2=  pd.concat([table2,pd.DataFrame([[item.get('id'),part.get('id'),part.get('name')]], columns=table2.columns)], ignore_index=True)
-        sections=part.get('projectsections')
-        for section in sections:
-          table3=  pd.concat([table3,pd.DataFrame([[item.get('id'),section.get('projectPartId'),section.get('section')]], columns=table3.columns)], ignore_index=True)
-  # table1 = pd.concat([table1, pd.DataFrame([['2222','trial1']], columns=table1.columns)], ignore_index=True)
-  # table2=  pd.concat([table2,pd.DataFrame([['2222','66','partname']], columns=table2.columns)], ignore_index=True)
-  # table3=  pd.concat([table3,pd.DataFrame([['2222','66','newSectionsss']], columns=table3.columns)], ignore_index=True)
-  return table1,table2,table3  
 
 # Set Tables to Sheets
 def AppendtablestoSheets():
   gc=AuthorizeGoogleSheets()[2]
   # createSheet()
   ws = gc.open_by_key('1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc')
+  global table1
+  global table2
+  global table3
   table1,table2,table3= GenerateTables()
-  projectNamesSheet=ws.worksheet_by_title('Project Names')
-  projectPartsSheet=ws.worksheet_by_title('Project Parts')
-  projectSectionsSheet=ws.worksheet_by_title('Sections')
-  projectNamesSheet.clear()
-  projectPartsSheet.clear()
-
-  #append tables to google sheets
-  table1 = table1.drop_duplicates()
-  table2 = table2.drop_duplicates()
-  table3 = table3.drop_duplicates()
-  projectNamesSheet.set_dataframe(start='A1',df=table1)
-  projectPartsSheet.set_dataframe(start='A1',df=table2)
-  projectSectionsSheet.clear()
-  projectSectionsSheet.set_dataframe(start='A1',df=table3)
+  # projectNamesSheet=ws.worksheet_by_title('Project Names')
+  # projectPartsSheet=ws.worksheet_by_title('Project Parts')
+  # projectSectionsSheet=ws.worksheet_by_title('Sections')
+  # projectNamesSheet.clear()
+  # projectPartsSheet.clear()
+
+  # #append tables to google sheets
+  # table1 = table1.drop_duplicates()
+  # table2 = table2.drop_duplicates()
+  # table3 = table3.drop_duplicates()
+  # projectNamesSheet.set_dataframe(start='A1',df=table1)
+  # projectPartsSheet.set_dataframe(start='A1',df=table2)
+  # projectSectionsSheet.clear()
+  # projectSectionsSheet.set_dataframe(start='A1',df=table3)
   
   # return table1,table2,table3
-# %%
-#-------------------------------------------------------------------------------CALL THIS FUNCTION TO BEGIN----------------------------------------------------------------------
-#--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-def getPrjNames(url=prjnamesURL):
-  #url first sheet of names 
-  # Read the CSV data from the Google Sheet URL
-  df = pd.read_csv(prjnamesURL)
-  return df['ProjectName'].tolist(), df['ProjectId'].tolist()
 
-# %%
-def getprjParts(chosenprjid,urlNames=prjnamesURL,urlparts=prjpartsURL):
-
-  # url_1 = urlNames.replace('/edit#gid=', '/export?format=csv&gid=')
-  # global dfNames
-  # dfNames = pd.read_csv(url_1)
-  # chosenprjname=chosenprjname.replace('"', '')
-  # chosenprjnameList=chosenprjname.split(' ')
-  # for i, row in dfNames.iterrows():
-  #   prjnameString=dfNames['ProjectName'].loc[i]
-  #   if all(name in prjnameString for name in chosenprjnameList):
-  #     projectNameID=dfNames.iloc[i]['ProjectId']
-  # projectNameID=dfNames.iloc[np.where(dfNames['ProjectName'].str.startswith(chosenprjnameList[1]))]['ProjectId']  #ProjectName == chosenprjname
-  # url_2 = urlparts.replace('/edit#gid=', '/export?format=csv&gid=')
-  global dfParts
-  dfParts = pd.read_csv(prjpartsURL)
-  print(chosenprjid,dfParts)
-  dfParts= dfParts.iloc[np.where(dfParts['ProjectId']==int(chosenprjid))]
-  parts=dfParts['ProjectPart'].tolist()
-  partsIds=dfParts['ProjectPartId'].tolist()
-  print(parts)
-  print(partsIds)
-#Get projectName Id
-  
-  return parts,partsIds
-
-# %%
-def getprjSections(chosenprjid, chosenpartid,urlSection=prjsectionsURL):
-  #GetprojectSections
-  # url_1 = urlSection.replace('/edit#gid=', '/export?format=csv&gid=')
-  dfSections = pd.read_csv(prjsectionsURL)
-  # chosenprjname=chosenprjname.replace('"', '')
-  # chosenpart=chosenpart.replace('"', '')
-  # projectId=''
-  # projectPartID=''
-  # chosenprjnameList=chosenprjname.split(' ')
-  # chosenpartList=chosenpart.split(' ')
-  # for i, row in dfNames.iterrows():
-  #   prjnameString=dfNames['ProjectName'].loc[i]
-  #   if all(name in prjnameString for name in chosenprjnameList):
-  #     projectId=dfNames.iloc[i]['ProjectId']
-  # # projectId=dfNames.iloc[np.where(dfNames['ProjectName'].astype(str)==chosenprjname)]['ProjectId']  #ProjectName == chosenprjname
-  # for i, row in dfParts.iterrows():
-  #   prjpartString=dfParts['ProjectPart'].loc[i]
-  #   if all(part in prjpartString for part in chosenpartList):
-  #     projectPartID=dfParts['ProjectPartId'].loc[i]
-  # projectPartID=dfParts.iloc[np.where(dfParts['ProjectPart'].astype(str)==chosenpart)]['ProjectPartId']
-  if chosenprjid and chosenpartid:
-    dfSections=dfSections.iloc[np.where((dfSections['ProjectId']==int(chosenprjid)) & (dfSections['ProjectPartId']==int(chosenpartid)) ) ]
-    sections=dfSections['ProjectSection'].tolist()
-    return sections
-  else:
-    return
+def GenerateTables():
+    """
+    Optimized function to generate tables for projects, parts, and sections.
+    """
+    dict1 = APIValues()
+
+    # Initialize lists to collect data for each table
+    table1_data = []
+    table2_data = []
+    table3_data = []
+
+    # Initialize lists for bulk processing
+    table1_data = [[item.get('id'), item.get('projectname')] for item in dict1]
+
+    table2_data = [
+        [item.get('id'), part.get('id'), part.get('name')]
+        for item in dict1
+        for part in item.get('projectparts', [])
+    ]
+
+    table3_data = [
+        [item.get('id'), part.get('id'), section.get('section')]
+        for item in dict1
+        for part in item.get('projectparts', [])
+        for section in part.get('projectsections', [])
+    ]
+
+    # Convert lists to DataFrames
+    global table1
+    global table2
+    global table3
+    table1 = pd.DataFrame(table1_data, columns=['ProjectId', 'ProjectName'])
+    table2 = pd.DataFrame(table2_data, columns=['ProjectId', 'ProjectPartId', 'ProjectPart'])
+    table3 = pd.DataFrame(table3_data, columns=['ProjectId', 'ProjectPartId', 'ProjectSection'])
+
+    return table1, table2, table3
+
+
+table1,table2,table3= GenerateTables()
+def getPrjNames(progress_callback=None):
+    """
+    Returns a list of project names and IDs.
+    """
+    if progress_callback:
+        progress_callback(40)
+    global table1
+    if progress_callback:
+        progress_callback(60)
+    return table1['ProjectName'].tolist(), table1['ProjectId'].tolist()
+
+
+def getprjParts(chosenprjid):
+    """
+    Returns parts and their IDs for a given project ID.
+    """
+    global table2
+    df_parts = table2[table2['ProjectId'] == int(chosenprjid)]
+    return df_parts['ProjectPart'].tolist(), df_parts['ProjectPartId'].tolist()
+
+
+def getprjSections(chosenprjid, chosenpartid):
+    """
+    Returns sections for a given project ID and part ID.
+    """
+    global table3
+    if chosenprjid and chosenpartid:
+        df_sections = table3[
+            (table3['ProjectId'] == int(chosenprjid)) &
+            (table3['ProjectPartId'] == int(chosenpartid))
+        ]
+        return df_sections['ProjectSection'].tolist()
+    return None
 
 
 # ##############################################################################