Update API.py

API.py

@@ -9,14 +9,18 @@ import requests
 import json
 import pandas as pd
 import threading
-
-# %%
+from threading import Timer
+from threading import Thread
+import queue
+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 save_thread_result import ThreadWithResult
+from threading import Thread, Event
 
 prjnamesURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=0'
 prjpartsURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8bPtuiETna1HGWVuHbuDBk/edit#gid=2102042200'
@@ -24,7 +28,9 @@ prjsectionsURL= 'https://docs.google.com/spreadsheets/d/1I4P7wiCXTAwnld0YQfUJC8b
 
 dfNames=pd.DataFrame()
 dfParts=pd.DataFrame()
-
+que= queue.Queue()
+returnString=''
+#FIRST TIME ONLY , DONT CALL UNLESS NEEDED
 def AuthorizeGoogleSheets():
   SCOPES = [
   'https://www.googleapis.com/auth/spreadsheets',
@@ -36,7 +42,7 @@ def AuthorizeGoogleSheets():
   gc = pygsheets.authorize(custom_credentials=credentials, client_secret='credentials.json')
   return spreadsheet_service,drive_service,gc
 
-# %%
+# %% #FIRST TIME ONLY , DONT CALL UNLESS NEEDED
 def createSheet():
   spreadsheet_service,drive_service,gc=AuthorizeGoogleSheets()
   #create sheet
@@ -93,6 +99,7 @@ def APIValues():
 # %%
 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
@@ -127,7 +134,8 @@ def AppendtablestoSheets():
   projectNamesSheet.set_dataframe(start='A1',df=table1)
   projectPartsSheet.set_dataframe(start='A1',df=table2)
   projectSectionsSheet.set_dataframe(start='A1',df=table3)
-
+  
+  # return table1,table2,table3
 # %%
 #-------------------------------------------------------------------------------CALL THIS FUNCTION TO BEGIN----------------------------------------------------------------------
 #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -155,6 +163,9 @@ def getprjParts(chosenprjname,urlNames=prjnamesURL,urlparts=prjpartsURL):
   dfParts = pd.read_csv(url_2)
   dfParts= dfParts.iloc[np.where(dfParts['ProjectId']==int(projectNameID))]
   parts=dfParts['ProjectPart'].tolist()
+  print(parts)
+#Get projectName Id
+  
   return  parts
 
 # %%
@@ -164,7 +175,8 @@ def getprjSections(chosenprjname, chosenpart,urlSection=prjsectionsURL):
   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():
@@ -177,21 +189,104 @@ def getprjSections(chosenprjname, chosenpart,urlSection=prjsectionsURL):
     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']
-  dfSections=dfSections.iloc[np.where((dfSections['ProjectId']==int(projectId)) & (dfSections['ProjectPartId']==int(projectPartID)) ) ]
-  sections=dfSections['ProjectSection'].tolist()
-  return sections
-    
-##############################################################################
-def update_df(): #get file from drive
+  if projectId and projectPartID:
+    dfSections=dfSections.iloc[np.where((dfSections['ProjectId']==int(projectId)) & (dfSections['ProjectPartId']==int(projectPartID)) ) ]
+    sections=dfSections['ProjectSection'].tolist()
+    return sections
+  else:
+    return
+
+
+# ##############################################################################
+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=')
-    df_Old = pd.read_csv(url_1)
-    threading.Timer(20.0,update_df).start() 
-    print(datetime.now())
-
-    df_New = pd.read_csv(url_1)
-    df_diff = pd.concat([df_Old,df_New]).drop_duplicates(keep=False)
-    print('kkkkkkkkkkkkkkkkkkkkk',df_diff)
-    # if df_diff.shape[0] >0:
-    #   print('new')
-    #   print(df_diff)
-    #   AppendtablestoSheets()
+
+    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
+