Update app.py

app.py

@@ -84,16 +84,17 @@ You are tasked with analyzing the contents of a food label and evaluating its he
    - Give Rating in large size text
    - Based on the corrected food label and the user's profile, assign a health rating on a scale from 1 to 10 (where 10 is the healthiest).
    - Consider the user's dietary preferences, health goals, allergies, and activity level in your rating.
-   - *If the food contains any ingredients to which the user is allergic (e.g., peanuts for a nut allergy), assign a health rating of 0/10 and include a clear warning and also before doing this be double sure that the food has a substance to which the user is allergic *.
-   - If the user should avoid the food altogether, assign a rating from 1 to 4.
+   - If the food contains any ingredients to which the user is allergic (e.g., peanuts for a nut allergy), assign a health rating of **0/10** and include a clear warning and also before doing this be double sure that the food has a substance to which the user is allergic .
+   - If the food does not have an allergen to which the user is allergic to and yet the user should avoid the food altogether, assign a rating from 1 to 4.
    - If the user should consume the food in moderation, assign a rating from 5 to 7.
    - If the user can consume the food frequently, assign a rating from 8 to 10.
 
 2. Health Analysis:
-   - Detailed Breakdown: Present a statistical breakdown of the food's nutritional content (e.g., "The food contains 2% saturated fat, 12g sugar, and 10g protein"). Ensure all terms and values are correctly spelled and reflect the accurate content of the food item.
-   - Personalized Evaluation: Explain why the food item is either good or bad for the user based on their specific health profile. Double check if there actually is an item in food to which user is allergic to.  Identify any ingredients or nutritional aspects that align well or poorly with the user's dietary needs (e.g., "This food is high in sugar, which may not align with your goal of maintaining stable blood sugar levels"). **If the food contains an allergen, make sure to emphasize that.ze the risk for the user.
-   - Advice: Provide guidance on whether the user should consume this food frequently, in moderation, or avoid it altogether, considering their health goals, dietary restrictions, and any allergens. **If the food contains an allergen, recommend avoiding it entirely and issue a warning in the conclusion.
+   -* Detailed Breakdown*: Present a statistical breakdown of the food's nutritional content (e.g., "The food contains 2% saturated fat, 12g sugar, and 10g protein"). Ensure all terms and values are correctly spelled and reflect the accurate content of the food item.
+   - *Personalized Evaluation*: Explain why the food item is either good or bad for the user based on their specific health profile. Double check if there actually is an item in food to which user is allergic to.  Identify any ingredients or nutritional aspects that align well or poorly with the user's dietary needs (e.g., "This food is high in sugar, which may not align with your goal of maintaining stable blood sugar levels"). **If the food contains an allergen, make sure to emphasize that.ze the risk for the user.
+   - *Advice*: Provide guidance on whether the user should consume this food frequently, in moderation, or avoid it altogether, considering their health goals, dietary restrictions, and any allergens. **If the food contains an allergen, recommend avoiding it entirely and issue a warning in the conclusion.
 
