Update app.py

app.py

@@ -14,12 +14,17 @@ def calculate_total_calories(user_input):
     for item in menu_items:
         # Split the menu item into quantity and item name
         parts = item.strip().split(' ', 1)
-        
+
         if len(parts) == 2:
-            quantity = int(parts[0])
-            item_name = parts[1]
+            quantity_str = parts[0]
+            if quantity_str.isdigit():
+                quantity = int(quantity_str)
+                item_name = parts[1]
+            else:
+                quantity = 1
+                item_name = item.strip()
         else:
-            quantity = 1  # Assume a default quantity of 1 if not specified
+            quantity = 1
             item_name = item.strip()
         
         # Calculate the similarity scores between the item name and menu item names
@@ -38,12 +43,18 @@ def calculate_total_calories(user_input):
         # Get the closest match menu item details
         closest_match = df_menu.loc[closest_match_index]
         menu_name = closest_match['food']
-        unit = closest_match['detail']
+        unit = closest_match['unit']
         calories = closest_match['calo']
+        calories_per_unit = closest_match['calo_per_unit']
         
         # Calculate the total calories for the current menu item
-        item_calories = calories * quantity
-        total_calories += item_calories
+        unit_spec = ['ml','g','gram']
+        if unit in unit_spec:
+            item_calories = calories_per_unit * quantity
+            total_calories += item_calories
+        else:
+            item_calories = calories * quantity
+            total_calories += item_calories
         results.append("Tên món ăn: " + menu_name)
         results.append("Số lượng: " + str(quantity))
         results.append("Đơn vị: " + unit)