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

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

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

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

@@ -5,8 +5,8 @@ pykubegrader/telemetry.py,sha256=0Is-LhpVoKcEjmgqEjCfNLCKJVGAmJaQmD2VHF8KI9w,163
 pykubegrader/utils.py,sha256=jlJklKvRhY3O7Hz2aaU1m0y3p_n9eMAXNnAF7LUEaPY,1275
 pykubegrader/validate.py,sha256=OKnItGyd-L8QPKcsE0KRuwBI_IxKiJzMLJKZiA2j3II,11184
 pykubegrader/build/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pykubegrader/build/api_notebook_builder.py,sha256=FVLnycCRLmZKbimw1FVwDVO-ufKUiAkcnb0O1NrUCEk,25997
-pykubegrader/build/build_folder.py,sha256=ecriZoXp5SzpCvP532vXfox61gyJOg9YAYNVoiNq4Ck,87803
+pykubegrader/build/api_notebook_builder.py,sha256=vSnBEgHglKjNqwwQnsY0VrWhkwc6q5soJuszNfyKz9o,25748
+pykubegrader/build/build_folder.py,sha256=UL5AzApDLRXD0EujHI5nsCbgaYo486SvL4_vYP_HsDE,87645
 pykubegrader/build/clean_folder.py,sha256=8N0KyL4eXRs0DCw-V_2jR9igtFs_mOFMQufdL6tD-38,1323
 pykubegrader/build/collate.py,sha256=cVvF7tf2U3iiH4R_dbghTcieedIx5w3Fyw9L_llInM8,6754
 pykubegrader/build/markdown_questions.py,sha256=cSh8mkHK3hh-etJdgrZu9UQi1WPrKQtofkzLCUp1Z-w,4676
@@ -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.9.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.3.9.dist-info/METADATA,sha256=fPAObIviDbz7vOFs5JCQm_IBTI1lT8W_l2TRIqhkPhM,2757
-PyKubeGrader-0.3.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.3.9.dist-info/entry_points.txt,sha256=RR57KvzDRJrP4omy5heS5cZ3E7g56YxcxJhDnp57ZU0,253
-PyKubeGrader-0.3.9.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.3.9.dist-info/RECORD,,
+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/build/api_notebook_builder.py

@@ -1,11 +1,11 @@
 import ast
-import base64
 import json
 import re
 import shutil
-import sys
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Optional
+import base64
 from typing import Any, Optional
 
 import nbformat
@@ -15,17 +15,17 @@ import nbformat
 class FastAPINotebookBuilder:
     notebook_path: str
     temp_notebook: Optional[str] = None
-    assignment_tag: str = ""
-    require_key: bool = False
-    verbose: bool = False
+    assignment_tag: Optional[str] = ""
+    require_key: Optional[bool] = False
+    verbose: Optional[bool] = False
 
     def __post_init__(self) -> None:
         self.root_path, self.filename = FastAPINotebookBuilder.get_filename_and_root(
             self.notebook_path
         )
-        self.total_points = 0.0
+        self.total_points = 0
 
-        self.max_question_points: dict[str, float] = {}
+        self.max_question_points = {}
         self.run()
 
     def run(self) -> None:
@@ -87,17 +87,13 @@ class FastAPINotebookBuilder:
         for i, question in enumerate(self.max_question_points.keys()):
             index, source = self.find_question_description(question)
             try:
-                modified_source = FastAPINotebookBuilder.add_text_after_double_hash(
-                    source,
-                    f"Question {i + 1} (Points: {self.max_question_points[question]}):",
-                )
+                modified_source  = FastAPINotebookBuilder.add_text_after_double_hash(source, f"Question {i+1} (Points: {self.max_question_points[question]}):")
                 self.replace_cell_source(index, modified_source)
-            except Exception as e:
-                print(f"Error adding question description: {e}", file=sys.stderr)
+            except:
                 pass
 
         for i, (cell_index, cell_dict) in enumerate(self.assertion_tests_dict.items()):
