Moved system and welcome messages to be together

app.py

@@ -110,31 +110,6 @@ def chat_with_model(messages, pid):
     pad_id = current_tokenizer.pad_token_id or current_tokenizer.unk_token_id or 0
     eos_id = current_tokenizer.eos_token_id
 
-        # Build system context
-    system_messages = [
-        {
-            "role": "system",
-            "content": (
-                "You are a radiologist's companion, here to answer questions about the patient and assist in the diagnosis if asked to do so. "
-                "You are able to call specialized tools. "
-                "At the moment, you have one tool available: an organ segmentation algorithm for abdominal CTs.\n\n"
-                "If the user requests an organ segmentation, output a JSON object in this structure:\n"
-                "{\n"
-                "  \"function\": \"segment_organ\",\n"
-                "  \"arguments\": {\n"
-                "    \"scan_path\": \"<path_to_ct_scan>\",\n"
-                "    \"organ\": \"<organ_name>\"\n"
-                "  }\n"
-                "}\n\n"
-                "Once you call the function, the app will execute it and return the result."
-            )
-        },
-        {
-            "role": "system",
-            "content": f"Patient Information:\nName: {patient_name.value}\nAge: {patient_age.value}\nID: {patient_id.value}\nNotes: {patient_notes.value}"
-        }
-    ]
-
     # FULL conversation
     full_messages = system_messages + messages
 
@@ -284,21 +259,46 @@ def load_patient_conversation(patient_key):
         patient_id_val = patient_db[patient_key]["id"]
         history = patient_conversations.get(patient_id_val, [])
         if not history:
-            welcome_message = {
-                "role": "assistant",
+            system_message = [
+                {
+                "role": "system",
                 "content": (
-                    "**Welcome to the Radiologist's Companion!**\n\n"
-                    "You can ask me about the patient's medical history or available imaging data.\n"
-                    "- I can summarize key details from the EHR.\n"
-                    "- I can tell you which medical images are available.\n"
-                    "- If you'd like an organ segmentation (e.g. spleen, liver, kidney_left, colon, femur_right) on an abdominal CT scan, just ask!\n\n"
-                    "**Example Requests:**\n"
-                    "- \"What do we know about this patient?\"\n"
-                    "- \"Which images are available for this patient?\"\n"
-                    "- \"Can you segment the spleen from the CT scan?\"\n"
-                )
-            }
-            history = [welcome_message]
+                    "You are a radiologist's companion, here to answer questions about the patient and assist in the diagnosis if asked to do so. "
+                    "You are able to call specialized tools. "
+                    "At the moment, you have one tool available: an organ segmentation algorithm for abdominal CTs.\n\n"
+                    "If the user requests an organ segmentation, output a JSON object in this structure:\n"
+                    "{\n"
+                    "  \"function\": \"segment_organ\",\n"
+                    "  \"arguments\": {\n"
+                    "    \"scan_path\": \"<path_to_ct_scan>\",\n"
+                    "    \"organ\": \"<organ_name>\"\n"
+                    "  }\n"
+                    "}\n\n"
+                    "Once you call the function, the app will execute it and return the result."
+                    )
+                },
+                {
+                    "role": "system",
+                    "content": f"Patient Information:\nName: {patient_name.value}\nAge: {patient_age.value}\nID: {patient_id.value}\nNotes: {patient_notes.value}"
+                }
+            ]
+            welcome_message = [
+                {
+                    "role": "assistant",
+                    "content": (
+                        "**Welcome to the Radiologist's Companion!**\n\n"
+                        "You can ask me about the patient's medical history or available imaging data.\n"
+                        "- I can summarize key details from the EHR.\n"
+                        "- I can tell you which medical images are available.\n"
+                        "- If you'd like an organ segmentation (e.g. spleen, liver, kidney_left, colon, femur_right) on an abdominal CT scan, just ask!\n\n"
+                        "**Example Requests:**\n"
+                        "- \"What do we know about this patient?\"\n"
+                        "- \"Which images are available for this patient?\"\n"
+                        "- \"Can you segment the spleen from the CT scan?\"\n"
+                    )
+                }
+            ]
+            history = system_message + welcome_message
         return history
     return []