ygrader 2.6.7__tar.gz → 2.6.10__tar.gz

{ygrader-2.6.7/ygrader.egg-info → ygrader-2.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygrader
-Version: 2.6.7
+Version: 2.6.10
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders

{ygrader-2.6.7 → ygrader-2.6.10}/setup.py

@@ -4,7 +4,7 @@ setup(
     name="ygrader",
     packages=["ygrader"],
     package_data={"ygrader": ["*.ahk"]},
-    version="2.6.7",
+    version="2.6.10",
     description="Grading scripts used in BYU's Electrical and Computer Engineering Department",
     author="Jeff Goeders",
     author_email="jeff.goeders@gmail.com",

{ygrader-2.6.7 → ygrader-2.6.10}/test/test_unittest.py

@@ -50,6 +50,7 @@ class TestGithub(unittest.TestCase):
         grader.set_submission_system_github(
             "main", TEST_RESOURCES_PATH / "github.csv", use_https=True
         )
+        grader.set_other_options(show_completion_menu=False)
         grader.run()
 
         self.assertTrue(filecmp.cmp(deductions1_yaml_path, deductions1_golden_path))
@@ -83,6 +84,7 @@ class TestLearningSuite(unittest.TestCase):
         grader.set_submission_system_learning_suite(
             TEST_RESOURCES_PATH / "submissions.zip"
         )
+        grader.set_other_options(show_completion_menu=False)
         grader.run()
 
         self.assertTrue(filecmp.cmp(deductions_path, deductions_golden_path))
@@ -127,6 +129,7 @@ class TestLearningSuite(unittest.TestCase):
             TEST_RESOURCES_PATH / "submissions2.zip"
         )
         grader.set_learning_suite_groups(TEST_RESOURCES_PATH / "groups3.csv")
+        grader.set_other_options(show_completion_menu=False)
         grader.run()
 
         self.assertTrue(filecmp.cmp(deductions1_path, deductions1_golden_path))

{ygrader-2.6.7 → ygrader-2.6.10}/ygrader/grader.py

@@ -21,7 +21,7 @@ import pandas
 
 from . import grades_csv, student_repos, utils
 from .grading_item import GradeItem
-from .score_input import show_completion_menu
+from .score_input import display_completion_menu
 from .utils import (
     CallbackFailed,
     TermColors,
@@ -100,7 +100,7 @@ class Grader:
         self.code_source = None
         self.prep_fcn = None
         self.last_graded_net_ids = None  # Track last fully graded student for undo
-        self.interactive_grading_occurred = False  # Track if any user interaction happened
+        self.show_completion_menu = True  # Show menu when grading completes
         self.learning_suite_submissions_zip_path = None
         self.github_csv_path = None
         self.github_csv_col_name = None
@@ -345,6 +345,7 @@ class Grader:
         dry_run_all=False,
         workflow_hash=None,
         parallel_workers=None,
+        show_completion_menu=True,
     ):
         """
         This can be used to set other options for the grader.
@@ -390,6 +391,9 @@ class Grader:
             If set to an integer, process students in parallel using that many workers.
             Only works with build_only mode since interactive grading cannot be parallelized.
             Default is None (sequential processing).
+        show_completion_menu: bool
+            Whether to show the completion menu when all students are graded.
+            Default is True.
         """
         self.format_code = format_code
         self.build_only = build_only
@@ -419,6 +423,8 @@ class Grader:
         if parallel_workers is not None and not build_only:
             error("parallel_workers is only supported when build_only=True")
 
+        self.show_completion_menu = show_completion_menu
+
     def _validate_config(self):
         """Check that everything has been configured before running"""
         # Check that callback function has been set up
@@ -498,17 +504,16 @@ class Grader:
             self._run_grading_sequential(student_grades_df, grouped_df)
 
     def _run_grading_sequential(self, student_grades_df, grouped_df):
-        # Sort by last name for consistent grading order
-        # After groupby().agg(list), "Last Name" is a list, so we sort by the first element
+        # Sort by first name for consistent grading order (matches display name sorting in [g] menu)
+        # After groupby().agg(list), "First Name" is a list, so we sort by the first element
         sorted_df = grouped_df.sort_values(
-            by="Last Name", key=lambda x: x.apply(lambda names: names[0].lower())
+            by="First Name", key=lambda x: x.apply(lambda names: names[0].lower())
         )
 
         # Convert to list for index-based iteration (needed for going back)
         rows_list = list(sorted_df.iterrows())
         idx = 0
         prev_idx = None  # Track previous student index for undo
-        any_student_needed_grading = False  # Track if any student needed grading
 
         # Loop through all of the students/groups and perform grading
         while idx < len(rows_list):
@@ -528,8 +533,6 @@ class Grader:
                 idx += 1
                 continue
 
-            any_student_needed_grading = True
-
             # Print name(s) of who we are grading
             student_work_path = self.work_path / utils.names_to_dir(
                 first_names, last_names, net_ids
@@ -617,17 +620,16 @@ class Grader:
             prev_idx = idx
             idx += 1
 
-        # Show completion menu when all students are done (unless in special modes)
-        # Show if interactive grading occurred OR if no students needed grading (all already graded)
+        # Show completion menu when all students are done (unless disabled or in special modes)
         if (
-            not self.build_only
+            self.show_completion_menu
+            and not self.build_only
             and not self.dry_run_first
             and not self.dry_run_all
-            and (self.interactive_grading_occurred or not any_student_needed_grading)
         ):
             # Get names_by_netid from first item for display purposes
             names_by_netid = self.items[0].names_by_netid if self.items else None
-            show_completion_menu(self.items, names_by_netid)
+            display_completion_menu(self.items, names_by_netid)
 
     def _process_single_student_build(self, row):
         """Process a single student for parallel build mode. Returns (net_ids, success, message, log_path)."""

{ygrader-2.6.7 → ygrader-2.6.10}/ygrader/grading_item.py

@@ -260,7 +260,6 @@ class GradeItem:
 
             # callback_result is None - interactive mode
             # Prompt with deductions mode - handles everything internally
-            self.grader.interactive_grading_occurred = True
             try:
                 score = get_score(
                     concated_names,

{ygrader-2.6.7 → ygrader-2.6.10}/ygrader/score_input.py

@@ -40,7 +40,7 @@ def _print_menu_item(cmd, description, indent="    ", pad=10):
     )
 
 
-def show_completion_menu(items, names_by_netid=None):
+def display_completion_menu(items, names_by_netid=None):
     """Show a menu when all students have been graded.
 
     Allows the user to manage grades, edit deduction types, etc.
@@ -191,8 +191,8 @@ def get_score(
         )
         print(fpad2 + "Current deductions:")
         if current_deductions:
-            for d in current_deductions:
-                print(fpad2 + f"  -{d.points}: {d.message}")
+            for deduction in current_deductions:
+                print(fpad2 + f"  -{deduction.points}: {deduction.message}")
         else:
             print(fpad2 + "  (None)")
         print("")
@@ -328,8 +328,8 @@ def get_score(
                     # Fallback for single item - wrap in list
                     # Create a minimal item-like object for backwards compatibility
                     class _SingleItemWrapper:
-                        def __init__(self, sd):
-                            self.student_deductions = sd
+                        def __init__(self, student_deductions_arg):
+                            self.student_deductions = student_deductions_arg
 
                     _manage_grades_interactive(
                         [_SingleItemWrapper(student_deductions)], names_by_netid

{ygrader-2.6.7 → ygrader-2.6.10/ygrader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygrader
-Version: 2.6.7
+Version: 2.6.10
 Summary: Grading scripts used in BYU's Electrical and Computer Engineering Department
 Home-page: https://github.com/byu-cpe/ygrader
 Author: Jeff Goeders