Update app.py

app.py

@@ -1,5 +1,7 @@
 import gradio as gr
 import random
+import numpy as np
+from datetime import datetime, timedelta
 
 DAYS = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Saturday', 'Sunday']
 DEFAULT_DISHES = [
@@ -29,47 +31,69 @@ class SevakManager:
             self.dishes = [dish.strip() for dish in dish_list.split(',') if dish.strip()]
         return f"Dishes updated. Total dishes: {len(self.dishes)}"
 
-    def generate_schedule(self):
-        cooking_schedule = {}
-        cleaning_schedule = {}
-
+    def generate_schedule(self, weeks=1):
         cooks = [s for s in self.sevaks if s['duty'] in ['Cooking', 'Both']]
         cleaners = [s for s in self.sevaks if s['duty'] in ['Cleaning', 'Both']]
 
-        for day in DAYS:
-            required_cooks = self.required_per_day[day]['Cooking']
-            required_cleaners = self.required_per_day[day]['Cleaning']
-
-            available_cooks = [s for s in cooks if day in s['availability']]
-            available_cleaners = [s for s in cleaners if day in s['availability']]
-
-            cooking_assigned = random.sample(available_cooks, min(required_cooks, len(available_cooks)))
-            cleaning_assigned = random.sample(available_cleaners, min(required_cleaners, len(available_cleaners)))
-
-            cooking_schedule[day] = [
-                f"{s['name']} ({random.choice(self.dishes)})" for s in cooking_assigned
-            ] if cooking_assigned else ["No cooks available"]
-
-            cleaning_schedule[day] = [
-                s['name'] for s in cleaning_assigned
-            ] if cleaning_assigned else ["No cleaners available"]
-
-        html = """
-        <h2>Weekly Chores Schedule</h2>
-        <table border='1' style='width: 100%; border-collapse: collapse;'>
-            <thead>
-                <tr>
-                    <th>Day</th>
-                    <th>Cooking</th>
-                    <th>Cleaning</th>
-                </tr>
-            </thead>
-            <tbody>
-        """
-        for day in DAYS:
-            html += f"<tr><td>{day}</td><td>{'<br>'.join(cooking_schedule[day])}</td><td>{'<br>'.join(cleaning_schedule[day])}</td></tr>"
-        html += "</tbody></table><p><i>Note: Friday is excluded.</i></p>"
-        return html
+        cook_counts = {s['name']: 0 for s in cooks}
+        clean_counts = {s['name']: 0 for s in cleaners}
+
+        all_weeks_html = ""
+        today = datetime.today()
+
+        for week in range(weeks):
+            cooking_schedule = {}
+            cleaning_schedule = {}
+
+            week_start = today + timedelta(days=(week * 7))
+            week_days = [(week_start + timedelta(days=i)) for i in range(7) if (week_start + timedelta(days=i)).strftime('%A') != 'Friday']
+
+            for day_date in week_days:
+                day = day_date.strftime('%A')
+                day_str = day_date.strftime('%b %d, %Y')
+                required_cooks = self.required_per_day[day]['Cooking']
+                required_cleaners = self.required_per_day[day]['Cleaning']
+
+                available_cooks = [s for s in cooks if day in s['availability']]
+                available_cleaners = [s for s in cleaners if day in s['availability']]
+
+                if available_cooks:
+                    sorted_cooks = sorted(available_cooks, key=lambda s: cook_counts[s['name']])
+                    selected = sorted_cooks[:required_cooks]
+                    for s in selected:
+                        cook_counts[s['name']] += 1
+                    cooking_schedule[day_str] = [f"{s['name']} ({random.choice(self.dishes)})" for s in selected]
+                else:
+                    cooking_schedule[day_str] = ["No cooks available"]
+
+                if available_cleaners:
+                    sorted_cleaners = sorted(available_cleaners, key=lambda s: clean_counts[s['name']])
+                    selected = sorted_cleaners[:required_cleaners]
+                    for s in selected:
+                        clean_counts[s['name']] += 1
+                    cleaning_schedule[day_str] = [s['name'] for s in selected]
+                else:
+                    cleaning_schedule[day_str] = ["No cleaners available"]
+
+            html = f"""
+            <h2>Week {week + 1} ({week_days[0].strftime('%b %d')} - {week_days[-1].strftime('%b %d')})</h2>
+            <table border='1' style='width: 100%; border-collapse: collapse;'>
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Cooking</th>
+                        <th>Cleaning</th>
+                    </tr>
+                </thead>
+                <tbody>
+            """
+            for date_str in cooking_schedule:
+                html += f"<tr><td>{date_str}</td><td>{'<br>'.join(cooking_schedule[date_str])}</td><td>{'<br>'.join(cleaning_schedule[date_str])}</td></tr>"
+            html += "</tbody></table><br>"
+            all_weeks_html += html
+
+        all_weeks_html += "<p><i>Note: Friday is excluded.</i></p>"
+        return all_weeks_html
 
 manager = SevakManager()
 
@@ -89,8 +113,8 @@ def update_required_per_day(*sliders):
     manager.set_total_required(update_dict)
     return "Per-day assignment numbers updated."
 
-def generate_schedule_ui():
-    return manager.generate_schedule()
+def generate_schedule_ui(week_count):
+    return manager.generate_schedule(week_count)
 
 def get_current_sevaks():
     if not manager.sevaks:
@@ -121,6 +145,7 @@ with gr.Blocks() as app:
             update_day_req_btn = gr.Button("Update Daily Requirements")
             daily_req_status = gr.Markdown()
 
+            week_slider = gr.Slider(1, 6, step=1, value=1, label="Number of Weeks")
             schedule_btn = gr.Button("Generate Schedule")
             schedule_html = gr.HTML()
 
@@ -128,7 +153,7 @@ with gr.Blocks() as app:
     add_btn.click(get_current_sevaks, outputs=sevak_list_html)
     update_dishes_btn.click(update_dishes_ui, inputs=dish_input, outputs=dish_status)
     update_day_req_btn.click(update_required_per_day, inputs=cooking_counts + cleaning_counts, outputs=daily_req_status)
-    schedule_btn.click(generate_schedule_ui, outputs=schedule_html)
+    schedule_btn.click(generate_schedule_ui, inputs=week_slider, outputs=schedule_html)
 
 if __name__ == "__main__":
     app.launch()