add month search

app.py

@@ -15,10 +15,8 @@ def calculate_gematria_sum(text):
     if text:
         text_gematria = calculate_gematria(strip_diacritics(text))
         return text_gematria
-    else:
-        return None
+    return None
 
-# Custom function to convert number to ordinal words
 def number_to_ordinal_word(number):
     ordinal_dict = {
         1: "first", 2: "second", 3: "third", 4: "fourth", 5: "fifth",
@@ -36,7 +34,16 @@ def date_to_words(date_string):
     """Converts a date in YYYY-MM-DD format to English words."""
     inf_engine = inflect.engine()
     date_obj = datetime.strptime(date_string, "%Y-%m-%d")
+    return format_date(date_obj, inf_engine)
+
+
+def month_year_to_words(date_string):
+    """Converts a month and year in YYYY-MM format to English words."""
+    inf_engine = inflect.engine()
+    date_obj = datetime.strptime(date_string, "%Y-%m")
+    return format_date(date_obj, inf_engine)
 
+def format_date(date_obj, inf_engine):
     year = date_obj.year
     if 1100 <= year <= 1999:
         year_words = f"{inf_engine.number_to_words(year // 100, andword='') } hundred"
@@ -47,11 +54,15 @@ def date_to_words(date_string):
     year_formatted = year_words.replace(',', '')
 
     month = date_obj.strftime("%B")
-    day = date_obj.day
-    day_ordinal = number_to_ordinal_word(day)
+    
+    try:  # Try getting the day, if available
+        day = date_obj.day
+        day_ordinal = number_to_ordinal_word(day)
+        return f"{day_ordinal} {month} {year_formatted}" # Return with day
+    except: 
+        return f"{month} {year_formatted}"  # Return without day
+
 
-    output_text = f"{day_ordinal} {month} {year_formatted}"
-    return output_text
 
 def perform_gematria_calculation_for_date_range(start_date, end_date):
     """Performs gematria calculation for a date range and groups by sum."""
@@ -61,27 +72,37 @@ def perform_gematria_calculation_for_date_range(start_date, end_date):
     current_date = start_date
 
     while current_date <= end_date:
-        # Convert date to string
         date_string = current_date.strftime("%Y-%m-%d")
         date_words = date_to_words(date_string)
-        logger.debug(f"Date: {current_date}, Day Name: {date_words}")
         gematria_sum = calculate_gematria_sum(date_words)
-        logger.debug(f"Gematria Sum: {gematria_sum}")
 
         if gematria_sum not in results:
             results[gematria_sum] = []
+        results[gematria_sum].append({"date": date_string, "date_words": date_words})
+
+        # Handle Month-Year separately, without the day
+        if current_date.day == 1:  # Prevent multiple entries for the same month-year
+            month_year_string = current_date.strftime("%Y-%m")
+            month_year_words = f"{current_date.strftime('%B')} {current_date.year}"
+            month_year_gematria_sum = calculate_gematria_sum(month_year_words)
 
-        results[gematria_sum].append({
-            "date": current_date.strftime('%Y-%m-%d'),
-            "date_words": date_words
-        })
+            if month_year_gematria_sum not in results:
+                results[month_year_gematria_sum] = []
+            results[month_year_gematria_sum].append({
+                "date": month_year_string,
+                "date_words": month_year_words
+            })
 
         current_date += delta
 
     return results
 
+
+
+
 def generate_json_output(results, start_date, end_date):
     """Generates the JSON output with the date range and results."""
+
     result = {
         "DateRange": {
             "StartDate": start_date.strftime("%Y-%m-%d"),
@@ -94,40 +115,66 @@ def generate_json_output(results, start_date, end_date):
 def download_json(json_data, start_date, end_date):
     """Downloads the JSON data to a file."""
     filename = f"gematria_results_{start_date.strftime('%Y%m%d')}_{end_date.strftime('%Y%m%d')}.json"
-    return (filename, json_data)  # Rückgabe von Dateiname und JSON-Daten
+    return (filename, json_data) 
 
 # --- Main Gradio App ---
 with gr.Blocks() as app:
     with gr.Row():
         start_date = Calendar(type="datetime", label="Start Date")
         end_date = Calendar(type="datetime", label="End Date")
+    
+    include_date_words = gr.Checkbox(value=True, label="Include Date-Words in JSON")
 
     calculate_btn = gr.Button("Calculate Gematria for Date Range")
     json_output = gr.Textbox(label="JSON Output")
     download_btn = gr.Button("Download JSON")
-    json_file = gr.File(label="Downloaded JSON")  # Entferne visible=False
+    json_file = gr.File(label="Downloaded JSON")
 
     # --- Event Handlers ---
-    def perform_calculation(start_date, end_date):
+    def perform_calculation(start_date, end_date, include_words):
         """Performs the calculation and generates the JSON output."""
-        logger.debug(f"perform_calculation called with: start_date={start_date}, end_date={end_date}")
+        logger.debug(f"perform_calculation called with: start_date={start_date}, end_date={end_date}, include_words={include_words}")
         results = perform_gematria_calculation_for_date_range(start_date, end_date)
-        json_result = generate_json_output(results, start_date, end_date)
+        json_result = generate_json_output(results, start_date, end_date, include_words)
         return json_result
 
+    def generate_json_output(results, start_date, end_date, include_words):
+        """Generates the JSON output with the date range and results."""
+        result = {
+            "DateRange": {
+                "StartDate": start_date.strftime("%Y-%m-%d"),
+                "EndDate": end_date.strftime("%Y-%m-%d")
+            },
+            "Results": []
+        }
+        for gematria_sum, entries in results.items():
+            group = {
+                "GematriaSum": gematria_sum,
+                "Entries": []
+            }
+            for entry in entries:
+                entry_data = {"date": entry["date"]}
+                if include_words:  # Conditionally include `date_words`
+                    entry_data["date_words"] = entry["date_words"]
+                group["Entries"].append(entry_data)
+            result["Results"].append(group)
+        
+        # Ensure JSON validity
+        return json.dumps(result, indent=4, ensure_ascii=False)
+
     # --- Event Triggers ---
     calculate_btn.click(
         perform_calculation,
-        inputs=[start_date, end_date],
+        inputs=[start_date, end_date, include_date_words],
         outputs=[json_output],
         api_name="calculate_gematria"
     )
 
     download_btn.click(
-        download_json,
+        lambda json_data, start_date, end_date: download_json(json_data, start_date, end_date),
         inputs=[json_output, start_date, end_date],
         outputs=[json_file],
     )
 
 if __name__ == "__main__":
-    app.launch(share=False)
+    app.launch(share=False)