ygrader 2.3.0__tar.gz → 2.5.0__tar.gz

{ygrader-2.3.0/ygrader.egg-info → ygrader-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ygrader
-Version: 2.3.0
+Version: 2.5.0
 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.3.0 → ygrader-2.5.0}/setup.py

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

{ygrader-2.3.0 → ygrader-2.5.0}/ygrader/feedback.py

@@ -5,55 +5,59 @@ import pathlib
 import zipfile
 from typing import Callable, Dict, Optional, Tuple
 
-import numpy as np
 import pandas
+import yaml
 
 from .deductions import StudentDeductions
 from .grading_item_config import LearningSuiteColumn
 from .utils import warning, print_color, TermColors
 
 
-# Type alias for late penalty callback: (late_days, max_score, actual_score) -> new_score
-LatePenaltyCallback = Callable[[int, float, float], float]
+# Type alias for late penalty callback:
+# (due_datetime, submitted_datetime, max_score, actual_score) -> new_score
+# If submitted_datetime is None, the student submitted on time or no submit time was recorded.
+LatePenaltyCallback = Callable[
+    [datetime.datetime, Optional[datetime.datetime], float, float], float
+]
 
 
-def _calculate_late_days(
-    submit_time_str: Optional[str],
-    due_date: datetime.datetime,
-) -> int:
-    """Calculate the number of business days late from a submit time.
+def _load_due_date_exceptions(
+    exceptions_path: pathlib.Path,
+) -> Dict[str, datetime.datetime]:
+    """Load due date exceptions from YAML file.
 
     Args:
-        submit_time_str: ISO format timestamp string of submission.
-        due_date: The effective due date for the student.
+        exceptions_path: Path to the deadline_exceptions.yaml file.
+            Expected format is: net_id: "YYYY-MM-DD HH:MM:SS"
 
     Returns:
-        Number of business days late (0 if on time or no submit time).
+        Mapping from net_id to exception datetime.
     """
-    if not submit_time_str:
-        return 0
+    if not exceptions_path.exists():
+        return {}
 
-    try:
-        submit_time = datetime.datetime.fromisoformat(submit_time_str)
-    except ValueError:
-        return 0
+    with open(exceptions_path, "r", encoding="utf-8") as f:
+        data = yaml.safe_load(f)
 
-    if submit_time <= due_date:
-        return 0
+    if not data:
+        return {}
 
-    days_late = np.busday_count(due_date.date(), submit_time.date())
-    if days_late == 0:
-        days_late = 1  # Same day but after deadline
-    return int(days_late)
+    exceptions = {}
+    for net_id, exception_date in data.items():
+        if net_id and exception_date:
+            exceptions[net_id] = datetime.datetime.strptime(
+                exception_date, "%Y-%m-%d %H:%M:%S"
+            )
+    return exceptions
 
 
-def _get_student_key_and_max_late_days(
+def _get_student_key_and_submit_info(
     net_id: str,
     item_deductions: Dict[str, StudentDeductions],
     due_date: Optional[datetime.datetime] = None,
     due_date_exceptions: Optional[Dict[str, datetime.datetime]] = None,
-) -> tuple:
-    """Find the student key and maximum late days across all items.
+) -> Tuple[Optional[tuple], Optional[datetime.datetime], Optional[datetime.datetime]]:
+    """Find the student key and submission timing info across all items.
 
     Args:
         net_id: The student's net ID.
@@ -62,10 +66,12 @@ def _get_student_key_and_max_late_days(
         due_date_exceptions: Mapping from net_id to exception due date.
 
     Returns:
-        Tuple of (student_key or None, max_late_days).
+        Tuple of (student_key or None, effective_due_date or None, latest_submit_time or None).
+        latest_submit_time is None if on time or no submit time recorded.
     """
-    max_late_days = 0
     found_student_key = None
+    latest_submit_time: Optional[datetime.datetime] = None
+    effective_due_date: Optional[datetime.datetime] = due_date
 
     if due_date_exceptions is None:
         due_date_exceptions = {}
