Update app.py

app.py

@@ -150,13 +150,7 @@ def get_date_panchang(date: str = None, data_language: str = "EN") -> str:
 @tool
 def get_holidays(year: int = None, app_language: str = "EN", data_language: str = "HI") -> str:
     """
-    Fetches government and popular holidays for a given year from ExaWeb API.
-    Does not include Panchang events like Ekadashi.
-
-    Args:
-        year: Year (e.g., 2025). Optional — defaults to current year.
-        app_language: App language for API (default: "EN").
-        data_language: Data language for holidays (default: "HI").
+    Fetches holidays from all categories (Hindu, Islamic, Christian) for a given year from ExaWeb API.
     """
     if not year:
         year = datetime.datetime.now().year
@@ -171,32 +165,34 @@ def get_holidays(year: int = None, app_language: str = "EN", data_language: str
     }
 
     try:
-        response = requests.get("https://api.exaweb.in:3004/api/panchang/holiday", params=params, headers=headers)
+        response = requests.get(
+            "https://api.exaweb.in:3004/api/panchang/holiday",
+            params=params,
+            headers=headers
+        )
         response.raise_for_status()
         data = response.json()
 
-        holidays = []
-        
-        hindu_holidays = data.get("Hindu", [])
-        
-        # The response structure has nested lists, so we flatten and collect
-        for month_list in hindu_holidays:
-            for holiday in month_list:
-                title = holiday.get("title", "")
-                date = holiday.get("date", "")
-                holidays.append(f"{date}: {title}")
+        formatted = []
+
+        for category, groups in data.items():
+            if category in ["year", "app_language", "data_language"]:
+                continue  # Skip non-holiday keys
 
-        if not holidays:
-            return f"No holiday data found for year {year}."
+            formatted.append(f"\n=== {category} Holidays ===")
 
-        formatted_holidays = "\n".join(holidays)
-        return f"Holidays for {year}:\n{formatted_holidays}"
+            for group in groups:
+                for holiday in group:
+                    title = holiday.get("title", "")
+                    date = holiday.get("date", "")
+                    formatted.append(f"{date}: {title}")
+
+        return "\n".join(formatted) if formatted else f"No holidays found for {year}."
 
     except requests.RequestException as e:
         return f"Error fetching holidays: {e}"
 
 
-
 @tool
 def get_panchang_field(field: str, date: str = None) -> str:
     """Fetches specific Panchang field like Tithi, Nakshatra, Yoga, etc.