revert to refactor

app.py

@@ -8,7 +8,6 @@ from util import process_json_files
 from gematria import calculate_gematria
 from deep_translator import GoogleTranslator, exceptions
 from urllib.parse import quote_plus
-from tqdm import tqdm
 
 # Set up logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -57,8 +56,7 @@ def populate_database(tanach_texts, max_phrase_length=1):
     logging.info("Populating database...")
     cursor = conn.cursor()
 
-    for book_id in tqdm(range(1, len(tanach_texts) + 1), desc="Populating database", leave=False):
-        book_data = tanach_texts[book_id]
+    for book_id, book_data in tanach_texts.items():
         # Check if the book is already processed for this max_phrase_length
         cursor.execute('''SELECT max_phrase_length FROM processed_books WHERE book = ?''', (book_id,))
         result = cursor.fetchone()
@@ -73,7 +71,7 @@ def populate_database(tanach_texts, max_phrase_length=1):
             continue
 
         title = book_data.get('title', 'Unknown')
-        book_names[book_id] = title
+        book_names[book_id] = title 
 
         chapters = book_data['text']
         for chapter_id, chapter in enumerate(chapters):
@@ -138,7 +136,7 @@ def get_translation(phrase):
 def translate_and_store(phrase):
     """Translates a Hebrew phrase to English using Google Translate and handles potential errors."""
     global translator
-    max_retries = 3
+    max_retries = 3 
     retries = 0
 
     while retries < max_retries:
@@ -147,7 +145,7 @@ def translate_and_store(phrase):
             logging.debug(f"Translated phrase: {translation}")
             return translation
         except (exceptions.TranslationNotFound, exceptions.NotValidPayload,
-            exceptions.ServerException, exceptions.RequestError, requests.exceptions.ConnectionError) as e:
+            exceptions.ServerException, exceptions.RequestError, requests.exceptions.ConnectionError) as e: 
             retries += 1
             logging.warning(f"Error translating phrase '{phrase}': {e}. Retrying... ({retries}/{max_retries})")
 
@@ -165,11 +163,11 @@ def search_gematria_in_db(gematria_sum):
     logging.debug(f"Found {len(results)} matching phrases for Gematria: {gematria_sum}")
     return results
 
-def gematria_search_interface(phrase, progress_bar):
+def gematria_search_interface(phrase):
     """The main function for the Gradio interface."""
     if not phrase.strip():
-        return "Please enter a phrase.", progress_bar
-    
+        return "Please enter a phrase."
+
     global conn, book_names
     conn = sqlite3.connect('gematria.db')
     cursor = conn.cursor()
@@ -179,7 +177,7 @@ def gematria_search_interface(phrase, progress_bar):
 
     matching_phrases = search_gematria_in_db(phrase_gematria)
     if not matching_phrases:
-        return "No matching phrases found.", progress_bar
+        return "No matching phrases found."
 
     # Sort results by book, chapter, and verse
     sorted_phrases = sorted(matching_phrases, key=lambda x: (x[1], x[2], x[3]))
@@ -240,7 +238,7 @@ def gematria_search_interface(phrase, progress_bar):
     </style>
     """
 
-    return style + "\n".join(results), progress_bar
+    return style + "\n".join(results) 
 
 def flatten_text(text):
     """Helper function to flatten nested lists into a single list."""
@@ -254,40 +252,21 @@ def run_app():
     initialize_translator()
 
     # Pre-populate the database
-    tanach_texts = process_json_files(1, 39)
-    populate_database(tanach_texts, max_phrase_length=1)
-    tanach_texts = process_json_files(27, 27)
+    tanach_texts = process_json_files(1, 39) 
     populate_database(tanach_texts, max_phrase_length=12)
+    tanach_texts = process_json_files(27, 27) 
+    populate_database(tanach_texts, max_phrase_length=24)
 
-    progress_bar = gr.Progress(label="Database Population", visible=False)
-    with gr.Blocks() as iface:
-        with gr.Row():
-            phrase_input = gr.Textbox(label="Enter phrase")
-            results_output = gr.HTML(label="Results")
-        iface.launch()
-
-    # Create a hidden interface for populating the database with a progress bar
-    hidden_iface = gr.Interface(
-        fn=populate_database,
-        inputs=[gr.Textbox(label="Tanach texts"), gr.Textbox(label="Max phrase length")],
-        outputs=[progress_bar],
-        title="Populate database",
-        description="Populate the database with phrases from the Tanach.",
-        live=False,
-        allow_flagging="never",
-        visible=False
-    )
-
-    # Trigger the database population when the main interface is launched
-    iface.launch(inline=False)
-    hidden_iface.launch(inline=False, share=False, server_port=8081)  # Hidden interface
-    
-    # Run the search function when the "Search" button is clicked
-    phrase_input.change(
+    iface = gr.Interface(
         fn=gematria_search_interface,
-        inputs=[phrase_input, progress_bar],
-        outputs=[results_output, progress_bar]
+        inputs=gr.Textbox(label="Enter phrase"),
+        outputs=gr.HTML(label="Results"),
+        title="Gematria Search in Tanach",
+        description="Search for phrases in the Tanach that have the same Gematria value.",
+        live=False,
+        allow_flagging="never"
     )
+    iface.launch()
 
 if __name__ == "__main__":
     run_app()