+if you mention any of the user's allergies or health conditions or health goals dont write them in list format if there is more than one. Just write them in a string.
 Ensure that the output is free from spelling mistakes and important points or warnings are clearly communicated with bold keywords and underline  relevant details.
 """
 
@@ -112,11 +113,11 @@ def analyze_food_label(image_path, email):
     if user:
         user_profile = {
             "BMI": user.get("bmi", "Not provided"),
-            "Allergies": ', '.join(user.get("allergies", [])),
-            "Health Conditions": user.get("health_conditions", "None"),
+            "Allergies": user.get("allergies", []),  # Now a list
+            "Health Conditions": user.get("health_conditions", []),  # Now a list
             "Dietary Preferences": user.get("dietary_preferences", "None"),
             "Activity Level": user.get("activity_level", "Moderate"),
-            "Health Goals": user.get("health_goals", "General well-being")
+            "Health Goals": user.get("health_goals", ["General well-being"])  # Assuming this is already a list
         }
 
         llama_output = analyze_with_llama_index(corrected_text, user_profile)
@@ -164,7 +165,7 @@ def update_product_database(ocr_text, product_type=None, consumption_frequency=N
     1. Correct any spelling mistakes or grammatical errors in the OCR text.
     2. Extract and structure the following information:
        - Product Name
-       - Brand Name (look for company names following by manufactured by or owned by or prduced by)
+       - Brand Name (look for company names following by "manufactured by" or "owned by" or "produced by")
        - Weight in Grams/ML
        - Nutritional information: Include the serving size (e.g., "per 100g", "per 200ml") as specified on the label. If multiple serving sizes are given, use the one that provides the most comprehensive nutritional breakdown.
        - Ingredients
@@ -296,7 +297,7 @@ def home():
         with st.container():
             if register():
                 st.session_state.show_steps = False
-                st.rerun()
+                #st.rerun()
             if st.button("Close Registration Form"):
                 st.session_state.show_steps = False
                 st.rerun()
@@ -359,7 +360,6 @@ def register():
     st.markdown('<h2 style="font-size: 2.5rem;">User Registration</h2>', unsafe_allow_html=True)
     st.info("Password must be at least 8 characters long and contain at least one uppercase letter, one digit, and one special character.")
     
-    
     with st.form("registration_form"):
         name = st.text_input("Name *", key="register_name")
         email = st.text_input("Email *", key="register_email")
@@ -368,8 +368,13 @@ def register():
         age = st.number_input("Age *", min_value=1, max_value=120, key="register_age")
         height = st.number_input("Height (in cm) *", min_value=50, max_value=250, key="register_height")
         weight = st.number_input("Weight (in kg) *", min_value=10, max_value=300, key="register_weight")
-        allergies = st.text_input("Allergies (if any)", key="register_allergies")
-        health_conditions = st.text_input("Health Conditions (if any)", key="register_health_conditions")
+        
+        # Modified input for allergies
+        allergies = st.text_area("Allergies (if any, one per line)", key="register_allergies")
+        
+        # Modified input for health conditions
+        health_conditions = st.text_area("Health Conditions (if any, one per line)", key="register_health_conditions")
+        
         activity_level = st.selectbox("Activity Level", ["Low", "Moderate", "High"], key="register_activity_level")
         dietary_preferences = st.selectbox("Dietary Preferences", ["No preference","Vegetarian", "Vegan", "Gluten-Free", "Keto", "Paleo"], key="register_dietary_preferences")
         health_goals = st.multiselect("Health Goals", ["Lose weight", "Gain muscle", "Maintain weight", "Improve stamina", "General well-being"], key="register_health_goals")
@@ -390,6 +395,11 @@ def register():
                 st.error("Password must be at least 8 characters long, contain one uppercase letter, one special character, and one digit.")
             else:
                 bmi = calculate_bmi(weight, height)
+                
+                # Process allergies and health conditions
+                allergies_list = [allergy.strip() for allergy in allergies.split('\n') if allergy.strip()]
+                health_conditions_list = [condition.strip() for condition in health_conditions.split('\n') if condition.strip()]
+                
                 user_data = {
                     "name": name,
                     "email": email,
@@ -398,8 +408,8 @@ def register():
                     "height": height,
                     "weight": weight,
                     "bmi": bmi,
-                    "allergies": allergies,
-                    "health_conditions": health_conditions,
+                    "allergies": allergies_list,
+                    "health_conditions": health_conditions_list,
                     "activity_level": activity_level,
                     "dietary_preferences": dietary_preferences,
                     "health_goals": health_goals
@@ -407,7 +417,7 @@ def register():
                 customer_collection.insert_one(user_data)
                 st.success(f"Registration successful! Your BMI is {bmi}. Please log in.")
                 return True
-    return False    
+    return False
 def validate_password_strength(password):
     if len(password) < 8:
         return False