revert back

app.py

@@ -42,7 +42,7 @@ def fetch_required_files(exp_config):
     return exp_config
 
 
-def call_flask_server(modelname):
+def call_flask_server(username):
     url = "https://saraht14-server.hf.space/"
     
     try:
@@ -148,7 +148,7 @@ def install_requirements(file_path):
         print(f"Error: {file_path} not found.")
     except subprocess.CalledProcessError as e:
         print(f"Installation failed: {e}")
-HEADERS = ["Model Name", "Group Name", "Execution Time (s)", "Accuracy", "TP", "FP", "FN", "TN"]
+HEADERS = ["Username", "Execution Time (s)", "Accuracy", "TP", "FP", "FN", "TN"]
 BASE = {'ottawa':(45.30326753851309,-75.93640391349997),
         'ali_home':(37.88560412289598,-122.30218612514359),
         'josh_home':(37.8697406, -122.30218612514359),
@@ -173,11 +173,6 @@ def fetch_lb():
     try:
         leaderboard_dataset = load_dataset("saraht14/responses", split="train", token=HF_TOKEN)
         leaderboard_data = leaderboard_dataset.to_pandas()
-
-        for col in HEADERS:
-            if col not in leaderboard_data.columns:
-                leaderboard_data[col] = "N/A"
-
         leaderboard_data = leaderboard_data[HEADERS]  # keep it ordered
         leaderboard_data = leaderboard_data.sort_values(by=["Accuracy", "Execution Time (s)"], ascending=[False, True])
     except Exception as e:
@@ -246,15 +241,15 @@ def read_configuration(filename):
 
 
 
-def evaluate_model(modelname, groupname, file):
+def evaluate_model(username, file):
     print("evaluating...")
     global leaderboard_data
 
-    modelname = modelname.strip()
-    if not modelname:
+    username = username.strip()
+    if not username:
         return leaderboard_data.values.tolist()
 
-    script_path = f"submissions/{modelname}.py"
+    script_path = f"submissions/{username}.py"
     os.makedirs("submissions", exist_ok=True)
     
     # # Get the file path from the NamedString object
@@ -339,12 +334,12 @@ def evaluate_model(modelname, groupname, file):
         status = "Success" if accuracy > 0 else "Incorrect Model"
 # ["Username", "Execution Time (s)", "Accuracy", "True Positive", "False Positive", "False Negative", "False Positive"]
     except Exception as e:
-        leaderboard_data = pd.concat([leaderboard_data, pd.DataFrame([[modelname, groupname, float("inf"), 0,-1,-1,-1,-1]], 
+        leaderboard_data = pd.concat([leaderboard_data, pd.DataFrame([[username, float("inf"), 0,-1,-1,-1,-1]], 
                                  columns=HEADERS)], ignore_index=True)
         return leaderboard_data.values.tolist()
     print("calculating new entry")
     
-    new_entry = pd.DataFrame([[modelname, groupname, execution_time, accuracy, TP, FP, FN, TN]], 
+    new_entry = pd.DataFrame([[username, execution_time, accuracy, TP, FP, FN, TN]], 
                                  columns=HEADERS)
     print("updating new entry")
     leaderboard_data = update_results_dataset(new_entry)
@@ -429,13 +424,13 @@ def import_and_run_function(script_path, function_name, filename):
 
 
 
-def update_leaderboard(modelname, groupname, zip_file):
+def update_leaderboard(username, zip_file):
     if not zip_file:
         set_error_message("No file uploaded.")
         return get_error_message(), None
 
     zip_path = zip_file.name 
-    extract_path = os.path.join("", modelname)
+    extract_path = os.path.join("", username)
    # if not os.path.exists(extract_path):
     #    os.makedirs(extract_path)
         
@@ -494,7 +489,7 @@ def update_leaderboard(modelname, groupname, zip_file):
         return "No Python script (main.py) found in ZIP.", None
     
     try:
-        updated_leaderboard = evaluate_model(modelname, groupname, python_script)
+        updated_leaderboard = evaluate_model(username, python_script)
 
         if updated_leaderboard == None:
             return "An error occured while evaluting the model", None
@@ -516,8 +511,7 @@ with gr.Blocks() as demo:
     gr.Markdown("# 🚀 Indoor vs Outdoor Detection Leaderboard \nUsing the provided dataset, submit a model that can predict if a device is inside or outside. \nSee the README for submission details.")
 
     with gr.Row():
-        modelname_input = gr.Textbox(label="Model Name")
-        groupname_input = gr.Textbox(label = "Group Name")
+        username_input = gr.Textbox(label="Model Name")
         file_input = gr.File(label="Upload Zip File")
         submit_button = gr.Button("Submit File")
 
@@ -532,7 +526,7 @@ with gr.Blocks() as demo:
 
    
     submit_button.click(fn=update_leaderboard, 
-                        inputs=[modelname_input, groupname_input, file_input], 
+                        inputs=[username_input, file_input], 
                         outputs=[status_output, leaderboard_display])
 
     status_output.change(fn=get_error_message, inputs=[], outputs=status_output)