patch app.py

app.py

@@ -1,5 +1,4 @@
 import logging
-
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
@@ -25,7 +24,6 @@ from typing import List, Tuple
 DATABASE_FILE = 'gematria.db'
 MAX_PHRASE_LENGTH_LIMIT = 20
 
-
 # --- Database Initialization ---
 def initialize_database():
     global conn
@@ -40,7 +38,7 @@ def initialize_database():
         chapter INTEGER,
         verse INTEGER,
         phrase_length INTEGER,
-        word_position TEXT, 
+        word_position TEXT,
         PRIMARY KEY (gematria_sum, words, book, chapter, verse, word_position)
     )
     ''')
@@ -56,31 +54,27 @@ def initialize_database():
     ''')
     conn.commit()
 
-
 # --- Initialize Database ---
 initialize_database()
 
-
 # --- Helper Functions (from Network app.py) ---
 def flatten_text(text: List) -> str:
     if isinstance(text, list):
         return " ".join(flatten_text(item) if isinstance(item, list) else item for item in text)
     return text
 
-
 def search_gematria_in_db(gematria_sum: int, max_words: int) -> List[Tuple[str, str, int, int, int, str]]:
     global conn
     with sqlite3.connect(DATABASE_FILE) as conn:
         cursor = conn.cursor()
         cursor.execute('''
-        SELECT words, book, chapter, verse, phrase_length, word_position 
-        FROM results 
+        SELECT words, book, chapter, verse, phrase_length, word_position
+        FROM results
         WHERE gematria_sum = ? AND phrase_length <= ?
         ''', (gematria_sum, max_words))
         results = cursor.fetchall()
     return results
 
-
 def get_most_frequent_phrase(results):
     phrase_counts = defaultdict(int)
     for words, book, chapter, verse, phrase_length, word_position in results:
@@ -88,18 +82,16 @@ def get_most_frequent_phrase(results):
     most_frequent_phrase = max(phrase_counts, key=phrase_counts.get) if phrase_counts else None  # Handle empty results
     return most_frequent_phrase
 
-
 # --- Functions from BOS app.py ---
 def create_language_dropdown(label, default_value='en', show_label=True):
     languages = GoogleTranslator(source='en', target='en').get_supported_languages(as_dict=True)
     return gr.Dropdown(
-        choices=list(languages.keys()),
-        label=label,
-        value=default_value,
-        show_label=show_label
+      choices=list(languages.keys()),
+      label=label,
+      value=default_value,
+      show_label=show_label
     )
 
-
 def calculate_gematria_sum(text, date_words):
     if text or date_words:
         combined_input = f"{text} {date_words}"
@@ -112,9 +104,7 @@ def calculate_gematria_sum(text, date_words):
     else:
         return None
 
-
-def perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk,
-                       merge_results, include_torah, include_bible, include_quran):
+def perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, merge_results, include_torah, include_bible, include_quran):
     if step == 0 or rounds_combination == "0,0":
         return None
 
@@ -123,19 +113,13 @@ def perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_b
     quran_results = []
 
     if include_torah:
-        torah_results.extend(
-            torah.process_json_files(1, 39, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces,
-                                     strip_diacritics))
+        torah_results.extend(torah.process_json_files(1, 39, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces, strip_diacritics))
 
     if include_bible:
-        bible_results.extend(
-            bible.process_json_files(40, 66, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces,
-                                     strip_diacritics))
+        bible_results.extend(bible.process_json_files(40, 66, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces, strip_diacritics))
 
     if include_quran:
-        quran_results.extend(
-            quran.process_json_files(1, 114, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces,
-                                     strip_diacritics))
+        quran_results.extend(quran.process_json_files(1, 114, step, rounds_combination, 0, tlang, strip_spaces, strip_in_braces, strip_diacritics))
 
     if merge_results:
         results = []
@@ -152,14 +136,12 @@ def perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_b
 
     return results
 
