fix my submissions for multi metrics

competitions/competitions.py

@@ -14,7 +14,6 @@ from .text import (
     SUBMISSION_SUCCESS,
     SUBMISSION_TEXT,
 )
-from .utils import make_clickable_user
 
 
 leaderboard = Leaderboard(
@@ -46,25 +45,36 @@ def _new_submission(user_token, submission_file):
 
 
 def _my_submissions(user_token):
-    df = submissions.my_submissions(user_token)
+    df, failed_df = submissions.my_submissions(user_token)
     if len(df) == 0:
         return [
             gr.Markdown.update(visible=True, value=NO_SUBMISSIONS),
             gr.DataFrame.update(visible=False),
+            gr.DataFrame.update(
+                visible=True if len(failed_df) > 0 else False, value=failed_df if len(failed_df) > 0 else None
+            ),
             gr.TextArea.update(visible=False),
             gr.Button.update(visible=False),
         ]
     selected_submission_ids = df[df["selected"] == True]["submission_id"].values.tolist()
+    failed_selected_submission_ids = failed_df[failed_df["selected"] == True]["submission_id"].values.tolist()
+    selected_submission_ids.extend(failed_selected_submission_ids)
     if len(selected_submission_ids) > 0:
         return [
             gr.Markdown.update(visible=True),
             gr.DataFrame.update(visible=True, value=df),
+            gr.DataFrame.update(
+                visible=True if len(failed_df) > 0 else False, value=failed_df if len(failed_df) > 0 else None
+            ),
             gr.TextArea.update(visible=True, value="\n".join(selected_submission_ids), interactive=True),
             gr.Button.update(visible=True),
         ]
     return [
         gr.Markdown.update(visible=False),
         gr.DataFrame.update(visible=True, value=df),
+        gr.DataFrame.update(
+            visible=True if len(failed_df) > 0 else False, value=failed_df if len(failed_df) > 0 else None
+        ),
         gr.TextArea.update(visible=True, interactive=True),
         gr.Button.update(visible=True),
     ]
@@ -84,6 +94,7 @@ def _update_selected_submissions(user_token, submission_ids):
         return [
             gr.Markdown.update(visible=True, value="You can no longer select submissions after the deadline."),
             gr.DataFrame.update(visible=False),
+            gr.DataFrame.update(visible=False),
             gr.TextArea.update(visible=False),
             gr.Button.update(visible=False),
         ]
@@ -148,7 +159,8 @@ with gr.Blocks(css=".tabitem {padding: 25px}") as demo:
                 max_lines=1, value="", label="Please enter your Hugging Face token (read only)", type="password"
             )
             output_text = gr.Markdown(visible=True, show_label=False)
