Update app.py

app.py

@@ -48,13 +48,13 @@ def init_db():
 init_db()
 
 # ============================================================================
-# PARSER – tuned for your exact paste style
+# PARSER
 # ============================================================================
 def parse_nutrition_text(text):
     result = {}
     key_variants = {
-        'calories': ['calories', 'kcal'],
-        'protein': ['protein'],
+        'calories': ['calories', 'kcal', 'energy'],
+        'protein': ['protein', 'prot'],
         'fat': ['fat'],
         'saturated_fat': ['saturated fat', 'sat fat', 'saturated'],
         'carbs': ['carbs', 'carbohydrates'],
@@ -101,7 +101,7 @@ def parse_nutrition_text(text):
         val_str = numbers[-1]
         pos = line.rfind(val_str)
         label = line[:pos].strip().lower()
-        label = re.sub(r'\s*\([^)]*\)', '', label).strip()  # remove (g), (mg), etc.
+        label = re.sub(r'\s*\([^)]*\)', '', label).strip()
 
         all_keys = []
         for k, vs in key_variants.items():
@@ -118,7 +118,7 @@ def parse_nutrition_text(text):
     return result
 
 # ============================================================================
-# DATABASE HELPERS
+# DB HELPERS
 # ============================================================================
 def get_db():
     conn = sqlite3.connect("health_tracker.db")
@@ -154,13 +154,13 @@ def delete_food(fid):
     conn.close()
     return "Deleted"
 
-def log_meal(date, time_str, food_name, portion, nutrition):
+def log_meal(date_str, time_str, food_name, portion, nutrition):
     conn = get_db()
     c = conn.cursor()
     cols = ', '.join(nutrition.keys())
     vals = ', '.join(['?'] * len(nutrition))
     c.execute(f"INSERT INTO meals (date, time, food_name, portion, {cols}) VALUES (?, ?, ?, ?, {vals})",
-              (date, time_str, food_name, portion, *nutrition.values()))
+              (date_str, time_str, food_name, portion, *nutrition.values()))
     conn.commit()
     conn.close()
     return "Meal logged"
@@ -173,19 +173,19 @@ def get_meals(start_date, end_date):
     return df
 
 # ============================================================================
-# GRADIO INTERFACE
+# GRADIO APP – fixed for 4.44.0
 # ============================================================================
 def parse_and_show(text):
     parsed = parse_nutrition_text(text)
-    return parsed, "Paste parsed! Fill name & save."
+    return parsed, "Parsed! Now enter name and save."
 
 def save_food(name, parsed):
     if not name.strip():
         return "Enter food name", None
     if not parsed:
-        return "No data to save", None
+        return "No data parsed", None
     msg = add_food_to_library(name.strip(), parsed)
-    return msg, None  # clear parsed after save
+    return msg, None
 
 def refresh_foods():
     df = get_all_foods()
@@ -194,88 +194,98 @@ def refresh_foods():
     choices = [f"{row['id']} - {row['food_name']}" for _, row in df.iterrows()]
     return df.to_string(index=False), gr.update(choices=choices)
 
-def delete_selected_food(selected):
+def delete_selected(selected):
     if not selected:
-        return "Select food first"
+        return "Select food"
     fid = int(selected.split(" - ")[0])
     msg = delete_food(fid)
-    _, choices_update = refresh_foods()
-    return msg, choices_update
+    _, choices = refresh_foods()
+    return msg, choices
 
-def log_selected_meal(food_choice, qty, date, time_str):
+def log_meal_fn(food_choice, qty, date_obj, time_obj):
     if not food_choice:
-        return "Select food first"
+        return "Select food"
     fid = int(food_choice.split(" - ")[0])
     foods = get_all_foods()
+    if foods.empty or fid not in foods['id'].values:
+        return "Food not found"
     food_row = foods[foods['id'] == fid].iloc[0].to_dict()
 
     nutrition = {}
