backend

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .vscode
 __pycache__
-leaderboard_data.json
+leaderboard_data.json
+.env

app.py

@@ -1,106 +1,116 @@
 import gradio as gr
 import random
-import json
 import os
+import requests  # added import for API calls
+from dotenv import load_dotenv
+load_dotenv()
 
-initial_data = [
-    ["dalle_desc_25", 1000, ""],
-    ["dalle_desc_50", 1000, ""],
-    ["dalle_desc_100", 1000, ""],
-    ["dalle_desc_150", 1000, ""],
-    ["dalle_desc_250", 1000, ""],
-    ["desc_25_threshold_250", 1000, ""],
-    ["desc_25_threshold_500", 1000, ""],
-    ["desc_25_threshold_1000", 1000, ""],
-    ["desc_250_threshold_250", 1000, ""],
-    ["desc_250_threshold_500", 1000, ""],
-    ["desc_250_threshold_1000", 1000, ""],
-    ["jpeg_scale_2", 1000, ""],
-    ["jpeg_scale_4", 1000, ""],
-    ["jpeg_scale_8", 1000, ""],
-    ["jpeg_scale_16", 1000, ""],
-    ["jpeg_scale_32", 1000, ""],
-    ["sa30_desc_50", 1000, ""],
-    ["sa30_desc_100", 1000, ""],
-    ["sa30_desc_150", 1000, ""],
-    ["sa30_desc_250", 1000, ""],
-    ["sd30_desc_25", 1000, ""],
-    ["sd35_desc_25", 1000, ""],
-    ["sd35_desc_50", 1000, ""],
-    ["sd35_desc_100", 1000, ""],
-    ["sd35_desc_150", 1000, ""],
-    ["sd35_desc_250", 1000, ""],
+# Define model names for randomization (extracted from your previous initial_data)
+model_names = [
+    "dalle_desc_25",
+    "dalle_desc_50",
+    "dalle_desc_100",
+    "dalle_desc_150",
+    "dalle_desc_250",
+    "desc_25_threshold_250",
+    "desc_25_threshold_500",
+    "desc_25_threshold_1000",
+    "desc_250_threshold_250",
+    "desc_250_threshold_500",
+    "desc_250_threshold_1000",
+    "jpeg_scale_2",
+    "jpeg_scale_4",
+    "jpeg_scale_8",
+    "jpeg_scale_16",
+    "jpeg_scale_32",
+    "sa30_desc_50",
+    "sa30_desc_100",
+    "sa30_desc_150",
+    "sa30_desc_250",
+    "sd30_desc_25",
+    "sd35_desc_25",
+    "sd35_desc_50",
+    "sd35_desc_100",
+    "sd35_desc_150",
+    "sd35_desc_250"
 ]
 
-# File to store leaderboard data
-LEADERBOARD_FILE = "leaderboard_data.json"
-
-def load_leaderboard_data():
-    if os.path.exists(LEADERBOARD_FILE):
-        with open(LEADERBOARD_FILE, 'r') as f:
-            return json.load(f)
-    else:
-        # Initial leaderboard data if file doesn't exist
-        save_leaderboard_data(initial_data)
-        return initial_data
+# Global variables for the image template and current state:
+images = [f"3d/{model}/OBJ.png" for model in model_names]
+current_images = [0, 0]
+current_obj = None  # will store the object used in the current voting round
 
-def save_leaderboard_data(data):
-    with open(LEADERBOARD_FILE, 'w') as f:
-        json.dump(data, f)
+# Set API host and access key from environment variables
+BACK_HOST = os.getenv("BACK_HOST")
+ACCESS_KEY = os.getenv("ACCESS_KEY")
 
-# Initialize global variables
+# List of objects to choose from (kept as-is)
 objs = ['axe', 'barrel', 'bed', 'bottle', 'canon', 'car', 'chair', 'chair2', 'chair3', 'chair4']
-leaderboard_data = load_leaderboard_data()
-images = [f"3d/{e[0]}/OBJ.png" for e in initial_data]
-current_images = [0, 0]
 
 def get_new_images():
-    global current_images
+    global current_images, current_obj
     random.seed()
     idx1, idx2 = random.sample(range(len(images)), 2)
     current_images = [idx1, idx2]
     obj = random.choice(objs)
-    new_images = [i.replace('OBJ', obj) for i in images]
+    current_obj = obj  # store the object for the current round
+    new_images = [img.replace('OBJ', obj) for img in images]
     original = f"3d/original/{obj}.png"
     return {
         "original": original,
         "image1": new_images[idx1],
         "image2": new_images[idx2],
         "label1": "Left",
-        "label2": "Right"
+        "label2": "Right",
+        "obj": obj  # return the object in case it is needed
     }
 
-def update_elo(winner, loser, k=32):
-    global leaderboard_data
-    winner_elo = leaderboard_data[winner][1]
-    loser_elo = leaderboard_data[loser][1]
-    expected_winner = 1 / (1 + 10 ** ((loser_elo - winner_elo) / 400))
-    expected_loser = 1 / (1 + 10 ** ((winner_elo - loser_elo) / 400))
-    leaderboard_data[winner][1] += round(k * (1 - expected_winner))
-    leaderboard_data[loser][1] += round(k * (0 - expected_loser))
-    save_leaderboard_data(leaderboard_data)
-    return leaderboard_data
-
 def vote_and_randomize(choice):
-    global current_images
-    
+    global current_images, current_obj
     if choice == "left":
-        updated_data = update_elo(current_images[0], current_images[1])
-        winner_name = leaderboard_data[current_images[0]][0]
+        winner_index = current_images[0]
+        loser_index = current_images[1]
     else:
-        updated_data = update_elo(current_images[1], current_images[0])
-        winner_name = leaderboard_data[current_images[1]][0]
+        winner_index = current_images[1]
+        loser_index = current_images[0]
     
+    winner_model = model_names[winner_index]
+    loser_model = model_names[loser_index]
+    # Use the current object generated during the image randomization
+    obj = current_obj
+
+    # Prepare payload for voting
+    payload = {
+        "winner": winner_model,
+        "loser": loser_model,
+        "object": obj
+    }
+    url = f"{BACK_HOST}/vote"
+    headers = {
+        "Authorization": f"Bearer {ACCESS_KEY}",
+        "Content-Type": "application/json"
+    }
+    try:
+        response = requests.post(url, headers=headers, json=payload)
+        resp_json = response.json()
+        if resp_json.get("message") == "Vote recorded successfully":
+            message = f"Thanks for voting for {winner_model}!"
+        else:
+            message = "Error recording vote. Please try again."
+    except Exception as e:
+        message = "Error recording vote. Please try again."
+
     new_state = get_new_images()
-    
+    updated_leaderboard = get_leaderboard_data()  # refresh leaderboard from API
+
     return (
-        f"Thanks for voting for {winner_name}!", 
+        message,
         new_state["original"],
-        new_state["image1"], 
+        new_state["image1"],
         new_state["image2"],
         new_state["label1"],
         new_state["label2"],
-        updated_data
+        updated_leaderboard
     )
 
 def start_voting():
@@ -117,13 +127,34 @@ def start_voting():
         initial_state["label2"]
     )
 
