From dad4ff170c8fa29cd14e596118d65106da32c3c1 Mon Sep 17 00:00:00 2001 From: BoYanZh Date: Wed, 18 Jun 2025 09:05:47 -0400 Subject: [PATCH] chore: rename valid time args --- joint_teapot/app.py | 8 ++++---- joint_teapot/teapot.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/joint_teapot/app.py b/joint_teapot/app.py index ed8e83c..c2934b6 100644 --- a/joint_teapot/app.py +++ b/joint_teapot/app.py @@ -450,8 +450,8 @@ def joj3_check_env( "Example: --group-config joj=10:24,run=20:48" ), ), - valid_after: Optional[datetime] = Option(None), - valid_before: Optional[datetime] = Option(None), + begin_time: Optional[datetime] = Option(None), + end_time: Optional[datetime] = Option(None), ) -> None: app.pretty_exceptions_enable = False set_settings(Settings(_env_file=env_path)) @@ -465,8 +465,8 @@ def joj3_check_env( logger.error("missing required env var") raise Exit(code=1) time_msg, time_failed = tea.pot.joj3_check_submission_time( - valid_after, - valid_before, + begin_time, + end_time, ) count_msg, count_failed = tea.pot.joj3_check_submission_count( env, grading_repo_name, group_config, scoreboard_filename diff --git a/joint_teapot/teapot.py b/joint_teapot/teapot.py index 6ac888e..35db0b1 100644 --- a/joint_teapot/teapot.py +++ b/joint_teapot/teapot.py @@ -284,21 +284,21 @@ class Teapot: def joj3_check_submission_time( self, - valid_after: Optional[datetime] = None, - valid_before: Optional[datetime] = None, + begin_time: Optional[datetime] = None, + end_time: Optional[datetime] = None, ) -> Tuple[str, bool]: 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 ( "### Submission Time Check Failed:\n" f"Current time {now} is not in the valid range " - f"[{valid_after}, {valid_before}].\n", + f"[{begin_time}, {end_time}].\n", True, ) return ( "### Submission Time Check Passed:\n" f"Current time {now} is in the valid range " - f"[{valid_after}, {valid_before}].\n", + f"[{begin_time}, {end_time}].\n", False, )