Update app.py

app.py

@@ -218,6 +218,34 @@ if "uploads_count" not in st.session_state:
 if "food_items" not in st.session_state:
     st.session_state["food_items"] = []
 
+# Initialize form input state variables
+if "custom_food_name" not in st.session_state:
+    st.session_state["custom_food_name"] = ""
+    
+def reset_form_fields():
+    """Reset all form fields after adding an item"""
+    # Only reset custom food name, keep the dropdown at its current value
+    st.session_state["custom_food_name"] = ""
+    # We don't reset the dropdown selection as users might want to add multiple similar items
+
+def add_food_item(food_name, portion_size, portion_unit, cooking_method, ingredients):
+    """Add a food item to the session state"""
+    if food_name and portion_size and portion_unit and cooking_method:
+        # Add the food item to the session state
+        st.session_state["food_items"].append({
+            "food_name": food_name,
+            "portion_size": portion_size,
+            "portion_unit": portion_unit,
+            "cooking_method": cooking_method,
+            "ingredients": ingredients
+        })
+        st.success(f"✅ Added {food_name} to your submission")
+        reset_form_fields()
+        return True
+    else:
+        st.error("❌ Please fill in all required fields")
+        return False
+
 # Streamlit Layout - Authentication Section
 st.sidebar.title("🔑 User Authentication")
 auth_option = st.sidebar.radio("Select an option", ["Login", "Sign Up", "Logout"])
@@ -355,108 +383,134 @@ if "original_image" in st.session_state:
 
     # Food metadata form
     st.subheader("🍲 Add Food Details")
+
+    # Use Streamlit form to capture Enter key and provide a better UX
+    with st.form(key="food_item_form"):
+        food_selection = st.selectbox("Food Name", options=[""] + FOOD_SUGGESTIONS, index=0)
+        
+        # Only show custom food name if the dropdown is empty
+        custom_food_name = ""
+        if food_selection == "":
+            custom_food_name = st.text_input("Or enter a custom food name", 
+                                          value=st.session_state["custom_food_name"], 
+                                          key="food_name_input")
+        
+        # Determine the actual food name to use
+        food_name = food_selection if food_selection else custom_food_name
+        
+        col1, col2 = st.columns(2)
+        with col1:
+            portion_size = st.number_input("Portion Size", min_value=0.1, step=0.1, format="%.2f")
+        with col2:
+            portion_unit = st.selectbox("Unit", options=UNIT_OPTIONS)
+        
+        cooking_method = st.selectbox("Cooking Method", options=[""] + COOKING_METHODS)
+        
+        ingredients = st_tags.st_tags(
+            label="Main Ingredients (Add up to 5)",
+            text="Press enter to add",
+            value=[],
+            suggestions=["Salt", "Pepper", "Olive Oil", "Butter", "Garlic", "Onion", "Tomato"],
+            maxtags=5
+        )
+        
+        # Submit button inside the form
+        submitted = st.form_submit_button(label="➕ Add This Food Item")
+        if submitted:
+            if add_food_item(food_name, portion_size, portion_unit, cooking_method, ingredients):
+                # Store custom food name for next reset
+                if custom_food_name:
+                    st.session_state["custom_food_name"] = custom_food_name
+                st.rerun()
     
-    food_name = st.selectbox("Food Name", options=[""] + FOOD_SUGGESTIONS, index=0)
-    if food_name == "":
-        food_name = st.text_input("Or enter a custom food name")
-    
-    col1, col2 = st.columns(2)
-    with col1:
-        portion_size = st.number_input("Portion Size", min_value=0.1, step=0.1, format="%.2f")
-    with col2:
-        portion_unit = st.selectbox("Unit", options=UNIT_OPTIONS)
-    
-    cooking_method = st.selectbox("Cooking Method", options=[""] + COOKING_METHODS)
-    
-    ingredients = st_tags.st_tags(
-        label="Main Ingredients (Add up to 5)",
-        text="Press enter to add",
-        value=[],
-        suggestions=["Salt", "Pepper", "Olive Oil", "Butter", "Garlic", "Onion", "Tomato"],
-        maxtags=5
-    )
-    
-    # Add this food to the list
-    col1, col2 = st.columns([1, 1])
+    # Separate section for quick-add common foods
+    if "original_image" in st.session_state:
+        with st.expander("🚀 Quick Add Common Foods"):
+            st.info("Click to quickly add common food items with default values")
+            quick_add_cols = st.columns(3)
+            
+            common_foods = [
+                {"name": "French Fries", "portion": 100, "unit": "grams", "cooking": "Fried", "ingredients": ["Potatoes", "Salt", "Oil"]},
+                {"name": "Hamburger", "portion": 1, "unit": "pieces", "cooking": "Grilled", "ingredients": ["Beef", "Bun", "Lettuce", "Tomato"]},
+                {"name": "Salad", "portion": 150, "unit": "grams", "cooking": "Raw", "ingredients": ["Lettuce", "Tomato", "Cucumber"]}
+            ]
+            
+            for i, food in enumerate(common_foods):
+                with quick_add_cols[i % 3]:
+                    if st.button(f"+ {food['name']}", key=f"quick_{i}"):
+                        add_food_item(
+                            food['name'], 
+                            food['portion'], 
+                            food['unit'], 
+                            food['cooking'], 
+                            food['ingredients']
+                        )
+                        st.rerun()
     
