Update app.py

bible book filtering

app.py

@@ -68,6 +68,28 @@ relevance_terms = [
     'Likely highly relevant'
 ]
 
+def check_books(filter: bool, books: []):
+    if len(books) == 0 and filter:
+        return md('<h5>Warning: You enabled bible book filter but have no books selected in filter</h5>\n')
+    else:
+        return 'ok'
+
+def on_db_change(db_name: str):
+    global bible_books
+    date_vis = True
+    bible_vis = False
+    books = [] 
+    if 'ISR' in db_name:
+        date_vis = False
+        bible_vis = True
+        if populate_bible_books():
+            for key in bible_books.keys():
+                books.append(key) 
+    return [gr.Markdown(visible=date_vis), gr.Textbox(visible=date_vis),
+        gr.Textbox(visible=date_vis),
+        gr.Dropdown(visible=bible_vis, choices=books),
+        gr.Checkbox(visible=bible_vis)]
+
 def make_sorted_passages(passages): #, bible_books):
     global bible_books
     numbered_passages = []
@@ -295,7 +317,7 @@ def seek_hms(seek_ms):
     secs = int(seek_ms - hrs * 3600 - mins * 60)
     return f'{hrs}h{mins}m{secs}s'
 
-def do_bible_search(prompt, db_name):
+def do_bible_search(prompt, db_name, books, book_filter):
     db_name += '.db'
     if (not os.path.exists(dataDir + db_name)):
         return ([])
@@ -303,8 +325,9 @@ def do_bible_search(prompt, db_name):
     (prompt_embed, prompt_tokens, total_tokens) = get_prompt_embedding(prompt)
     dot_products = []
     for (book, chapter, verse_range, verse, db_embed) in embeddings:
-        dp = dot_product(prompt_embed, db_embed)
-        dot_products.append((book, chapter, verse_range, verse, dp) )
+        if not book_filter or book in books:
+            dp = dot_product(prompt_embed, db_embed)
+            dot_products.append((book, chapter, verse_range, verse, dp) )
     sorted_dots = sorted(dot_products, key=lambda x: x[4])[-10:] # was -10, -5
     sorted_dots.reverse()
     return (sorted_dots, prompt_tokens, total_tokens)
@@ -563,7 +586,7 @@ def updatePassword(user, pwd):
 
 
 def chat(prompt, user_window, pwd_window, past, response, gptModel, clip_text, db_name,
-         start_date,end_date, language, en_hebrew): #, bible_books):
+         start_date,end_date, language, en_hebrew, books, book_filter): #, bible_books):
     global bible_books
     user_window = user_window.lower().strip()
     translation_count = 0
