Update app.py

app.py

@@ -13,8 +13,8 @@ def load_excel(file):
     """
     Reads the Excel file and normalizes header names.
     Expected headers (row 1): "Player", "Role 1", "Role 2", "Role 3", "xB90".
-    Returns six Dropdown components: three for the selected roles and three for the corresponding preferred proposal roles,
-    populated with the union of roles from all three role columns (with a blank option prepended).
+    Returns six Dropdown components: three for selected roles and three for preferred proposal roles,
+    populated with the union of roles from all three columns (with a blank option prepended).
     """
     global df
     logging.debug("load_excel: Received file %s", file.name)
@@ -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 from all three columns.
+    # Get union of roles.
     roles = pd.concat([df["role1"], df["role2"], df["role3"]]).dropna().unique().tolist()
     roles = sorted(roles)
     roles = [""] + roles  # Prepend blank.
@@ -73,10 +73,18 @@ def update_players(selected_role):
     logging.debug("Players for role %s: %s", selected_role, players)
     return gr.Dropdown(choices=players, interactive=True)
 
+def sync_pref(selected_role):
+    """
+    If the selected role is "Por", returns "Por" to automatically set the preferred proposal role.
+    Otherwise, returns an empty string.
+    """
+    if selected_role == "Por":
+        return "Por"
+    return ""
+
 def get_xb90_value(role, player):
     """
-    Returns the xB90 value (as a string) for the given player and selected role.
-    Searches rows where the player's name matches and the role appears in any column.
+    Returns the xB90 value (as a string) for the given player where the selected role appears in any role column.
     """
     global df
     logging.debug("get_xb90_value: role=%s, player=%s", role, player)
@@ -111,22 +119,27 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
     Computes exchange proposals:
       - Actual value: sum of selected players’ xB90.
       - Target: actual * multiplier.
-      - For each selected player, gather candidate replacements from rows where:
+      - For each selected player, gathers candidate replacements from rows where:
             (a) the candidate has the selected role (in any column), and 
             (b) if a preferred proposal role is provided, candidate must have it.
-          If no candidate meets the preference, relax the constraint.
+          If no candidate meets the preferred criterion, the preference constraint is relaxed.
       - 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.
-      - Also enforces that if the selected role is "Por", then the preferred must be "Por".
+      - 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.
     """
     global df
     logging.debug("compute_exchange: Starting computation")
     selected = []
     for i, (r, p, pref) in enumerate([(role1, player1, pref1), (role2, player2, pref2), (role3, player3, pref3)], start=1):
         if r and p:
-            if r == "Por":  # enforce rule: if role is Por, then preferred must be Por.
-                logging.debug("For player %d with role 'Por', forcing preferred to 'Por'", i)
+            if r == "Por":
+                if pref != "Por":
+                    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 == "":
@@ -289,13 +302,17 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
             xb90_3 = gr.Textbox(label="xB90 per Giocatore 3", interactive=False)
             pref3 = gr.Dropdown(label="Ruolo Preferito per Proposta (3)", choices=[], interactive=True)
     
-    # Add slider for configurable multiplier.
     multiplier_slider = gr.Slider(minimum=0.5, maximum=1.5, value=1.05, step=0.01, label="Moltiplicatore di Scambio", interactive=True)
     
     file_input.change(fn=load_excel, inputs=file_input, outputs=[role1, role2, role3, pref1, pref2, pref3])
     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"
+    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)
+    
     player1.change(fn=get_xb90_value, inputs=[role1, player1], outputs=xb90_1)
     player2.change(fn=get_xb90_value, inputs=[role2, player2], outputs=xb90_2)
     player3.change(fn=get_xb90_value, inputs=[role3, player3], outputs=xb90_3)