+def get_leaderboard_data():
+    """Fetch leaderboard data from the API and transform it for display."""
+    headers = {
+        "Authorization": f"Bearer {ACCESS_KEY}"
+    }
+    try:
+        response = requests.get(f"{BACK_HOST}/get", headers=headers)
+        if response.status_code == 200:
+            data = response.json()
+            # Transform the dictionary into a list of rows for the DataFrame
+            leaderboard_list = [[name, elo, ""] for name, elo in data.items()]
+            return leaderboard_list
+        else:
+            return []
+    except Exception as e:
+        return []
+
+def refresh_leaderboard():
+    """Refresh leaderboard data."""
+    return get_leaderboard_data()
+
 with gr.Blocks(css="""
     #main-image {
         margin: auto; /* Center the image */
         display: block;
     }
     """) as demo:
-    with gr.Tabs():
+    with gr.Tabs() as tabs:  # Remove elem_id, we don't need it anymore
         # Tab 1: Voting
         with gr.Tab("Voting"):
             gr.Markdown("### Vote for your favorite option!")
@@ -150,13 +181,15 @@ with gr.Blocks(css="""
                 output = gr.Textbox(label="Vote Result", interactive=False)
         
         # Tab 2: Leaderboard
-        with gr.Tab("Leaderboard"):
+        with gr.Tab("Leaderboard") as leaderboard_tab:
             gr.Markdown("### Leaderboard")
             leaderboard_table = gr.DataFrame(
                 headers=["Name", "Elo", "Description"],
-                value=load_leaderboard_data(),
+                value=get_leaderboard_data(),
                 interactive=False
             )
+            # Add a refresh button
+            refresh_btn = gr.Button("Refresh Leaderboard")
     
     # Handle start button click
     start_btn.click(
@@ -182,5 +215,17 @@ with gr.Blocks(css="""
         outputs=[output, main_image, left_image, right_image, vote_1, vote_2, leaderboard_table]
     )
 
+    # Replace the tabs.change with a refresh button click handler
+    refresh_btn.click(
+        fn=refresh_leaderboard,
+        outputs=leaderboard_table
+    )
+
+    # Also refresh when the leaderboard tab is selected
+    leaderboard_tab.select(
+        fn=refresh_leaderboard,
+        outputs=leaderboard_table
+    )
+
 if __name__ == "__main__":
     demo.launch()