-    for k in NUTRIENT_FIELDS:
+    for k in ['calories', 'protein', 'fat', 'carbs', 'fiber', 'sodium', 'cholesterol', 'sugar', 'saturated_fat',
+              'vitamin_a', 'vitamin_b1', 'vitamin_b2', 'vitamin_b3', 'vitamin_b5', 'vitamin_b6', 'vitamin_b12',
+              'vitamin_c', 'vitamin_d', 'vitamin_e', 'vitamin_k', 'folate', 'calcium', 'iron', 'magnesium',
+              'phosphorus', 'potassium', 'zinc', 'copper', 'manganese', 'selenium', 'iodine', 'chromium',
+              'molybdenum', 'omega_3', 'omega_6', 'water', 'ash']:
+        val = food_row.get(k, 0)
         if k == 'calories':
-            nutrition[k] = str(float(food_row.get(k, 0)) * qty)
+            nutrition[k] = str(float(val) * qty if val else 0)
         else:
-            nutrition[k] = food_row.get(k, 0) * qty
+            nutrition[k] = float(val) * qty if val else 0
 
-    msg = log_meal(date, time_str, food_row['food_name'], f"{qty}x", nutrition)
+    date_str = date_obj.strftime("%Y-%m-%d") if date_obj else datetime.now().strftime("%Y-%m-%d")
+    time_str = time_obj.strftime("%H:%M") if time_obj else datetime.now().strftime("%H:%M")
+
+    msg = log_meal(date_str, time_str, food_row['food_name'], f"{qty}x", nutrition)
     return msg
 
-def show_today_log():
+def show_today():
     today = datetime.now().strftime("%Y-%m-%d")
     df = get_meals(today, today)
     if df.empty:
         return "No meals today"
-    cals = df['calories'].apply(lambda x: float(x) if x else 0).sum()
+    df['calories'] = pd.to_numeric(df['calories'], errors='coerce').fillna(0)
+    cals = df['calories'].sum()
     pro = df['protein'].sum()
     fat = df['fat'].sum()
     carb = df['carbs'].sum()
-    summary = f"Today: {cals:.0f} kcal | P {pro:.1f}g | F {fat:.1f}g | C {carb:.1f}g"
-    return summary + "\n\n" + df[['time', 'food_name', 'portion', 'calories']].to_string(index=False)
+    summary = f"Today: {cals:.0f} kcal | Protein {pro:.1f}g | Fat {fat:.1f}g | Carbs {carb:.1f}g\n\n"
+    return summary + df[['time', 'food_name', 'portion', 'calories']].to_string(index=False)
 
-with gr.Blocks(title="Iron Nutrition Tracker", theme=gr.themes.Soft()) as app:
-    gr.Markdown("# 🍛 Iron's Nutrition Tracker - Karachi")
+with gr.Blocks(title="Nutrition Tracker") as app:
+    gr.Markdown("# 🍛 Nutrition Tracker - Paste & Track")
 
     with gr.Tabs():
-        with gr.Tab("Add Food (Paste)"):
+        with gr.Tab("Add Food"):
             with gr.Row():
-                with gr.Column():
-                    paste_box = gr.Textbox(label="Paste nutrition text here", lines=12,
-                                           placeholder="Calories (kcal) 340\nProtein (g) 13.00\n...")
-                    parse_btn = gr.Button("Parse", variant="secondary")
-                    food_name = gr.Textbox(label="Food Name (e.g. 2 omlette)")
-                    save_btn = gr.Button("💾 Save Food", variant="primary")
-                with gr.Column():
-                    parsed_output = gr.JSON(label="Parsed Values")
-                    status = gr.Textbox(label="Status")
-
-            parse_btn.click(parse_and_show, inputs=paste_box, outputs=[parsed_output, status])
-            save_btn.click(save_food, inputs=[food_name, parsed_output], outputs=[status, parsed_output])
+                paste = gr.Textbox(label="Paste Nutrition Text", lines=15, placeholder="Calories (kcal) 340\nProtein (g) 13.00\n...")
+                parse_btn = gr.Button("Parse")
+            parsed_json = gr.JSON(label="Parsed Result")
+            status_parse = gr.Textbox(label="Parse Status")
+            food_name_in = gr.Textbox(label="Food Name")
+            save_btn = gr.Button("Save Food", variant="primary")
+            save_status = gr.Textbox(label="Save Status")
 