@@ -92,26 +98,35 @@ def _get_student_key_and_max_late_days(
         if student_key:
             found_student_key = student_key
 
-            # Calculate late days from submit_time if we have a due date
+            # Calculate effective due date (using most generous exception for group)
             if due_date is not None:
-                submit_time_str = deductions_obj.submit_time_by_students.get(
-                    student_key
-                )
-                if submit_time_str:
-                    # Calculate effective due date (using most generous exception for group)
-                    effective_due_date = due_date
-                    for member_net_id in student_key:
-                        if member_net_id in due_date_exceptions:
-                            effective_due_date = max(
-                                effective_due_date, due_date_exceptions[member_net_id]
-                            )
-
-                    days_late = _calculate_late_days(
-                        submit_time_str, effective_due_date
-                    )
-                    max_late_days = max(max_late_days, days_late)
-
-    return found_student_key, max_late_days
+                effective_due_date = due_date
+                for member_net_id in student_key:
+                    if member_net_id in due_date_exceptions:
+                        effective_due_date = max(
+                            effective_due_date, due_date_exceptions[member_net_id]
+                        )
+
+            # Get submit time
+            submit_time_str = deductions_obj.submit_time_by_students.get(student_key)
+            if submit_time_str:
+                try:
+                    submit_time = datetime.datetime.fromisoformat(submit_time_str)
+                    # Track latest submit time across all items
+                    if latest_submit_time is None or submit_time > latest_submit_time:
+                        latest_submit_time = submit_time
+                except ValueError:
+                    pass
+
+    # Return None for submit_time if on time
+    if (
+        latest_submit_time is not None
+        and effective_due_date is not None
+        and latest_submit_time <= effective_due_date
+    ):
+        latest_submit_time = None
+
+    return found_student_key, effective_due_date, latest_submit_time
 
 
 def _calculate_student_score(
@@ -123,7 +138,7 @@ def _calculate_student_score(
     warn_on_missing_callback: bool = True,
     due_date: Optional[datetime.datetime] = None,
     due_date_exceptions: Optional[Dict[str, datetime.datetime]] = None,
-) -> Tuple[float, float, int]:
+) -> Tuple[float, float, Optional[datetime.datetime]]:
     """Calculate a student's final score.
 
     Args:
@@ -131,12 +146,12 @@ def _calculate_student_score(
         ls_column: The LearningSuiteColumn configuration.
         item_deductions: Mapping from item name to StudentDeductions.
         late_penalty_callback: Optional callback for late penalty.
-        warn_on_missing_callback: Whether to warn if late days found but no callback.
+        warn_on_missing_callback: Whether to warn if late but no callback.
         due_date: The default due date for the assignment.
         due_date_exceptions: Mapping from net_id to exception due date.
 
     Returns:
-        Tuple of (final_score, total_possible, max_late_days).
+        Tuple of (final_score, total_possible, submitted_datetime or None if on time).
     """
     total_possible = sum(item.points for item in ls_column.items)
     total_deductions = 0.0
@@ -162,21 +177,26 @@ def _calculate_student_score(
     # Calculate score before late penalty
     score = max(0, total_possible - total_deductions)
 
-    # Get max late days
-    _, max_late_days = _get_student_key_and_max_late_days(
+    # Get submit info
+    _, effective_due_date, submitted_datetime = _get_student_key_and_submit_info(
         net_id, item_deductions, due_date, due_date_exceptions
     )
 
-    # Apply late penalty if applicable
-    if max_late_days > 0:
-        if late_penalty_callback:
-            score = max(0, late_penalty_callback(max_late_days, total_possible, score))
+    # Apply late penalty if applicable (submitted_datetime is None if on time)
+    if submitted_datetime is not None:
+        if late_penalty_callback and effective_due_date is not None:
+            score = max(
+                0,
+                late_penalty_callback(
+                    effective_due_date, submitted_datetime, total_possible, score
+                ),
+            )
         elif warn_on_missing_callback:
             warning(
-                f"Student {net_id} has {max_late_days} late day(s) but no late penalty callback provided"
+                f"Student {net_id} submitted late but no late penalty callback provided"
             )
 
-    return score, total_possible, max_late_days
+    return score, total_possible, submitted_datetime
 
 
 def assemble_grades(
@@ -188,7 +208,7 @@ def assemble_grades(
     output_csv_path: Optional[pathlib.Path] = None,
     late_penalty_callback: Optional[LatePenaltyCallback] = None,
     due_date: Optional[datetime.datetime] = None,
-    due_date_exceptions: Optional[Dict[str, datetime.datetime]] = None,
+    due_date_exceptions_path: Optional[pathlib.Path] = None,
 ) -> Tuple[Optional[pathlib.Path], Optional[pathlib.Path]]:
     """Generate feedback zip and/or grades CSV from deductions.
 
@@ -199,14 +219,20 @@ def assemble_grades(
         output_zip_path: Path for the output zip file. If None, no zip is generated.
         output_csv_path: Path for the output CSV file. If None, no CSV is generated.
         late_penalty_callback: Optional callback function that takes
-            (late_days, max_score, actual_score) and returns the adjusted score.
+            (due_datetime, submitted_datetime, max_score, actual_score) and returns the adjusted score.
+            submitted_datetime will be None if on time.
         due_date: The default due date for the assignment. Required for late penalty.
-        due_date_exceptions: Mapping from net_id to exception due date.
+        due_date_exceptions_path: Path to YAML file with due date exceptions (net_id: "YYYY-MM-DD HH:MM:SS").
 
     Returns:
         Tuple of (feedback_zip_path or None, grades_csv_path or None).
     """
     yaml_path = pathlib.Path(yaml_path)
+
+    # Load due date exceptions if path provided
+    due_date_exceptions: Dict[str, datetime.datetime] = {}
+    if due_date_exceptions_path:
+        due_date_exceptions = _load_due_date_exceptions(due_date_exceptions_path)
     ls_column = LearningSuiteColumn(yaml_path)
 
     # Get the lab name from the YAML file's parent directory
@@ -263,8 +289,13 @@ def assemble_grades(
                     f"but NOT [{', '.join(items_not_graded)}]",
                 )
 
+            # Get submit info for this student
+            _, effective_due_date, submitted_datetime = _get_student_key_and_submit_info(
+                net_id, subitem_deductions, due_date, due_date_exceptions
+            )
+
             # Calculate score before late penalty
-            score_before_late, total_possible, max_late_days = _calculate_student_score(
+            score_before_late, total_possible, _ = _calculate_student_score(
                 net_id=net_id,
                 ls_column=ls_column,
                 item_deductions=subitem_deductions,
@@ -274,18 +305,25 @@ def assemble_grades(
                 due_date_exceptions=due_date_exceptions,
             )
 
-            # Apply late penalty if applicable
+            # Apply late penalty if applicable (submitted_datetime is None if on time)
             final_score = score_before_late
-            if max_late_days > 0 and late_penalty_callback:
+            if (
+                submitted_datetime is not None
+                and late_penalty_callback
+                and effective_due_date is not None
+            ):
                 final_score = max(
                     0,
                     late_penalty_callback(
-                        max_late_days, total_possible, score_before_late
+                        effective_due_date,
+                        submitted_datetime,
+                        total_possible,
+                        score_before_late,
                     ),
                 )
                 print_color(
                     TermColors.YELLOW,
-                    f"Late: {net_id} ({max_late_days} day{'s' if max_late_days != 1 else ''}): "
+                    f"Late: {net_id} (submitted {submitted_datetime}): "
                     f"{score_before_late:.1f} -> {final_score:.1f}",
                 )
 
@@ -433,24 +471,26 @@ def _generate_student_feedback(
     # Calculate score before late penalty (clamped to 0)
     score_before_late = max(0, total_points_possible - total_points_deducted)
 
-    # Get max late days for this student
-    _, max_late_days = _get_student_key_and_max_late_days(
+    # Get submit info for this student
+    _, effective_due_date, submitted_datetime = _get_student_key_and_submit_info(
         net_id, subitem_deductions, due_date, due_date_exceptions
     )
 
     # Late penalty section
     lines.append("")
     lines.append("=" * 60)
-    if max_late_days > 0 and late_penalty_callback:
+    if (
+        submitted_datetime is not None
+        and late_penalty_callback
+        and effective_due_date is not None
+    ):
         final_score = late_penalty_callback(
-            max_late_days, total_points_possible, score_before_late
+            effective_due_date, submitted_datetime, total_points_possible, score_before_late
         )
         # Ensure final score is not negative
         final_score = max(0, final_score)
         late_penalty_points = score_before_late - final_score
-        late_label = (
-            f"Late Penalty ({max_late_days} day{'s' if max_late_days != 1 else ''}):"
-        )
+        late_label = f"Late Penalty (submitted {submitted_datetime.strftime('%Y-%m-%d %H:%M')}):"
         lines.append(
             f"{late_label:<{item_col_width}} {-late_penalty_points:>{score_col_width}.1f}"
         )

{ygrader-2.3.0 → ygrader-2.5.0/ygrader.egg-info}/PKG-INFO

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