reverting some changes

app.py

@@ -116,20 +116,29 @@ def onSelectedTablesChange(tablesSelected):
   global queryHelper
   print(f"Selected tables : {tablesSelected}")
   metadataLayout = queryHelper.getMetadata()
-  allTables = list(metadataLayout.getAllTablesCols())
+  allTablesAndCols = metadataLayout.getAllTablesCols()
+  selectedTablesAndCols = metadataLayout.getSelectedTablesAndCols()
+  allTablesList = list(allTablesAndCols.keys())
   tableBoxes = []
-  for i in range(len(allTables)):
-    if allTables[i] in tablesSelected:
-      tableBoxes.append(gr.Textbox(f"Textbox {allTables[i]}", visible=True, label=f"{allTables[i]}"))
+  for i in range(len(allTablesList)):
+    if allTablesList[i] in tablesSelected:
+      dd = gr.Dropdown(
+             allTablesAndCols[allTablesList[i]],visible=True,value=selectedTablesAndCols.get(allTablesList[i],None), multiselect=True, label=allTablesList[i], info="Select columns of a table"
+        )
+      tableBoxes.append(dd)
     else:
-      tableBoxes.append(gr.Textbox(f"Textbox {allTables[i]}", visible=False, label=f"{allTables[i]}"))
+      dd = gr.Dropdown(
+             allTablesAndCols[allTablesList[i]],visible=False,value=selectedTablesAndCols.get(allTablesList[i],None), multiselect=True, label=allTablesList[i], info="Select columns of a table"
+        )
+      tableBoxes.append(dd)
   return tableBoxes
 
 def onSelectedColumnsChange(*tableBoxes):
   #update selection of columns and tables (include new tables and cols in gpts context)
   global queryHelper
   metadataLayout = queryHelper.getMetadata()
-  allTablesList = list(metadataLayout.getAllTablesCols().keys())
+  allTablesAndCols = metadataLayout.getAllTablesCols()
+  allTablesList = list(allTablesAndCols.keys())
   tablesAndCols = {}
   result = ''
   print("Getting selected tables and columns from gradio")
@@ -148,18 +157,26 @@ def onSelectedColumnsChange(*tableBoxes):
 
 def onResetToDefaultSelection():
   global queryHelper
-  tablesSelected = list(DEFAULT_TABLES_COLS.keys())
+  metadataLayout = queryHelper.getMetadata()
+  metadataLayout.setSelection(tablesAndCols=tablesAndCols)
+  queryHelper.updateMetadata(metadataLayout)
+
+  metadataLayout = queryHelper.getMetadata()
+  allTablesAndCols = metadataLayout.getAllTablesCols()
+  selectedTablesAndCols = metadataLayout.getSelectedTablesAndCols()
+  allTablesList = list(allTablesAndCols.keys())
   tableBoxes = []
-  allTablesList = list(metadataLayout.getAllTablesCols().keys())
   for i in range(len(allTablesList)):
-    if allTablesList[i] in tablesSelected:
-      tableBoxes.append(gr.Textbox(f"Textbox {allTablesList[i]}", visible=True, label=f"{allTablesList[i]}"))
+    if allTablesList[i] in selectedTablesAndCols.keys():
+      dd = gr.Dropdown(
+             allTablesAndCols[allTablesList[i]],visible=True,value=selectedTablesAndCols.get(allTablesList[i],None), multiselect=True, label=allTablesList[i], info="Select columns of a table"
+        )
+      tableBoxes.append(dd)
     else:
-      tableBoxes.append(gr.Textbox(f"Textbox {allTablesList[i]}", visible=False, label=f"{allTablesList[i]}"))
-
-  metadataLayout.resetSelection()
-  metadataLayout.setSelection(DEFAULT_TABLES_COLS)
-  queryHelper.updateMetadata(metadataLayout)
+      dd = gr.Dropdown(
+             allTablesAndCols[allTablesList[i]],visible=False,value=selectedTablesAndCols.get(allTablesList[i],None), multiselect=True, label=allTablesList[i], info="Select columns of a table"
+        )
+      tableBoxes.append(dd)
 
   return tableBoxes