-            if self.verbose:
+            if self.verbose: 
                 print(
                     f"Processing cell {cell_index + 1}, {i} of {len(self.assertion_tests_dict)}"
                 )
@@ -150,47 +146,41 @@ class FastAPINotebookBuilder:
                 FastAPINotebookBuilder.construct_update_responses(cell_dict)
             )
 
-            self.replace_cell_source(cell_index, updated_cell_source)
+            self.replace_cell_source(cell_index, updated_cell_source)   
 
     def find_question_description(self, search_string):
-        with open(self.temp_notebook, "r", encoding="utf-8") as f:
+        with open(self.temp_notebook, 'r', encoding='utf-8') as f:
             nb_data = json.load(f)
 
         found_raw = False
 
         for idx, cell in enumerate(nb_data.get("cells", [])):
-            if (
-                cell["cell_type"] == "raw"
-                and any("# BEGIN QUESTION" in line for line in cell.get("source", []))
-                and any(search_string in line for line in cell.get("source", []))
-            ):
+            if cell["cell_type"] == "raw" and any("# BEGIN QUESTION" in line for line in cell.get("source", [])) and any(search_string in line for line in cell.get("source", [])):
                 found_raw = True
             elif found_raw and cell["cell_type"] == "markdown":
-                return idx, cell.get(
-                    "source", []
-                )  # Return the index of the first matching markdown cell
+                return idx, cell.get("source", [])  # Return the index of the first matching markdown cell
 
-        return None, None  # Return None if no such markdown cell is found
+        return None, None  # Return None if no such markdown cell is found 
 
     def add_total_points_to_notebook(self) -> None:
         self.max_question_points.keys()
 
     def get_max_question_points(self, cell_dict) -> float:
         return sum(
-            cell["points"]
-            for cell in self.assertion_tests_dict.values()
-            if cell["question"] == cell_dict["question"]
-        )
+                    cell["points"]
+                    for cell in self.assertion_tests_dict.values()
+                    if cell["question"] == cell_dict["question"]
+                )
 
     @staticmethod
     def add_text_after_double_hash(markdown_source, insert_text):
         """
         Adds insert_text immediately after the first '##' in the first line that starts with '##'.
-
+        
         Args:
         - markdown_source (list of str): The list of lines in the markdown cell.
         - insert_text (str): The text to be inserted.
-
+        
         Returns:
         - list of str: The modified markdown cell content.
         """
@@ -199,9 +189,7 @@ class FastAPINotebookBuilder:
 
         for line in markdown_source:
             if not inserted and line.startswith("## "):
-                modified_source.append(
-                    f"## {insert_text} {line[3:]}"
-                )  # Insert text after '##'
+                modified_source.append(f"## {insert_text} {line[3:]}")  # Insert text after '##'
                 inserted = True  # Ensure it only happens once
             else:
                 modified_source.append(line)
@@ -216,9 +204,7 @@ class FastAPINotebookBuilder:
                 max_question_points = self.get_max_question_points(cell_dict)
 
                 # store the max points for the question
-                self.max_question_points[f"{cell_dict['question']}"] = (
-                    max_question_points
-                )
+                self.max_question_points[f"{cell_dict["question"]}"] = max_question_points
 
                 self.total_points += max_question_points
 
@@ -344,9 +330,7 @@ class FastAPINotebookBuilder:
         return original_list[:index] + insert_list + original_list[index:]
 
     @staticmethod
-    def add_import_statements_to_tests(
-        cell_source: list[str], require_key: bool = False
-    ) -> list[str]:
+    def add_import_statements_to_tests(cell_source: list[str], require_key:bool = False, assignment_tag = None) -> list[str]:
         """
         Adds the necessary import statements to the first cell of the notebook.
         """

pykubegrader/build/build_folder.py