-            output_df = gr.DataFrame(visible=False)
+            output_df = gr.DataFrame(visible=False, label="Succesful Submissions")
+            failed_df = gr.DataFrame(visible=False, label="Failed Submissions")
             selected_submissions = gr.TextArea(
                 visible=False,
                 label="Selected Submissions (one submission id per line)",
@@ -160,12 +172,12 @@ with gr.Blocks(css=".tabitem {padding: 25px}") as demo:
             my_subs_button.click(
                 fn=_my_submissions,
                 inputs=[user_token],
-                outputs=[output_text, output_df, selected_submissions, update_selected_submissions],
+                outputs=[output_text, output_df, failed_df, selected_submissions, update_selected_submissions],
             )
             update_selected_submissions.click(
                 fn=_update_selected_submissions,
                 inputs=[user_token, selected_submissions],
-                outputs=[output_text, output_df, selected_submissions, update_selected_submissions],
+                outputs=[output_text, output_df, failed_df, selected_submissions, update_selected_submissions],
             )
 
         fetch_lb_partial = partial(_fetch_leaderboard, private=False)

competitions/create.py

@@ -65,7 +65,6 @@ def create_competition(
     solution_file,
     is_public,
 ):
-
     # verify sample submission and solution
     try:
         verify_sample_and_solution(sample_submission_file, solution_file, eval_metric)

competitions/submissions.py

@@ -237,35 +237,55 @@ class Submissions:
             raise NoSubmissionError("No submissions found ")
 
         submissions_df = pd.DataFrame(user_submissions)
-        logger.info(submissions_df)
+
         if not private:
             submissions_df = submissions_df.drop(columns=["private_score"])
             submissions_df = submissions_df[self.public_sub_columns]
         else:
             submissions_df = submissions_df[self.private_sub_columns]
+        if not private:
+            failed_submissions = submissions_df[
+                (submissions_df["status"].isin(["failed", "error"])) | (submissions_df["public_score"] == -1)
+            ]
+            successful_submissions = submissions_df[
+                ~submissions_df["status"].isin(["failed", "error"]) & (submissions_df["public_score"] != -1)
+            ]
+        else:
+            failed_submissions = submissions_df[
+                (submissions_df["status"].isin(["failed", "error"]))
+                | (submissions_df["private_score"] == -1)
+                | (submissions_df["public_score"] == -1)
+            ]
+            successful_submissions = submissions_df[
+                ~submissions_df["status"].isin(["failed", "error"])
+                & (submissions_df["private_score"] != -1)
+                & (submissions_df["public_score"] != -1)
+            ]
+        failed_submissions = failed_submissions.reset_index(drop=True)
+        successful_submissions = successful_submissions.reset_index(drop=True)
 
         if not private:
-            first_submission = submissions_df.iloc[0]
+            first_submission = successful_submissions.iloc[0]
             if isinstance(first_submission["public_score"], dict):
                 # split the public score dict into columns
-                temp_scores_df = submissions_df["public_score"].apply(pd.Series)
+                temp_scores_df = successful_submissions["public_score"].apply(pd.Series)
                 temp_scores_df = temp_scores_df.rename(columns=lambda x: "public_" + str(x))
-                submissions_df = pd.concat(
+                successful_submissions = pd.concat(
                     [
-                        submissions_df.drop(["public_score"], axis=1),
+                        successful_submissions.drop(["public_score"], axis=1),
                         temp_scores_df,
                     ],
                     axis=1,
                 )
         else:
-            first_submission = submissions_df.iloc[0]
+            first_submission = successful_submissions.iloc[0]
             if isinstance(first_submission["private_score"], dict):
                 # split the public score dict into columns
-                temp_scores_df = submissions_df["private_score"].apply(pd.Series)
+                temp_scores_df = successful_submissions["private_score"].apply(pd.Series)
                 temp_scores_df = temp_scores_df.rename(columns=lambda x: "private_" + str(x))
-                submissions_df = pd.concat(
+                successful_submissions = pd.concat(
                     [
-                        submissions_df.drop(["private_score"], axis=1),
+                        successful_submissions.drop(["private_score"], axis=1),
                         temp_scores_df,
                     ],
                     axis=1,
@@ -273,17 +293,16 @@ class Submissions:
 
             if isinstance(first_submission["public_score"], dict):
                 # split the public score dict into columns
-                temp_scores_df = submissions_df["public_score"].apply(pd.Series)
+                temp_scores_df = successful_submissions["public_score"].apply(pd.Series)
                 temp_scores_df = temp_scores_df.rename(columns=lambda x: "public_" + str(x))
-                submissions_df = pd.concat(
+                successful_submissions = pd.concat(
                     [
-                        submissions_df.drop(["public_score"], axis=1),
+                        successful_submissions.drop(["public_score"], axis=1),
                         temp_scores_df,
                     ],
                     axis=1,
                 )
-
-        return submissions_df
+        return successful_submissions, failed_submissions
 
     def _get_user_info(self, user_token):
         user_info = user_authentication(token=user_token)
@@ -358,8 +377,8 @@ class Submissions:
         private = False
         if current_date_time >= self.end_date:
             private = True
-        subs = self._get_user_subs(user_info, private=private)
-        return subs
+        success_subs, failed_subs = self._get_user_subs(user_info, private=private)
+        return success_subs, failed_subs
 
     def new_submission(self, user_token, uploaded_file):
         # verify token

requirements.txt

@@ -1,6 +1,6 @@
 gradio==3.24.1
 joblib==1.2.0
 loguru>=0.6.0
-pandas==1.5.0
+pandas>=2.0.1
 huggingface_hub>=0.10.1
 tabulate==0.9.0