@@ -627,15 +650,24 @@ def chat(prompt, user_window, pwd_window, past, response, gptModel, clip_text, d
         if len(past) == 0:
             first_time = True
             if 'bible' in db_name.casefold():
+                msg = check_books(book_filter, books)
+                if msg != 'ok':
+                    return [past, msg, None, gptModel,clip_text]
                 if not populate_bible_books():
                     return [past, 'Failed to load Bible books', None, gptModel,clip_text]
                 instructions = '''You are a helpful assistant who has expert knowledge
  of the Bible and is familiar with Hebrew versions of biblical names. '''
                 past.append({'role':'developer', 'content': instructions})
                 prompt = make_hebrew(prompt, en_hebrew)
-                (results, prompt_tokens, total_tokens) = do_bible_search(prompt, db_name)
-                bible_list = []
-                txt = '\n=================\n\n<h5>Following are ISR Bible verses in response to your query.</h5> Listed in the order they appear in the bible:\n=================\n'
+                (results, prompt_tokens, total_tokens) = do_bible_search(prompt,
+                                                                        db_name,
+                                                                        books,
+                                                                        book_filter)
+                insert = ''
+                if book_filter:
+                    book_listing = ' ,'.join(books)
+                    insert = f' From books in filter: {book_listing}, '
+                txt = f'\n=================\n\n<h5>Following are ISR Bible verses in response to your query.</h5>{insert} Listed in the order they appear in the bible:\n=================\n'
                 bible_list.append(txt)
                 if len(results) == 0:
                     txt = '\nSorry, no verses were found in response to your prompt\n'
@@ -835,19 +867,29 @@ def show_help():
     txt = '''
     MTOI Search scans a database you select that contains transcripts of MTOI video teachings, or the
        ISR Scriptures, finding sections/passages that relate to the question or topic you enter.
-       It formulates a response based on that text found and then lists at least five
-       text clips and YouTube links to the video at the point when that text is spoken, or ten
-       bible passages.  Responses will be given in the selected translation language.
-       Prompts/questions may be entered in English or the selected language except that bible
-       search prompts must be in English only.
+       It formulates a response based on that text found. It appends to the response as
+       follows:
+
+         For video teachings, it lists at least five text clips plus YouTube links to
+         the video at the point when that text is spoken.  Prompts may be entered in either
+         English or the selected translation language. Responses will be given in the
+         selected translation language.
+
+         For ISR_Bible searches, it lists up to ten bible passages. The AI response will be
+         given in the selected translation language but the ISR Bible verses remain as found.
+         Prompts/questions should be entered in English
     1.  Gemeral:
         1.1 Login with user name and password (not case-sensitive)
         1.2 Select a database (topic) using "Choose Topic".  You can target all the teaching
-            video databases by selecting "All Teaching Topics"
+            video databases by selecting "All Teaching Topics".  Note: This selection does not
+            include ISR_Bible scripture in the search.  Bible and teachings searches are two
+            distinct procedures and cannot be combined.
         1.3 Select a Translation language (initially defaults to "English")
         1.4 Type prompts (questions, topics) into "Prompt or Question" window.
-        1.5 You can limit results based on the dates when the results were uploaded to YouTube with the
-             Start Date and End Date entries.  This applies to video teaching searches only.
+        1.5 For teaching videos, you can limit results based on the dates when the results were uploaded to YouTube with the
+             Start Date and End Date entries.
+        1.6 For ISR_Bible searches, you can filter searches to any selection of books by checking
+             Activate Filter and selecting book(s) you want to limit search to.
     2.  Search:
         2.1 Enter prompt/question and tap the "Submit Prompt/Question" button.  The responses appear in the Dialog window.
         2.2 Enter follow-up questions in the Prompt window.  Then tap "Submit Prompt/Question".
@@ -902,10 +944,15 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         with gr.Column(scale=3):
             prompt_window = gr.Textbox(label = "Prompt or Question", scale=3)
         with gr.Column(scale=2):
-            gr.Markdown('### **Optional Date Filter.  Most common formats are OK<br />such as  &nbsp; 12/2004, &nbsp; &nbsp; jan 2015, &nbsp;  &nbsp; 4 Dec 2012**')
+            filter_heading = gr.Markdown('### **Optional Date Filter.  Most common formats are OK<br />such as  &nbsp; 12/2004, &nbsp; &nbsp; jan 2015, &nbsp;  &nbsp; 4 Dec 2012**')
             with gr.Row():
                 start_date = gr.Textbox(label='Start Date (YYYY-mm-dd)', scale =1,value='1990-01-01',max_lines=1)
                 end_date = gr.Textbox(label='End Date (YYYY-mm-dd)', scale =1,value=etz_now(),max_lines=1)
+                checkbox_filter = gr.Checkbox(label='Activate Book Filter', scale=2,
+                                                show_label=True, visible=False)
+                book_chooser = gr.Dropdown(choices=[],type='value', scale=3,
+                                            multiselect=True, interactive=True,
+                                            label='Book Filter, Select one or more', visible=False)
     gr.Markdown('### **Dialog:**')
     #output_window = gr.Text(container=True, label='Dialog')
     output_window = gr.Markdown(container=True)
@@ -914,7 +961,8 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     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, db_chooser,start_date,end_date, lang_chooser, en_hebrew],
+                    model, clip_text, db_chooser,start_date,end_date, lang_chooser,
+                    en_hebrew, book_chooser, checkbox_filter],
                     # bible_books],
              outputs=[history, output_window, prompt_window, model, clip_text])
     clear_button.click(fn=new_conversation, inputs=[user_window],
@@ -923,9 +971,12 @@ 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=on_db_change,inputs= [db_chooser],
+            outputs= [filter_heading, start_date, end_date, book_chooser, checkbox_filter])
     timer.tick(fn=init_db_end_date, inputs=[en_hebrew], # bible_books],
                outputs=[timer, db_chooser, end_date, en_hebrew]) #, bible_books])
+    # checkbox_filter.input(fn=check_books, inputs=[checkbox_filter, book_chooser],
+    #                       outputs=[output_window])
 
 demo.launch(share=True, allowed_paths=[dataDir], ssr_mode=False)