PyKubeGrader 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

{PyKubeGrader-0.2.22.dist-info → PyKubeGrader-0.2.24.dist-info}/METADATA

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

{PyKubeGrader-0.2.22.dist-info → PyKubeGrader-0.2.24.dist-info}/RECORD

@@ -5,7 +5,7 @@ pykubegrader/utils.py,sha256=T3GYnLnTL9VXjTZNPr00sUgMgobQYsNTGwynMyXdvHk,696
 pykubegrader/validate.py,sha256=2KLSB3wfFZbBh1NGgmrOV073paKAgrQz4AgA6LmCIj4,11076
 pykubegrader/build/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/build/api_notebook_builder.py,sha256=IzzU_jh6SYSA2wtjtlhxa4t9WM8-JqWnWsV8e3UPwdo,20305
-pykubegrader/build/build_folder.py,sha256=y5hrxkZgqVr0MRXL3AkihaJQmtm70F4umyVT8--uYTk,81820
+pykubegrader/build/build_folder.py,sha256=Zd0E_R_UciK61wrUprrFSqw6Ara8EGzoa4TP2WmmOIQ,82944
 pykubegrader/build/clean_folder.py,sha256=8N0KyL4eXRs0DCw-V_2jR9igtFs_mOFMQufdL6tD-38,1323
 pykubegrader/graders/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/graders/late_assignments.py,sha256=_2-rA5RqO0BWY9WAQA_mbCxxPKTOiJOl-byD2CYWaE0,1393
@@ -27,9 +27,9 @@ pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-
 pykubegrader/widgets_base/multi_select.py,sha256=Cl0IN21wXLZuFu-zC65aS9tD4jMfzCRJ2DPjHao5_Ak,4044
 pykubegrader/widgets_base/reading.py,sha256=_vjUPynqmJe_R4vf-7hVhGnQR726S9GL6qT8bflBXBM,5383
 pykubegrader/widgets_base/select.py,sha256=Fw3uFNOIWo1a3CvlzSx23bvi6bSmA3TqutuRbhD4Dp8,2525
-PyKubeGrader-0.2.22.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.22.dist-info/METADATA,sha256=dPgcV3VFD4CAMAFJ2kQR8dw3ZY9wu1qls8k5gstiKJw,2779
-PyKubeGrader-0.2.22.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-PyKubeGrader-0.2.22.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.22.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.22.dist-info/RECORD,,
+PyKubeGrader-0.2.24.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.24.dist-info/METADATA,sha256=iv1P7l0ln6yI66lxzwYBV7DUa-uLMcz_l8pa8HFzToA,2779
+PyKubeGrader-0.2.24.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+PyKubeGrader-0.2.24.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.24.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.24.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -60,6 +60,7 @@ class NotebookProcessor:
     verbose: bool = False
     log: bool = True
     require_key: bool = False
+    bonus_points: float = 0
 
     def __post_init__(self):
         """
@@ -80,6 +81,7 @@ class NotebookProcessor:
                 assignment = data.get("assignment", {})
                 week_num = assignment.get("week")
                 self.assignment_type = assignment.get("assignment_type")
+                self.bonus_points = assignment.get("bonus_points", 0)
         else:
             self.assignment_type = self.assignment_tag.split("-")[0].lower()
             week_num = self.assignment_tag.split("-")[-1]
@@ -218,7 +220,6 @@ class NotebookProcessor:
                 print(f"Error parsing due_date: {e}")
 
         title = f"Week {week} - {assignment_type}"
-
         # Return the extracted details as a dictionary
         return {
             "title": title,
@@ -226,7 +227,7 @@ class NotebookProcessor:
             "week_number": week,
             "assignment_type": assignment_type,
             "due_date": due_date,
-            "max_score": int(self.assignment_total_points),
+            "max_score": self.assignment_total_points - self.bonus_points,
         }
 
     def build_payload_notebook(self, yaml_content, notebook_title, total_points):
@@ -575,7 +576,7 @@ class NotebookProcessor:
 
         if self.require_key:
             # Add an additional line for validate_token()
-            validate_token_line = "from pykubegrader.submit.submit_assignment import validate_token\nvalidate_token()\n"
+            validate_token_line = "from pykubegrader.tokens.validate_token import validate_token\nvalidate_token()\n"
 
             # Define the Code cell
             code_cell = nbformat.v4.new_code_cell(
@@ -723,6 +724,38 @@ class NotebookProcessor:
         with open(notebook_path, "w", encoding="utf-8") as f:
             nbformat.write(notebook, f)
 
+    def add_validate_token_cell(notebook_path: str, require_key: bool) -> None:
+        """
+        Adds a new code cell at the top of a Jupyter notebook if require_key is True.
+
+        Args:
+            notebook_path (str): The path to the notebook file to modify.
+            require_key (bool): Whether to add the validate_token cell.
+
+        Returns:
+            None
+        """
+        if not require_key:
+            print("require_key is False. No changes made to the notebook.")
+            return
+
+        # Load the notebook
+        with open(notebook_path, "r", encoding="utf-8") as f:
+            notebook = nbformat.read(f, as_version=4)
+
+        # Create the new code cell
+        new_cell = nbformat.v4.new_code_cell(
+            "from pykubegrader.tokens.validate_token import validate_token\n"
+            "validate_token('type the key provided by your instructor here')\n"
+        )
+
+        # Add the new cell to the top of the notebook
+        notebook.cells.insert(0, new_cell)
+
+        # Save the modified notebook
+        with open(notebook_path, "w", encoding="utf-8") as f:
+            nbformat.write(notebook, f)
+
     @staticmethod
     def add_initialization_code(
         notebook_path, week, assignment_type, require_key=False
@@ -732,15 +765,13 @@ class NotebookProcessor:
         cell = cell["source"]
         import_text = "# You must make sure to run all cells in sequence using shift + enter or you might encounter errors\n"
         import_text += "from pykubegrader.initialize import initialize_assignment\n"
-        if require_key:
-            import_text += (
-                "from pykubegrader.token.validate_token import validate_token\n"
-            )
-            import_text += "validate_token('type the key provided by your TA here')\n"
         import_text += f'\nresponses = initialize_assignment("{os.path.splitext(os.path.basename(notebook_path))[0]}", "{week}", "{assignment_type}" )\n'
         cell = f"{import_text}\n" + cell
         replace_cell_source(notebook_path, index, cell)
 
+        if require_key:
+            NotebookProcessor.add_validate_token_cell(notebook_path, require_key)
+
     def multiple_choice_parser(self, temp_notebook_path, new_notebook_path):
         ### Parse the notebook for multiple choice questions
         if self.has_assignment(temp_notebook_path, "# BEGIN MULTIPLE CHOICE"):