selected submissions

competitions/app.py

@@ -52,6 +52,11 @@ class User(BaseModel):
     user_token: str
 
 
+class UserSubmissionUpdate(BaseModel):
+    user_token: str
+    submission_ids: str
+
+
 def run_job_runner():
     job_runner = JobRunner(token=HF_TOKEN, competition_info=COMP_INFO, output_path=OUTPUT_PATH)
     job_runner.run()
@@ -148,8 +153,8 @@ async def my_submissions(request: Request, user: User):
             }
         }
     subs = pd.concat([success_subs, failed_subs], axis=0)
-    subs = subs.to_markdown(index=False)
-    if len(subs.strip()) == 0:
+    subs = subs.to_dict(orient="records")
+    if len(subs) == 0:
         subs = "You have not made any submissions yet."
         failed_subs = ""
     submission_text = SUBMISSION_TEXT.format(COMP_INFO.submission_limit)
@@ -189,3 +194,24 @@ async def new_submission(
     except AuthenticationError:
         return {"response": "Invalid token"}
     return {"response": "Invalid competition type"}
+
+
+@app.post("/update_selected_submissions", response_class=JSONResponse)
+def update_selected_submissions(request: Request, user_sub: UserSubmissionUpdate):
+    sub = Submissions(
+        end_date=COMP_INFO.end_date,
+        submission_limit=COMP_INFO.submission_limit,
+        competition_id=COMPETITION_ID,
+        token=HF_TOKEN,
+        competition_type=COMP_INFO.competition_type,
+        hardware=COMP_INFO.hardware,
+    )
+    submission_ids = user_sub.submission_ids.split(",")
+    submission_ids = [s.strip() for s in submission_ids]
+    if len(submission_ids) > COMP_INFO.selection_limit:
+        return {
+            "success": False,
+            "error": f"Please select at most {COMP_INFO.selection_limit} submissions.",
+        }
+    sub.update_selected_submissions(user_token=user_sub.user_token, selected_submission_ids=submission_ids)
+    return {"success": True, "error": ""}

competitions/templates/index.html

@@ -133,7 +133,35 @@
                     })
                     .then(data => {
                         const contentDiv = document.getElementById('content');
-                        contentDiv.innerHTML = marked.parse(data.response.submission_text) + marked.parse(data.response.submissions);
+                        // console.log(data.response.submissions);
+                        // contentDiv.innerHTML = marked.parse(data.response.submission_text) + data.response.submissions;
+                        if (data.response.submissions && data.response.submissions.length > 0) {
+                            // Start building the table HTML
+                            let tableHTML = '<table border="1"><tr><th>Datetime</th><th>Submission ID</th><th>Public Score</th><th>Submission Comment</th><th>Selected</th><th>Status</th></tr>';
+
+                            // Iterate over each submission and add it to the table
+                            data.response.submissions.forEach(submission => {
+                                tableHTML += `<tr>
+                                    <td>${submission.datetime}</td>
+                                    <td>${submission.submission_id}</td>
+                                    <td>${submission.public_score}</td>
+                                    <td>${submission.submission_comment}</td>
+                                    <td><input type="checkbox" name="selectedSubmissions" value="${submission.submission_id}" ${submission.selected ? 'checked' : ''}></td>
+                                    <td>${submission.status}</td>
+                                  </tr>`;
+                            });
+
+                            // Close the table HTML and set it as the content
+                            tableHTML += '</table>';
+                            tableHTML += '<button id="updateSelectedSubmissionsButton" type="button" class="confirm text-white bg-green-600 hover:bg-green-800 focus:ring-4 focus:outline-none focus:ring-green-300 font-medium rounded-lg text-sm inline-flex items-center px-5 py-2.5 text-center me-2">Update Selected Submissions</button>';
+                            contentDiv.innerHTML = marked.parse(data.response.submission_text) + tableHTML;
+                            document.getElementById('updateSelectedSubmissionsButton').addEventListener('click', function () {
+                                updateSelectedSubmissions(userToken);
+                            });
+                        } else {
+                            // Display message if there are no submissions
+                            contentDiv.innerHTML = marked.parse(data.response.submission_text) + 'You have not made any submissions yet.';
+                        }
                         articleLoadingSpinner.classList.add('hidden');
                     })
                     .catch(error => {
@@ -389,7 +417,7 @@
                         (optional)
                     </label>
                     <textarea id="submission_comment" name="submission_comment" rows="5"
-                        class="p-2.5 w-full text-sm text-gray-900" placeholder=""></textarea>
+                        class="p-2.5 w-full text-sm text-gray-900" placeholder=" "></textarea>
                 </div>
                 <div class="form-actions mt-6">
                     <button data-modal-hide="submission-modal" type="button"
@@ -461,4 +489,53 @@
     });
 </script>
 
+<script>
+    function updateSelectedSubmissions(userToken) {
+        const selectedSubmissions = document.querySelectorAll('input[name="selectedSubmissions"]:checked');
+        const articleLoadingSpinner = document.getElementById('articleLoadingSpinner');
+        articleLoadingSpinner.classList.remove('hidden');
+        let selectedSubmissionIds = [];
+        selectedSubmissions.forEach((submission) => {
+            selectedSubmissionIds.push(submission.value);
+        });
+
+        const updateEndpoint = '/update_selected_submissions';
+        const requestOptions = {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                "user_token": userToken,
+                "submission_ids": selectedSubmissionIds.join(',')
+            })
+        };
+
+        fetch(updateEndpoint, requestOptions)
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('Network response was not ok');
+                }
+                return response.json();
+            })
+            .then(data => {
+                if (data.success) {
+                    // Optionally, display a success message or handle accordingly
+                    console.log('Update successful');
+                    articleLoadingSpinner.classList.add('hidden');
+                } else {
+                    // Handle failure case
+                    console.log('Update failed');
+                    articleLoadingSpinner.classList.add('hidden');
+                    alert(data.error);
+                }
+                // Refresh submissions display
+                fetchAndDisplaySubmissions();
+            })
+            .catch(error => {
+                console.error('There was a problem with the fetch operation for updating:', error);
+            });
+    }
+</script>
+
 </html>