Update app.py

app.py

@@ -9,7 +9,8 @@ genai.configure(api_key="AIzaSyB6z5crVaKSj1ct_gVsq6nrHtSGme_JmoY")
 # API configurations for Dobby
 DOBBY_API_URL = "https://api.fireworks.ai/inference/v1/chat/completions"
 DOBBY_API_KEY = "fw_3ZjtsywUGddwa1wGY4VvB3eW"
-DOBBY_UNLEASHED_MODEL = "accounts/sentientfoundation/models/dobby-mini-unhinged-llama-3-1-8b#accounts/sentientfoundation/deployments/81e155fc"
+DOBBY_LEASHED_MODEL = "accounts/sentientfoundation/models/dobby-mini-leashed-llama-3-1-8b#accounts/sentientfoundation/deployments/22e7b3fd"
+DOBBY_UNHINGED_MODEL = "accounts/sentientfoundation/models/dobby-mini-unhinged-llama-3-1-8b#accounts/sentientfoundation/deployments/81e155fc"
 
 # Initialize session state for tracking meals and user info
 if "meal_data" not in st.session_state:
@@ -19,46 +20,62 @@ if "daily_totals" not in st.session_state:
 if "user_info" not in st.session_state:
     st.session_state.user_info = {}
 
-# Custom Streamlit UI Styling
-st.markdown(
-    """
+# App setup
+st.markdown("""
     <style>
         .stApp {
-            background-color: #f9f9f9;
+            background-color: #f4f4f8;
+            font-family: Arial, sans-serif;
+        }
+        .title {
+            font-size: 36px;
+            font-weight: bold;
+            color: #444;
+            text-align: center;
+            margin-bottom: 20px;
         }
-        .block-container {
-            padding-top: 2rem;
+        .subtitle {
+            font-size: 20px;
+            font-weight: 400;
+            color: #666;
+            text-align: center;
+            margin-bottom: 40px;
         }
-        .css-1q8dd3e {
-            font-size: 18px;
+        .header {
+            font-size: 24px;
+            font-weight: bold;
+            color: #333;
+            margin-bottom: 10px;
+        }
+        .button {
+            background-color: #4CAF50;
+            color: white;
+            font-size: 16px;
+            padding: 10px 20px;
+            border-radius: 5px;
         }
     </style>
-    """,
-    unsafe_allow_html=True,
-)
+""", unsafe_allow_html=True)
 
-# App setup
-st.title("Calorie Bro")
-st.write("Calorie Bro is your AI image calorie tracker. Dare to get meal feedback from Dobby based on your goals!")
+st.markdown('<div class="title">Calorie Bro</div>', unsafe_allow_html=True)
+st.markdown('<div class="subtitle">Your AI image calorie tracker, powered by Dobby. Dare to get feedback!</div>', unsafe_allow_html=True)
 
-# Sidebar for User Preferences
-st.sidebar.header("Set Your Preferences")
+# Step 1: User inputs weight, goal, and Dobby tone
 if not st.session_state.user_info:
-    default_weight = 70
-    weight = st.sidebar.number_input("Enter your weight (kg):", value=default_weight, min_value=30, max_value=300, step=1)
-    goal = st.sidebar.selectbox("Select your goal:", ["Lose Weight", "Maintain Weight", "Gain Weight"])
-    tone = st.sidebar.radio("Select Dobby's tone:", ["Motivational (Leashed)", "Sarcastic (Unhinged)"])
-    if st.sidebar.button("Save Preferences"):
+    st.markdown('<div class="header">Step 1: Set Your Preferences</div>', unsafe_allow_html=True)
+    weight = st.number_input("Enter your weight (kg):", min_value=30, max_value=300, step=1, value=70)
+    goal = st.selectbox("Select your goal:", ["Lose Weight", "Maintain Weight", "Gain Weight"])
+    tone = "Sarcastic (Unhinged)"  # Default tone
+    if st.button("Submit", help="Save your preferences to start tracking meals."):
         st.session_state.user_info = {
             "Weight": weight,
             "Goal": goal,
             "Tone": tone
         }
-        st.sidebar.success("Preferences saved! Proceed to meal tracking.")
+        st.success("Your preferences have been saved! Proceed to meal tracking.")
 
-# Step 2: Meal Tracking
+# Step 2: Meal tracking
 if st.session_state.user_info:
-    st.subheader("Step 2: Meal Tracking")
     meal = st.selectbox("Select Meal:", ["Breakfast", "Lunch", "Dinner"])
     uploaded_file = st.file_uploader(f"Upload your {meal} image", type=["jpg", "jpeg", "png"])
 
@@ -72,7 +89,8 @@ if st.session_state.user_info:
         bytes_data = uploaded_file.getvalue()
         return [{"mime_type": uploaded_file.type, "data": bytes_data}]
 
-    def get_dobby_comment(food_name, total_calories, total_protein, total_carbs, total_fat, meal, goal):
+    def get_dobby_comment(food_name, total_calories, total_protein, total_carbs, total_fat, meal, goal, tone):
+        selected_model = DOBBY_UNHINGED_MODEL  # Default tone is sarcastic
         dobby_prompt = f"""
         The user had {meal}: {food_name}.
         Nutritional data: {total_calories} kcal, {total_protein} g protein, {total_carbs} g carbs, {total_fat} g fat.
@@ -85,7 +103,7 @@ if st.session_state.user_info:
                 "Content-Type": "application/json",
             },
             json={
-                "model": DOBBY_UNLEASHED_MODEL,
+                "model": selected_model,
                 "messages": [{"role": "user", "content": dobby_prompt}],
             },
         )
@@ -93,7 +111,7 @@ if st.session_state.user_info:
 
     # Process uploaded meal image
     if uploaded_file:
-        st.image(uploaded_file, caption=f"Uploaded {meal} Image", use_column_width=True)
+        st.image(uploaded_file, caption=f"Uploaded {meal} Image", use_container_width=True)
         with st.spinner("Analyzing the image..."):
             try:
                 # Prepare image data and analyze with Gemini
@@ -137,7 +155,7 @@ if st.session_state.user_info:
                 # Get Dobby's feedback
                 dobby_comment = get_dobby_comment(
                     food_name, total_calories, total_protein, total_carbs, total_fat, meal,
-                    st.session_state.user_info["Goal"]
+                    st.session_state.user_info["Goal"], st.session_state.user_info["Tone"]
                 )
 
                 # Display results in the desired format
@@ -171,6 +189,6 @@ if st.session_state.user_info:
         final_comment = get_dobby_comment(
             "", st.session_state.daily_totals["Calories"], st.session_state.daily_totals["Protein"],
             st.session_state.daily_totals["Carbs"], st.session_state.daily_totals["Fat"], "Daily Summary",
-            st.session_state.user_info["Goal"]
+            st.session_state.user_info["Goal"], st.session_state.user_info["Tone"]
         )
         st.write(final_comment)