chore: rename valid time args
All checks were successful
build / trigger-build-image (push) Successful in 14s

This commit is contained in:
张泊明518370910136 2025-06-18 09:05:47 -04:00
parent 011b9c26b0
commit dad4ff170c
GPG Key ID: CA088E6D9284F870
2 changed files with 9 additions and 9 deletions

View File

@ -450,8 +450,8 @@ def joj3_check_env(
"Example: --group-config joj=10:24,run=20:48" "Example: --group-config joj=10:24,run=20:48"
), ),
), ),
valid_after: Optional[datetime] = Option(None), begin_time: Optional[datetime] = Option(None),
valid_before: Optional[datetime] = Option(None), end_time: Optional[datetime] = Option(None),
) -> None: ) -> None:
app.pretty_exceptions_enable = False app.pretty_exceptions_enable = False
set_settings(Settings(_env_file=env_path)) set_settings(Settings(_env_file=env_path))
@ -465,8 +465,8 @@ def joj3_check_env(
logger.error("missing required env var") logger.error("missing required env var")
raise Exit(code=1) raise Exit(code=1)
time_msg, time_failed = tea.pot.joj3_check_submission_time( time_msg, time_failed = tea.pot.joj3_check_submission_time(
valid_after, begin_time,
valid_before, end_time,
) )
count_msg, count_failed = tea.pot.joj3_check_submission_count( count_msg, count_failed = tea.pot.joj3_check_submission_count(
env, grading_repo_name, group_config, scoreboard_filename env, grading_repo_name, group_config, scoreboard_filename

View File

@ -284,21 +284,21 @@ class Teapot:
def joj3_check_submission_time( def joj3_check_submission_time(
self, self,
valid_after: Optional[datetime] = None, begin_time: Optional[datetime] = None,
valid_before: Optional[datetime] = None, end_time: Optional[datetime] = None,
) -> Tuple[str, bool]: ) -> Tuple[str, bool]:
now = datetime.now() now = datetime.now()
if (valid_after and now < valid_after) or (valid_before and now > valid_before): if (begin_time and now < begin_time) or (end_time and now > end_time):
return ( return (
"### Submission Time Check Failed:\n" "### Submission Time Check Failed:\n"
f"Current time {now} is not in the valid range " f"Current time {now} is not in the valid range "
f"[{valid_after}, {valid_before}].\n", f"[{begin_time}, {end_time}].\n",
True, True,
) )
return ( return (
"### Submission Time Check Passed:\n" "### Submission Time Check Passed:\n"
f"Current time {now} is in the valid range " f"Current time {now} is in the valid range "
f"[{valid_after}, {valid_before}].\n", f"[{begin_time}, {end_time}].\n",
False, False,
) )