@@ -83,7 +83,7 @@ class NotebookProcessor:
                 self.require_key = assignment.get("require_key", False)
                 self.assignment_tag = assignment.get(
                     "assignment_tag",
-                    f"week{assignment.get('week')}-{self.assignment_type}",
+                    f"week{assignment.get("week")}-{self.assignment_type}",
                 )
         else:
             self.assignment_type = self.assignment_tag.split("-")[0].lower()
@@ -578,7 +578,7 @@ class NotebookProcessor:
 
         if self.require_key:
             # Add an additional line for validate_token()
-            validate_token_line = f"from pykubegrader.tokens.validate_token import validate_token\nvalidate_token(assignment = '{self.assignment_tag}')\n"
+            validate_token_line =f"from pykubegrader.tokens.validate_token import validate_token\nvalidate_token(assignment = '{self.assignment_tag}')\n"
 
             # Define the Code cell
             code_cell = nbformat.v4.new_code_cell(
@@ -681,7 +681,7 @@ class NotebookProcessor:
                 self.week,
                 self.assignment_type,
                 require_key=self.require_key,
-                assignment_tag=self.assignment_tag,
+                assignment_tag = self.assignment_tag,
             )
 
             NotebookProcessor.replace_temp_in_notebook(
@@ -712,7 +712,7 @@ class NotebookProcessor:
                 self.week,
                 self.assignment_type,
                 require_key=self.require_key,
-                assignment_tag=self.assignment_tag,
+                assignment_tag = self.assignment_tag
             )
             NotebookProcessor.replace_temp_no_otter(
                 temp_notebook_path, temp_notebook_path
@@ -744,9 +744,7 @@ class NotebookProcessor:
             nbformat.write(notebook, f)
 
     @staticmethod
-    def add_validate_token_cell(
-        notebook_path: str, require_key: bool, **kwargs
-    ) -> None:
+    def add_validate_token_cell(notebook_path: str, require_key: bool, **kwargs) -> None:
         """
         Adds a new code cell at the top of a Jupyter notebook if require_key is True.
 
@@ -760,12 +758,8 @@ class NotebookProcessor:
         if not require_key:
             print("require_key is False. No changes made to the notebook.")
             return
-
-        NotebookProcessor.add_validate_block(
-            notebook_path,
-            require_key,
-            assignment_tag=kwargs.get("assignment_tag", None),
-        )
+        
+        NotebookProcessor.add_validate_block(notebook_path, require_key, assignment_tag = kwargs.get("assignment_tag", None))
 
         # Load the notebook
         with open(notebook_path, "r", encoding="utf-8") as f:
@@ -774,13 +768,13 @@ class NotebookProcessor:
         # Create the new code cell
         if kwargs.get("assignment_tag", None):
             new_cell = nbformat.v4.new_code_cell(
-                "from pykubegrader.tokens.validate_token import validate_token\n"
-                f"validate_token('type the key provided by your instructor here', assignment = '{kwargs.get('assignment_tag')}')\n"
+            "from pykubegrader.tokens.validate_token import validate_token\n"
+            f"validate_token('type the key provided by your instructor here', assignment = '{kwargs.get('assignment_tag')}')\n"
             )
         else:
             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"
+            "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
@@ -825,11 +819,7 @@ class NotebookProcessor:
 
     @staticmethod
     def add_initialization_code(
-        notebook_path,
-        week,
-        assignment_type,
-        require_key=False,
-        **kwargs,
+        notebook_path, week, assignment_type, require_key=False, **kwargs,
     ):
         # finds the first code cell
         index, cell = find_first_code_cell(notebook_path)
@@ -841,11 +831,7 @@ class NotebookProcessor:
         replace_cell_source(notebook_path, index, cell)
 
         if require_key:
-            NotebookProcessor.add_validate_token_cell(
-                notebook_path,
-                require_key,
-                assignment_tag=kwargs.get("assignment_tag", None),
-            )
+            NotebookProcessor.add_validate_token_cell(notebook_path, require_key, assignment_tag = kwargs.get("assignment_tag", None))
 
     def multiple_choice_parser(self, temp_notebook_path, new_notebook_path):
         ### Parse the notebook for multiple choice questions