Fix returns and file names

src/submission_uploader.py

@@ -1,10 +1,8 @@
 import json
-import logging
 import os
 from typing import List, Optional
 
-from huggingface_hub import (CommitInfo, CommitOperationAdd, Discussion, HfApi,
-                             HfFileSystem)
+from huggingface_hub import CommitOperationAdd, Discussion, HfApi, HfFileSystem
 
 from .tasks import TASKS_PRETTY_REVERSE
 
@@ -56,7 +54,7 @@ class SubmissionUploader:
         # add predictions files
         commit_operations = [
             CommitOperationAdd(
-                path_in_repo=f"{task_id}/{model_folder}/predictions/{filename}",
+                path_in_repo=f"{task_id}/{model_folder}/predictions/{os.path.basename(filename)}",
                 path_or_fileobj=filename,
             )
             for filename in filenames
@@ -92,58 +90,58 @@ class SubmissionUploader:
         submitted_by: str,
         filenames: Optional[List[str]],
         force: bool = False,
-    ) -> Optional[CommitInfo]:
-        pr_title = f"🚀 New submission to {task_pretty} task: {model_name_pretty} with {context_size} context size from {submitted_by}"
-
-        task_id = TASKS_PRETTY_REVERSE[task_pretty]
-
-        if not force:
-            if model_name_pretty in self._fs.ls(
-                f"datasets/{self._dataset_id}/{task_id}/predictions"
-            ) and all(
-                filename
-                in self._fs.ls(
-                    f"datasets/{self._dataset_id}/{task_id}/predictions/{model_name_pretty}"
-                )
-                for filename in filenames + ["metadata.json"]
-            ):
-                raise AlreadyExists(
-                    f"{model_name_pretty} is already present in {self._dataset_id}."
-                )
-
-            prev_pr = self._get_previous_pr(pr_title)
-            if prev_pr is not None:
-                url = f"https://huggingface.co/datasets/{self._dataset_id}/discussions/{prev_pr.num}"
-                raise AlreadyExists(
-                    f"{self._dataset_id} already has an open PR for this submission: {url}."
-                )
-
-        commit_operations = self._upload_files(
-            task_id=task_id,
-            model_folder=model_folder,
-            model_name_pretty=model_name_pretty,
-            model_availability=model_availability,
-            urls=urls,
-            context_size=context_size,
-            submitted_by=submitted_by,
-            filenames=filenames,
-        )
+    ) -> str:
+        try:
+            pr_title = f"🚀 New submission to {task_pretty} task: {model_name_pretty} with {context_size} context size from {submitted_by}"
+
+            task_id = TASKS_PRETTY_REVERSE[task_pretty]
+
+            if not force:
+                if model_name_pretty in self._fs.ls(
+                    f"datasets/{self._dataset_id}/{task_id}/predictions"
+                ) and all(
+                    filename
+                    in self._fs.ls(
+                        f"datasets/{self._dataset_id}/{task_id}/predictions/{model_name_pretty}"
+                    )
+                    for filename in filenames + ["metadata.json"]
+                ):
+                    return (
+                        f"{model_name_pretty} is already present in {self._dataset_id}."
+                    )
+
+                prev_pr = self._get_previous_pr(pr_title)
+                if prev_pr is not None:
+                    url = f"https://huggingface.co/datasets/{self._dataset_id}/discussions/{prev_pr.num}"
+                    return f"{self._dataset_id} already has an open PR for this submission: {url}."
+
+            commit_operations = self._upload_files(
+                task_id=task_id,
+                model_folder=model_folder,
+                model_name_pretty=model_name_pretty,
+                model_availability=model_availability,
+                urls=urls,
+                context_size=context_size,
+                submitted_by=submitted_by,
+                filenames=filenames,
+            )
 
-        new_pr = self._api.create_commit(
-            repo_id=self._dataset_id,
-            operations=commit_operations,
-            commit_message=pr_title,
-            commit_description=f"""New submission to {task_pretty} task in 🏟️Long Code Arena benchmark!
-                
-                * Model name: {model_name_pretty}
-                * Model availability: {model_availability}
-                * Context Size: {context_size}
-                * Relevant URLs: {urls}
-                * Submitted By: {submitted_by}
-                """,
-            create_pr=True,
-            repo_type="dataset",
-        )
-        logging.info(f"PR created at {new_pr.pr_url}")
+            new_pr = self._api.create_commit(
+                repo_id=self._dataset_id,
+                operations=commit_operations,
+                commit_message=pr_title,
+                commit_description=f"""New submission to {task_pretty} task in 🏟️ Long Code Arena benchmark!
+                    
+                    * Model name: {model_name_pretty}
+                    * Model availability: {model_availability}
+                    * Context Size: {context_size}
+                    * Relevant URLs: {urls}
+                    * Submitted By: {submitted_by}
+                    """,
+                create_pr=True,
+                repo_type="dataset",
+            )
+            return f"🎉 PR created at {new_pr.pr_url}."
 
-        return new_pr
+        except Exception:
+            return "An exception occured."