Update API.py

API.py

@@ -19,7 +19,7 @@ from google.oauth2 import service_account
 import pygsheets
 import numpy as np
 from datetime import datetime
-# from save_thread_result import ThreadWithResult
+from save_thread_result import ThreadWithResult
 from threading import Thread, Event
 
 prjnamesURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=0'
@@ -143,56 +143,30 @@ def getPrjNames(url=prjnamesURL):
   #url first sheet of names 
   url_1 = url.replace('/edit#gid=', '/export?format=csv&gid=')
   df = pd.read_csv(url_1)
-  return df['ProjectName'].tolist()
+  return df['ProjectName'].tolist(), df['ProjectId'].tolist()
 
 # %%
-def getprjParts(chosenprjname,urlNames=prjnamesURL,urlparts=prjpartsURL):
+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(url_2)
-  dfParts= dfParts.iloc[np.where(dfParts['ProjectId']==int(projectNameID))]
+  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(chosenprjname, chosenpart,urlSection=prjsectionsURL):
+def getprjSections(chosenprjid, chosenpartid,urlSection=prjsectionsURL):
   #GetprojectSections
   url_1 = urlSection.replace('/edit#gid=', '/export?format=csv&gid=')
   dfSections = pd.read_csv(url_1)
-  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 projectId and projectPartID:
-    dfSections=dfSections.iloc[np.where((dfSections['ProjectId']==int(projectId)) & (dfSections['ProjectPartId']==int(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:
@@ -200,95 +174,3 @@ def getprjSections(chosenprjname, chosenpart,urlSection=prjsectionsURL):
 
 
 # ##############################################################################
-def update_df(table1,table2,table3): #API old dictionary 
-
-    prjnamesURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=0'
-    url_1 = prjnamesURL.replace('/edit#gid=', '/export?format=csv&gid=')
-
-    table1N,table2N,table3N=GenerateTables()
-    table1N = pd.read_csv(url_1)
-    t1Diff=table1N[~table1N.isin(table1)].dropna()
-    t2Diff=table2N[~table2N.isin(table2)].dropna()
-    t3Diff=table3N[~table3N.isin(table3)].dropna()
-    returnString=''
-    if not t1Diff.empty:
-      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 process(if any).'
-    if not t2Diff.empty:
-      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 process(if any).'
-    if not t3Diff.empty:
-      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 process(if any).'
-    if (not t1Diff.empty) and (not t2Diff.empty):
-      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 process(if any).'
-    if (not t1Diff.empty) and (not t3Diff.empty):
-      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 process(if any).'
-    if (not t2Diff.empty) and (not t3Diff.empty):
-      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 process(if any).'
-
-    # print(t1Diff,t2Diff,t3Diff)
-    # result= returnString
-    # print(returnString)
-    # # que.put(returnString)
-
-    print('kkkkk',datetime.now())
-
-    
-    threading.Timer(5.0,update_df, args=(table1,table2,table3)).start()
-    lock=threading.Lock()
-
-    lock.acquire()
-    if lock.locked:
-      lock.release()
-    yield returnString
-  
-
-  
-
-
-# class CustomThread(Thread):
-#     # constructor
-#     def __init__(self, worker_func,table1,table2,table3):
-#         super().__init__()
-#         self._worker_func = worker_func
-#         self.table1_thread=table1
-#         self.table2_thread=table2
-#         self.table3_thread=table3
-#         self.value1=None
-
-#     def run(self):
-#         # while not self.stop_event.is_set():
-#             result=self._worker_func(self.table1_thread,self.table2_thread,self.table3_thread)
-#             self.value1=result
-#             time.sleep(20.0)
-
-# def calltoUpdate(table1,table2,table3):
-#     while True:
-#       thread = CustomThread(update_df,table1,table2,table3)
-#       # start the thread
-#       thread.start()
-#       # wait for the thread to finish
-#       thread.join()
-#       # report all values returned from a thread
-#       print('OUTPIITT',thread.value1)
-#       yield thread.value1
-
-
-def do_every (interval, worker_func, iterations = 0):
-  if iterations != 1:
-    threading.Timer (
-      interval,
-      do_every, [interval, worker_func, 0 if iterations == 0 else iterations-1]
-    ).start ()
-
-  worker_func ()
-
-def print_hw ():
-  print ("hello world")
-
-def print_so ():
-  hi="stackoverflow"
-  print('ghh')
-  return hi
-
-
-# call print_so every second, 5 times total
-