Update app.py

app.py

@@ -49,7 +49,7 @@ except:
     medical_model = clip_model
     MEDICAL_MODEL_AVAILABLE = False
 
-# Stanford Dogs & lifespans (same as your original)
+# Stanford Dogs & lifespans
 STANFORD_BREEDS = [
     "afghan hound", "african hunting dog", "airedale", "american staffordshire terrier",
     "appenzeller", "australian terrier", "basenji", "basset", "beagle", 
@@ -120,43 +120,21 @@ BREED_LIFESPAN = {
     "wire-haired fox terrier": 13.5, "yorkshire terrier": 13.3
 }
 
-# HRQOL Questionnaire (same as your original)
+# SHORTENED HRQOL Questionnaire - One comprehensive question per domain
 HRQOL_QUESTIONNAIRE = {
     "vitality": {
         "title": "🔋 Vitality & Energy Assessment",
-        "description": "Evaluate your dog's energy levels and enthusiasm for activities",
+        "description": "Evaluate your dog's overall energy and responsiveness",
         "questions": [
             {
-                "id": "vitality_energy",
-                "text": "How would you rate your dog's energy level over the past week?",
+                "id": "vitality_comprehensive",
+                "text": "How would you rate your dog's overall vitality considering energy levels, playfulness, and responsiveness to exciting activities?",
                 "options": [
-                    "Excellent - Very energetic, eager for activities",
-                    "Very Good - Generally energetic with occasional rest",
-                    "Good - Moderate energy, participates willingly",
-                    "Fair - Lower energy, needs encouragement",
-                    "Poor - Very low energy, reluctant to participate"
-                ]
-            },
-            {
-                "id": "vitality_play", 
-                "text": "How often does your dog seek out play or interaction?",
-                "options": [
-                    "Always seeks play/interaction",
-                    "Often seeks play/interaction",
-                    "Sometimes seeks play/interaction",
-                    "Rarely seeks play/interaction",
-                    "Never seeks play/interaction"
-                ]
-            },
-            {
-                "id": "vitality_response",
-                "text": "How quickly does your dog respond to exciting stimuli (treats, walks, visitors)?",
-                "options": [
-                    "Immediate enthusiastic response",
-                    "Quick positive response",
-                    "Moderate response time",
-                    "Slow or delayed response",
-                    "No response or negative reaction"
+                    "Excellent - Very energetic, always seeks play, immediate enthusiastic responses",
+                    "Very Good - Generally energetic, often seeks play, quick positive responses",
+                    "Good - Moderate energy, sometimes seeks play, moderate response time",
+                    "Fair - Lower energy, rarely seeks play, slow or delayed responses",
+                    "Poor - Very low energy, never seeks play, no response or negative reactions"
                 ]
             }
         ],
@@ -164,39 +142,17 @@ HRQOL_QUESTIONNAIRE = {
     },
     "comfort": {
         "title": "😌 Comfort & Pain Management",
-        "description": "Assess signs of discomfort, pain, or mobility issues",
+        "description": "Assess overall comfort and mobility",
         "questions": [
             {
-                "id": "comfort_activities",
-                "text": "How comfortable does your dog appear during normal activities?",
-                "options": [
-                    "Completely comfortable during all activities",
-                    "Mostly comfortable with minor adjustments",
-                    "Some discomfort during certain activities",
-                    "Frequently uncomfortable, avoids some activities",
-                    "Severe discomfort, avoids most activities"
-                ]
-            },
-            {
-                "id": "comfort_pain_frequency",
-                "text": "How often do you notice signs of pain or discomfort?",
-                "options": [
-                    "Never shows pain signs",
-                    "Rarely shows pain signs (< 1 day/week)",
-                    "Sometimes shows pain signs (2-3 days/week)",
-                    "Often shows pain signs (4-5 days/week)",
-                    "Always shows pain signs (daily)"
-                ]
-            },
-            {
-                "id": "comfort_impact",
-                "text": "How does your dog's comfort level affect daily activities?",
+                "id": "comfort_comprehensive",
+                "text": "How would you assess your dog's overall comfort considering activity comfort, pain frequency, and impact on daily life?",
                 "options": [
-                    "No impact on daily activities",
-                    "Minimal impact on daily activities",
-                    "Moderate impact, some activities modified",
-                    "Significant impact, many activities avoided",
-                    "Severe impact, most activities impossible"
+                    "Excellent - Completely comfortable in all activities, never shows pain, no impact on daily life",
+                    "Very Good - Mostly comfortable with minor adjustments, rarely shows pain, minimal impact",
+                    "Good - Some discomfort in certain activities, occasional pain signs, moderate activity modifications",
+                    "Fair - Frequently uncomfortable, often shows pain, significant activity limitations",
+                    "Poor - Severe discomfort in most activities, daily pain signs, major activity restrictions"
                 ]
             }
         ],
@@ -204,39 +160,17 @@ HRQOL_QUESTIONNAIRE = {
     },
     "emotional_wellbeing": {
         "title": "😊 Emotional Wellbeing",
-        "description": "Evaluate mood, anxiety levels, and social engagement",
+        "description": "Evaluate mood, stress levels, and social engagement",
         "questions": [
             {
-                "id": "emotion_mood",
-                "text": "How would you describe your dog's overall mood?",
-                "options": [
-                    "Very positive - happy, content, enthusiastic",
-                    "Mostly positive - generally cheerful",
-                    "Neutral - neither particularly happy nor sad",
-                    "Mostly negative - seems subdued or withdrawn",
-                    "Very negative - appears depressed or distressed"
-                ]
-            },
-            {
-                "id": "emotion_anxiety",
-                "text": "How often does your dog show signs of anxiety or stress?",
-                "options": [
-                    "Never shows anxiety/stress",
-                    "Rarely shows anxiety/stress",
-                    "Sometimes shows anxiety/stress",
-                    "Often shows anxiety/stress",
-                    "Constantly shows anxiety/stress"
-                ]
-            },
-            {
-                "id": "emotion_engagement",
-                "text": "How engaged is your dog with family activities?",
+                "id": "emotional_comprehensive",
+                "text": "How would you describe your dog's overall emotional state considering mood, stress/anxiety levels, and family engagement?",
                 "options": [
-                    "Highly engaged, initiates family interactions",
-                    "Well engaged, participates enthusiastically",
-                    "Moderately engaged, participates when invited",
-                    "Minimally engaged, needs encouragement",
-                    "Not engaged, avoids family activities"
+                    "Excellent - Very positive mood, never shows stress, highly engaged with family activities",
+                    "Very Good - Mostly positive mood, rarely shows stress, well engaged with family",
+                    "Good - Generally neutral mood, sometimes shows stress, moderately engaged when invited",
+                    "Fair - Often subdued mood, frequently shows stress, minimally engaged with encouragement",
+                    "Poor - Negative/depressed mood, constantly stressed, avoids family activities"
                 ]
             }
         ],
@@ -244,39 +178,17 @@ HRQOL_QUESTIONNAIRE = {
     },
     "alertness": {
         "title": "🧠 Alertness & Cognition",
-        "description": "Assess cognitive function, awareness, and responsiveness",
+        "description": "Assess cognitive function and awareness",
         "questions": [
             {
-                "id": "alert_awareness",
-                "text": "How alert and aware does your dog seem?",
-                "options": [
-                    "Highly alert, notices everything immediately",
-                    "Alert, notices most things quickly",
-                    "Moderately alert, notices things with some delay",
-                    "Slightly alert, slow to notice surroundings",
-                    "Not alert, seems confused or disoriented"
-                ]
-            },
-            {
-                "id": "alert_commands",
-                "text": "How well does your dog respond to commands or their name?",
-                "options": [
-                    "Responds immediately to name/commands",
-                    "Usually responds quickly to name/commands",
-                    "Sometimes responds, may need repetition",
-                    "Often doesn't respond, needs multiple attempts",
-                    "Rarely or never responds to name/commands"
-                ]
-            },
-            {
-                "id": "alert_focus",
-                "text": "How focused is your dog during training or play?",
+                "id": "alertness_comprehensive",
+                "text": "How would you rate your dog's overall cognitive function considering awareness, command response, and focus during activities?",
                 "options": [
-                    "Highly focused, maintains attention easily",
-                    "Good focus, occasional distraction",
-                    "Moderate focus, some difficulty concentrating",
-                    "Poor focus, easily distracted",
-                    "No focus, cannot maintain attention"
+                    "Excellent - Highly alert and aware, responds immediately to commands, maintains excellent focus",
+                    "Very Good - Alert and notices things quickly, usually responds quickly, good focus with occasional distraction",
+                    "Good - Moderately alert with some delay, sometimes needs repetition, moderate focus with difficulty concentrating",
+                    "Fair - Slightly alert and slow to notice, often needs multiple attempts, poor focus and easily distracted",
+                    "Poor - Not alert or confused, rarely responds to commands, cannot maintain attention or focus"
                 ]
             }
         ],
@@ -532,7 +444,7 @@ def compute_vision_quality(img: Image.Image):
         logger.error(f"Error in quality computation: {e}")
         return 0.5  # Default medium quality
 
-# ====== KEEP YOUR EXISTING FUNCTIONS ======
+# ====== EXISTING FUNCTIONS (UNCHANGED) ======
 
 def analyze_medical_image(img: Image.Image):
     health_conditions = [
@@ -658,50 +570,30 @@ def score_from_response(response, score_mapping):
     return 50
 
 def calculate_hrqol_scores(hrqol_responses):
-    """Convert VetMetrica-style responses to 0-100 domain scores"""
+    """Convert comprehensive HRQOL responses to 0-100 domain scores"""
     
     score_mapping = {
-        "excellent": 100, "very good": 80, "good": 60, "fair": 40, "poor": 20,
-        "always": 100, "often": 80, "sometimes": 60, "rarely": 40, "never": 20,
-        "immediate": 100, "quick": 80, "moderate": 60, "slow": 40, "no response": 20,
-        "completely": 100, "mostly": 80, "some": 60, "frequently": 40, "severe": 20,
-        "very positive": 100, "mostly positive": 80, "neutral": 60, "mostly negative": 40, "very negative": 20,
-        "highly": 100, "well": 80, "moderately": 60, "minimally": 40, "not": 20
+        "excellent": 100, "very good": 80, "good": 60, "fair": 40, "poor": 20
     }
     
     domain_scores = {}
     
-    # Vitality Domain
-    vitality_scores = [
-        score_from_response(hrqol_responses.get("vitality_energy", ""), score_mapping),
-        score_from_response(hrqol_responses.get("vitality_play", ""), score_mapping),
-        score_from_response(hrqol_responses.get("vitality_response", ""), score_mapping)
-    ]
-    domain_scores["vitality"] = np.mean(vitality_scores)
+    # Each domain now has one comprehensive question
+    domain_scores["vitality"] = score_from_response(
+        hrqol_responses.get("vitality_comprehensive", ""), score_mapping
+    )
     
-    # Comfort Domain (invert pain frequency)
-    comfort_scores = [
-        score_from_response(hrqol_responses.get("comfort_activities", ""), score_mapping),
-        100 - score_from_response(hrqol_responses.get("comfort_pain_frequency", ""), score_mapping),
-        score_from_response(hrqol_responses.get("comfort_impact", ""), score_mapping)
-    ]
-    domain_scores["comfort"] = max(0, np.mean(comfort_scores))
+    domain_scores["comfort"] = score_from_response(
+        hrqol_responses.get("comfort_comprehensive", ""), score_mapping
+    )
     
-    # Emotional Wellbeing Domain (invert anxiety)
-    emotion_scores = [
-        score_from_response(hrqol_responses.get("emotion_mood", ""), score_mapping),
-        100 - score_from_response(hrqol_responses.get("emotion_anxiety", ""), score_mapping),
-        score_from_response(hrqol_responses.get("emotion_engagement", ""), score_mapping)
-    ]
-    domain_scores["emotional_wellbeing"] = max(0, np.mean(emotion_scores))
+    domain_scores["emotional_wellbeing"] = score_from_response(
+        hrqol_responses.get("emotional_comprehensive", ""), score_mapping
+    )
     
-    # Alertness Domain
-    alertness_scores = [
-        score_from_response(hrqol_responses.get("alert_awareness", ""), score_mapping),
-        score_from_response(hrqol_responses.get("alert_commands", ""), score_mapping),
-        score_from_response(hrqol_responses.get("alert_focus", ""), score_mapping)
-    ]
-    domain_scores["alertness"] = np.mean(alertness_scores)
+    domain_scores["alertness"] = score_from_response(
+        hrqol_responses.get("alertness_comprehensive", ""), score_mapping
+    )
     
     return domain_scores
 
@@ -787,7 +679,7 @@ def comprehensive_healthspan_analysis(input_type, image_input, video_input, bree
         yield "❌ **Error**: Please complete the HRQOL questionnaire before analysis."
         return
     
-    # Build HRQOL responses dictionary
+    # Build HRQOL responses dictionary - Updated for shortened questionnaire
     response_keys = []
     for domain_key, domain_data in HRQOL_QUESTIONNAIRE.items():
         for question in domain_data["questions"]:
@@ -887,7 +779,7 @@ def comprehensive_healthspan_analysis(input_type, image_input, video_input, bree
     <div style="font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; max-width: 1000px; margin: 0 auto;">
         <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white; padding: 30px; border-radius: 15px; margin: 20px 0; text-align: center; box-shadow: 0 4px 6px rgba(0,0,0,0.1);">
             <h2 style="margin: 0; font-size: 2em; text-shadow: 1px 1px 2px rgba(0,0,0,0.3);">{input_type_icon} Enhanced Multi-Modal Health Assessment</h2>
-            <div style="font-size: 1.1em; margin: 10px 0; opacity: 0.9;">Analysis Type: {input_type} | Enhanced Biological Age Prediction</div>
+            <div style="font-size: 1.1em; margin: 10px 0; opacity: 0.9;">Analysis Type: {input_type} | Streamlined HRQOL Assessment</div>
             <div style="font-size: 3em; font-weight: bold; margin: 15px 0; text-shadow: 2px 2px 4px rgba(0,0,0,0.3);">{final_healthspan_score:.1f}/100</div>
             <div style="font-size: 1.2em; background: rgba(255,255,255,0.2); padding: 8px 16px; border-radius: 20px; display: inline-block;">{get_healthspan_grade(final_healthspan_score)}</div>
         </div>
@@ -912,7 +804,7 @@ def comprehensive_healthspan_analysis(input_type, image_input, video_input, bree
     
     report_html += "</div>"
     
-    # Enhanced Visual Analysis section with uncertainty and confidence factors
+    # Enhanced Visual Analysis section
     if breed_info:
         uncertainty_info = ""
         if breed_info.get('high_uncertainty', False):
@@ -940,7 +832,7 @@ def comprehensive_healthspan_analysis(input_type, image_input, video_input, bree
         gait_factor = confidence_factors.get('gait_factor', 0)
         
         factors_info = f"""<div style="background: #f8f9fa; border-radius: 8px; padding: 10px; margin: 10px 0;">
-                          <p style="margin: 5px 0; font-size: 0.9em; color: #555;"><strong>Enhanced Analysis Factors:</strong></p>
+                          <p style="margin: 5px 0; font-size: 0.9em; color: #555;"><strong>Analysis Factors:</strong></p>
                           <p style="margin: 2px 0; font-size: 0.8em; color: #666;">• Visual Health Factor: {visual_health.get('age_factor', 0):.2f}</p>
                           <p style="margin: 2px 0; font-size: 0.8em; color: #666;">• HRQOL Adjustment: {hrqol_factor:.2f}</p>
                           <p style="margin: 2px 0; font-size: 0.8em; color: #666;">• Gait Factor: {gait_factor:.2f}</p>
@@ -1029,12 +921,11 @@ def comprehensive_healthspan_analysis(input_type, image_input, video_input, bree
         <div style="background: #F5F5F5; border: 1px solid #E0E0E0; padding: 20px; border-radius: 8px; margin: 20px 0;">
             <p style="margin: 0; font-size: 0.9em; color: #424242; line-height: 1.5;">
                 <strong style="color: #D32F2F;">⚠️ Important Disclaimer:</strong> 
-                This analysis uses enhanced AI models with improved biological age prediction based on visual health indicators, 
-                HRQOL correlations, and movement analysis. Results are for educational purposes only. 
-                Always consult with a qualified veterinarian for professional medical advice and diagnosis.
+                This analysis uses enhanced AI models with improved biological age prediction and streamlined HRQOL assessment. 
+                Results are for educational purposes only. Always consult with a qualified veterinarian for professional medical advice and diagnosis.
             </p>
             <p style="margin: 10px 0 0 0; font-size: 0.8em; color: #666;">
-                <strong>Enhanced Features:</strong> Multi-factor age prediction, uncertainty quantification, quality-aware analysis, breed-specific calibration
+                <strong>Enhanced Features:</strong> Comprehensive 4-question HRQOL assessment, multi-factor age prediction, uncertainty quantification
             </p>
         </div>
     </div>
@@ -1049,7 +940,7 @@ def update_media_input(input_type):
     else:  # Video Analysis
         return gr.update(visible=False), gr.update(visible=True)
 
-# Custom CSS for enhanced styling (same as your original)
+# Custom CSS for enhanced styling
 custom_css = """
 /* Enhanced gradient background */
 .gradio-container {
@@ -1137,7 +1028,7 @@ custom_css = """
 }
 """
 
-# Gradio Interface with Enhanced UI (same structure as your original)
+# Gradio Interface with Enhanced UI
 with gr.Blocks(
     title="🐶 Enhanced AI Dog Health Analyzer", 
     theme=gr.themes.Soft(),
@@ -1151,7 +1042,7 @@ with gr.Blocks(
             🐕 Enhanced AI Dog Health & Aging Analyzer
         </h1>
         <p style="margin: 15px 0 0 0; font-size: 1.2em; opacity: 0.9;">
-            Enhanced Biological Age Prediction • Multi-Factor Analysis • Uncertainty Quantification
+            Streamlined HRQOL Assessment • Enhanced Biological Age Prediction • Multi-Factor Analysis
         </p>
     </div>
     """)
@@ -1223,15 +1114,15 @@ with gr.Blocks(
                 maximum=25
             )
         
-        # Right Column - Enhanced HRQOL Questionnaire
+        # Right Column - SHORTENED HRQOL Questionnaire
         with gr.Column(scale=1):
             gr.HTML("""
             <div class="questionnaire-card">
                 <h2 style="color: #667eea; margin: 0 0 10px 0; text-align: center;">
-                    📋 HRQOL Assessment
+                    📋 Streamlined HRQOL Assessment
                 </h2>
                 <p style="text-align: center; color: #666; font-style: italic; margin-bottom: 20px;">
-                    Complete all sections for accurate healthspan analysis
+                    Complete all 4 comprehensive questions for accurate healthspan analysis
                 </p>
             </div>
             """)