-        with gr.Tab("Log Meal"):
-            foods_df = get_all_foods()
-            food_choices = [f"{row['id']} - {row['food_name']}" for _, row in foods_df.iterrows()] if not foods_df.empty else []
+            parse_btn.click(parse_and_show, inputs=paste, outputs=[parsed_json, status_parse])
+            save_btn.click(save_food, inputs=[food_name_in, parsed_json], outputs=[save_status, parsed_json])
 
-            food_select = gr.Dropdown(label="Select Food", choices=food_choices)
-            qty = gr.Number(label="Quantity (× serving)", value=1.0, minimum=0.1)
-            date = gr.DatePicker(label="Date", value=datetime.now().date())
-            time_input = gr.TimePicker(label="Time", value=datetime.now().time())
-            log_btn = gr.Button("Log Meal", variant="primary")
-            log_status = gr.Textbox(label="Status")
+        with gr.Tab("Log Meal"):
+            food_dropdown = gr.Dropdown(label="Select Food", choices=[])
+            qty_input = gr.Number(label="Quantity", value=1.0, minimum=0.1)
+            date_input = gr.DatePicker(label="Date")
+            time_input = gr.TimePicker(label="Time")
+            log_btn = gr.Button("Log Meal")
+            log_status_out = gr.Textbox(label="Log Status")
 
-            log_btn.click(log_selected_meal, inputs=[food_select, qty, date, time_input], outputs=log_status)
+            log_btn.click(log_meal_fn, inputs=[food_dropdown, qty_input, date_input, time_input], outputs=log_status_out)
 
         with gr.Tab("Today's Log"):
-            today_summary = gr.Textbox(label="Today's Meals", lines=10, interactive=False)
-            refresh_today = gr.Button("Refresh")
-            refresh_today.click(show_today_log, outputs=today_summary)
+            today_text = gr.Textbox(label="Today's Summary", lines=12, interactive=False)
+            refresh_today_btn = gr.Button("Refresh")
+            refresh_today_btn.click(show_today, outputs=today_text)
 
         with gr.Tab("Food Library"):
-            foods_table = gr.Textbox(label="All Foods", lines=15, interactive=False)
-            delete_choice = gr.Dropdown(label="Delete Food", choices=[])
-            delete_btn = gr.Button("🗑️ Delete", variant="stop")
+            foods_text = gr.Textbox(label="Foods List", lines=15, interactive=False)
+            delete_dropdown = gr.Dropdown(label="Delete Food", choices=[])
+            delete_btn = gr.Button("Delete", variant="stop")
             lib_status = gr.Textbox(label="Status")
 
-            refresh_lib = gr.Button("Refresh Library")
-            refresh_lib.click(refresh_foods, outputs=[foods_table, delete_choice])
-            delete_btn.click(delete_selected_food, inputs=delete_choice, outputs=[lib_status, delete_choice])
+            refresh_lib_btn = gr.Button("Refresh Library")
+            refresh_lib_btn.click(refresh_foods, outputs=[foods_text, delete_dropdown])
+            delete_btn.click(delete_selected, inputs=delete_dropdown, outputs=[lib_status, delete_dropdown])
+
+    # Initial load
+    app.load(refresh_foods, outputs=[foods_text, delete_dropdown])
+    app.load(refresh_foods, outputs=[food_dropdown])  # for log tab
 
-app.launch(server_name="0.0.0.0", server_port=7860, share=False)  # share=True if you want public link
+app.launch(server_name="0.0.0.0", server_port=7860, theme=gr.themes.Soft())