Update app.py

app.py

@@ -39,7 +39,7 @@ def load_excel(file):
     df["role2"] = df["role2"].astype(str).str.strip()
     df["role3"] = df["role3"].astype(str).str.strip()
     df["xb90"] = pd.to_numeric(df["xb90"], errors="coerce")
-    # Get union of roles.
+    # Get union of roles from all three columns.
     roles = pd.concat([df["role1"], df["role2"], df["role3"]]).dropna().unique().tolist()
     roles = sorted(roles)
     roles = [""] + roles  # Prepend blank.
@@ -75,7 +75,7 @@ def update_players(selected_role):
 
 def sync_pref(selected_role):
     """
-    If the selected role is "Por", returns "Por" to automatically set the preferred proposal role.
+    If the selected role is "Por", returns "Por" for the corresponding preferred proposal role.
     Otherwise, returns an empty string.
     """
     if selected_role == "Por":
@@ -100,6 +100,7 @@ def get_xb90_value(role, player):
 def get_candidate_roles(candidate_name):
     """
     Returns a comma-separated string of roles for the candidate.
+    Omits any role that is 'nan' (case-insensitive).
     """
     global df
     if df is None or not candidate_name:
@@ -109,8 +110,9 @@ def get_candidate_roles(candidate_name):
         roles = set()
         for col in ["role1", "role2", "role3"]:
             val = row.iloc[0][col]
-            if pd.notna(val) and str(val).strip():
-                roles.add(str(val).strip())
+            val_str = str(val).strip()
+            if pd.notna(val) and val_str and val_str.lower() != "nan":
+                roles.add(val_str)
         return ", ".join(sorted(roles))
     return ""
 
@@ -126,8 +128,7 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
       - Excludes any candidate that is among the selected players.
       - Generates candidate combinations and selects up to three proposals ensuring no candidate 
         is repeated across proposals.
-      - Enforces that if a player's role is "Por", then the preferred must be "Por".
-      - If a user somehow sets a different preferred value for a "Por" player, an error is returned.
+      - Enforces that if a player's role is "Por", then the preferred must be "Por"; if not, returns an error.
     """
     global df
     logging.debug("compute_exchange: Starting computation")
@@ -139,7 +140,6 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
                     msg = f"Puoi scambiare un portiere solo per un altro portiere. (Giocatore {i})"
                     logging.error(msg)
                     return msg
-                # Automatically force preferred to Por.
                 pref = "Por"
             xb90_val = get_xb90_value(r, p)
             if xb90_val == "":
@@ -210,7 +210,7 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
         combo_diffs.append((combo, combo_value, diff))
     combo_diffs.sort(key=lambda x: x[2])
     
-    # Choose up to three proposals ensuring disjoint candidate sets.
+    # Choose up to three proposals ensuring no candidate is repeated across proposals.
     selected_options = []
     used_candidates = set()
     for combo, combo_value, diff in combo_diffs:
@@ -308,7 +308,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
     role1.change(fn=update_players, inputs=role1, outputs=player1)
     role2.change(fn=update_players, inputs=role2, outputs=player2)
     role3.change(fn=update_players, inputs=role3, outputs=player3)
-    # Sync preferred role: if role is "Por", force preferred to "Por"
+    # Sync preferred role if "Por" is selected.
     role1.change(fn=sync_pref, inputs=role1, outputs=pref1)
     role2.change(fn=sync_pref, inputs=role2, outputs=pref2)
     role3.change(fn=sync_pref, inputs=role3, outputs=pref3)