Do not read big JSON file twice

app.py

@@ -182,13 +182,12 @@ def submit_results(*inputs):
     inputs = dict(zip(SUBMISSION_INPUTS, inputs))
     with open(inputs["submission_file"]) as fp:
         data = json.load(fp)
-    metadata = data["submission_metadata"]
     gr.Info('Checking if the tournament is complete…')
-    leaderboard_server.save_model_submission(inputs["submission_file"], metadata)
+    leaderboard_server.save_model_submission(inputs["submission_file"], data=data)
     gr.Info('Submission successful!')
     
     # erase pre-submit
-    submission_id = metadata["submission_id"]
+    submission_id = data["submission_metadata"]["submission_id"]
     leaderboard_server.pre_submit.pop(submission_id)
     
     with leaderboard_server.var_lock.ro:
@@ -225,8 +224,7 @@ def erase_pre_submit(*inputs):
     inputs = dict(zip(SUBMISSION_INPUTS, inputs))
     with open(inputs["submission_file"]) as fp:
         data = json.load(fp)
-    metadata = data["submission_metadata"]
-    submission_id = metadata["submission_id"]
+    submission_id = data["submission_metadata"]["submission_id"]
     leaderboard_server.pre_submit.pop(submission_id)
     
     return (

server.py

@@ -937,16 +937,17 @@ class LeaderboardServer:
         with open(file, "w") as f:
             json.dump(data, f, separators=(',', ':'))  # compact JSON
         
-        return self._prepare_model_for_submission(file, metadata, do_submit=False)
+        return self._prepare_model_for_submission(file, data=data, do_submit=False)
 
-    def save_model_submission(self, file, metadata) -> PreSubmit:
-        return self._prepare_model_for_submission(file, metadata, do_submit=True)
+    def save_model_submission(self, file, data=None) -> PreSubmit:
+        return self._prepare_model_for_submission(file, data=data, do_submit=True)
 
-    def _prepare_model_for_submission(self, file, metadata, do_submit=False) -> PreSubmit:
+    def _prepare_model_for_submission(self, file, data=None, do_submit=False) -> PreSubmit:
         with open(file, "r") as f:
-            data = json.load(f)
+            if not data:
+                data = json.load(f)
         
-        submission_id = metadata["submission_id"]
+        submission_id = data["submission_metadata"]["submission_id"]
         
         while True:
             submit_lock = self.submit_lock if do_submit else NoneLock()
@@ -973,7 +974,7 @@ class LeaderboardServer:
                         {
                             "results": data["results"],
                             "metadata": data.get("metadata", {}),
-                            "submission_metadata": metadata,
+                            "submission_metadata": data["submission_metadata"],
                         }
                     )
                     self.pre_submit[submission_id] = pre_submit