Update API.py

API.py

@@ -6,26 +6,25 @@
 
 # %%
 import requests
-import json
+# import json
 import pandas as pd
-import threading
-from threading import Timer
-from threading import Thread
+# import threading
+# from threading import Timer
+# from threading import Thread
 import queue
-import time
+# import time
 # from __future__ import print_function
 from googleapiclient.discovery import build
 from google.oauth2 import service_account
 import pygsheets
 import numpy as np
-from datetime import datetime
+# from datetime import datetime
 # from save_thread_result import ThreadWithResult
-from threading import Thread, Event
-
-prjnamesURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=0'
-prjpartsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=34865056'
-prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc/export?format=csv&gid=1751466819'
+# from threading import Thread, Event
 
+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=34865056'
+prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc/export?format=csv&gid=1751466819'
 
 dfNames=pd.DataFrame()
 dfParts=pd.DataFrame()
@@ -92,6 +91,7 @@ def APIValues():
   head={'Content-Type':'application/json;charset=UTF-8',"Authorization":'Bearer {}'.format(key)}
   response=requests.post(url="https://console.trevorsadd.co.uk/project/getprojectslist",json=query,headers=head)
   dict1=response.json()
+  print(dict1)
   return dict1
 
 # %% [markdown]
@@ -99,6 +99,7 @@ def APIValues():
 
 # %%
 def GenerateTables():
+ 
   dict1=APIValues()
 
   ##First table should ONLY contain: All project Ids and names
@@ -123,17 +124,22 @@ def GenerateTables():
 # Set Tables to Sheets
 def AppendtablestoSheets():
   gc=AuthorizeGoogleSheets()[2]
-  ws = gc.open_by_key('1nsIgi9o9VSBKQlNxbxihPzG_N7s4um0eNVfgL4gaGPc')
+  # createSheet()
+  ws = gc.open_by_key('1n8AG8_lCyhh1X97Dg3ZwWUXRUm-G2JdIUgQBTzE4qgc')
   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()
-  projectSectionsSheet.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
@@ -142,13 +148,23 @@ def AppendtablestoSheets():
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 def getPrjNames(url=prjnamesURL):
   #url first sheet of names 
-  # url_1 = url.replace('/edit#gid=', '/export?format=csv&gid=')
+  # 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)
@@ -158,7 +174,8 @@ def getprjParts(chosenprjid,urlNames=prjnamesURL,urlparts=prjpartsURL):
   partsIds=dfParts['ProjectPartId'].tolist()
   print(parts)
   print(partsIds)
-
+#Get projectName Id
+  
   return parts,partsIds
 
 # %%
@@ -166,6 +183,22 @@ 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()