Update app.py

app.py

@@ -1,15 +1,32 @@
+# app.py
 import gradio as gr
 from typing import List, Literal, Tuple
-MOTIVATION = [
+
+# -------------------------------
+# Motivation banner (rotates every 10s via JS)
+# -------------------------------
+MOTIVATION_JS = """
+<div id="motivation" class="motivation">Let’s begin strong! 🚀</div>
+<script>
+  const MOTIVATION = [
     "You’re doing great—one step at a time! 💪",
     "Small habits, big results. Keep going. 🔁",
     "Hydrate and move—your future self thanks you. 💧",
     "Form first, weight second. You’ve got this. 🧠",
     "Consistency beats intensity. Show up today. ✅",
-]
-def rotate_msg(i: int):
-    msg = MOTIVATION[i % len(MOTIVATION)]
-    return msg, i + 1
+  ];
+  let i = 0;
+  function tick(){
+    const el = document.getElementById("motivation");
+    if (!el) return;
+    el.textContent = MOTIVATION[i % MOTIVATION.length];
+    i++;
+  }
+  tick();                  // first line immediately
+  setInterval(tick, 10000); // then every 10s
+</script>
+"""
+
 # -------------------------------
 # Helpers: BMI / BMR / TDEE
 # -------------------------------
@@ -28,7 +45,7 @@ def bmi_category(bmi: float) -> str:
     return "Obese"
 
 def bmr_mifflin(sex: Literal["male","female"], age: int, height_cm: float, weight_kg: float) -> float:
-    # Mifflin-St Jeor
+    # Mifflin–St Jeor
     s = 5 if sex == "male" else -161
     return 10*weight_kg + 6.25*height_cm - 5*age + s
 
@@ -40,35 +57,34 @@ ACTIVITY = {
     "Athlete (2x/day)": 1.9,
 }
 
-def tdee(sex: str, age: int, height_cm: float, weight_kg: float, activity: str) -> Tuple[float, float, float]:
+def tdee(sex: str, age: int, height_cm: float, weight_kg: float, activity: str) -> Tuple[int, int, int]:
     base = bmr_mifflin(sex, age, height_cm, weight_kg)
     factor = ACTIVITY.get(activity, 1.2)
     maintenance = round(base * factor)
-    cut = maintenance - 500             # خسارة دهون تقريبية
-    bulk = maintenance + 300            # زيادة عضل تدريجية
+    cut = maintenance - 500           # gentle fat loss
+    bulk = maintenance + 300          # lean bulk
     return maintenance, cut, bulk
 
 def water_intake_ml(weight_kg: float) -> int:
-    # 30–35 ml لكل كجم
+    # 35 ml per kg (simple guideline)
     return int(weight_kg * 35)
 
 # -------------------------------
 # Agent 1: BMI & TDEE
 # -------------------------------
-def agent_bmi_tdee(
-    sex, age, height_cm, weight_kg, activity, goal
-):
+def agent_bmi_tdee(sex, age, height_cm, weight_kg, activity, goal):
     bmi = bmi_value(height_cm, weight_kg)
     cat = bmi_category(bmi)
     maint, cut, bulk = tdee(sex, age, height_cm, weight_kg, activity)
     target = {"Lose fat": cut, "Maintain": maint, "Build muscle": bulk}[goal]
     water = water_intake_ml(weight_kg)
+    water_l = round(water / 1000, 1)
 
     md = f"""### 📊 BMI & TDEE
 - **BMI:** `{bmi}` → **{cat}**
 - **Maintenance Calories:** **{maint} kcal/day**
 - **Target for goal ({goal}):** **{target} kcal/day**
-- **Water recommendation:** ~ **{water//1000}–{(water//1000)+0} L/day** (≈ {water} ml)
+- **Water recommendation:** ~ **{water_l} L/day** (≈ {water} ml)
 
 > *These are estimates, not medical advice. Adjust by ±100–150 kcal based on weekly progress.*
 """
@@ -80,12 +96,11 @@ def agent_bmi_tdee(
 GOAL_SPLITS = {
     "Lose fat": ["FBW", "FBW", "LISS Cardio", "Mobility"],
     "Maintain": ["Upper", "Lower", "Full Body", "HIIT/Cardio", "Mobility"],
-    "Build muscle": ["Push", "Pull", "Legs", "Upper", "Lower", "Mobility"]
+    "Build muscle": ["Push", "Pull", "Legs", "Upper", "Lower", "Mobility"],
 }
 
-
 def session_template(name: str, level: str, equipment: str) -> List[str]:
-    # بسيط ومفهوم للمبتدئ
+    # Compact, beginner-friendly templates
     if name == "FBW":
         return [
             "Goblet Squat 3x8-10",
@@ -110,15 +125,15 @@ def session_template(name: str, level: str, equipment: str) -> List[str]:
             "Calf Raise 3x12-15",
             "Core: Deadbug 3x10",
         ]
-    if name == "Push":  # صدر/كتف/ترايسبس
+    if name == "Push":
         return [
             "DB Bench Press 4x6-10",
             "Incline Push-ups 3x10",
             "DB Shoulder Press 3x8-10",
             "Lateral Raise 3x12-15",
-            "Triceps Rope/Extensions 3x10-12",
+            "Triceps Extensions 3x10-12",
         ]
-    if name == "Pull":  # ظهر/بايسبس
+    if name == "Pull":
         return [
             "Lat Pulldown / Assisted Pull-ups 4x6-10",
             "Seated Row / One-arm Row 3x10",
@@ -135,11 +150,11 @@ def session_template(name: str, level: str, equipment: str) -> List[str]:
             "Core: Side Plank 3x30s/side",
         ]
     if name == "HIIT/Cardio":
-        return ["20–25 min intervals (1 min fast / 1 min easy) OR 30–40 min brisk walk"]
+        return ["20–25 min intervals (1 fast / 1 easy) OR 30–40 min brisk walk"]
     if name == "LISS Cardio":
         return ["30–45 min easy jog/bike/walk (Zone 2)"]
     if name == "Mobility":
-        return ["15–20 min full-body mobility + light stretching and breathing"]
+        return ["15–20 min mobility + light stretching & breathing"]
     return ["Rest / Light activity (walk 6–8k steps)"]
 
 def agent_workout(level: str, days_per_week: int, goal: str, equipment: str):
@@ -154,19 +169,18 @@ def agent_workout(level: str, days_per_week: int, goal: str, equipment: str):
     md = "### 🏋️ Weekly Plan\n"
     for title, items in plan:
         md += f"\n**{title}**\n" + "\n".join([f"- {x}" for x in items]) + "\n"
-    md += "\n*Rest between sets: 60–90s. Choose weights that leave ~2 reps in reserve (RIR 2).*"
+    md += "\n*Rest 60–90s between sets. Aim for ~2 reps in reserve (RIR 2).*"
     return md
 
 # -------------------------------
 # Agent 3: Nutrition & Meal Plan
 # -------------------------------
-PROTEIN_PER_KG = 1.6  # g/kg للمبتدئ
-FAT_MIN_G_PER_KG = 0.6
+PROTEIN_PER_KG = 1.6   # g/kg for beginners
+FAT_MIN_G_PER_KG = 0.6 # g/kg
 
-def macros_for_calories(weight_kg: float, calories: int) -> Tuple[int,int,int]:
+def macros_for_calories(weight_kg: float, calories: int) -> Tuple[int, int, int]:
     protein_g = int(round(PROTEIN_PER_KG * weight_kg))
     fat_g = int(round(FAT_MIN_G_PER_KG * weight_kg))
-    # احسبي الكارب من الباقي
     cals_from_p = protein_g * 4
     cals_from_f = fat_g * 9
     carbs_g = max(0, int(round((calories - cals_from_p - cals_from_f) / 4)))
@@ -197,16 +211,17 @@ def agent_nutrition(weight_kg: float, target_kcal: int, liked_csv: str, avoid_cs
 
     p, c, f = macros_for_calories(weight_kg, target_kcal)
     per_meal = max(1, meals)
-    p_m, c_m, f_m = p//per_meal, c//per_meal, f//per_meal
+    p_m, c_m, f_m = p // per_meal, c // per_meal, f // per_meal
 
     sample_day = [
-        f"Meal {i+1}: {proteins[i % len(proteins)]} + {carbs[i % len(carbs)]} + {vegs[i % len(vegs)]} + {fats[i % len(fats)]}"
+        f"Meal {i+1}: {proteins[i % len(proteins)]} + {carbs[i % len(carbs)]} "
+        f"+ {vegs[i % len(vegs)]} + {fats[i % len(fats)]}"
         for i in range(per_meal)
     ]
 
     md = f"""### 🥗 Nutrition Plan
 - **Target:** **{target_kcal} kcal/day**
-- **Macros (approx.):** Protein **{p} g**, Carbs **{c} g**, Fat **{f} g**  → per meal ≈ **{p_m}/{c_m}/{f_m} g**
+- **Macros (approx.):** Protein **{p} g**, Carbs **{c} g**, Fat **{f} g** → per meal ≈ **{p_m}/{c_m}/{f_m} g**
 - **Preferred foods used:** {", ".join(proteins[:3])} …
 
 **Sample Day:**
@@ -218,33 +233,27 @@ def agent_nutrition(weight_kg: float, target_kcal: int, liked_csv: str, avoid_cs
 - Fats: {", ".join(fats)}
 - Veggies: {", ".join(vegs)}
 
-> Tips: add 20–30g protein to each meal, veggies freely, and 1–2 pieces fruit/day.
+> Tips: add 20–30 g protein each meal, plenty of veggies, and 1–2 pieces of fruit/day.
 """
     return md
 
 # -------------------------------
-# All-in-one Coach (chains agents)
+# Chained: All-in-One Coach
 # -------------------------------
 def coach_all_in_one(
     sex, age, height_cm, weight_kg, activity, goal,
     level, days, equipment,
     liked_csv, avoid_csv, meals
 ):
-    # 1) BMI & TDEE
     report = agent_bmi_tdee(sex, age, height_cm, weight_kg, activity, goal)
-    _, cut, bulk = tdee(sex, age, height_cm, weight_kg, activity)
-    target = {"Lose fat": cut, "Maintain": tdee(sex, age, height_cm, weight_kg, activity)[0], "Build muscle": bulk}[goal]
-
-    # 2) Workout
+    maint, cut, bulk = tdee(sex, age, height_cm, weight_kg, activity)
+    target = {"Lose fat": cut, "Maintain": maint, "Build muscle": bulk}[goal]
     w = agent_workout(level, days, goal, equipment)
-
-    # 3) Nutrition
     n = agent_nutrition(weight_kg, target, liked_csv, avoid_csv, meals)
-
     return report + "\n---\n" + w + "\n---\n" + n
 
 # -------------------------------
-# UI (Gradio)
+# UI
 # -------------------------------
 with gr.Blocks(
     title="Beginner Gym Coach — Multi-Agent",
@@ -255,105 +264,92 @@ with gr.Blocks(
         padding:10px 14px;
         border-radius:8px;
         font-size:16px;
+        margin-bottom:10px;
       }
     """
 ) as demo:
     gr.Markdown("## 🏋️ Beginner Gym Coach — Multi-Agent\nGive me your basics and I’ll coach you.")
-
-    banner = gr.Markdown("", elem_id="motivation")
-    idx = gr.State(0)
-
-
-banner = gr.HTML(
-    """
-    <div id="motivation" class="motivation">Let’s begin strong! 🚀</div>
-    <script>
-      const MOTIVATION = [
-        "You’re doing great—one step at a time! 💪",
-        "Small habits, big results. Keep going. 🔁",
-        "Hydrate and move—your future self thanks you. 💧",
-        "Form first, weight second. You’ve got this. 🧠",
-        "Consistency beats intensity. Show up today. ✅",
-      ];
-      let i = 0;
-      function tick() {
-        const el = document.getElementById("motivation");
-        if (!el) return;
-        el.textContent = MOTIVATION[i % MOTIVATION.length];
-        i++;
-      }
-      tick();                       // first line immediately
-      setInterval(tick, 10000);     // then every 10s
-    </script>
-    """
-)
-
-    
-    # ... your Tabs ...
-
-with gr.Tabs():
-    with gr.Tab("BMI & TDEE"):
-        with gr.Row():
-            with gr.Column():
-                sex = gr.Radio(["male","female"], value="female", label="Sex")
-                age = gr.Slider(15, 70, value=24, step=1, label="Age")
-                height = gr.Slider(130, 210, value=165, step=1, label="Height (cm)")
-                weight = gr.Slider(35, 160, value=60, step=0.5, label="Weight (kg)")
-                activity = gr.Dropdown(list(ACTIVITY.keys()), value="Light (1-3x/wk)", label="Activity")
-                goal = gr.Radio(["Lose fat","Maintain","Build muscle"], value="Maintain", label="Goal")
-                btn1 = gr.Button("Calculate")
-            out1 = gr.Markdown()
-        btn1.click(agent_bmi_tdee, [sex, age, height, weight, activity, goal], out1)
-
-    with gr.Tab("Workout Plan"):
-        with gr.Row():
-            with gr.Column():
-                level = gr.Radio(["Beginner","Intermediate"], value="Beginner", label="Level")
-                days = gr.Slider(2, 6, value=4, step=1, label="Days/week")
-                goal_w = gr.Radio(["Lose fat","Maintain","Build muscle"], value="Build muscle", label="Goal")
-                equipment = gr.Dropdown(["Gym (machines/dumbbells)","Home (bands/db)","Bodyweight only"], 
-                                        value="Gym (machines/dumbbells)", label="Equipment")
-                btn2 = gr.Button("Generate Plan")
-            out2 = gr.Markdown()
-        btn2.click(agent_workout, [level, days, goal_w, equipment], out2)
-
-    with gr.Tab("Nutrition"):
-        with gr.Row():
-            with gr.Column():
-                target_kcal = gr.Number(value=1900, label="Target calories (kcal)")
-                weight_n = gr.Number(value=60, label="Weight (kg)")
-                liked = gr.Textbox(label="Preferred foods (comma-separated)", 
-                                   placeholder="chicken, eggs, rice, oats, salad, laban")
-                avoid = gr.Textbox(label="Allergies / avoid (comma-separated)", placeholder="nuts, shrimp, gluten")
-                meals = gr.Slider(2, 6, value=3, step=1, label="Meals/day")
-                btn3 = gr.Button("Build Meal Plan")
-            out3 = gr.Markdown()
-        btn3.click(agent_nutrition, [weight_n, target_kcal, liked, avoid, meals], out3)
-
-    with gr.Tab("All-in-One Coach"):
-        with gr.Row():
-            with gr.Column():
-                sex2 = gr.Radio(["male","female"], value="female", label="Sex")
-                age2 = gr.Slider(15, 70, value=24, step=1, label="Age")
-                height2 = gr.Slider(130, 210, value=165, step=1, label="Height (cm)")
-                weight2 = gr.Slider(35, 160, value=60, step=0.5, label="Weight (kg)")
-                activity2 = gr.Dropdown(list(ACTIVITY.keys()), value="Light (1-3x/wk)", label="Activity")
-                goal2 = gr.Radio(["Lose fat","Maintain","Build muscle"], value="Build muscle", label="Goal")
-                level2 = gr.Radio(["Beginner","Intermediate"], value="Beginner", label="Level")
-                days2 = gr.Slider(2, 6, value=4, step=1, label="Days/week")
-                equipment2 = gr.Dropdown(["Gym (machines/dumbbells)","Home (bands/db)","Bodyweight only"], 
-                                          value="Gym (machines/dumbbells)", label="Equipment")
-                liked2 = gr.Textbox(label="Preferred foods", placeholder="chicken, eggs, rice, potatoes")
-                avoid2 = gr.Textbox(label="Allergies / avoid", placeholder="nuts, shrimp")
-                meals2 = gr.Slider(2, 6, value=3, step=1, label="Meals/day")
-                btn4 = gr.Button("Get My Full Plan 🚀")
-            out4 = gr.Markdown()
-        btn4.click(
-            coach_all_in_one,
-            [sex2, age2, height2, weight2, activity2, goal2, level2, days2, equipment2, liked2, avoid2, meals2],
-            out4
-        )
-        
+    gr.HTML(MOTIVATION_JS)
+
+    with gr.Tabs():
+        # -------- BMI & TDEE --------
+        with gr.Tab("BMI & TDEE"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    sex = gr.Radio(["male","female"], value="female", label="Sex")
+                    age = gr.Slider(15, 70, value=24, step=1, label="Age")
+                    height = gr.Slider(130, 210, value=165, step=1, label="Height (cm)")
+                    weight = gr.Slider(35, 160, value=60, step=0.5, label="Weight (kg)")
+                    activity = gr.Dropdown(list(ACTIVITY.keys()),
+                                           value="Light (1-3x/wk)", label="Activity")
+                    goal = gr.Radio(["Lose fat","Maintain","Build muscle"],
+                                    value="Maintain", label="Goal")
+                    btn1 = gr.Button("Calculate")
+                with gr.Column(scale=1):
+                    out1 = gr.Markdown()
+            btn1.click(agent_bmi_tdee, [sex, age, height, weight, activity, goal], out1)
+
+        # -------- Workout Plan --------
+        with gr.Tab("Workout Plan"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    level = gr.Radio(["Beginner","Intermediate"], value="Beginner", label="Level")
+                    days = gr.Slider(2, 6, value=4, step=1, label="Days/week")
+                    goal_w = gr.Radio(["Lose fat","Maintain","Build muscle"],
+                                      value="Build muscle", label="Goal")
+                    equipment = gr.Dropdown(["Gym (machines/dumbbells)",
+                                             "Home (bands/db)", "Bodyweight only"],
+                                            value="Gym (machines/dumbbells)", label="Equipment")
+                    btn2 = gr.Button("Generate Plan")
+                with gr.Column(scale=1):
+                    out2 = gr.Markdown()
+            btn2.click(agent_workout, [level, days, goal_w, equipment], out2)
+
+        # -------- Nutrition --------
+        with gr.Tab("Nutrition"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    target_kcal = gr.Number(value=1900, label="Target calories (kcal)")
+                    weight_n = gr.Number(value=60, label="Weight (kg)")
+                    liked = gr.Textbox(label="Preferred foods (comma-separated)",
+                                       placeholder="chicken, eggs, rice, oats, salad, laban")
+                    avoid = gr.Textbox(label="Allergies / avoid (comma-separated)",
+                                       placeholder="nuts, shrimp, gluten")
+                    meals = gr.Slider(2, 6, value=3, step=1, label="Meals/day")
+                    btn3 = gr.Button("Build Meal Plan")
+                with gr.Column(scale=1):
+                    out3 = gr.Markdown()
+            btn3.click(agent_nutrition, [weight_n, target_kcal, liked, avoid, meals], out3)
+
+        # -------- All-in-One --------
+        with gr.Tab("All-in-One Coach"):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    sex2 = gr.Radio(["male","female"], value="female", label="Sex")
+                    age2 = gr.Slider(15, 70, value=24, step=1, label="Age")
+                    height2 = gr.Slider(130, 210, value=165, step=1, label="Height (cm)")
+                    weight2 = gr.Slider(35, 160, value=60, step=0.5, label="Weight (kg)")
+                    activity2 = gr.Dropdown(list(ACTIVITY.keys()),
+                                            value="Light (1-3x/wk)", label="Activity")
+                    goal2 = gr.Radio(["Lose fat","Maintain","Build muscle"],
+                                     value="Build muscle", label="Goal")
+                    level2 = gr.Radio(["Beginner","Intermediate"], value="Beginner", label="Level")
+                    days2 = gr.Slider(2, 6, value=4, step=1, label="Days/week")
+                    equipment2 = gr.Dropdown(["Gym (machines/dumbbells)",
+                                              "Home (bands/db)", "Bodyweight only"],
+                                             value="Gym (machines/dumbbells)", label="Equipment")
+                    liked2 = gr.Textbox(label="Preferred foods", placeholder="chicken, eggs, rice, potatoes")
+                    avoid2 = gr.Textbox(label="Allergies / avoid", placeholder="nuts, shrimp")
+                    meals2 = gr.Slider(2, 6, value=3, step=1, label="Meals/day")
+                    btn4 = gr.Button("Get My Full Plan 🚀")
+                with gr.Column(scale=1):
+                    out4 = gr.Markdown()
+            btn4.click(
+                coach_all_in_one,
+                [sex2, age2, height2, weight2, activity2, goal2,
+                 level2, days2, equipment2, liked2, avoid2, meals2],
+                out4
+            )
 
 if __name__ == "__main__":
     demo.launch()