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 selected roles and three for preferred proposal roles,
-    populated from the union of roles in all role columns (with a blank option prepended).
+    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).
     """
     global df
     logging.debug("load_excel: Received file %s", file.name)
@@ -42,7 +42,7 @@ def load_excel(file):
     # 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 option.
+    roles = [""] + roles  # Prepend blank.
     logging.debug("Roles found: %s", roles)
     return (
         gr.Dropdown(choices=roles, interactive=True),
@@ -89,23 +89,45 @@ def get_xb90_value(role, player):
         return value
     return ""
 
-def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player3, pref3):
+def get_candidate_roles(candidate_name):
+    """
+    Returns a comma-separated string of roles for the candidate.
+    """
+    global df
+    if df is None or not candidate_name:
+        return ""
+    row = df[df["player"] == candidate_name]
+    if not row.empty:
+        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())
+        return ", ".join(sorted(roles))
+    return ""
+
+def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player3, pref3, multiplier):
     """
     Computes exchange proposals:
       - Actual value: sum of selected players’ xB90.
-      - Target: actual * 1.05.
-      - For each selected player, gather candidate replacements from rows where the candidate 
-        has the selected role (in any column) and, if a preferred proposal role is provided, 
-        it must match. If no candidate meets the preferred criterion, the preference is relaxed.
+      - Target: actual * multiplier.
+      - For each selected player, gather 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.
       - Excludes any candidate that is among the selected players.
-      - Generates candidate combinations and selects up to three proposals ensuring that no candidate 
-        appears in more than one proposal.
+      - 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".
     """
     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)
+                pref = "Por"
             xb90_val = get_xb90_value(r, p)
             if xb90_val == "":
                 msg = f"Error: Could not find xB90 for Player {i}."
@@ -123,15 +145,15 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
         return "Please select at least one player."
     
     actual_value = sum(item["xb90"] for item in selected)
-    target = actual_value * 1.05
-    logging.debug("Actual value: %s, Target: %s", actual_value, target)
+    target = actual_value * multiplier
+    logging.debug("Actual value: %s, Target: %s (multiplier=%s)", actual_value, target, multiplier)
     
     selected_names = {sel["player"] for sel in selected}
     candidate_lists = []
     for sel in selected:
         r = sel["role"]
         pref = sel["pref"]
-        logging.debug("Gathering candidates for selected role %s with preference %s", r, pref)
+        logging.debug("Gathering candidates for role %s with preference %s", r, pref)
         if pref:
             candidates_df = df[
                 (((df["role1"] == r) | (df["role2"] == r) | (df["role3"] == r))) &
@@ -154,7 +176,7 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
             candidates = candidates_df[["player", "xb90"]].dropna().to_dict(orient="records")
         logging.debug("Candidates for role %s: %s", r, candidates)
         if not candidates:
-            return f"No alternative candidates found for role '{r}' (excluding selected players)."
+            return f"No alternative candidates found for role '{r}' (excluding selected players) matching preference '{pref}'."
         candidate_lists.append(candidates)
     
     all_combos = list(itertools.product(*candidate_lists))
@@ -175,7 +197,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 no candidate is repeated across proposals.
+    # Choose up to three proposals ensuring disjoint candidate sets.
     selected_options = []
     used_candidates = set()
     for combo, combo_value, diff in combo_diffs:
@@ -198,9 +220,10 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
     for idx, (combo, combo_value, diff, _) in enumerate(selected_options, start=1):
         option_str = f"Option {idx} (Total xB90: {combo_value:.2f}, Diff: {diff:.2f}):\n"
         for i, candidate in enumerate(combo):
+            cand_roles = get_candidate_roles(candidate["player"])
             option_str += (
                 f"  - Replacement for '{selected[i]['player']}' (Role: {selected[i]['role']}): "
-                f"{candidate['player']} (xB90: {candidate['xb90']})\n"
+                f"{candidate['player']} (Role: {cand_roles}, xB90: {candidate['xb90']})\n"
             )
         output += option_str + "\n"
     logging.debug("Exchange proposals computed successfully.")
@@ -213,7 +236,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
         font-family: 'Montserrat', sans-serif;
     }
     .gradio-container {
-        background: linear-gradient(rgba(0,0,0,0.6), rgba(0,0,0,0.6)), url('https://source.unsplash.com/1600x900/?football') no-repeat center center fixed;
+        background: linear-gradient(rgba(0,0,0,0.6), rgba(0,0,0,0.6)), url('https://source.unsplash.com/1600x900/?football,stadium') no-repeat center center fixed;
         background-size: cover;
     }
     .gradio-interface {
@@ -266,6 +289,9 @@ 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)
@@ -279,7 +305,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
     
     exchange_button.click(
         fn=compute_exchange,
-        inputs=[role1, player1, pref1, role2, player2, pref2, role3, player3, pref3],
+        inputs=[role1, player1, pref1, role2, player2, pref2, role3, player3, pref3, multiplier_slider],
         outputs=output_box,
     )