add submission addition function

competitions/app.py

@@ -30,7 +30,6 @@ from competitions.text import SUBMISSION_SELECTION_TEXT, SUBMISSION_TEXT
 from competitions.utils import team_file_api, submission_api, leaderboard_api, error_log_api
 from competitions.enums import SubmissionStatus, ErrorMessage
 
-
 HF_TOKEN = os.environ.get("HF_TOKEN", None)
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 COMPETITION_ID = os.environ.get("COMPETITION_ID")
@@ -333,15 +332,21 @@ def new_submission(
     if team_id not in team_file_api.get_team_white_list():
         return {"response": "You are not allowed to make submissions."}
 
+    team_submission_limit_dict = team_file_api.get_team_submission_limit(user_token)
+
     lock = FileLock(f"./submission_lock/{team_id}.lock", blocking=False)
     try:
         with lock:
             if submission_api.exists_submission_info(team_id) and submission_api.count_by_status(team_id, [SubmissionStatus.QUEUED, SubmissionStatus.PENDING, SubmissionStatus.PROCESSING]) > 0:
                 return {"response": "Another submission is being processed. Please wait a moment."}
             competition_info = CompetitionInfo(competition_id=COMPETITION_ID, autotrain_token=HF_TOKEN)
+            if team_id in team_submission_limit_dict.keys():
+                submission_limit = team_submission_limit_dict[team_id]
+            else:
+                submission_limit = competition_info.submission_limit
             sub = Submissions(
                 end_date=competition_info.end_date,
-                submission_limit=competition_info.submission_limit,
+                submission_limit=submission_limit,
                 competition_id=COMPETITION_ID,
                 token=HF_TOKEN,
                 competition_type=competition_info.competition_type,

competitions/utils.py

@@ -28,7 +28,6 @@ from competitions.params import EvalParams
 
 from . import HF_URL
 
-
 USER_TOKEN = os.environ.get("USER_TOKEN")
 
 
@@ -269,6 +268,7 @@ class TeamAlreadyExistsError(Exception):
     """Custom exception for when a team already exists."""
     pass
 
+
 class TeamFileApi:
     def __init__(self, hf_token: str, competition_id: str):
         self.hf_token = hf_token
@@ -358,7 +358,7 @@ class TeamFileApi:
                 repo_type="dataset",
             )
         return team_id
-    
+
     def create_team(self, user_token: str, team_name: str, other_data: Dict[str, Any]) -> str:
         user_info = token_information(token=user_token)
         return self._create_team(user_info["id"], team_name, other_data)
@@ -394,7 +394,7 @@ class TeamFileApi:
                 repo_type="dataset",
             )
         return new_team_name
