initial commit

app.py

@@ -91,43 +91,35 @@ def find_matching_dates(date_gematrias, names, search_journal_sum):
     return matching_dates
 
 
-def find_shared_gematria_dates(date_gematrias, names):
-    """Finds dates where names share the same journal sum."""
-    logger.debug("Calculating shared gematria dates...")
-    shared_dates = {}
-    name_gematrias = {}
-
-    for name in names:
-        name_gematrias[name] = calculate_gematria_sum(name)
+def find_shared_journal_sums(date_gematrias, names):
+    """Finds shared journal sums and formats output with names and dates together."""
+    logger.debug("Calculating shared journal sums...")
+    shared_sums = {}
+    name_gematrias = {name: calculate_gematria_sum(name) for name in names}
 
     for date_str, date_data in date_gematrias.items():
         date_gematria = date_data["date_gematria"]
-        for name1 in names:
-            for name2 in names:
-                if name1 != name2:
-                    journal_sum1 = date_gematria + name_gematrias[name1]
-                    journal_sum2 = date_gematria + name_gematrias[name2]
-
-                    if journal_sum1 == journal_sum2:
-                        key = tuple(sorted((name1, name2))) # Create a consistent key regardless of name order
-                        if key not in shared_dates:
-                            shared_dates[key] = []
-                        shared_dates[key].append(date_str)
-
-    logger.debug(f"Shared Gematria Dates: {shared_dates}")  # Log the shared dates
-    return shared_dates
-
-def calculate_and_find(start_date, end_date, names_input, search_journal_sum):
-    names = [n.strip() for n in names_input.split("\n") if n.strip()]
-    date_gematrias = perform_gematria_calculation_for_date_range(start_date, end_date)
-    matching_dates = find_matching_dates(date_gematrias, names, int(search_journal_sum))
-    shared_gematria_dates = find_shared_gematria_dates(date_gematrias, names)
+        for name, name_gematria in name_gematrias.items():
+            journal_sum = date_gematria + name_gematria
+            if journal_sum not in shared_sums:
+                shared_sums[journal_sum] = {}  # Initialize as a dictionary
+            if name not in shared_sums[journal_sum]:
+                shared_sums[journal_sum][name] = []  # Initialize list for each name
+            shared_sums[journal_sum][name].append(date_str)
+
+    # Filter out sums not shared by at least two names and format output
+    result = {}
+    for journal_sum, data in shared_sums.items():
+        if len(data) >= 2:  # Check if at least two names have this sum
+            result[journal_sum] = {}
+            for name, dates in data.items():
+                result[journal_sum][name] = dates
+
+
+
+    logger.debug(f"Shared Journal Sums: {result}")
+    return result
 
-    return (
-        json.dumps(matching_dates, indent=4, ensure_ascii=False),
-        json.dumps(date_gematrias, indent=4, ensure_ascii=False),  # Keep this for debugging if needed
-        json.dumps(shared_gematria_dates, indent=4, ensure_ascii=False)
-    )
 
 
 # --- Main Gradio App ---
@@ -136,21 +128,40 @@ with gr.Blocks() as app:
         start_date = Calendar(type="datetime", label="Start Date")
         end_date = Calendar(type="datetime", label="End Date")
     with gr.Row():
-        names_input = gr.Textbox(label="Names (one per line)", lines=5) # Multiline input
+        names_input = gr.Textbox(label="Names (one per line)", lines=5)
         search_sum = gr.Number(label="Search Journal Sum", precision=0)
 
-    calculate_btn = gr.Button("Calculate")
     with gr.Row():
-        matching_dates_output = gr.JSON(label="Matching Dates")
-        shared_dates_output = gr.JSON(label="Shared Gematria Dates") # New output component
-        json_output = gr.JSON(label="Complete Results (for debugging)")
+        calculate_btn = gr.Button("Search Journal Sum")
+        shared_sums_btn = gr.Button("Find Shared Journal Sums") # new button
+
+    matching_dates_output = gr.JSON(label="Matching Dates")
+    shared_sums_output = gr.JSON(label="Shared Journal Sums")
+
 
 
     calculate_btn.click(
-        calculate_and_find,
+        lambda start_date, end_date, names_input, search_sum: calculate_and_find(start_date, end_date, names_input, int(search_sum), find_shared = False), # find_shared as input
         inputs=[start_date, end_date, names_input, search_sum],
-        outputs=[matching_dates_output, json_output, shared_dates_output]  # Added shared_dates_output
+        outputs=[matching_dates_output, shared_sums_output] # shared_sums_output included for consistency, even if empty
     )
 
+    shared_sums_btn.click(
+        lambda start_date, end_date, names_input: calculate_and_find(start_date, end_date, names_input, 0, find_shared = True), # find_shared as input, search_sum is not used here.
+        inputs=[start_date, end_date, names_input],  #search_sum is irrelevant here, can be omitted
+        outputs=[matching_dates_output, shared_sums_output]
+    )
+
+def calculate_and_find(start_date, end_date, names_input, search_journal_sum, find_shared = False): # added find_shared parameter
+    names = [n.strip() for n in names_input.split("\n") if n.strip()]
+    date_gematrias = perform_gematria_calculation_for_date_range(start_date, end_date)
+    if find_shared:
+        shared_sums = find_shared_journal_sums(date_gematrias, names)
+        return None, json.dumps(shared_sums, indent=4, ensure_ascii=False) # outputs for consistency with 3 outputs
+    else:
+        matching_dates = find_matching_dates(date_gematrias, names, int(search_journal_sum))
+        return json.dumps(matching_dates, indent=4, ensure_ascii=False), None # shared sums are None when this button is pressed
+
+
 if __name__ == "__main__":
     app.launch(share=False)