Update app.py

app.py

@@ -101,11 +101,13 @@ def visualize_bmi(bmi):
 
 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,
@@ -114,71 +116,75 @@ def calculate_calories(age, weight, height, activity_level, gender):
             "Extra active": 1.9,
         }
 
-        calories = bmr * activity_multipliers.get(activity_level, 1.2)
-        return calories
-    except Exception:
-        return "Invalid inputs for calorie calculation."
+        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}"
 
 # Interface Components
 with gr.Blocks() as demo:
-    gr.Markdown("<strong>FIT.AI - Your Fitness and Wellbeing Coach</strong>")
-
-    # User Info
-    with gr.Row():
-        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"
+    gr.Markdown("# FIT.AI - Your Fitness and Wellbeing Coach")
+
+    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]
         )
 
-    # Outputs
-    bmi_output = gr.Label(label="BMI Result")
-    calorie_output = gr.Label(label="Calorie Needs")
-    bmi_chart = gr.Image(label="BMI Chart")
-
-    chatbot = gr.Chatbot(label="Chat with FIT.AI")
-    text_input = gr.Textbox(placeholder="Type your question here...", label="Your Question")
-    submit_button = gr.Button("Submit")
-    clear_button = gr.Button("Clear Chat")
-
-    def submit_message(message, history=[]):
-        user_details = {
-            "name": user_name.value,
-            "age": user_age.value,
-            "weight": user_weight.value,
-            "height": user_height.value,
-            "activity_level": activity_level.value,
-            "gender": user_gender.value
-        }
-        response = run_graph(message, history, user_details)
-        history.append(("User", message))
-        history.append(("FIT.AI", response))
-        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])
-
-    # Actions
-    calculate_button = gr.Button("Calculate")
-
-    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:.2f} 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]
-    )
+    with gr.Tab("Chat with FIT.AI"):
+        chatbot = gr.Chatbot(label="Chat with FIT.AI")
+        text_input = gr.Textbox(placeholder="Type your question here...", label="Your Question")
+        submit_button = gr.Button("Submit")
+        clear_button = gr.Button("Clear Chat")
+
+        def submit_message(message, history=[]):
+            user_details = {
+                "name": user_name.value,
+                "age": user_age.value,
+                "weight": user_weight.value,
+                "height": user_height.value,
+                "activity_level": activity_level.value,
+                "gender": user_gender.value
+            }
+            response = run_graph(message, history, user_details)
+            history.append(("User", message))
+            history.append(("FIT.AI", response))
+            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])
 
 demo.launch(share=True)