Update app.py

app.py

@@ -1,8 +1,6 @@
 import streamlit as st
 import json
 import os
-import io
-import base64
 import boto3
 from PIL import Image
 import firebase_admin
@@ -47,7 +45,7 @@ FOOD_SUGGESTIONS = [
 ]  # Extend this list with diverse cuisines
 
 # Unit options for food weight/volume
-UNIT_OPTIONS = ["grams", "ounces", "teaspoons", "tablespoons", "cups", "pieces"]
+UNIT_OPTIONS = ["grams", "ounces", "teaspoons", "tablespoons", "cups", "slices", "pieces"]
 
 # Streamlit Layout - Authentication Section
 st.sidebar.title("🔑 User Authentication")
@@ -70,6 +68,7 @@ if auth_option == "Login":
         try:
             user = auth.get_user_by_email(email)
             st.session_state["user_id"] = user.uid
+            st.session_state["tokens"] = 0  # Initialize token count
             st.sidebar.success("✅ Logged in successfully!")
         except Exception as e:
             st.sidebar.error(f"Login failed: {e}")
@@ -94,21 +93,22 @@ st.write(
     " You are responsible for ensuring you own the image and it does not violate any copyright laws."
     " We do not guarantee when tokens will be redeemable. Keep track of your user ID."
 )
-st.checkbox("I agree to the terms and conditions", key="terms_accepted")
+terms_accepted = st.checkbox("I agree to the terms and conditions", key="terms_accepted")
+if not terms_accepted:
+    st.warning("⚠️ You must agree to the terms before proceeding.")
+    st.stop()
 
 # Upload Image
 uploaded_file = st.file_uploader("Upload an image of your food", type=["jpg", "png", "jpeg"])
-
-# Ensure uploaded file is valid before proceeding
 if uploaded_file:
     original_img = Image.open(uploaded_file)
     st.session_state["original_image"] = original_img
+    st.session_state["tokens"] += 1  # Earn 1 token for upload
 
-# Ensure an image is available in session state before processing
+# If an image has been uploaded, process and display it
 if "original_image" in st.session_state:
     original_img = st.session_state["original_image"]
     
-    # 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:
@@ -121,79 +121,35 @@ if "original_image" in st.session_state:
 
     processed_img = resize_image(original_img)
 
-    # Layout Update: Original and Processed images spanning two columns each
-    col1, col2 = st.columns([2, 2])
-
+    col1, col2 = st.columns(2)
     with col1:
         st.subheader("📷 Original Image")
-        st.image(original_img, caption=f"Original ({original_img.width}x{original_img.height} pixels)", use_column_width=True)
-
+        st.image(original_img, caption=f"Original ({original_img.width}x{original_img.height} pixels)", use_container_width=True)
     with col2:
         st.subheader("🖼️ Processed Image")
-        st.image(processed_img, caption=f"Processed ({processed_img.width}x{processed_img.height} pixels)", use_column_width=True)
-        
-    # Store processed image in session state for annotations
+        st.image(processed_img, caption=f"Processed ({processed_img.width}x{processed_img.height} pixels)", use_container_width=True)
     st.session_state["processed_image"] = processed_img
 
-# Food Annotation Table
-st.subheader("📝 Add Annotations")
+# Display earned tokens
+st.success(f"🎉 Tokens Earned: {st.session_state['tokens']}")
 
-# Initialize session state for annotations if not already present
+# Annotation Table
+st.subheader("📝 Add Annotations")
 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"])
+new_food_item = st.selectbox("Food Item", FOOD_SUGGESTIONS + ["Other..."])
+if new_food_item == "Other...":
+    new_food_item = st.text_input("Enter custom food item")
+new_quantity = st.number_input("Quantity", min_value=0, step=1)
+new_unit = st.selectbox("Unit", UNIT_OPTIONS)
 
-# Function to add a new food item
-def add_food_item():
+if st.button("Add Annotation"):
     st.session_state["annotations"].append({
-        "name": "",
-        "quantity": "",
-        "unit": "",
-        "ingredients": []
+        "name": new_food_item,
+        "quantity": new_quantity,
+        "unit": new_unit
     })
+    st.session_state["tokens"] += 1  # Earn 1 token per annotation
 
-# 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}")
-
-    # Unit Dropdown
-    food["unit"] = cols[2].selectbox(f"Unit {i+1}", UNIT_OPTIONS, key=f"unit_{i}")
-
-    # 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)
-
-    # Display Added Ingredients
-    if food["ingredients"]:
-        st.write(f"Ingredients: {', '.join(food['ingredients'])}")
-
-# Button to add new food row
-if st.button("+ Add Another Food Item"):
-    add_food_item()
-
-# Save annotations when user is done
-if st.button("Save 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.")
-
+st.table(st.session_state["annotations"])