Update app.py

app.py

@@ -4,54 +4,77 @@ import pandas as pd
 import requests
 
 def update_table(category):
-    data_dict = {
-        "Overall": {
-            "Rank": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],
-            "Model": ["Model A", "Model B", "Model C", "Model D", "Model E", "Model F", "Model G", "Model H", "Model I", "Model J", "Model K", "Model L", "Model M", "Model N", "Model O", "Model P", "Model Q", "Model R", "Model S", "Model T", "Model U", "Model V", "Model W", "Model X", "Model Y", "Model Z"],
-            "Votes": [1250, 200, 3150, 4250, 5200, 6150, 7250, 8200, 9150, 10250, 11200, 12150, 13250, 21250, 200, 3150, 4250, 5200, 6150, 7250, 8200, 9150, 10250, 11200, 12150, 13250],
-            "Organization": ["Org A", "Org B", "Org C", "Org D", "Org E", "Org F", "Org G", "Org H", "Org I", "Org J", "Org K", "Org L", "Org M", "Org N", "Org O", "Org P", "Org Q", "Model R", "Model S", "Model T", "Model U", "Model V", "Model W", "Model X", "Model Y", "Model Z"],
-            "License": ["1MIT", "2Apache 2.0", "3GPL", "4MIT", "5Apache 2.0", "6GPL", "7MIT", "8Apache 2.0", "9GPL", "10MIT", "11Apache 2.0", "12GPL", "13MIT", "1MIT", "2Apache 2.0", "3GPL", "4MIT", "5Apache 2.0", "6GPL", "7MIT", "8Apache 2.0", "9GPL", "10MIT", "11Apache 2.0", "12GPL", "13MIT"]
-        },
-        "Biology": {
-            "Rank": [1, 2],
-            "Model": ["GenePredict", "BioSeq"],
-            "Votes": [180, 160],
-            "Organization": ["BioTech", "Genomics Inc"],
-            "License": ["GPL", "MIT"]
-        }
-    }
+    # TODO: url -> env
+    url = "https://leaderboard.nexa4ai.com/model/get-ranking-by-category"   
+    url_with_params = f"{url}?category={category}"
     
-    data = data_dict.get(category, {"Rank": [], "Model": [], "Votes": [], "Organization": [], "License": []})
-    df = pd.DataFrame(data)
-    return df
+    print("Getting model table with URL:", url_with_params) 
+    response = requests.get(url_with_params)
 
+    if response.status_code == 200:
+        ranking_data = response.json()["ranking"]
+        # Process the API data into a DataFrame
+        api_model_data = {
+            "Model": [item["model_id"] for item in ranking_data],
+            "Votes": [item["votes"] for item in ranking_data],
+            "Categories": [category] * len(ranking_data)
+        }
+        api_df = pd.DataFrame(api_model_data)
+    else:
+        print(f"Failed to submit request: {response.text}")
+        api_df = pd.DataFrame()  
+    return api_df
 
 def get_user(profile: gr.OAuthProfile | None) -> str:
     if profile is None:
         return ""
-    return {profile.username}
+    return profile.username
+
+def get_vote_models(category):
+    print (category)
+    if not category:
+        return []
+    
+    url = "https://leaderboard.nexa4ai.com/model/get-models-by-category" 
+    url_with_params = f"{url}?category={category}"
+
+    print("Getting models with URL:", url_with_params) 
+    response = requests.get(url_with_params)
+
+    if response.status_code == 200:
+        models_data = response.json()
+        models.choices = models_data  # Set choices of models
+        print(f"models_data: {models_data}")
+        print(f"models.choices: {models.choices}")
+        return models_data
+    else:
+        print(f"Failed to get models: {response.text}")
+        return []
+
 
 
-def submit_vote(username, category, vote):
-    if not category or not vote:
+def submit_vote(username, category, model_ids):
+    if not category or not model_ids:
         return "All fields are required!"
     if not username:
         return "You need to log in to submit a vote."
     if username.startswith("Hello "):
         username = username[6:]
 
-    url = "https://sdk.nexa4ai.com/task"   # Will have a new endpoint
-    data = {
+    url = "https://leaderboard.nexa4ai.com/model/vote"    
+    params = {
         "category": category,
-        "model_id": vote,
         "username": username
     }
+    data = {
+        "model_ids": model_ids
+    }
     
     print("Submitting vote with payload:", data) 
-    response = requests.post(url, json=data)
+    response = requests.post(url, params=params, json=data)
     
     if response.status_code == 200:
-        return f"Vote '{vote}' submitted successfully!"
+        return f"Vote '{model_ids}' submitted successfully!"
     else:
         return f"Failed to vote: {response.text}"
 
@@ -60,7 +83,7 @@ def submit_model(category, model_id):
     if not category or not model_id:
         return "All fields are required!"
     
-    url = "https://sdk.nexa4ai.com/task"   # Will have a new endpoint
+    url = "https://leaderboard.nexa4ai.com/"   # Will have a new endpoint
     data = {
         "category": category,
         "model_id": model_id
@@ -79,17 +102,17 @@ with gr.Blocks() as app:
     with gr.Tabs():
         with gr.TabItem("Table"):
             category = gr.Dropdown(
-                choices=["Overall", "Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"],
+                choices=["all", "Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"],
                 label="Select Category",
-                value="Overall"
+                value="all"
             )
             
-            initial_data = update_table("Overall")
+            initial_data = update_table("all")
             table = gr.Dataframe(
-                headers=["Rank", "Model", "Votes", "Organization", "License"],
-                datatype=["number", "str", "number", "str", "str"],
+                headers=["Model", "Votes", "Categories"],
+                datatype=["str", "number", "str"],
                 value=initial_data,
-                col_count=(5, "fixed"),
+                col_count=(3, "fixed"),
             )
             category.change(update_table, inputs=category, outputs=table)
         
@@ -102,11 +125,16 @@ with gr.Blocks() as app:
                 choices=["Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"], 
                 label="Select Category"
             )
-            vote = gr.CheckboxGroup(choices=["Option 1", "Option 2", "Option 3"], label="Choose your options")
+    
+            models = gr.CheckboxGroup(choices=[], label="Choose your options")
             submit_button = gr.Button("Submit Vote")
             submit_result = gr.Label()
 
-            submit_button.click(fn=submit_vote, inputs=[username_text, category, vote], outputs=submit_result)
+            category.change(get_vote_models, inputs=[category], outputs=[models])  # Fix: Use models.choices to update choices
+
+            submit_button.click(fn=submit_vote, inputs=[username_text, category, models], outputs=submit_result)
+
+
 
         
         # with gr.TabItem("Submit Model"):