Update app.py

app.py

@@ -71,13 +71,16 @@ def calculate_bmi(height, weight, gender):
             status = "overweight"
         else:
             status = "obese"
+
         return bmi, status
     except Exception:
         return None, "Invalid height or weight provided."
 
+
 def visualize_bmi(bmi):
     try:
         categories = ["Underweight", "Normal Weight", "Overweight", "Obese"]
+        x_pos = np.arange(len(categories))
         colors = ['blue', 'green', 'orange', 'red']
 
         plt.figure(figsize=(8, 4))
@@ -91,17 +94,21 @@ def visualize_bmi(bmi):
         plt_path = "bmi_chart.png"
         plt.savefig(plt_path)
         plt.close()
+
         return plt_path
     except Exception as e:
         return f"Error creating BMI visualization: {e}"
 
+
 def calculate_calories(age, weight, height, activity_level, gender):
     try:
+        # Base Metabolic Rate (BMR) calculation
         if gender.lower() == "male":
             bmr = 10 * weight + 6.25 * height - 5 * age + 5
         else:
             bmr = 10 * weight + 6.25 * height - 5 * age - 161
 
+        # Activity multiplier mapping
         activity_multipliers = {
             "Sedentary": 1.2,
             "Lightly active": 1.375,
@@ -109,7 +116,13 @@ def calculate_calories(age, weight, height, activity_level, gender):
             "Very active": 1.725,
             "Extra active": 1.9,
         }
-        return round(bmr * activity_multipliers[activity_level], 2)
+
+        if activity_level in activity_multipliers:
+            calories = bmr * activity_multipliers[activity_level]
+        else:
+            raise ValueError("Invalid activity level")
+
+        return round(calories, 2)
     except Exception as e:
         return f"Error in calorie calculation: {e}"
 
@@ -117,13 +130,12 @@ def calculate_calories(age, weight, height, activity_level, gender):
 with gr.Blocks() as demo:
     gr.Markdown("# FIT.AI - Your Fitness and Wellbeing Coach")
 
-    with gr.Tab("Interactive Consultation"):
+    with gr.Tab("Chat with FIT.AI"):
         with gr.Row():
-            with gr.Row():
-                user_name = gr.Textbox(placeholder="Enter your name", label="Name", interactive=True)
+            with gr.Column():
+                user_name = gr.Textbox(placeholder="Enter your name", label="Name")
                 user_age = gr.Number(label="Age (years)", value=25, precision=0)
                 user_gender = gr.Dropdown(choices=["Male", "Female"], label="Gender", value="Male")
-            with gr.Row():
                 user_weight = gr.Number(label="Weight (kg)", value=70, precision=1)
                 user_height = gr.Number(label="Height (cm)", value=170, precision=1)
                 activity_level = gr.Dropdown(
@@ -131,10 +143,9 @@ with gr.Blocks() as demo:
                     label="Activity Level",
                     value="Moderately active"
                 )
-        with gr.Row():
-            chatbot = gr.Chatbot(label="Chat with FIT.AI", type="messages", height=500)
+
+            chatbot = gr.Chatbot(label="Chat with FIT.AI", type="messages")
             text_input = gr.Textbox(placeholder="Type your question here...", label="Your Question")
-        with gr.Row():
             submit_button = gr.Button("Submit")
             clear_button = gr.Button("Clear Chat")
 
@@ -148,27 +159,53 @@ with gr.Blocks() as demo:
                 "gender": user_gender.value
             }
             bmi, status = calculate_bmi(user_details["height"], user_details["weight"], user_details["gender"])
-            try:
-                if bmi:
-                    bmi_path = visualize_bmi(bmi)
-                    calories = calculate_calories(
-                        user_details["age"], user_details["weight"], user_details["height"], user_details["activity_level"], user_details["gender"]
-                    )
-                    response = run_graph(message, history, user_details)
-                    history.append({"role": "user", "content": message})
-                    history.append({
-                        "role": "assistant",
-                        "content": f"{response}\n\nYour BMI is {bmi:.2f}, considered {status}.\nDaily calorie needs: {calories} kcal.",
-                        "image": bmi_path
-                    })
-                else:
-                    history.append({"role": "assistant", "content": "Error in calculation."})
+            if bmi:
+                bmi_path = visualize_bmi(bmi)
+                calories = calculate_calories(user_details["age"], user_details["weight"], user_details["height"], user_details["activity_level"], user_details["gender"])
+                response = run_graph(message, history, user_details)
+                history.append({"role": "user", "content": message})
+                history.append({"role": "assistant", "content": response + f"\nYour BMI is {bmi:.2f}, considered {status}.\nDaily calorie needs: {calories} kcal.", "image": bmi_path})
                 return history, ""
-            except Exception as e:
-                history.append({"role": "assistant", "content": f"Error occurred: {e}"})
+            else:
+                history.append({"role": "assistant", "content": "Error in calculation."})
                 return history, ""
 
         submit_button.click(submit_message, inputs=[text_input, chatbot], outputs=[chatbot, text_input])
         clear_button.click(lambda: ([], ""), inputs=None, outputs=[chatbot, text_input])
 
+    with gr.Tab("BMI and Calorie Calculator"):
+        with gr.Row():
+            with gr.Column():
+                user_name = gr.Textbox(placeholder="Enter your name", label="Name")
+                user_age = gr.Number(label="Age (years)", value=25, precision=0)
+                user_gender = gr.Dropdown(choices=["Male", "Female"], label="Gender", value="Male")
+                user_weight = gr.Number(label="Weight (kg)", value=70, precision=1)
+                user_height = gr.Number(label="Height (cm)", value=170, precision=1)
+                activity_level = gr.Dropdown(
+                    choices=["Sedentary", "Lightly active", "Moderately active", "Very active", "Extra active"],
+                    label="Activity Level",
+                    value="Moderately active"
+                )
+                calculate_button = gr.Button("Calculate")
+
+            with gr.Column():
+                bmi_output = gr.Label(label="BMI Result")
+                calorie_output = gr.Label(label="Calorie Needs")
+                bmi_chart = gr.Image(label="BMI Chart")
+
+        def calculate_metrics(age, weight, height, gender, activity_level):
+            bmi, status = calculate_bmi(height, weight, gender)
+            if bmi:
+                bmi_path = visualize_bmi(bmi)
+                calories = calculate_calories(age, weight, height, activity_level, gender)
+                return f"Your BMI is {bmi:.2f}, considered {status}.", f"Daily calorie needs: {calories} kcal", bmi_path
+            else:
+                return "Invalid inputs.", "", ""
+
+        calculate_button.click(
+            calculate_metrics,
+            inputs=[user_age, user_weight, user_height, user_gender, activity_level],
+            outputs=[bmi_output, calorie_output, bmi_chart]
+        )
+
 demo.launch(share=True)