Update app.py

app.py

@@ -1,19 +1,23 @@
+import os
 import gradio as gr
 import pandas as pd
-# from gradio_huggingfacehub_search import HuggingfaceHubSearch
+from gradio_huggingfacehub_search import HuggingfaceHubSearch
 import requests
 
-def update_table(category):
-    # TODO: url -> env
-    url = "https://leaderboard.nexa4ai.com/model/get-ranking-by-category"   
-    url_with_params = f"{url}?category={category}"
+leaderboard_url = os.getenv("LEADERBOARD_URL", "https://leaderboard.nexa4ai.com")
+
+get_ranking_url = f"{leaderboard_url}/model/get-ranking-by-category"
+get_models_url = f"{leaderboard_url}/model/get-models-by-category"
+vote_url = f"{leaderboard_url}/model/vote"
+submit_models_url = f"{leaderboard_url}/model/submit-models"
+
+def update_table(category): 
+    url_with_params = f"{get_ranking_url}?category={category}"
     
-    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],
@@ -25,56 +29,47 @@ def update_table(category):
         api_df = pd.DataFrame()  
     return api_df
 
+
 def get_user(profile: gr.OAuthProfile | None) -> str:
     if profile is None:
         return ""
     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) 
+    url_with_params = f"{get_models_url}?category={category}" 
+
     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
+        return gr.CheckboxGroup(choices=models_data, label="Choose your options", interactive=True)
     else:
         print(f"Failed to get models: {response.text}")
         return []
 
 
-
-def submit_vote(username, category, model_ids):
-    if not category or not model_ids:
+def submit_vote(username, category, models):
+    if not category or not models:
         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://leaderboard.nexa4ai.com/model/vote"    
-    params = {
-        "category": category,
-        "username": username
-    }
+  
     data = {
-        "model_ids": model_ids
+        "category": category,
+        "username": username,
+        "model_ids": models
     }
     
-    print("Submitting vote with payload:", data) 
-    response = requests.post(url, params=params, json=data)
+    response = requests.post(vote_url, json=data)
     
     if response.status_code == 200:
-        return f"Vote '{model_ids}' submitted successfully!"
+        return f"Vote '{models}' submitted successfully!"
     else:
         return f"Failed to vote: {response.text}"
 
@@ -83,14 +78,12 @@ def submit_model(category, model_id):
     if not category or not model_id:
         return "All fields are required!"
     
-    url = "https://leaderboard.nexa4ai.com/"   # Will have a new endpoint
     data = {
-        "category": category,
-        "model_id": model_id
+        "model_id": model_id,
+        "categories": [category]  
     }
     
-    print("Submitting model with payload:", data) 
-    response = requests.post(url, json=data)
+    response = requests.post(submit_models_url, json=data)
     
     if response.status_code == 200:
         return "Your request has been submitted successfully. We will notify you by email once processing is complete."
@@ -98,7 +91,9 @@ def submit_model(category, model_id):
         return f"Failed to submit request: {response.text}"
 
 
-with gr.Blocks() as app:
+theme = gr.themes.Soft()
+
+with gr.Blocks(theme=theme) as app:
     with gr.Tabs():
         with gr.TabItem("Table"):
             category = gr.Dropdown(
@@ -125,23 +120,21 @@ with gr.Blocks() as app:
                 choices=["Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"], 
                 label="Select Category"
             )
-    
-            models = gr.CheckboxGroup(choices=[], label="Choose your options")
-            submit_button = gr.Button("Submit Vote")
-            submit_result = gr.Label()
 
-            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)
+            cbg = gr.CheckboxGroup(choices=[], label="Choose your options",interactive=True)
+            submit_button = gr.Button("Submit Vote")
+            submit_result = gr.Markdown()
 
+            category.change(get_vote_models, inputs=category, outputs=cbg) 
 
+            submit_button.click(fn=submit_vote, inputs=[username_text, category, cbg], outputs=submit_result)
 
         
-        # with gr.TabItem("Submit Model"):
-        #     category = gr.Dropdown(choices=["Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"], label="Select Category")
-        #     model_id = HuggingfaceHubSearch(label="Hub Model ID", placeholder="Search for model id on Huggingface", search_type="model")
-        #     submit_model_button = gr.Button("Submit Model")
-        #     submit_model_result = gr.Label()
-        #     submit_model_button.click(fn=submit_model, inputs=[category, model_id], outputs=submit_model_result)
+        with gr.TabItem("Submit Model"):
+            category = gr.Dropdown(choices=["Biology", "Physics", "Business", "Chemistry", "Economics", "Philosophy", "History", "Culture", "Computer Science", "Math", "Health", "Law", "Engineering", "Other"], label="Select Category")
+            model_id = HuggingfaceHubSearch(label="Hub Model ID", placeholder="Search for model id on Huggingface", search_type="model")
+            submit_model_button = gr.Button("Submit Model")
+            submit_model_result = gr.Markdown()
+            submit_model_button.click(fn=submit_model, inputs=[category, model_id], outputs=submit_model_result)
 
 app.launch()