PyKubeGrader 0.1.10__tar.gz → 0.1.12__tar.gz

{pykubegrader-0.1.10/src/PyKubeGrader.egg-info → pykubegrader-0.1.12}/PKG-INFO

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

{pykubegrader-0.1.10 → pykubegrader-0.1.12/src/PyKubeGrader.egg-info}/PKG-INFO

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

{pykubegrader-0.1.10 → pykubegrader-0.1.12}/src/pykubegrader/build/api_notebook_builder.py

@@ -6,6 +6,7 @@ import nbformat
 import json
 import re
 import shutil
+import ast
 
 
 @dataclass
@@ -20,7 +21,6 @@ class FastAPINotebookBuilder:
         self.run()
 
     def run(self):
-
         # here for easy debugging
         if self.temp_notebook is not None:
             shutil.copy(
@@ -34,7 +34,6 @@ class FastAPINotebookBuilder:
         self.add_api_code()
 
     def add_api_code(self):
-
         for i, (cell_index, cell_dict) in enumerate(self.assertion_tests_dict.items()):
             print(
                 f"Processing cell {cell_index + 1}, {i} of {len(self.assertion_tests_dict)}"
@@ -105,7 +104,6 @@ class FastAPINotebookBuilder:
     @staticmethod
     def construct_update_responses(cell_dict):
         update_responses = []
-        question_id = cell_dict["question"] + "-" + str(cell_dict["test_number"]) + "\n"
 
         logging_variables = cell_dict["logging_variables"]
 
@@ -141,7 +139,6 @@ class FastAPINotebookBuilder:
 
     @staticmethod
     def construct_graders(cell_dict):
-
         # Generate Python code
         added_code = [
             "if "
@@ -283,7 +280,7 @@ class FastAPINotebookBuilder:
         """
         last_import_index = -1
         is_multiline_import = False  # Flag to track if we're inside a multiline import
-        
+
         for i, line in enumerate(cell_source):
             stripped_line = line.strip()
 
@@ -313,11 +310,15 @@ class FastAPINotebookBuilder:
         if "source" in cell:
             for line in cell["source"]:
                 # Look for the log_variables pattern
-                match = re.search(r"log_variables:\s*\[(.*?)\]", line)
+                match = re.search(r"log_variables:\s*(\[.*\])", line)
                 if match:
-                    # Split the variables by comma and strip whitespace
-                    log_variables = [var.strip() for var in match.group(1).split(",")]
-                    return log_variables
+                    # Parse the list using ast.literal_eval for safety
+                    try:
+                        log_variables = ast.literal_eval(match.group(1))
+                        if isinstance(log_variables, list):
+                            return [var.strip() for var in log_variables]
+                    except (SyntaxError, ValueError):
+                        pass
         return []
 
     def tag_questions(cells_dict):
@@ -363,7 +364,6 @@ class FastAPINotebookBuilder:
         return cells_dict
 
     def question_dict(self):
-
         notebook_path = Path(self.temp_notebook)
         if not notebook_path.exists():
             raise FileNotFoundError(f"The file {notebook_path} does not exist.")

{pykubegrader-0.1.10 → pykubegrader-0.1.12}/src/pykubegrader/build/build_folder.py

@@ -166,7 +166,7 @@ class NotebookProcessor:
         Returns:
             None
         """
-        
+
         print(f"Processing notebook: {notebook_path}")
 
         logging.info(f"Processing notebook: {notebook_path}")
@@ -278,26 +278,38 @@ class NotebookProcessor:
         self, temp_notebook_path, notebook_subfolder, notebook_name
     ):
         if self.has_assignment(temp_notebook_path, "# ASSIGNMENT CONFIG"):
-
             # TODO: This is hardcoded for now, but should be in a configuration file.
             client_private_key = os.path.join(
                 notebook_subfolder,
-                "client_private_key.bin",
+                ".client_private_key.bin",
             )
             server_public_key = os.path.join(
                 notebook_subfolder,
-                "server_public_key.bin",
+                ".server_public_key.bin",
             )
 
-            shutil.copy("./keys/client_private_key.bin", client_private_key)
-            shutil.copy("./keys/server_public_key.bin", server_public_key)
+            shutil.copy("./keys/.client_private_key.bin", client_private_key)
+            shutil.copy("./keys/.server_public_key.bin", server_public_key)
 
             FastAPINotebookBuilder(notebook_path=temp_notebook_path)
 
+            debug_notebook = os.path.join(
+                notebook_subfolder,
+                "dist",
+                "autograder",
+                os.path.basename(temp_notebook_path).replace("_temp", "_debugger"),
+            )
+
             self.run_otter_assign(
                 temp_notebook_path, os.path.join(notebook_subfolder, "dist")
             )
 
+            print(f"Copying {temp_notebook_path} to {debug_notebook}")
+
+            shutil.copy(temp_notebook_path, debug_notebook)
+
+            NotebookProcessor.remove_assignment_config_cells(debug_notebook)
+
             student_notebook = os.path.join(
                 notebook_subfolder, "dist", "student", f"{notebook_name}.ipynb"
             )
@@ -329,18 +341,34 @@ class NotebookProcessor:
             NotebookProcessor.add_initialization_code(temp_notebook_path)
             return None
 
+    @staticmethod
+    def remove_assignment_config_cells(notebook_path):
+        # Read the notebook
+        with open(notebook_path, "r", encoding="utf-8") as f:
+            notebook = nbformat.read(f, as_version=nbformat.NO_CONVERT)
+
+        # Filter out cells containing "# ASSIGNMENT CONFIG"
+        notebook.cells = [
+            cell
+            for cell in notebook.cells
+            if "# ASSIGNMENT CONFIG" not in cell.get("source", "")
+        ]
+
+        # Save the updated notebook
+        with open(notebook_path, "w", encoding="utf-8") as f:
+            nbformat.write(notebook, f)
+
     @staticmethod
     def add_initialization_code(notebook_path):
         # finds the first code cell
         index, cell = find_first_code_cell(notebook_path)
-        cell = cell['source']
+        cell = cell["source"]
         import_text = "from pykubegrader.initialize import initialize_assignment\n"
         cell = f"{import_text}\n" + cell
         cell += f'\nresponses = initialize_assignment("{os.path.splitext(os.path.basename(notebook_path))[0]}")\n'
         replace_cell_source(notebook_path, index, cell)
 
     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"):
             self._print_and_log(
@@ -627,7 +655,7 @@ class NotebookProcessor:
         """
 
         solutions = {}
-        total_points = 0.0
+        total_points = []
 
         # If the output file exists, load the existing solutions and total_points
         if os.path.exists(output_file):
@@ -641,14 +669,14 @@ class NotebookProcessor:
             if hasattr(existing_module, "solutions"):
                 solutions.update(existing_module.solutions)
             if hasattr(existing_module, "total_points"):
-                total_points += existing_module.total_points
+                total_points.extend(existing_module.total_points)
 
         # Process new question data and update solutions and total_points
         for question_set in data_list:
             for key, question_data in question_set.items():
                 solution_key = f"q{question_data['question number']}-{question_data['subquestion_number']}-{key}"
                 solutions[solution_key] = question_data["solution"]
-                total_points += question_data["points"]
+                total_points.extend([question_data["points"]])
 
         # Write updated total_points and solutions back to the file
         with open(output_file, "w", encoding="utf-8") as f:
@@ -1577,29 +1605,28 @@ def find_first_code_cell(notebook_path):
 
 
 def replace_cell_source(notebook_path, cell_index, new_source):
-        """
-        Replace the source code of a specific Jupyter notebook cell.
+    """
+    Replace the source code of a specific Jupyter notebook cell.
 
-        Args:
-            cell_index (int): Index of the cell to be modified (0-based).
-            new_source (str): New source code to replace the cell's content.
-        """
-        # Load the notebook
-        with open(notebook_path, "r", encoding="utf-8") as f:
-            notebook = nbformat.read(f, as_version=4)
+    Args:
+        cell_index (int): Index of the cell to be modified (0-based).
+        new_source (str): New source code to replace the cell's content.
+    """
+    # Load the notebook
+    with open(notebook_path, "r", encoding="utf-8") as f:
+        notebook = nbformat.read(f, as_version=4)
 
-        # Check if the cell index is valid
-        if cell_index >= len(notebook.cells) or cell_index < 0:
-            raise IndexError(
-                f"Cell index {cell_index} is out of range for this notebook."
-            )
+    # Check if the cell index is valid
+    if cell_index >= len(notebook.cells) or cell_index < 0:
+        raise IndexError(f"Cell index {cell_index} is out of range for this notebook.")
 
-        # Replace the source code of the specified cell
-        notebook.cells[cell_index]["source"] = new_source
+    # Replace the source code of the specified cell
+    notebook.cells[cell_index]["source"] = new_source
+
+    # Save the notebook
+    with open(notebook_path, "w", encoding="utf-8") as f:
+        nbformat.write(notebook, f)
 
-        # Save the notebook
-        with open(notebook_path, "w", encoding="utf-8") as f:
-            nbformat.write(notebook, f)
 
 def main():
     parser = argparse.ArgumentParser(

{pykubegrader-0.1.10 → pykubegrader-0.1.12}/src/pykubegrader/initialize.py

@@ -8,11 +8,11 @@ import requests
 from .telemetry import telemetry, update_responses, ensure_responses
 
 
-
-def initialize_assignment(name: str, 
-                          verbose: Optional[bool] = False,
-                          url: Optional[str] = "https://engr-131-api.eastus.cloudapp.azure.com/") -> None:
-
+def initialize_assignment(
+    name: str,
+    verbose: Optional[bool] = False,
+    url: Optional[str] = "https://engr-131-api.eastus.cloudapp.azure.com/",
+) -> None:
     ipython = get_ipython()
     if ipython is None:
         print("Setup unsuccessful. Are you in a Jupyter environment?")
@@ -38,13 +38,12 @@ def initialize_assignment(name: str,
     except (TypeError, json.JSONDecodeError) as e:
         print(f"Failed to initialize assignment: {e}")
         return
-    
-    
+
     # extract responses
     responses = ensure_responses()
-    
-    # TODO: Add more checks here??        
-    assert isinstance(responses.get('seed'), int), "valid seed not found in responses"
+
+    # TODO: Add more checks here??
+    assert isinstance(responses.get("seed"), int), "valid seed not found in responses"
 
     pn.extension(silent=True)
 
@@ -52,17 +51,15 @@ def initialize_assignment(name: str,
         print("Assignment successfully initialized")
         print(f"Assignment: {name}")
         print(f"Username: {jhub_user}")
-        
 
-    
     # Checks connectivity to the API
-    params = { "jhub_user": responses["jhub_user"] }
+    params = {"jhub_user": responses["jhub_user"]}
     response = requests.get(url, params=params)
     if verbose:
         print(f"status code: {response.status_code}")
         data = response.json()
         for k, v in data.items():
             print(f"{k}: {v}")
-        
+
     print("Assignment successfully initialized")
     return responses

{pykubegrader-0.1.10 → pykubegrader-0.1.12}/src/pykubegrader/telemetry.py

@@ -20,11 +20,11 @@ logging.basicConfig(filename=".output.log", level=logging.INFO, force=True)
 
 
 def encrypt_to_b64(message: str) -> str:
-    with open("server_public_key.bin", "rb") as f:
+    with open(".server_public_key.bin", "rb") as f:
         server_pub_key_bytes = f.read()
     server_pub_key = nacl.public.PublicKey(server_pub_key_bytes)
 
-    with open("client_private_key.bin", "rb") as f:
+    with open(".client_private_key.bin", "rb") as f:
         client_private_key_bytes = f.read()
     client_priv_key = nacl.public.PrivateKey(client_private_key_bytes)
 
@@ -36,7 +36,6 @@ def encrypt_to_b64(message: str) -> str:
 
 
 def ensure_responses() -> dict:
-
     with open(".responses.json", "a") as _:
         pass
 
@@ -48,7 +47,7 @@ def ensure_responses() -> dict:
     except json.JSONDecodeError:
         with open(".responses.json", "w") as f:
             json.dump(responses, f)
-    
+
     return responses
 
 

{pykubegrader-0.1.10 → pykubegrader-0.1.12}/src/pykubegrader/validate.py

@@ -252,11 +252,11 @@ def validate_logfile(
 
 
 def generate_keys() -> nacl.public.Box:
-    with open("server_private_key.bin", "rb") as priv_file:
+    with open(".server_private_key.bin", "rb") as priv_file:
         server_private_key_bytes = priv_file.read()
     server_priv_key = nacl.public.PrivateKey(server_private_key_bytes)
 
-    with open("client_public_key.bin", "rb") as pub_file:
+    with open(".client_public_key.bin", "rb") as pub_file:
         client_public_key_bytes = pub_file.read()
     client_pub_key = nacl.public.PublicKey(client_public_key_bytes)