fix year-words

app.py

@@ -63,6 +63,16 @@ def format_date(date_obj, inf_engine):
         return f"{month} {year_formatted}"  # Return without day
 
 
+def format_year_to_words(year):
+    """Formats a year as English words."""
+    inf_engine = inflect.engine()
+    if 1100 <= year <= 1999:
+        year_words = f"{inf_engine.number_to_words(year // 100, andword='')} hundred"
+        if year % 100 != 0:
+            year_words += f" {inf_engine.number_to_words(year % 100, andword='')}"
+    else:
+        year_words = inf_engine.number_to_words(year, andword='')
+    return year_words.replace(',', '')
 
 def perform_gematria_calculation_for_date_range(start_date, end_date):
     """Performs gematria calculation for a date range and groups by sum."""
@@ -71,7 +81,11 @@ def perform_gematria_calculation_for_date_range(start_date, end_date):
     delta = timedelta(days=1)
     current_date = start_date
 
+    processed_months = set()  # To track processed month-year combinations
+    processed_years = set()  # To track processed years
+
     while current_date <= end_date:
+        # Full date calculation
         date_string = current_date.strftime("%Y-%m-%d")
         date_words = date_to_words(date_string)
         gematria_sum = calculate_gematria_sum(date_words)
@@ -80,49 +94,79 @@ def perform_gematria_calculation_for_date_range(start_date, end_date):
             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 calculation (processed once per month)
+        month_year_key = current_date.strftime("%Y-%m")
+        if month_year_key not in processed_months:
+            processed_months.add(month_year_key)
+            month_year_words = f"{current_date.strftime('%B')} {format_year_to_words(current_date.year)}"
             month_year_gematria_sum = calculate_gematria_sum(month_year_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": month_year_key,
                 "date_words": month_year_words
             })
 
+        # Year-only calculation (processed once per year)
+        year_key = str(current_date.year)
+        if year_key not in processed_years:
+            processed_years.add(year_key)
+            year_words = format_year_to_words(current_date.year)
+            year_gematria_sum = calculate_gematria_sum(year_words)
+
+            if year_gematria_sum not in results:
+                results[year_gematria_sum] = []
+            results[year_gematria_sum].append({
+                "date": year_key,
+                "date_words": year_words
+            })
+
         current_date += delta
 
     return results
 
 
+# --- Event Handlers ---
+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}, 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, include_words)
+    return json_result
 
 
-def generate_json_output(results, start_date, end_date):
+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": results
+        "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)
 
-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) 
 
 # --- 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")
@@ -130,38 +174,6 @@ with gr.Blocks() as app:
     download_btn = gr.Button("Download JSON")
     json_file = gr.File(label="Downloaded JSON")
 
-    # --- Event Handlers ---
-    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}, 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, 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,
@@ -177,4 +189,4 @@ with gr.Blocks() as app:
     )
 
 if __name__ == "__main__":
-    app.launch(share=False)
+    app.launch(share=False)