New format of model data: renamed "metadata" to "submission_metadata"

server.py

@@ -227,7 +227,7 @@ class LeaderboardServer:
                 submission_id: {
                     category: self._dataframe_to_csv(
                         self._get_model_tournament_table(submission_id, category, to_csv=True),
-                        f"Tournament table - {self.submission_id_to_data[submission_id]['metadata']['model_name'][:self.MAX_LENGTH_OF_MODEL_TITLE].replace('/', '_')} - {category}.csv",
+                        f"Tournament table - {self.submission_id_to_data[submission_id]['submission_metadata']['model_name'][:self.MAX_LENGTH_OF_MODEL_TITLE].replace('/', '_')} - {category}.csv",
                     )
                     for category in sorted(self.TASKS_CATEGORIES)
                 }
@@ -285,7 +285,7 @@ class LeaderboardServer:
         with self.results_dataset_local_snapshot_lock.ro:
             for submission_file in glob.glob(os.path.join(self.results_dataset_local_snapshot, "data") + "/*.json"):
                 data = json.load(open(submission_file))
-                metadata = data.get('metadata')
+                metadata = data.get("submission_metadata")
                 if metadata is None:
                     continue
                 submission_id = metadata["submission_id"]
@@ -293,7 +293,7 @@ class LeaderboardServer:
                 submission_ids.add(submission_id)
                 submission_id_to_file[submission_id] = submission_file
                 submission_id_to_model_title[submission_id] = metadata["team_name"] + "/" + metadata["model_name"]
-                submission_id_to_data[submission_id] = {"results": data["results"], "metadata": metadata}
+                submission_id_to_data[submission_id] = {"results": data["results"], "submission_metadata": metadata}
         
         with self.var_lock.rw:
             self.submission_ids = submission_ids
@@ -406,14 +406,14 @@ class LeaderboardServer:
                             match_task_result_details = "\n".join(f"{k}: {v}" for k, v in match_task_result_details.items())
                             match_results[task] = f'<abbr title={xmlQuoteAttr(match_task_result_details)}>{match_task_result_significant}</abbr>'
                 
-                model_link = data["metadata"]["link_to_model"]
-                model_title = data["metadata"]["team_name"] + "/" + data["metadata"]["model_name"]
+                model_link = data["submission_metadata"]["link_to_model"]
+                model_title = data["submission_metadata"]["team_name"] + "/" + data["submission_metadata"]["model_name"]
                 if to_csv:
                     match_results["model"] = model_title
                     match_results["link_to_model"] = model_link
                 else:
-                    model_title_abbr_team_name = self.abbreviate(data["metadata"]["team_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
-                    model_title_abbr_model_name = self.abbreviate(data["metadata"]["model_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
+                    model_title_abbr_team_name = self.abbreviate(data["submission_metadata"]["team_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
+                    model_title_abbr_model_name = self.abbreviate(data["submission_metadata"]["model_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
                     model_title_abbr_html = f'<div style="font-size: 10px;">{xmlAndMarkdownEscape(model_title_abbr_team_name)}</div>{xmlAndMarkdownEscape(model_title_abbr_model_name)}'
                     match_results["model"] = f'<a href={xmlQuoteAttr(model_link)} title={xmlQuoteAttr(model_title)}>{model_title_abbr_html}</a>'
                 
@@ -492,7 +492,7 @@ class LeaderboardServer:
                     else:
                         data = self.submission_id_to_data[submission_id]
                     
-                    if submission_id != data["metadata"]["submission_id"]:
+                    if submission_id != data["submission_metadata"]["submission_id"]:
                         raise gr.Error(f"Proper submission [{submission_id}] not found")
 
                     local_results = {}
@@ -534,22 +534,22 @@ class LeaderboardServer:
                     else:
                         local_results["average_score"] = win_score[category]
                     
-                    model_link = data["metadata"]["link_to_model"]
-                    model_title = data["metadata"]["team_name"] + "/" + data["metadata"]["model_name"]
+                    model_link = data["submission_metadata"]["link_to_model"]
+                    model_title = data["submission_metadata"]["team_name"] + "/" + data["submission_metadata"]["model_name"]
                     if to_csv:
                         local_results["model"] = model_title
                         local_results["link_to_model"] = model_link
                     else:
-                        model_title_abbr_team_name = self.abbreviate(data["metadata"]["team_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
-                        model_title_abbr_model_name = self.abbreviate(data["metadata"]["model_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
+                        model_title_abbr_team_name = self.abbreviate(data["submission_metadata"]["team_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
+                        model_title_abbr_model_name = self.abbreviate(data["submission_metadata"]["model_name"], self.MAX_LENGTH_OF_MODEL_TITLE)
                         model_title_abbr_html = f'<div style="font-size: 10px;">{xmlAndMarkdownEscape(model_title_abbr_team_name)}</div>{xmlAndMarkdownEscape(model_title_abbr_model_name)}'
                         local_results["model"] = f'<a href={xmlQuoteAttr(model_link)} title={xmlQuoteAttr(model_title)}>{model_title_abbr_html}</a>'
                     
-                    release = data["metadata"].get("submission_timestamp")
+                    release = data["submission_metadata"].get("submission_timestamp")
                     release = time.strftime("%Y-%m-%d", time.gmtime(release)) if release else "N/A"
                     local_results["release"] = release
-                    local_results["model_type"] = data["metadata"]["model_type"]
-                    local_results["parameters"] = data["metadata"]["parameters"]
+                    local_results["model_type"] = data["submission_metadata"]["model_type"]
+                    local_results["parameters"] = data["submission_metadata"]["parameters"]
                     
                     if pre_submit and submission_id == pre_submit.submission_id:
                         processed_results.insert(0, local_results)
@@ -688,7 +688,7 @@ class LeaderboardServer:
         with open(file, "r") as f:
             data = json.load(f)
         
-        data["metadata"] = metadata
+        data["submission_metadata"] = metadata
         
         metadata["model_predictions_sha256"] = self.get_sha256_hexdigest(data["predictions"])
         metadata["model_results_sha256"] = self.get_sha256_hexdigest(data["results"])
@@ -755,4 +755,4 @@ class LeaderboardServer:
                 raise gr.Error(f"Submission [{submission_id}] not found")
             else:
                 data = self.submission_id_to_data[submission_id]
-                return data["metadata"]
+                return data["submission_metadata"]