Update app.py

app.py

@@ -98,16 +98,17 @@ st.checkbox("I agree to the terms and conditions", key="terms_accepted")
 
 # Upload Image
 uploaded_file = st.file_uploader("Upload an image of your food", type=["jpg", "png", "jpeg"])
-# Ensure an image is uploaded before displaying
+
+# Ensure uploaded file is valid before proceeding
 if uploaded_file:
     original_img = Image.open(uploaded_file)
     st.session_state["original_image"] = original_img
 
-# If an image has been uploaded, process and display it
+# Ensure an image is available in session state before processing
 if "original_image" in st.session_state:
     original_img = st.session_state["original_image"]
     
-    # Resize while maintaining aspect ratio (longest side = 512)
+    # Resize image while maintaining aspect ratio (longest side = 512)
     def resize_image(image, max_size=512):
         aspect_ratio = image.width / image.height
         if image.width > image.height:
@@ -120,8 +121,8 @@ if "original_image" in st.session_state:
 
     processed_img = resize_image(original_img)
 
-    # UI Layout: Two Columns for Images
-    col1, col2 = st.columns(2)
+    # Layout Update: Original and Processed images spanning two columns each
+    col1, col2 = st.columns([2, 2])
 
     with col1:
         st.subheader("📷 Original Image")
@@ -133,44 +134,66 @@ if "original_image" in st.session_state:
         
     # Store processed image in session state for annotations
     st.session_state["processed_image"] = processed_img
-else:
-    st.warning("⚠️ Please upload an image first.")
-
 
-# Create a table-like structure for food annotation
+# Food Annotation Table
 st.subheader("📝 Add Annotations")
 
-# Define columns for table structure
-col_food, col_qty, col_unit, col_ing = st.columns([2, 1, 1, 2])  # Define column widths
+# Initialize session state for annotations if not already present
+if "annotations" not in st.session_state:
+    st.session_state["annotations"] = []
+
+# Table-like structured input for food annotations
+food_data = pd.DataFrame(columns=["Food Item", "Quantity", "Unit", "Ingredients"])
+
+# Function to add a new food item
+def add_food_item():
+    st.session_state["annotations"].append({
+        "name": "",
+        "quantity": "",
+        "unit": "",
+        "ingredients": []
+    })
+
+# Render the existing food items in a table layout
+for i, food in enumerate(st.session_state["annotations"]):
+    cols = st.columns([2, 1, 1, 2])  # Adjust widths
+    
+    # Food Item (Dropdown with Intellisense + Custom Input)
+    food["name"] = cols[0].selectbox(f"Food Item {i+1}", FOOD_SUGGESTIONS + ["Other..."], index=None, key=f"food_{i}")
+    
+    # Quantity Input
+    food["quantity"] = cols[1].number_input(f"Qty {i+1}", min_value=0, step=1, key=f"qty_{i}")
 
-# Food Item Dropdown (with Intellisense)
-food_item = col_food.selectbox("Food Item", options=suggested_foods, index=None, placeholder="Select or enter food")
+    # Unit Dropdown
+    food["unit"] = cols[2].selectbox(f"Unit {i+1}", UNIT_OPTIONS, key=f"unit_{i}")
 
-# Quantity Input
-quantity = col_qty.number_input("Qty", min_value=0, step=1)
+    # Ingredients Section
+    with cols[3]:
+        ing_input = st.text_input(f"Ingredient {i+1}", key=f"ing_{i}")
+        if st.button(f"+ Add Ingredient {i+1}", key=f"btn_ing_{i}"):
+            if ing_input:
+                food["ingredients"].append(ing_input)
 
-# Unit Dropdown (Grams, Ounces, etc.)
-unit = col_unit.selectbox("Unit", ["g", "oz", "tsp", "tbsp", "cup", "slice", "piece"])
+    # Display Added Ingredients
+    if food["ingredients"]:
+        st.write(f"Ingredients: {', '.join(food['ingredients'])}")
 
-# Ingredients Section with Expandable Input
-with col_ing:
-    ingredients = []
-    if st.button("+ Add Ingredients"):
-        ingredient = st.text_input("Enter ingredient")
-        if ingredient:
-            ingredients.append(ingredient)
+# Button to add new food row
+if st.button("+ Add Another Food Item"):
+    add_food_item()
 
-# Display added annotations in a structured format
+# Save annotations when user is done
 if st.button("Save Annotations"):
-    new_entry = {
-        "name": food_item,
-        "quantity": quantity,
-        "unit": unit,
-        "ingredients": ingredients,
-    }
-    st.session_state["annotations"].append(new_entry)
-    st.success("✅ Annotation saved!")
-
-# Show existing annotations
-st.write("### Current Annotations")
-st.table(st.session_state["annotations"])
+    metadata_table.update_item(
+        Key={"image_id": uploaded_file.name},
+        UpdateExpression="SET user_id = :u, annotations = :a, processing_status = :p, s3_url = :s, tokens_earned = :t",
+        ExpressionAttributeValues={
+            ":u": st.session_state["user_id"],
+            ":a": st.session_state["annotations"],
+            ":p": "processed",
+            ":s": f"s3://{S3_BUCKET_NAME}/raw-uploads/{uploaded_file.name}",
+            ":t": len(st.session_state["annotations"])  # Tokens = total annotations
+        },
+    )
+    st.success(f"✅ Annotations saved! You earned {len(st.session_state['annotations'])} tokens.")
+