Update app.py

More space for db_chooser. lose '.db' in choices.

app.py

@@ -55,18 +55,11 @@ def init_db_end_date():
     db_paths = glob(dataDir + '*.db')
     db_list = []
     for path in db_paths:
-        db_list.append(os.path.basename(path))
+        db_list.append(os.path.basename(path)[:-3])
     db_list.append('All data')
-    return [gr.Timer(active=False), gr.Dropdown(choices=db_list), gr.DateTime(value=etz_now())]
+    return [gr.Timer(active=False), gr.Dropdown(choices=db_list, value=db_list[0]), gr.DateTime(value=etz_now())]
 
 
-# def load_db(dropDown):
-#     db_paths = glob(dataDir + '*.db')
-#     db_list = []
-#     for path in db_paths:
-#         db_list.append(os.path.basename)
-#     return gr.Dropdown(choices=db_list, value=db_list[0])
-
 def fix_date(date):
     try:
         dt = parse(date)
@@ -106,6 +99,7 @@ def seek_hms(seek_ms):
     return f'{hrs}h{mins}m{secs}s'
 
 def do_search(prompt, db_name, start_date, end_date):
+    db_name += '.db'
     if (not os.path.exists(dataDir + db_name)) and (not 'All' in db_name):
         return ([], 0, 0)
     embeddings = get_db_embeddings(db_name)
@@ -355,9 +349,7 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, clip_text, d
     if user_window == unames[0] and pwd_window == pwdList[0]:
         isBoss = True
         if prompt.startswith('delete'):
-            paths = glob(dataDir + 'Marriage*.db')
-            db_path = paths[0]
-#            db_path = dataDir + prompt[7:]
+            db_path = dataDir + prompt[7:]
             if not os.path.exists(db_path):
                 response = f'File {db_path} not found'
             else:
@@ -567,7 +559,6 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     file_browser_visibility = gr.State(False)
     q = gr.State([])
     qsave = gr.State([])
-    selected_db = gr.State('GoodNews.db')
     # search_start_date = gr.State('')
     # search_end_date = gr.State('')
 
@@ -692,12 +683,12 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
            show_recording_waveform=True), sources=['microphone'], scale = 3, label="Prompt/Question Voice Entry", max_length=120)
         reset_button = gr.ClearButton(value="Reset Voice Entry", scale=1) #new_func1()
     with gr.Row():
-        clear_button = gr.Button(value="Restart Conversation")
-        db_chooser = gr.Dropdown(type="value", label='Choose Database', show_label=True,
-                                choices=['GoodNews.db', 'passover.db', 'marriage.db','falseProphets.db'], interactive=True)
-        button_upload_db = gr.Button(value='Upload Database', visible=False)
-        speak_output = gr.Button(value="Speak Dialog", visible=True)
-        submit_button = gr.Button(value="Submit Prompt/Question")
+        clear_button = gr.Button(value="Restart Conversation", scale=2)
+        db_chooser = gr.Dropdown(type="value", label='Choose Database', show_label=True, scale=3,
+                                choices=['Good News', 'Passover', 'Marriage & Divorce','False Prophets'], interactive=True)
+        button_upload_db = gr.Button(value='Upload Database', visible=False, scale=1)
+        speak_output = gr.Button(value="Speak Dialog", visible=True, scale=2)
+        submit_button = gr.Button(value="Submit Prompt/Question", scale=2)
     with gr.Row():
         with gr.Column(scale=3):
             prompt_window = gr.Textbox(label = "Prompt or Question", scale=3)
@@ -713,7 +704,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         db_file = gr.File(visible=False, type="filepath", interactive=True, label='Upload Database')
     pwd_window.blur(updatePassword, inputs = [user_window, pwd_window], outputs = [password, pwd_window, button_upload_db])
     submit_button.click(chat,
-             inputs=[prompt_window, user_window, password, history, output_window, model, clip_text, selected_db,start_date,end_date],
+             inputs=[prompt_window, user_window, password, history, output_window, model, clip_text, db_chooser,start_date,end_date],
              outputs=[history, output_window, prompt_window, model, clip_text])
     clear_button.click(fn=new_conversation, inputs=[user_window],
                       outputs=[prompt_window, history, output_window, clip_text, start_date, end_date])
@@ -728,7 +719,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     button_upload_db.click(fn=upload_db_file,inputs = [file_browser_visibility],
                           outputs = [file_browser_visibility, db_file])
     db_file.upload(fn=write_db_file, inputs=[db_file], outputs=[output_window])
-    db_chooser.input(fn=set_db,inputs= [db_chooser], outputs= [selected_db])
+    # db_chooser.input(fn=set_db,inputs= [db_chooser], outputs= [selected_db])
     timer.tick(fn=init_db_end_date, inputs=[],outputs=[timer, db_chooser, end_date])
 
 demo.launch(share=True, allowed_paths=[dataDir], ssr_mode=False)