Update app.py

app.py

@@ -56,22 +56,6 @@ nutritional_data = {
     }
 }
 
-def display_dishes_in_city(city):
-    """Displays all dishes available in the selected city with their nutritional information and cost."""
-    result_str = f"### Available Dishes in {city} (Data pulled from leading food aggregators):\n"
-    for dish, info in nutritional_data.items():
-        result_str += f"- **{dish}**\n"
-        result_str += f"  - Cost: ₹{info[city]}\n"
-        result_str += f"  - Energy: {info['Energy (kcal)']} kcal\n"
-        result_str += f"  - Protein: {info['Protein (g)']} g\n"
-        result_str += f"  - Fat: {info['Fat (g)']} g\n"
-        result_str += f"  - Carbohydrate: {info['Carbohydrate (g)']} g\n"
-        result_str += f"  - Fiber: {info['Fiber (g)']} g\n"
-        result_str += f"  - Calcium: {info['Calcium (mg)']} mg\n"
-        result_str += f"  - Iron: {info['Iron (mg)']} mg\n"
-        result_str += f"  - Vitamin C: {info['Vitamin C (mg)']} mg\n\n"
-    return result_str
-
 def optimize_dishes_for_budget(city, daily_budget):
     # Extracting cost, calories, and protein data for the selected city
     costs = [nutritional_data[dish][city] for dish in nutritional_data]
@@ -92,23 +76,31 @@ def optimize_dishes_for_budget(city, daily_budget):
     result = linprog(c, A_ub=A_ub, b_ub=b_ub, bounds=bounds, method='highs')
     
     if result.success:
-        selected_dishes = [dish for i, dish in enumerate(nutritional_data) if result.x[i] > 1e-5]
-        quantities = result.x
-        total_cost = sum(cost * qty for cost, qty in zip(costs, quantities))
-        total_calories = sum(cal * qty for cal, qty in zip(calories, quantities))
-        total_protein = sum(prot * qty for prot, qty in zip(proteins, quantities))
+        selected_dishes = []
+        for i, qty in enumerate(result.x):
+            if qty > 0:
+                dish_name = list(nutritional_data.keys())[i]
+                selected_dishes.append({
+                    "dish": dish_name,
+                    "quantity": qty,
+                    "cost": nutritional_data[dish_name][city] * qty,
+                    "energy": nutritional_data[dish_name]["Energy (kcal)"] * qty,
+                    "protein": nutritional_data[dish_name]["Protein (g)"] * qty
+                })
+        
+        total_cost = sum(d['cost'] for d in selected_dishes)
+        total_calories = sum(d['energy'] for d in selected_dishes)
+        total_protein = sum(d['protein'] for d in selected_dishes)
         
         # Create the summary of the budget allocation
         result_str = f"### For ₹{daily_budget:.2f}, you can have:\n"
-        for dish, qty in zip(selected_dishes, quantities):
-            if qty > 1e-5:
-                result_str += f"- **{qty:.2f} portions of {dish}** at ₹{nutritional_data[dish][city]} per portion\n"
-                # Add detailed information about each selected dish
-                result_str += f"  - Total Cost: ₹{nutritional_data[dish][city] * qty:.2f}\n"
-                result_str += f"  - Total Energy: {nutritional_data[dish]['Energy (kcal)'] * qty:.2f} kcal\n"
-                result_str += f"  - Total Protein: {nutritional_data[dish]['Protein (g)'] * qty:.2f} g\n\n"
+        for dish in selected_dishes:
+            result_str += f"- **{dish['quantity']:.2f} portions of {dish['dish']}** at ₹{nutritional_data[dish['dish']][city]} per portion\n"
+            result_str += f"  - Total Cost: ₹{dish['cost']:.2f}\n"
+            result_str += f"  - Total Energy: {dish['energy']:.2f} kcal\n"
+            result_str += f"  - Total Protein: {dish['protein']:.2f} g\n\n"
         
-        result_str += f"\n### Total Cost: ₹{total_cost:.2f}\n"
+        result_str += f"### Total Cost: ₹{total_cost:.2f}\n"
         result_str += f"### Total Calories: {total_calories:.2f} kcal\n"
         result_str += f"### Total Protein: {total_protein:.2f} g\n"
         
@@ -116,6 +108,22 @@ def optimize_dishes_for_budget(city, daily_budget):
     else:
         return f"No feasible solution found for ₹{daily_budget:.2f} in {city}."
 
+def display_dishes_in_city(city):
+    """Displays all dishes available in the selected city with their nutritional information and cost."""
+    result_str = f"### Available Dishes in {city} (Data pulled from leading food aggregators):\n"
+    for dish, info in nutritional_data.items():
+        result_str += f"- **{dish}**\n"
+        result_str += f"  - Cost: ₹{info[city]}\n"
+        result_str += f"  - Energy: {info['Energy (kcal)']} kcal\n"
+        result_str += f"  - Protein: {info['Protein (g)']} g\n"
+        result_str += f"  - Fat: {info['Fat (g)']} g\n"
+        result_str += f"  - Carbohydrate: {info['Carbohydrate (g)']} g\n"
+        result_str += f"  - Fiber: {info['Fiber (g)']} g\n"
+        result_str += f"  - Calcium: {info['Calcium (mg)']} mg\n"
+        result_str += f"  - Iron: {info['Iron (mg)']} mg\n"
+        result_str += f"  - Vitamin C: {info['Vitamin C (mg)']} mg\n\n"
+    return result_str
+
 # Gradio Interface
 def create_interface():
     cities = ["Chennai", "Bengaluru", "Hyderabad", "New Delhi"]