-    
+
     @cached(cache=TTLCache(maxsize=1, ttl=600))
     def get_team_white_list(self) -> List[str]:
         file = hf_hub_download(
@@ -408,6 +408,19 @@ class TeamFileApi:
             team_white_list = json.load(f)
         return team_white_list
 
+    @cached(cache=TTLCache(maxsize=1, ttl=600))
+    def get_team_submission_limit(self) -> Dict[str, str]:
+        file = hf_hub_download(
+            repo_id=self.competition_id,
+            filename="team_submission_limit.json",
+            token=self.hf_token,
+            repo_type="dataset",
+        )
+
+        with open(file, "r", encoding="utf-8") as f:
+            team_submission_limit = json.load(f)
+        return team_submission_limit
+
 
 team_file_api = TeamFileApi(
     os.environ.get("HF_TOKEN", None),
@@ -420,7 +433,7 @@ class UserTokenApi:
         self.hf_token = hf_token
         self.key = base64.b64decode(key_base64)
         self.competition_id = competition_id
-    
+
     def _encrypt(self, text: str) -> str:
         aesgcm = AESGCM(self.key)
         nonce = os.urandom(12)
@@ -434,7 +447,7 @@ class UserTokenApi:
         ciphertext = data[12:]
         plaintext = aesgcm.decrypt(nonce, ciphertext, None)
         return plaintext.decode()
-    
+
     def put(self, team_id: str, user_token: str):
         encrypted_token = self._encrypt(user_token)
         api = HfApi(token=self.hf_token)
@@ -475,13 +488,13 @@ class ServerManager:
         self.server_url_list = server_url_list
         self._cur_index = 0
         self._lock = threading.Lock()
-    
+
     def get_next_server(self) -> str:
         with self._lock:
             server_url = self.server_url_list[self._cur_index]
             self._cur_index = (self._cur_index + 1) % len(self.server_url_list)
         return server_url
-    
+
 
 server_manager = ServerManager(["https://xdimlab-hugsim-web-server-0.hf.space"])
 
@@ -491,7 +504,7 @@ class SubmissionApi:
         self.hf_token = hf_token
         self.competition_id = competition_id
         self.api = HfApi(token=hf_token)
-    
+
     def exists_submission_info(self, team_id: str) -> bool:
         """
         Check if submission info exists for a given team ID.
@@ -521,7 +534,7 @@ class SubmissionApi:
         )
         with open(submission_info_path, 'r') as f:
             submission_info = json.load(f)
-        
+
         return submission_info
 
     def upload_submission_info(self, team_id: str, user_submission_info: Dict[str, Any]):
@@ -545,10 +558,11 @@ class SubmissionApi:
 
     def update_submission_status(self, team_id: str, submission_id: str, status: int):
         self.update_submission_data(team_id, submission_id, {"status": status})
-    
+
     def count_by_status(self, team_id: str, status_list: List[SubmissionStatus]) -> int:
         user_submission_info = self.download_submission_info(team_id)
-        count = sum(1 for submission in user_submission_info["submissions"] if SubmissionStatus(submission["status"]) in status_list)
+        count = sum(1 for submission in user_submission_info["submissions"] if
+                    SubmissionStatus(submission["status"]) in status_list)
         return count
 
 
@@ -600,7 +614,7 @@ class ErrorLogApi:
         }
         token = jwt.encode(payload, self.encode_key, algorithm="HS256")
         return token
-    
+
     def get_log_by_token(self, token: str) -> str:
         try:
             payload = jwt.decode(token, self.encode_key, algorithms=["HS256"])
@@ -617,7 +631,7 @@ class ErrorLogApi:
         )
         with open(log_file_path, 'r') as f:
             file_content = f.read()
-        
+
         return file_content
 
 
@@ -669,12 +683,13 @@ class SpaceCleaner:
                 submission_api.update_submission_data(
                     team_id=team_id,
                     submission_id=submission_id,
-                    data={"status": SubmissionStatus.FAILED.value, "error_message": ErrorMessage.BUILD_SPACE_FAILED.value},
+                    data={"status": SubmissionStatus.FAILED.value,
+                          "error_message": ErrorMessage.BUILD_SPACE_FAILED.value},
                 )
             else:
                 self.api.restart_space(repo_id=space_id)
             return
-        
+
         if space_info.runtime.stage == SpaceStage.RUNTIME_ERROR:
             log_content = error_log_api.get_log(space_id, kind="run")
             error_log_api.save_error_log(submission_id, log_content)
@@ -757,7 +772,6 @@ leaderboard_api = LeaderboardApi(
 )
 
 
-
 class DockerfileModifier:
     def __init__(self, allowed_hosts: str, source_so_path: str = "./network_filter.so"):
         self.allowed_hosts = allowed_hosts
@@ -765,46 +779,46 @@ class DockerfileModifier:
         self.tatget_so_dir = "/_app_extensions"
         self.tatget_so_path = os.path.join(self.tatget_so_dir, "network_filter.so")
         self.preload_prefix = f'LD_PRELOAD={self.tatget_so_path} ALLOWED_HOSTS="{allowed_hosts}"'
-        
+
     def parse_dockerfile_line(self, line: str) -> Tuple[str, str, str]:
         """
         解析 Dockerfile 行，返回 (指令名, 原始命令, 格式类型)
         格式类型: 'exec' (JSON数组) 或 'shell' (shell命令)
         """
         line = line.strip()
-        
+
         # 匹配 CMD 或 ENTRYPOINT
         cmd_match = re.match(r'^(CMD|ENTRYPOINT)\s+(.+)$', line, re.IGNORECASE)
         if not cmd_match:
             return "", "", ""
-            
+
         instruction = cmd_match.group(1).upper()
         command_part = cmd_match.group(2).strip()
-        
+
         # 判断是 exec 格式 (JSON数组) 还是 shell 格式
         if command_part.startswith('[') and command_part.endswith(']'):
             return instruction, command_part, "exec"
         else:
             return instruction, command_part, "shell"
-    
+
     def modify_shell_format(self, command: str) -> str:
         """修改 shell 格式的命令"""
         # 在原命令前添加环境变量
         return f'{self.preload_prefix} {command}'
-    
+
     def modify_exec_format(self, command: str) -> str:
         """修改 exec 格式 (JSON数组) 的命令"""
         try:
             # 解析 JSON 数组格式
             # 移除外层的方括号
             inner = command[1:-1].strip()
-            
+
             # 简单的 JSON 数组解析
             parts = []
             current = ""
             in_quotes = False
             escape_next = False
-            
+
             for char in inner:
                 if escape_next:
                     current += char
@@ -820,10 +834,10 @@ class DockerfileModifier:
                     current = ""
                 else:
                     current += char
-            
+
             if current.strip():
                 parts.append(current.strip())
-            
+
             # 移除引号并处理转义
             cleaned_parts = []
             for part in parts:
@@ -833,10 +847,10 @@ class DockerfileModifier:
                 # 处理基本的转义字符
                 part = part.replace('\\"', '"').replace('\\\\', '\\')
                 cleaned_parts.append(part)
-            
+
             if not cleaned_parts:
                 return command
-            
+
             # 构建新的命令
             # 第一个元素通常是 shell (/bin/sh, /bin/bash 等)
             # 如果第一个元素是 shell，修改执行的命令
@@ -855,22 +869,22 @@ class DockerfileModifier:
                 # 直接执行的命令，需要通过 shell 包装
                 original_cmd = ' '.join(cleaned_parts)
                 new_parts = ['/bin/sh', '-c', f'{self.preload_prefix} {original_cmd}']
-            
+
             # 重新构建 JSON 数组
             escaped_parts = []
             for part in new_parts:
                 # 转义引号和反斜杠
                 escaped = part.replace('\\', '\\\\').replace('"', '\\"')
                 escaped_parts.append(f'"{escaped}"')
-            
+
             return '[' + ', '.join(escaped_parts) + ']'
-            
+
         except Exception as e:
             print(f"警告: 解析 exec 格式失败: {e}")
             print(f"原始命令: {command}")
             # 如果解析失败，转换为 shell 格式
             return f'{self.preload_prefix} {command}'
-    
+
     def modify_dockerfile_content(self, content: str) -> Tuple[str, List[str]]:
         """
         修改 Dockerfile 内容
@@ -879,10 +893,10 @@ class DockerfileModifier:
         lines = content.splitlines()
         modified_lines = []
         changes = []
-        
+
         for i, line in enumerate(lines, 1):
             instruction, command, format_type = self.parse_dockerfile_line(line)
-            
+
             if instruction in ['CMD', 'ENTRYPOINT'] and command:
                 if format_type == "shell":
                     new_command = self.modify_shell_format(command)
@@ -892,7 +906,7 @@ class DockerfileModifier:
                     new_line = f'{instruction} {new_command}'
                 else:
                     new_line = line
-                
+
                 changes.append(f"第 {i} 行: {instruction} 指令已修改")
                 changes.append(f"  原始: {line}")
                 changes.append(f"  修改: {new_line}")
@@ -908,7 +922,8 @@ class DockerfileModifier:
         if last_user is None:
             modified_lines.insert(-1, f"COPY {self.source_so_path}" + f" {self.tatget_so_path}")
         else:
-            modified_lines.insert(-1, f"COPY --chown={last_user}:{last_user} {self.source_so_path} {self.tatget_so_path}")
+            modified_lines.insert(-1,
+                                  f"COPY --chown={last_user}:{last_user} {self.source_so_path} {self.tatget_so_path}")
             modified_lines.insert(-1, f"RUN chown -R {last_user}:{last_user} {self.tatget_so_dir}")
 
         return '\n'.join(modified_lines), changes