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 exchange roles and three for preferred proposal roles)
-    populated with the union of roles from the three role columns (blank option prepended).
+    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).
     """
     global df
     logging.debug("load_excel: Received file %s", file.name)
@@ -42,21 +42,20 @@ 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  # Blank option.
+    roles = [""] + roles  # Prepend blank option.
     logging.debug("Roles found: %s", roles)
-    # Return six dropdown components.
     return (
-        gr.Dropdown(choices=roles, interactive=True),  # role1 for exchange
-        gr.Dropdown(choices=roles, interactive=True),  # role2 for exchange
-        gr.Dropdown(choices=roles, interactive=True),  # role3 for exchange
-        gr.Dropdown(choices=roles, interactive=True),  # preferred role for player1
-        gr.Dropdown(choices=roles, interactive=True),  # preferred role for player2
-        gr.Dropdown(choices=roles, interactive=True)   # preferred role for player3
+        gr.Dropdown(choices=roles, interactive=True),
+        gr.Dropdown(choices=roles, interactive=True),
+        gr.Dropdown(choices=roles, interactive=True),
+        gr.Dropdown(choices=roles, interactive=True),
+        gr.Dropdown(choices=roles, interactive=True),
+        gr.Dropdown(choices=roles, interactive=True)
     )
 
 def update_players(selected_role):
     """
-    Given a selected role, returns a new Dropdown with players whose name appears
+    Given a selected role, returns a new Dropdown with players whose name appears 
     in any of the role columns.
     A blank option is added.
     """
@@ -65,8 +64,8 @@ def update_players(selected_role):
     if df is None or not selected_role:
         return gr.Dropdown(choices=[], interactive=True)
     players = df[
-        (df["role1"] == selected_role) |
-        (df["role2"] == selected_role) |
+        (df["role1"] == selected_role) | 
+        (df["role2"] == selected_role) | 
         (df["role3"] == selected_role)
     ]["player"].dropna().unique().tolist()
     players = sorted(players)
@@ -76,8 +75,8 @@ def update_players(selected_role):
 
 def get_xb90_value(role, player):
     """
-    Returns the xB90 value for the given player and selected role.
-    Searches rows where the player's name matches and the role appears in any role column.
+    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.
     """
     global df
     logging.debug("get_xb90_value: role=%s, player=%s", role, player)
@@ -95,18 +94,16 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
     Computes exchange proposals:
       - Actual value: sum of selected players’ xB90.
       - Target: actual * 1.05.
-      - For each selected player, gather candidate replacements from rows where:
-            (a) the candidate has the selected role (in any role column), and
-            (b) if a preferred role is provided for that player, then candidate must have it in some role column.
-          If no candidate meets the preferred criterion, the preference is relaxed.
+      - 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.
       - Excludes any candidate that is among the selected players.
-      - Generates candidate combinations (Cartesian product) 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 that no candidate 
+        appears in more than one proposal.
     """
     global df
     logging.debug("compute_exchange: Starting computation")
     selected = []
-    # Collect selected players.
     for i, (r, p, pref) in enumerate([(role1, player1, pref1), (role2, player2, pref2), (role3, player3, pref3)], start=1):
         if r and p:
             xb90_val = get_xb90_value(r, p)
@@ -135,7 +132,6 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
         r = sel["role"]
         pref = sel["pref"]
         logging.debug("Gathering candidates for selected role %s with preference %s", r, pref)
-        # First, try filtering by both role and preferred role if provided.
         if pref:
             candidates_df = df[
                 (((df["role1"] == r) | (df["role2"] == r) | (df["role3"] == r))) &
@@ -145,7 +141,6 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
             candidates = candidates_df[["player", "xb90"]].dropna().to_dict(orient="records")
             if not candidates:
                 logging.debug("No candidates found matching preference %s; relaxing preference", pref)
-                # Relax the preference constraint.
                 candidates_df = df[
                     (((df["role1"] == r) | (df["role2"] == r) | (df["role3"] == r))) &
                     (~df["player"].isin(selected_names))
@@ -157,7 +152,7 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
                 (~df["player"].isin(selected_names))
             ]
             candidates = candidates_df[["player", "xb90"]].dropna().to_dict(orient="records")
-        logging.debug("Candidates for %s: %s", r, candidates)
+        logging.debug("Candidates for role %s: %s", r, candidates)
         if not candidates:
             return f"No alternative candidates found for role '{r}' (excluding selected players)."
         candidate_lists.append(candidates)
@@ -211,52 +206,76 @@ def compute_exchange(role1, player1, pref1, role2, player2, pref2, role3, player
     logging.debug("Exchange proposals computed successfully.")
     return output
 
-# Build the Gradio Blocks interface with Soft theme and custom CSS for mobile.
+# Build the Gradio Blocks interface with advanced custom CSS.
 with gr.Blocks(theme=gr.themes.Soft(), css="""
-    .gradio-container { max-width: 800px; margin: auto; }
-    .gradio-interface { padding: 20px; }
+    @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap');
+    body, .gradio-container {
+        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-size: cover;
+    }
+    .gradio-interface {
+        background-color: rgba(255, 255, 255, 0.95) !important;
+        border-radius: 10px;
+        padding: 20px;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.5);
+    }
+    h2, h3, h4, p {
+        color: #FFD700;
+        text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
+    }
+    .gr-button {
+        background-color: #006400 !important;
+        color: #FFF !important;
+        border: none !important;
+        border-radius: 5px !important;
+        padding: 10px 20px !important;
+        font-size: 1.1em !important;
+        cursor: pointer !important;
+        transition: background-color 0.3s ease !important;
+    }
+    .gr-button:hover {
+        background-color: #228B22 !important;
+    }
     @media (max-width: 600px) {
         .gradio-container { padding: 10px; }
         .gradio-interface { padding: 10px; }
     }
 """) as demo:
-    gr.Markdown("<h2 style='text-align:center;'>Fantasy Football Player Exchange App</h2>")
-    gr.Markdown("<p style='text-align:center;'>Upload an Excel file with player data. Row 1 must have headers: 'Player', 'Role 1', 'Role 2', 'Role 3', 'xB90'.</p>")
+    gr.Markdown("<h2 style='text-align:center;'>Fantastico Calcio Andria - il foglietto dell'uomo algoritmo</h2>")
+    gr.Markdown("<p style='text-align:center;'>Carica il file Excel con i dati dei giocatori. La prima riga deve contenere le intestazioni: 'Player', 'Role 1', 'Role 2', 'Role 3', 'xB90'.</p>")
     
-    file_input = gr.File(label="Upload Excel File (.xlsx)", file_types=[".xlsx"])
+    file_input = gr.File(label="Carica file Excel (.xlsx)", file_types=[".xlsx"])
     
     with gr.Row():
         with gr.Column():
-            role1 = gr.Dropdown(label="Role for Player 1", choices=[], interactive=True)
-            player1 = gr.Dropdown(label="Player 1", choices=[], interactive=True)
-            xb90_1 = gr.Textbox(label="xB90 for Player 1", interactive=False)
-            pref1 = gr.Dropdown(label="Preferred Proposal Role for Player 1", choices=[], interactive=True)
+            role1 = gr.Dropdown(label="Ruolo per Giocatore 1", choices=[], interactive=True)
+            player1 = gr.Dropdown(label="Giocatore 1", choices=[], interactive=True)
+            xb90_1 = gr.Textbox(label="xB90 per Giocatore 1", interactive=False)
+            pref1 = gr.Dropdown(label="Ruolo Preferito per Proposta (1)", choices=[], interactive=True)
         with gr.Column():
-            role2 = gr.Dropdown(label="Role for Player 2 (Optional)", choices=[], interactive=True)
-            player2 = gr.Dropdown(label="Player 2 (Optional)", choices=[], interactive=True)
-            xb90_2 = gr.Textbox(label="xB90 for Player 2", interactive=False)
-            pref2 = gr.Dropdown(label="Preferred Proposal Role for Player 2", choices=[], interactive=True)
+            role2 = gr.Dropdown(label="Ruolo per Giocatore 2 (Opzionale)", choices=[], interactive=True)
+            player2 = gr.Dropdown(label="Giocatore 2 (Opzionale)", choices=[], interactive=True)
+            xb90_2 = gr.Textbox(label="xB90 per Giocatore 2", interactive=False)
+            pref2 = gr.Dropdown(label="Ruolo Preferito per Proposta (2)", choices=[], interactive=True)
         with gr.Column():
-            role3 = gr.Dropdown(label="Role for Player 3 (Optional)", choices=[], interactive=True)
-            player3 = gr.Dropdown(label="Player 3 (Optional)", choices=[], interactive=True)
-            xb90_3 = gr.Textbox(label="xB90 for Player 3", interactive=False)
-            pref3 = gr.Dropdown(label="Preferred Proposal Role for Player 3", choices=[], interactive=True)
+            role3 = gr.Dropdown(label="Ruolo per Giocatore 3 (Opzionale)", choices=[], interactive=True)
+            player3 = gr.Dropdown(label="Giocatore 3 (Opzionale)", choices=[], interactive=True)
+            xb90_3 = gr.Textbox(label="xB90 per Giocatore 3", interactive=False)
+            pref3 = gr.Dropdown(label="Ruolo Preferito per Proposta (3)", choices=[], interactive=True)
     
-    # When file is uploaded, update all six dropdowns with the union of roles.
     file_input.change(fn=load_excel, inputs=file_input, outputs=[role1, role2, role3, pref1, pref2, pref3])
-    
-    # When a role is selected, update the corresponding player dropdown.
     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)
-    
-    # When a player is selected, display the xB90 value.
     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)
     
-    exchange_button = gr.Button("Compute Exchange Proposals")
-    output_box = gr.Textbox(label="Exchange Proposals", lines=12)
+    exchange_button = gr.Button("Calcola Proposte di Scambio")
+    output_box = gr.Textbox(label="Proposte di Scambio", lines=14)
     
     exchange_button.click(
         fn=compute_exchange,
@@ -264,5 +283,5 @@ with gr.Blocks(theme=gr.themes.Soft(), css="""
         outputs=output_box,
     )
     
-# Launch the app with debug=True.
+# Launch the app with debug enabled.
 demo.launch(debug=True)