First iteratiion of gradio fixing

app.py

@@ -82,65 +82,68 @@ def build_demo():
                     gr.Markdown("# ✨ Submit your model here!", elem_classes="markdown-text")
 
                 with gr.Column():
-                    model_name_textbox = gr.Textbox(label="Model name")
-                    submitter_username = gr.Textbox(label="Username")  # can we get this info from hf??
-                    model_link_web = gr.Textbox(label="Link to Model")  # can we get this info from hf??
-
-                    def upload_file(file, model_name, username, link):
-                        file_name = file.name.split("/")[-1] if "/" in file.name else file.name
-                        file_name = model_name.value + "_" + file_name
-
-                        with open(f"{DATA_PATH}/{SUBMITS_META_FILE}", "r", encoding="utf-8") as submit_meta_file:
-                            current_info = json.loads(submit_meta_file)
-
-                            # for now just do not save same name model
-                            if any(filter(lambda x: x["model_name"] == model_name, current_info)):
-                                return False
-
-                            submit_info = {
-                                "model_name": model_name,
-                                "username": username,
-                                "file_name": file_name,
-                                "link": link if link else "",
-                            }
-
-                            current_info.append(submit_info)
-
-                        with open(f"{DATA_PATH}/{SUBMITS_META_FILE}", "w", encoding="utf-8") as submit_meta_file:
-                            submit_meta_file.write(json.dumps(current_info))
-
-                        logging.info(
-                            "New submition: file from %s saved to %s with model %s",
-                            username,
-                            file_name,
-                            model_name,
-                        )
-                        API.upload_file(
-                            path_or_fileobj=file.name,
-                            path_in_repo="arena-hard-v0.1/model_answers/" + file_name,
-                            repo_id=METAINFO_DATASET,
-                            repo_type="dataset",
-                            token=HF_TOKEN_PRIVATE,
-                        )
-                        API.upload_file(
-                            path_or_fileobj=SUBMITS_META_FILE,
-                            path_in_repo=SUBMITS_META_FILE,
-                            repo_id=METAINFO_DATASET,
-                            repo_type="dataset",
-                            token=HF_TOKEN_PRIVATE,
-                        )
-                        change_judgement(1)
-                        return file.name
-
-                    if model_name_textbox and submitter_username:
-                        file_output = gr.File()
-                        upload_button = gr.UploadButton(
-                            "Click to Upload & Submit Answers", file_types=["*"], file_count="single"
-                        )
-                        upload_button.upload(upload_file, inputs=[upload_button, model_name_textbox, submitter_username, model_link_web], outputs= file_output)
-
+                    file_input = gr.File(label="Upload File")
+                    model_name_input = gr.Textbox(label="Model name")
+                    username_input = gr.Textbox(label="Username")  # can we get this info from hf??
+                    link_input = gr.Textbox(label="Link to Model")  # can we get this info from hf??
+
+                    submit_button = gr.Button("Submit")
+                    output=gr.Textbox(label="Output")
+                    
+                    submit_button.click(
+                        fn=upload_file,
+                        inputs=[file_input, model_name_input, username_input, link_input],
+                        output=output,
+                    )
         return demo
 
+def upload_file(file, model_name, username, link):
+    if not file or not model_name or not username:
+        return "Fields file, model_name and username are required"
+    
+    file_name = file.name.split("/")[-1] if "/" in file.name else file.name
+    file_name = model_name.value + "_" + file_name
+
+    with open(f"{DATA_PATH}/{SUBMITS_META_FILE}", "r", encoding="utf-8") as submit_meta_file:
+        current_info = json.loads(submit_meta_file)
+
+        # for now just do not save same name model
+        if any(filter(lambda x: x["model_name"] == model_name, current_info)):
+            return False
+
+        submit_info = {
+            "model_name": model_name,
+            "username": username,
+            "file_name": file_name,
+            "link": link if link else "",
+        }
+
+        current_info.append(submit_info)
+
+    with open(f"{DATA_PATH}/{SUBMITS_META_FILE}", "w", encoding="utf-8") as submit_meta_file:
+        submit_meta_file.write(json.dumps(current_info))
+    logging.info(
+        "New submition: file from %s saved to %s with model %s",
+        username,
+        file_name,
+        model_name,
+    )
+    API.upload_file(
+        path_or_fileobj=file.name,
+        path_in_repo="arena-hard-v0.1/model_answers/" + file_name,
+        repo_id=METAINFO_DATASET,
+        repo_type="dataset",
+        token=HF_TOKEN_PRIVATE,
+    )
+    API.upload_file(
+        path_or_fileobj=SUBMITS_META_FILE,
+        path_in_repo=SUBMITS_META_FILE,
+        repo_id=METAINFO_DATASET,
+        repo_type="dataset",
+        token=HF_TOKEN_PRIVATE,
+    )
+    change_judgement(1)
+    return file.name
 
 # print(os.system('cd src/gen && ../../.venv/bin/python gen_judgment.py'))
 # print(os.system('cd src/gen/ && python show_result.py --output'))
@@ -159,8 +162,8 @@ def update_board():
 
 
 def change_judgement(need_recalc_state=0):
-    with open(PERSISTENT_FILE_CHECK_PATH, "w", encoding="utf-8") as file:
-        file.write(str(need_recalc_state))
+    with open(PERSISTENT_FILE_CHECK_PATH, "w", encoding="utf-8") as pers_file:
+        pers_file.write(str(need_recalc_state))
     API.upload_file(
         path_or_fileobj=PERSISTENT_FILE_CHECK_PATH,
         path_in_repo=PERSISTENT_FILE_CHECK,
@@ -176,8 +179,8 @@ if __name__ == "__main__":
 
     need_recalc = False
     try:
-        with open(PERSISTENT_FILE_CHECK_PATH, "r", encoding="utf-8") as file:
-            need_recalc = file.read() == "1"
+        with open(PERSISTENT_FILE_CHECK_PATH, "r", encoding="utf-8") as pers_file:
+            need_recalc = pers_file.read() == "1"
     except FileNotFoundError:
         need_recalc = True
 

src/leaderboard/build_leaderboard.py

@@ -66,7 +66,7 @@ def build_leadearboard_df():
         submit_info = pd.DataFrame.from_records(
             json.load(submit_meta_file), columns=["model_name", "username", "file_name", "link"]
         )[["model_name", "username", "file_name", "link"]]
-        
+
         # get the format of file_name that is used by the judge
         # can be hijacked using dot character
         # but i am not going to work just for that case
@@ -76,12 +76,12 @@ def build_leadearboard_df():
 
     # Merge the DataFrames
     merged_df = pd.merge(battle_info, submit_info, how="left", left_on="model", right_on="file_name")
-    
+
     # Fill missing usernames with None
     merged_df["username"] = merged_df["username"].fillna("")
     merged_df.loc[merged_df['model_name'].isna(), 'model_name'] = merged_df['model']
-    
+
     # Drop the model_name column if no longer needed
-    merged_df = merged_df.drop(columns=["file_name", "model"])
+    merged_df = merged_df.drop(columns=["file_name", "model"])[["model_name", "lower", "score", "upper", "username", "link"]]
 
     return merged_df.copy()