Refactoring

server.py

@@ -3,6 +3,7 @@ import glob
 import json
 import os
 import hashlib
+from collections import namedtuple
 
 import gradio as gr
 import pandas as pd
@@ -68,17 +69,17 @@ class LeaderboardServer:
             self.submission_id_to_file[submission_id] = submission_file
 
     def get_leaderboard(self, tournament_results=None):
-        results = tournament_results if tournament_results else self.tournament_results
+        tournament_results = tournament_results if tournament_results else self.tournament_results
 
-        if len(results) == 0:
+        if len(tournament_results) == 0:
             return pd.DataFrame(columns=['No submissions yet'])
         else:
             processed_results = []
-            for submission_id in results.keys():
+            for submission_id in tournament_results.keys():
                 path = self.submission_id_to_file.get(submission_id)
                 if path is None:
-                    if self.pre_submit and submission_id == self.pre_submit[1]:
-                        data = json.load(open(self.pre_submit[2]))
+                    if self.pre_submit and submission_id == self.pre_submit.submission_id:
+                        data = json.load(open(self.pre_submit.file))
                     else:
                         raise gr.Error(f"Internal error: Submission [{submission_id}] not found")
                 elif path:
@@ -91,10 +92,13 @@ class LeaderboardServer:
 
                 local_results = {}
                 for task in self.tasks_metadata.keys():
+                    
+                    # tournament_results
                     local_results[task] = 0
-                    for model in results[submission_id].keys():
-                        if results[submission_id][model][task]:
+                    for competitor_id in tournament_results[submission_id].keys():
+                        if tournament_results[submission_id][competitor_id][task]:
                             local_results[task] += 1
+                    
                     for metric in VISIBLE_METRICS:
                         metric_value = data['results'][task].get(metric)
                         if metric_value is not None:
@@ -102,7 +106,7 @@ class LeaderboardServer:
 
                 local_results["submission_id"] = submission_id
 
-                if self.pre_submit and submission_id == self.pre_submit[1]:
+                if self.pre_submit and submission_id == self.pre_submit.submission_id:
                     processed_results.insert(0, local_results)
                 else:
                     processed_results.append(local_results)
@@ -129,20 +133,20 @@ class LeaderboardServer:
             task: False for task in self.tasks_metadata.keys()
         }
 
-        for submission_id in self.submission_ids:
-            res = check_significance(new_model_file, self.submission_id_to_file[submission_id])
-            res_inverse = check_significance(self.submission_id_to_file[submission_id], new_model_file)
-            new_tournament[new_submission_id][submission_id] = {
+        for competitor_id in self.submission_ids:
+            res = check_significance(new_model_file, self.submission_id_to_file[competitor_id])
+            res_inverse = check_significance(self.submission_id_to_file[competitor_id], new_model_file)
+            new_tournament[new_submission_id][competitor_id] = {
                 task: data["significant"] for task, data in res.items()
             }
-            new_tournament[submission_id][new_submission_id] = {
+            new_tournament[competitor_id][new_submission_id] = {
                 task: data["significant"] for task, data in res_inverse.items()
             }
         return new_tournament
 
     @staticmethod
     def create_submission_id(metadata):
-        # Délka ID můsí být omezena, protože se používá v názvu souboru
+        # Délka ID musí být omezena, protože se používá v názvu souboru
         submission_id = "_".join([metadata[key][:7] for key in (
             "team_name",
             "model_name",
@@ -161,7 +165,9 @@ class LeaderboardServer:
         ).encode()
         result = hashlib.sha256(data).hexdigest()
         return result
-
+    
+    PreSubmit = namedtuple('PreSubmit', 'tournament_results, submission_id, file')
+    
     def prepare_model_for_submission(self, file, metadata) -> None:
         with open(file, "r") as f:
             data = json.load(f)
@@ -179,7 +185,7 @@ class LeaderboardServer:
             json.dump(data, f, separators=(',', ':'))  # compact JSON
         
         tournament_results = self.start_tournament(submission_id, file)
-        self.pre_submit = tournament_results, submission_id, file
+        self.pre_submit = self.PreSubmit(tournament_results, submission_id, file)
 
     def save_pre_submit(self):
         if self.pre_submit: