PyKubeGrader 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

{PyKubeGrader-0.3.10.dist-info → PyKubeGrader-0.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyKubeGrader
-Version: 0.3.10
+Version: 0.3.12
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2

{PyKubeGrader-0.3.10.dist-info → PyKubeGrader-0.3.12.dist-info}/RECORD

@@ -11,10 +11,10 @@ pykubegrader/build/clean_folder.py,sha256=8N0KyL4eXRs0DCw-V_2jR9igtFs_mOFMQufdL6
 pykubegrader/build/collate.py,sha256=cVvF7tf2U3iiH4R_dbghTcieedIx5w3Fyw9L_llInM8,6754
 pykubegrader/build/markdown_questions.py,sha256=cSh8mkHK3hh-etJdgrZu9UQi1WPrKQtofkzLCUp1Z-w,4676
 pykubegrader/grade_reports/__grade_reports.py,sha256=n8H_n9jdZRSPn2zlIf-GQt_Y8w91p6M8ZbdVH76Sg5k,2303
-pykubegrader/grade_reports/assignments.py,sha256=Wr5jvTeQ0a7Fl89e6EzXKqjhLrsA6KyObOdrJdN1V0Y,7614
+pykubegrader/grade_reports/assignments.py,sha256=I9NesLhwLelgqUekXfQCEGH-zTMAOjfb942eZYeh-Yo,7811
 pykubegrader/grade_reports/class_grade_report.py,sha256=9Uuvy-xoABtjTjv-05VYhmowebgTrgEFSgh1Grws-cQ,5078
-pykubegrader/grade_reports/grade_report.py,sha256=wxgSGjvX9rcE0s9Up2zxPACGv78sJ3TvP8px3bc7t-c,13993
-pykubegrader/grade_reports/grading_config.py,sha256=_Wki6ju6OkqIuwEl-YMpYJcG5Yeu5wid-NEUN5Oxshs,2332
+pykubegrader/grade_reports/grade_report.py,sha256=ugX0nojj8RdSmVluP9dbGl3B5W0OIb1AjTshDUrVSSs,16267
+pykubegrader/grade_reports/grading_config.py,sha256=o_68FrjOLQWqDzEptnA8p42zClLHyqEadAiaa9K2cm0,2374
 pykubegrader/grade_reports/test.ipynb,sha256=NkMZHcfBd-uJw3i1Y9ux-epBP5GiVFEhda5wxEbK0cU,808
 pykubegrader/graders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/graders/late_assignments.py,sha256=_2-rA5RqO0BWY9WAQA_mbCxxPKTOiJOl-byD2CYWaE0,1393
@@ -39,9 +39,9 @@ pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-
 pykubegrader/widgets_base/multi_select.py,sha256=WhpS7a8V3BOuEfEyFPzcDhMbgr7p1a4FFh_mKU1HLbI,4226
 pykubegrader/widgets_base/reading.py,sha256=ChUS3NOTa_HLtNpxR8hGX80LPKMvYMypnR6dFknfxus,5430
 pykubegrader/widgets_base/select.py,sha256=qP31bjTWIn8LEgKwtNUJbgJnum6P7bx6A_At-u1ivFk,2750
-PyKubeGrader-0.3.10.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.3.10.dist-info/METADATA,sha256=lM-bIik76huAUbqHX0y0fhftiNbaOUoDwDTt6Ut7b8Q,2758
-PyKubeGrader-0.3.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.3.10.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
-PyKubeGrader-0.3.10.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.3.10.dist-info/RECORD,,
+PyKubeGrader-0.3.12.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.3.12.dist-info/METADATA,sha256=7USplQzGd4_ZEtmIrZtZIoB3pI89kOLaPHvn_hWeWdw,2758
+PyKubeGrader-0.3.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.3.12.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
+PyKubeGrader-0.3.12.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.3.12.dist-info/RECORD,,

pykubegrader/grade_reports/assignments.py

@@ -116,6 +116,10 @@ class Assignment(assignment_type):
         """
         if self.exempted:
             self.score = np.nan
+            
+            # If the score is "---", return the score as is, this is an assignment that does not exist.
+            if self._score == "---":
+                return self.score
 
             # Saves a table with the score of the exempted assignment still recorded.
             try: 
@@ -126,6 +130,7 @@ class Assignment(assignment_type):
             except:
                 pass
             return self.score
+        
         elif submission is not None:
             # Adjust the score based on submission
             score_ = self.grade_adjustment(submission)

pykubegrader/grade_reports/grade_report.py

@@ -52,13 +52,42 @@ class GradeReport:
         self.update_weekly_table()
         self._build_running_avg()
         self._calculate_final_average()
+        df = self.highlight_nans(self.weekly_grades_df, self.weekly_grades_df_display)
         if display_:
             try:
-                display(self.weekly_grades_df)
+                display(df)
                 display(self.weighted_average_grades)
             except:  # noqa: E722
                 pass
 
+    @staticmethod
+    def highlight_nans(nan_df, display_df, color='red'):
+        """
+        Highlights NaN values from nan_df on display_df.
+        
+        Parameters:
+        nan_df (pd.DataFrame): DataFrame containing NaNs to be highlighted.
+        display_df (pd.DataFrame): DataFrame to be recolored.
+        color (str): Background color for NaNs. Default is 'red'.
+        
+        Returns:
+        pd.io.formats.style.Styler: Styled DataFrame with NaNs highlighted.
+        """
+        # Ensure both DataFrames have the same index and columns
+        nan_mask = nan_df.isna().reindex_like(display_df)
+        
+        # Function to apply the highlight conditionally
+        def apply_highlight(row):
+            return [
+                f'background-color: {color}' if nan_mask.loc[row.name, col] else ''
+                for col in row.index
+            ]
+
+        # Apply the highlighting row-wise
+        styled_df = display_df.style.apply(apply_highlight, axis=1)
+        
+        return styled_df
+
     def update_assignments_not_due_yet(self):
         """
         Updates the score of assignments that are not due yet to NaN.
@@ -69,7 +98,24 @@ class GradeReport:
                 due_date = datetime.fromisoformat(assignment.due_date.replace("Z", "+00:00"))
                 if due_date > datetime.now(due_date.tzinfo) and assignment.score == 0:
                     assignment.score = np.nan
+                    assignment._score = "---"
                     assignment.exempted = True
+                    
+                    
+    def color_cells(self, styler, week_list, assignment_list):
+        if week_list:
+            week = week_list.pop()
+            assignment = assignment_list.pop()
+
+            # Apply the style to the current cell
+            styler = styler.set_properties(
+                subset=pd.IndexSlice[[week], [assignment]],
+                **{'background-color': 'yellow'}
+            )
+            # Recursive call
+            return self.color_cells(styler, week_list, assignment_list)
+        else:
+            return styler
 
     def _calculate_final_average(self):
         total_percentage = 1
@@ -93,15 +139,27 @@ class GradeReport:
             ]
         )
 
-    def grade_report(self):
-        """Generates a grade report for the course.
-        Returns:
-            pd.DataFrame: A DataFrame containing the grade report or weekly grades only.
-        """
-        self._update_running_avg()
-        return self.weekly_grades_df
-
+    # def grade_report(self):
+    #     """Generates a grade report for the course.
+    #     Returns:
+    #         pd.DataFrame: A DataFrame containing the grade report or weekly grades only.
+    #     """
+    #     self._update_running_avg()
+    #     return self.weekly_grades_df
+    
     def update_weekly_table(self):
+        self._update_weekly_table_nan()
+        self._update_weekly_table_scores()
+    
+    # TODO: populate with average scores calculated from the exempted 
+    def _update_weekly_table_scores(self):
+        for assignment in self.graded_assignments:
+            if assignment.weekly:
+                self.weekly_grades_df_display.loc[f"week{assignment.week}", assignment.name] = (
+                    assignment._score
+                )
+
+    def _update_weekly_table_nan(self):
         """Updates the weekly grades table with the calculated scores."""
         for assignment in self.graded_assignments:
             if assignment.weekly:
@@ -114,6 +172,7 @@ class GradeReport:
         for assignment_type, week in self.globally_exempted_assignments:
             try:
                 self.get_graded_assignment(week, assignment_type)[0].exempted = True
+                self.get_graded_assignment(week, assignment_type)[0]._score = "---"
             except:  # noqa: E722
                 pass
 
@@ -293,7 +352,8 @@ class GradeReport:
         new_weekly_grades["inds"] = inds
         new_weekly_grades.set_index("inds", inplace=True)
         self.weekly_grades_df = new_weekly_grades
-
+        self.weekly_grades_df_display = new_weekly_grades.copy().astype(str) 
+        
     def _build_running_avg(self):
         """
         Subfunction to compute and update the Running Avg row, handling NaNs.
@@ -302,6 +362,9 @@ class GradeReport:
         self.weekly_grades_df.loc["Running Avg"] = self.weekly_grades_df.drop(
             "Running Avg", errors="ignore"
         ).mean(axis=0, skipna=True)
+        self.weekly_grades_df_display.loc["Running Avg"] = self.weekly_grades_df.drop(
+            "Running Avg", errors="ignore"
+        ).mean(axis=0, skipna=True)
 
     def drop_lowest_n_for_types(self, n, assignments_=None):
         """
@@ -337,17 +400,13 @@ class GradeReport:
 
             # Exempt the lowest `n` assignments
             dropped = []
-            for i in range(min(n, len(valid_assignments))):
+            i = -1
+            while i < n:
+                i += 1
                 valid_assignments[i].exempted = True
+                if valid_assignments[i].week in self.optional_drop_week:
+                    continue
                 dropped.append(valid_assignments[i])
                 self.student_assignments_dropped.append(valid_assignments[i])
-
-            # Check if the lowest dropped assignment is from week 1
-            if dropped and any(a.week in self.optional_drop_week for a in dropped):
-                # Find the next lowest non-exempted assignment and drop it
-                for a in valid_assignments:
-                    if not a.exempted:
-                        a.exempted = True
-                        break
-
+                
         self.calculate_grades()

pykubegrader/grade_reports/grading_config.py

@@ -21,7 +21,8 @@ custom_grade_adjustments = {
     ("lecture", 3): lambda score: 100.0 if score > 0 else 0.0,
     ("lecture", 4): lambda score: 100.0 if score > 0 else 0.0,
     ("lecture", 5): lambda score: 100.0 if score > 0 else 0.0,
-}
+    ("lecture", 7): lambda score: 100.0,
+} 
 
 # Exempted assignments, key is a tuple of assignment type and week
 globally_exempted_assignments = [