Update app.py

app.py

@@ -30,57 +30,65 @@ breed_info_topics = [
 def update_breed(pet_type):
     return gr.update(choices=breed_options.get(pet_type, []), value=None, visible=True), gr.update(visible=False, value="")
 
-def handle_other_input(choice, expected):
-    return gr.update(visible=(choice == expected), value="")
-
-def show_topic_fields(topic):
-    return [
-        gr.update(visible=(topic == "Symptom Checker")),
-        gr.update(visible=(topic == "Nutrition")),
-        gr.update(visible=(topic == "Breed Info"))
-    ]
+def handle_breed_other(breed_choice):
+    return gr.update(visible=(breed_choice == "Other"), value="")
+
+def handle_symptom_other(symptom):
+    return gr.update(visible=(symptom == "Other"), value="")
 
-def validate_inputs(pet, breed, other_breed, age, gender, weight, topic, symptom, other_symptom, condition, info_topic, other_info):
-    if not pet or not age or not gender or not weight or not topic:
-        return gr.update(interactive=False)
-    if topic == "Symptom Checker" and (not symptom or (symptom == "Other" and not other_symptom)):
-        return gr.update(interactive=False)
-    if topic == "Nutrition" and not condition:
-        return gr.update(interactive=False)
-    if topic == "Breed Info" and (not info_topic or (info_topic == "Other" and not other_info)):
-        return gr.update(interactive=False)
-    if breed == "Other" and not other_breed:
-        return gr.update(interactive=False)
-    return gr.update(interactive=True)
+def handle_info_other(info):
+    return gr.update(visible=(info == "Other"), value="")
 
 def ask_ai(pet, breed, other_breed, age, gender, weight, topic, symptom, other_symptom, condition, info_topic, other_info, user_detail):
     global chat_history, followup_count
     followup_count = 0
 
+    pet = pet.strip()
     final_breed = other_breed.strip() if breed == "Other" else breed
     final_symptom = other_symptom.strip() if symptom == "Other" else symptom
     final_info = other_info.strip() if info_topic == "Other" else info_topic
+    age = age.strip()
+    gender = gender.strip()
+    weight = weight.strip()
+    condition = condition.strip()
+    user_detail = user_detail.strip()[:100]
 
     prompt_parts = [
-        f"Pet: {pet}", f"Breed: {final_breed}", f"Age: {age}", f"Gender: {gender}", f"Weight: {weight}"
+        f"Pet: {pet}",
+        f"Breed: {final_breed}",
+        f"Age: {age}",
+        f"Gender: {gender}",
+        f"Weight: {weight}"
     ]
 
     if topic == "Symptom Checker":
         prompt_parts.append(f"Symptom: {final_symptom}")
-        prompt_parts.append("Please provide a detailed explanation including typical causes, usual onset, recommended treatments, expected recovery time, preventive measures, and when to consult a vet.")
+        prompt_parts.append(
+            "Please provide a detailed explanation including: typical causes, when and how this symptom usually appears, "
+            "recommended treatments and home care, expected recovery timeline, preventive measures, and when to seek a vet."
+        )
     elif topic == "Nutrition":
-        prompt_parts.append(f"Condition: {condition}")
-        prompt_parts.append("Give a comprehensive nutrition plan with best foods (in Pakistan), benefits, feeding quantity & frequency, and general care tips.")
+        prompt_parts.append(f"Condition: {condition if condition else 'None'}")
+        prompt_parts.append(
+            "Provide a comprehensive nutrition guide for this breed/condition: best foods available locally (Pakistan), benefits of each food, "
+            "recommended feeding quantity and frequency, and tips for maintaining optimal health."
+        )
     elif topic == "Breed Info":
-        prompt_parts.append(f"Requested Info: {final_info}")
-        prompt_parts.append("Share complete information about the breed regarding the selected topic.")
+        prompt_parts.append(f"Information Requested: {final_info}")
+        prompt_parts.append(
+            "Give detailed and interesting information on the selected topic related to the breed, covering key facts, practical tips, "
+            "common concerns, and any special advice."
+        )
 
     if user_detail:
-        prompt_parts.append(f"Extra User Detail: {user_detail[:100]}")
+        prompt_parts.append(f"User Detail: {user_detail}")
 
     user_prompt = "\n".join(prompt_parts)
 
-    messages = [{"role": "system", "content": SYSTEM_PROMPT}, {"role": "user", "content": user_prompt}]
+    messages = [
+        {"role": "system", "content": SYSTEM_PROMPT},
+        {"role": "user", "content": user_prompt}
+    ]
 
     payload = {
         "model": "gpt-4o-mini-2024-07-18",
@@ -111,6 +119,7 @@ def handle_followup(user_input):
         return "⚠️ Max of 5 follow-up questions reached."
 
     chat_history.append({"role": "user", "content": user_input})
+
     payload = {
         "model": "gpt-4o-mini-2024-07-18",
         "messages": chat_history,
@@ -143,43 +152,47 @@ with gr.Blocks() as demo:
         other_breed = gr.Textbox(label="✍️ Enter Breed", visible=False)
 
     pet.change(update_breed, pet, [breed, other_breed])
-    breed.change(lambda b: handle_other_input(b, "Other"), breed, other_breed)
+    breed.change(handle_breed_other, breed, other_breed)
 
     with gr.Row():
-        age = gr.Textbox(label="🎂 Age")
+        age = gr.Textbox(label="🎂 Age (e.g. 2 years or 8 months)")
         gender = gr.Dropdown(["Male", "Female", "Unknown"], label="🚻 Gender")
-        weight = gr.Textbox(label="⚖️ Weight (e.g. 10kg)")
+        weight = gr.Textbox(label="⚖️ Weight (e.g. 10 kg)")
 
     topic = gr.Dropdown(["Symptom Checker", "Nutrition", "Breed Info"], label="📚 Select Topic")
 
     with gr.Column(visible=False) as symptom_section:
         symptom = gr.Dropdown(symptom_list, label="🤒 Select Symptom")
         other_symptom = gr.Textbox(label="✍️ Enter Symptom", visible=False)
-        symptom.change(lambda s: handle_other_input(s, "Other"), symptom, other_symptom)
+        symptom.change(handle_symptom_other, symptom, other_symptom)
 
     with gr.Column(visible=False) as nutrition_section:
-        condition = gr.Textbox(label="🩺 Condition")
+        condition = gr.Textbox(label="🩺 Condition (Optional, e.g. slim, weak)")
 
     with gr.Column(visible=False) as breed_info_section:
-        info_topic = gr.Dropdown(breed_info_topics, label="📌 Info Type")
-        other_info = gr.Textbox(label="✍️ Enter Info", visible=False)
-        info_topic.change(lambda i: handle_other_input(i, "Other"), info_topic, other_info)
+        info_topic = gr.Dropdown(breed_info_topics, label="ℹ️ Select Info Type")
+        other_info = gr.Textbox(label="✍️ Enter Info Topic", visible=False)
+        info_topic.change(handle_info_other, info_topic, other_info)
 
-    topic.change(show_topic_fields, topic, [symptom_section, nutrition_section, breed_info_section])
+    user_detail = gr.Textbox(label="📝 Extra Detail (optional, max 100 chars)", max_lines=2)
+
+    def show_topic_fields(selected_topic):
+        return [
+            gr.update(visible=(selected_topic == "Symptom Checker")),
+            gr.update(visible=(selected_topic == "Nutrition")),
+            gr.update(visible=(selected_topic == "Breed Info"))
+        ]
 
-    user_detail = gr.Textbox(label="📝 Extra Detail (optional)", max_lines=2)
+    topic.change(show_topic_fields, topic, [symptom_section, nutrition_section, breed_info_section])
 
-    submit_btn = gr.Button("Get Advice", interactive=False)
+    submit_btn = gr.Button("Get Advice")
     output = gr.Textbox(label="💬 AI Response", lines=15)
 
+    gr.Markdown("### 🔄 Ask Follow-up")
     followup_input = gr.Textbox(label="🗣️ Follow-up Question")
     followup_btn = gr.Button("Ask Follow-up")
     followup_output = gr.Textbox(label="💡 Follow-up Response", lines=6)
 
-    inputs_to_check = [pet, breed, other_breed, age, gender, weight, topic, symptom, other_symptom, condition, info_topic, other_info]
-    for field in inputs_to_check:
-        field.change(fn=validate_inputs, inputs=inputs_to_check, outputs=submit_btn)
-
     submit_btn.click(
         ask_ai,
         inputs=[pet, breed, other_breed, age, gender, weight, topic, symptom, other_symptom, condition, info_topic, other_info, user_detail],