Update alz_companion/agent.py

alz_companion/agent.py

@@ -810,10 +810,24 @@ def make_rag_chain(vs_general: FAISS, vs_personal: FAISS, *, for_evaluation: boo
             print("[DEBUG] Personal Route Factual / Sum / Multi PROMPT") 
         else: # caregiving_scenario
             
-            if disease_stage == "Advanced Stage": template = ANSWER_TEMPLATE_ADQ_ADVANCED
-            elif disease_stage == "Moderate Stage": template = ANSWER_TEMPLATE_ADQ_MODERATE
-            else: template = ANSWER_TEMPLATE_ADQ
-                
+            #if disease_stage == "Advanced Stage": template = ANSWER_TEMPLATE_ADQ_ADVANCED
+            #elif disease_stage == "Moderate Stage": template = ANSWER_TEMPLATE_ADQ_MODERATE
+            #else: template = ANSWER_TEMPLATE_ADQ
+
+            # NEW --- START: REVISED LOGIC ---
+            # Select the template based on the user's role.
+            if role == "patient":
+                # Use the appropriate patient template based on disease stage
+                if disease_stage == "Advanced Stage": template = ANSWER_TEMPLATE_PATIENT_ADVANCED
+                elif disease_stage == "Moderate Stage": template = ANSWER_TEMPLATE_PATIENT_MODERATE
+                else: template = ANSWER_TEMPLATE_PATIENT
+                print("[DEBUG] Using PATIENT response template.")
+            else: # role == "caregiver"
+                # Use the single, clear caregiver template based original ADQ
+                template = ANSWER_TEMPLATE_CAREGIVER
+                print("[DEBUG] Using CAREGIVER response template.")
+                # --- END: REVISED LOGIC ---
+        
                 # template = ANSWER_TEMPLATE_ADQ
                 # NEXT evolution
                 # if settings.get("role") == "patient":
@@ -822,11 +836,11 @@ def make_rag_chain(vs_general: FAISS, vs_personal: FAISS, *, for_evaluation: boo
                 # else :
                 #    template = ANSWER_TEMPLATE_ADQ
                 #    print("[DEBUG] Use ANSWER_TEMPLATE_ADQ")
-            
-            emotions_context = render_emotion_guidelines(kwargs.get("emotion_tag"))
+
             # NEXT evolution
             # if emotion in ["confusion", "sadness", "anxiety", "orientation_check"]:
             #    template = ANSWER_TEMPLATE_CALM
+            emotions_context = render_emotion_guidelines(kwargs.get("emotion_tag"))
             user_prompt = template.format(general_context=general_context, personal_context=personal_context, question=query, scenario_tag=kwargs.get("scenario_tag"), emotions_context=emotions_context, role=role, language=language, patient_name=p_name, caregiver_name=c_name, emotion_tag=kwargs.get("emotion_tag"))
             print("[DEBUG] Caregiving Scenario PROMPT") 
         # end