-
-def generate_json_dump(start, end, step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk,
-                       search_phrase, results_df, start_date, end_date):
-    """Generates the JSON dump with configuration, date range, and results."""
+def generate_json_dump(start, end, initial_step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, search_phrase, results_df, start_date, end_date):
+    """Generates the JSON dump with configuration, date range, and results, including the initial step."""
     config = {
         "Start Book": start,
         "End Book": end,
-        "Step": step,
+        "Step": initial_step, # Use initial_step here
         "Rounds": rounds_combination,
         "Target Language": tlang,
         "Strip Spaces": strip_spaces,
@@ -178,7 +160,6 @@ def generate_json_dump(start, end, step, rounds_combination, tlang, strip_spaces
     logger.info(f"Generated JSON dump: {result}")
     return json.dumps(result, indent=4, ensure_ascii=False)
 
-
 def download_json_file(config_json, step, rounds_combination, strip_spaces, strip_in_braces, strip_diacritics_chk):
     """Downloads the JSON config file with a descriptive name."""
     filename_suffix = ""
@@ -203,8 +184,7 @@ with gr.Blocks() as app:
 
     with gr.Row():
         tlang = create_language_dropdown("Target Language for Translation", default_value='english')
-        date_language_input = create_language_dropdown("Language of the person/topic (optional) (Date Word Language)",
-                                                       default_value='english')
+        date_language_input = create_language_dropdown("Language of the person/topic (optional) (Date Word Language)", default_value='english')
 
     with gr.Row():
         gematria_text = gr.Textbox(label="Name and/or Topic (required)", value="Hans Albert Einstein")
@@ -236,51 +216,45 @@ with gr.Blocks() as app:
 
     # --- Output Components ---
     markdown_output = gr.Dataframe(label="ELS Results")
-    most_frequent_phrase_output = gr.Textbox(label="Most Frequent Phrase in Network Search")
+    #most_frequent_phrase_output = gr.Textbox(label="Most Frequent Phrase in Network Search")
     json_output = gr.Textbox(label="JSON Configuration Output")
     json_download_btn = gr.Button("Prepare .json for Download")
     json_file = gr.File(label="Download Config JSON", file_count="single")
 
-
     # --- Event Handlers ---
     def update_journal_sum(gematria_text, date_words_output):
         sum_value = calculate_gematria_sum(gematria_text, date_words_output)
         return sum_value, sum_value, sum_value
 
-
     def update_rounds_combination(round_x, round_y):
         return f"{int(round_x)},{int(round_y)}"
 
-
     def update_step_half(float_step):
         new_step = math.ceil(float_step / 2)
         return new_step, float_step / 2
 
-
     def update_step_double(float_step):
         new_step = math.ceil(float_step * 2)
         return new_step, float_step * 2
 
-
-    def perform_search(start_date, end_date, date_language_input, step, rounds_combination, tlang, strip_spaces,
-                       strip_in_braces, strip_diacritics_chk, merge_results, include_torah, include_bible,
-                       include_quran, gematria_text):
+    def perform_search(start_date, end_date, date_language_input, step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, merge_results, include_torah, include_bible, include_quran, gematria_text):
         all_results = []
         delta = timedelta(days=1)
         current_date = start_date
 
+        initial_step = step # Store the initial step value
+
         while current_date <= end_date:
             date_words_output = translate_date_to_words(current_date, date_language_input)
             journal_sum, _, _ = update_journal_sum(gematria_text, date_words_output)
-            step = journal_sum
+            step = journal_sum # Update step for each date
 
-            els_results = perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_braces,
-                                             strip_diacritics_chk, merge_results, include_torah, include_bible,
-                                             include_quran)
+            els_results = perform_els_search(step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, merge_results, include_torah, include_bible, include_quran)
 
             # --- Network Search Integration ---
             updated_els_results = []
             for result in els_results:
+                logger.debug(f"Processing result: {result}") # Add debugging log
                 try:
                     gematria_sum = calculate_gematria(result['result_text'])
                 except KeyError as e:
@@ -301,8 +275,7 @@ with gr.Blocks() as app:
                     most_frequent_phrase = get_most_frequent_phrase(matching_phrases)
                 else:
                     # Sort initial results by word count and take the first phrase
-                    sorted_results = sorted(search_gematria_in_db(gematria_sum, max_words_limit),
-                                            key=lambda x: len(x[0].split()))
+                    sorted_results = sorted(search_gematria_in_db(gematria_sum, max_words_limit), key=lambda x: len(x[0].split()))
                     most_frequent_phrase = sorted_results[0][0] if sorted_results else ""
 
                 # Add most frequent phrase, date, and date_words to the result dictionary
@@ -325,18 +298,14 @@ with gr.Blocks() as app:
         most_frequent_phrase = max(set(all_phrases), key=all_phrases.count) if all_phrases else ""
 
         # Generate JSON output
-        search_phrase = f"{gematria_text}"  # Removed date_words_output as it's now included in each result
-        config_json = generate_json_dump(1, 180, step, rounds_combination, tlang, strip_spaces, strip_in_braces,
-                                         strip_diacritics_chk, search_phrase, df, start_date, end_date)
-
-        return df, most_frequent_phrase, config_json
+        search_phrase = f"{gematria_text}" # Removed date_words_output as it's now included in each result
+        config_json = generate_json_dump(1, 180, initial_step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, search_phrase, df, start_date, end_date)
 
+        return df, config_json
 
-    def handle_json_download(config_json, step, rounds_combination, strip_spaces, strip_in_braces,
-                             strip_diacritics_chk):
+    def handle_json_download(config_json, step, rounds_combination, strip_spaces, strip_in_braces, strip_diacritics_chk):
         """Handles the download of the JSON config file."""
-        return download_json_file(config_json, step, rounds_combination, strip_spaces, strip_in_braces,
-                                  strip_diacritics_chk)
+        return download_json_file(config_json, step, rounds_combination, strip_spaces, strip_in_braces, strip_diacritics_chk)
 
 
     # --- Event Triggers ---
@@ -348,10 +317,8 @@ with gr.Blocks() as app:
 
     translate_btn.click(
         perform_search,
-        inputs=[start_date, end_date, date_language_input, step, rounds_combination, tlang, strip_spaces,
-                strip_in_braces, strip_diacritics_chk, merge_results_chk, include_torah_chk, include_bible_chk,
-                include_quran_chk, gematria_text],
-        outputs=[markdown_output, most_frequent_phrase_output, json_output]
+        inputs=[start_date, end_date, date_language_input, step, rounds_combination, tlang, strip_spaces, strip_in_braces, strip_diacritics_chk, merge_results_chk, include_torah_chk, include_bible_chk, include_quran_chk, gematria_text],
+        outputs=[markdown_output, json_output]
     )
 
     json_download_btn.click(
@@ -361,4 +328,4 @@ with gr.Blocks() as app:
     )
 
 if __name__ == "__main__":
-    app.launch(share=False)
+    app.launch(share=False)