-    with col1:
-        if st.button("➕ Add This Food Item"):
-            if food_name and portion_size and portion_unit and cooking_method:
-                # Add the food item to the session state
-                st.session_state["food_items"].append({
-                    "food_name": food_name,
-                    "portion_size": portion_size,
-                    "portion_unit": portion_unit,
-                    "cooking_method": cooking_method,
-                    "ingredients": ingredients
-                })
-                st.success(f"✅ Added {food_name} to your submission")
-                st.rerun()
-            else:
-                st.error("❌ Please fill in all required fields")
+    # Divider before submit button    
+    st.markdown("---")
     
-    # Submit all foods button
-    with col2:
-        if st.button("📤 Submit All Food Items"):
-            if not st.session_state["food_items"]:
-                st.error("❌ Please add at least one food item before submitting")
-            else:
-                with st.spinner("Processing your submission..."):
-                    all_saved = True
-                    total_tokens = 0
-                    
-                    # Determine image quality (simplified version)
-                    image_quality = "high" if original_img.width >= 1000 and original_img.height >= 1000 else "standard"
-                    
-                    # Upload image to S3 once
-                    s3_path = upload_to_s3(processed_img, st.session_state["user_id"])
+    # Submit all foods button - outside the form
+    if st.button("📤 Submit All Food Items", disabled=len(st.session_state["food_items"]) == 0):
+        if not st.session_state["food_items"]:
+            st.error("❌ Please add at least one food item before submitting")
+        else:
+            with st.spinner("Processing your submission..."):
+                all_saved = True
+                total_tokens = 0
+                
+                # Determine image quality (simplified version)
+                image_quality = "high" if original_img.width >= 1000 and original_img.height >= 1000 else "standard"
+                
+                # Upload image to S3 once
+                s3_path = upload_to_s3(processed_img, st.session_state["user_id"])
+                
+                if s3_path:
+                    # Save each food item with the same image
+                    for food_item in st.session_state["food_items"]:
+                        # Check if metadata is complete
+                        has_metadata = True  # Already validated
+                        
+                        # Check if the food is in a unique category (simplified)
+                        is_unique_category = food_item["food_name"] not in ["Pizza", "Burger", "Pasta", "Salad"]
+                        
+                        # Calculate tokens for this item
+                        tokens_awarded = calculate_tokens(image_quality, has_metadata, is_unique_category)
+                        total_tokens += tokens_awarded
+                        
+                        # Convert float to Decimal for DynamoDB
+                        portion_size_decimal = Decimal(str(food_item["portion_size"]))
+                        
+                        # Save metadata to DynamoDB
+                        success = save_metadata(
+                            st.session_state["user_id"],
+                            s3_path,
+                            food_item["food_name"],
+                            portion_size_decimal,  # Use Decimal type
+                            food_item["portion_unit"],
+                            food_item["cooking_method"],
+                            food_item["ingredients"],
+                            tokens_awarded
+                        )
+                        
+                        if not success:
+                            all_saved = False
+                            break
                     
-                    if s3_path:
-                        # Save each food item with the same image
-                        for food_item in st.session_state["food_items"]:
-                            # Check if metadata is complete
-                            has_metadata = True  # Already validated
-                            
-                            # Check if the food is in a unique category (simplified)
-                            is_unique_category = food_item["food_name"] not in ["Pizza", "Burger", "Pasta", "Salad"]
-                            
-                            # Calculate tokens for this item
-                            tokens_awarded = calculate_tokens(image_quality, has_metadata, is_unique_category)
-                            total_tokens += tokens_awarded
-                            
-                            # Convert float to Decimal for DynamoDB
-                            portion_size_decimal = Decimal(str(food_item["portion_size"]))
-                            
-                            # Save metadata to DynamoDB
-                            success = save_metadata(
-                                st.session_state["user_id"],
-                                s3_path,
-                                food_item["food_name"],
-                                portion_size_decimal,  # Use Decimal type
-                                food_item["portion_unit"],
-                                food_item["cooking_method"],
-                                food_item["ingredients"],
-                                tokens_awarded
-                            )
-                            
-                            if not success:
-                                all_saved = False
-                                break
+                    if all_saved:
+                        st.session_state["tokens"] += total_tokens
+                        st.session_state["uploads_count"] += 1
+                        st.success(f"✅ All food items uploaded successfully! You earned {total_tokens} tokens.")
                         
-                        if all_saved:
-                            st.session_state["tokens"] += total_tokens
-                            st.session_state["uploads_count"] += 1
-                            st.success(f"✅ All food items uploaded successfully! You earned {total_tokens} tokens.")
-                            
-                            # Clear the form and image for a new submission
-                            st.session_state.pop("original_image", None)
-                            st.session_state.pop("processed_image", None)
-                            st.session_state["food_items"] = []
-                            st.rerun()
-                        else:
-                            st.error("Failed to save some items. Please try again.")
+                        # Clear the form and image for a new submission
+                        st.session_state.pop("original_image", None)
+                        st.session_state.pop("processed_image", None)
+                        st.session_state["food_items"] = []
+                        st.rerun()
                     else:
-                        st.error("Failed to upload image. Please try again.")
+                        st.error("Failed to save some items. Please try again.")
+                else:
+                    st.error("Failed to upload image. Please try again.")
 
 # Display earned tokens
 st.sidebar.markdown("---")