Update app.py

app.py

@@ -84,15 +84,17 @@ def save_evaluations(evaluations, doctor_name):
     df.to_csv(filepath, index=False)
     return filepath, filename
 
-
-
-def get_preference_a():
-    """Wrapper for preference A."""
+def record_preference(choice):
+    """Record the doctor's preference and move to next image."""
     if not state["session_active"]:
-        return None, None, "Session not active."
+        return None, None, "Session not active.", ""
     
     current_pair = state["image_pairs"][state["current_index"]]
-    preferred_source = state["current_left_source"]
+    
+    if choice == "A":
+        preferred_source = state["current_left_source"]
+    else:  # choice == "B"
+        preferred_source = state["current_right_source"]
     
     state["evaluations"].append({
         'timestamp': datetime.now().isoformat(),
@@ -104,65 +106,21 @@ def get_preference_a():
     
     state["current_index"] += 1
     
-    if state["current_index"] >= len(state["image_pairs"]):
-        state["session_active"] = False
-        return None, None, "✅ Evaluation complete! All images have been reviewed."
-    
-    current_pair = state["image_pairs"][state["current_index"]]
-    
-    if current_pair['roentgen_left']:
-        left_image = load_image("roentgen", current_pair['roentgen'])
-        right_image = load_image("pedisynth", current_pair['pedisynth'])
-        state["current_left_source"] = "roentgen"
-        state["current_right_source"] = "pedisynth"
-    else:
-        left_image = load_image("pedisynth", current_pair['pedisynth'])
-        right_image = load_image("roentgen", current_pair['roentgen'])
-        state["current_left_source"] = "pedisynth"
-        state["current_right_source"] = "roentgen"
+    left_img, right_img, condition, progress = get_current_display()
     
-    progress = f"Image {state['current_index'] + 1} of {len(state['image_pairs'])} | Condition: {current_pair['condition']}"
+    if left_img is None:
+        state["session_active"] = False
+        return None, None, f"{progress} | Condition: {condition}", ""
     
-    return left_image, right_image, progress
+    return left_img, right_img, f"{progress} | Condition: {condition}", ""
+
+def get_preference_a():
+    """Wrapper for preference A."""
+    return record_preference("A")
 
 def get_preference_b():
     """Wrapper for preference B."""
-    if not state["session_active"]:
-        return None, None, "Session not active."
-    
-    current_pair = state["image_pairs"][state["current_index"]]
-    preferred_source = state["current_right_source"]
-    
-    state["evaluations"].append({
-        'timestamp': datetime.now().isoformat(),
-        'condition': current_pair['condition'],
-        'base_name': current_pair['base_name'],
-        'preference': preferred_source.capitalize(),
-        'doctor': state["doctor_name"]
-    })
-    
-    state["current_index"] += 1
-    
-    if state["current_index"] >= len(state["image_pairs"]):
-        state["session_active"] = False
-        return None, None, "✅ Evaluation complete! All images have been reviewed."
-    
-    current_pair = state["image_pairs"][state["current_index"]]
-    
-    if current_pair['roentgen_left']:
-        left_image = load_image("roentgen", current_pair['roentgen'])
-        right_image = load_image("pedisynth", current_pair['pedisynth'])
-        state["current_left_source"] = "roentgen"
-        state["current_right_source"] = "pedisynth"
-    else:
-        left_image = load_image("pedisynth", current_pair['pedisynth'])
-        right_image = load_image("roentgen", current_pair['roentgen'])
-        state["current_left_source"] = "pedisynth"
-        state["current_right_source"] = "roentgen"
-    
-    progress = f"Image {state['current_index'] + 1} of {len(state['image_pairs'])} | Condition: {current_pair['condition']}"
-    
-    return left_image, right_image, progress
+    return record_preference("B")
 
 def start_session(doctor_name):
     """Start a new evaluation session."""
@@ -180,19 +138,10 @@ def start_session(doctor_name):
     
     return update_display()
 
-
-
-def update_display():
-    """Update the display with current image pair."""
+def get_current_display():
+    """Get current image pair and metadata."""
     if not state["session_active"] or state["current_index"] >= len(state["image_pairs"]):
-        # Session complete
-        state["session_active"] = False
-        return (
-            gr.update(visible=False),
-            None,
-            None,
-            gr.update(value="✅ Evaluation complete! All images have been reviewed.")
-        )
+        return None, None, "", ""
     
     current_pair = state["image_pairs"][state["current_index"]]
     
@@ -211,10 +160,26 @@ def update_display():
     condition = current_pair['condition']
     progress = f"Image {state['current_index'] + 1} of {len(state['image_pairs'])}"
     
+    return left_image, right_image, condition, progress
+
+def update_display():
+    """Update the display with current image pair."""
+    left_img, right_img, condition, progress = get_current_display()
+    
+    if left_img is None:
+        # Session complete
+        state["session_active"] = False
+        return (
+            gr.update(visible=False),
+            None,
+            None,
+            gr.update(visible=True, value="✅ Evaluation complete! All images have been reviewed.")
+        )
+    
     return (
         gr.update(visible=True),
-        left_image,
-        right_image,
+        left_img,
+        right_img,
         gr.update(value=f"{progress} | Condition: {condition}")
     )