PyKubeGrader 0.2.23__tar.gz → 0.2.25__tar.gz

{pykubegrader-0.2.23 → pykubegrader-0.2.25}/.github/workflows/main.yml

@@ -2,20 +2,22 @@ name: CI/CD
 
 on:
   push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+    branches: [main]
+  # Comment out until we have real tests
+  # pull_request:
+  #   branches: [main]
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: self-hosted
+
     permissions:
       contents: write
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - name: Check out repository
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -59,6 +61,22 @@ jobs:
           python -m pip install --upgrade twine
           twine upload dist/*
 
+      - name: Trigger JupyterHub image rebuild
+        if: |
+          contains(github.event.head_commit.message, '#patch') ||
+          contains(github.event.head_commit.message, '#minor') ||
+          contains(github.event.head_commit.message, '#major')
+        env:
+          JHUB_TOKEN: ${{ secrets.JHUB_REBUILD_TOKEN }}
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $JHUB_TOKEN" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/theodore-s-beers/engr-131-jhub/actions/workflows/docker.yml/dispatches \
+            -d '{"ref":"main"}'
+
       - name: Deploy to GitHub Pages
         env:
           HOME: "${{ github.workspace }}/../" # Because self-hosted runner is root

{pykubegrader-0.2.23/src/PyKubeGrader.egg-info → pykubegrader-0.2.25}/PKG-INFO

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

{pykubegrader-0.2.23 → pykubegrader-0.2.25/src/PyKubeGrader.egg-info}/PKG-INFO

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

{pykubegrader-0.2.23 → pykubegrader-0.2.25}/src/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.tokens.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"):