PyKubeGrader 0.2.11__py3-none-any.whl → 0.2.13__py3-none-any.whl

{PyKubeGrader-0.2.11.dist-info → PyKubeGrader-0.2.13.dist-info}/METADATA

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

{PyKubeGrader-0.2.11.dist-info → PyKubeGrader-0.2.13.dist-info}/RECORD

@@ -1,18 +1,19 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
-pykubegrader/initialize.py,sha256=DUen_B1cHFOmwiMpB_wkCqHIjvGChsu62-WiFkKa5Wo,3766
+pykubegrader/initialize.py,sha256=lJu0h-fMUMRxZ70rFAEXix3H6j-TcRaxveC2SIKTzF4,3903
 pykubegrader/telemetry.py,sha256=h8PPrXWGFgPWCcrChJo2woqd_XIPMFfYcxgLJ0CWpH8,5360
 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=FEaTj1fEsPAes7KNrPuhClEvKzLuOL3wG7Hgr7FQc-o,20083
-pykubegrader/build/build_folder.py,sha256=Ahec6o48wHYpsLViUWi5qIHTirZQg9PJk3N4ABiZD-w,78871
+pykubegrader/build/build_folder.py,sha256=LfghCO0-CMFMua_OYwIK0-c7AlCXgGSTIQ8X45zNw-g,79679
 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
 pykubegrader/log_parser/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/log_parser/parse.ipynb,sha256=H1CUuqiUSE-tiZV1IS7VG6HAEvoopGd6i_5QM5CwoE0,12230
 pykubegrader/log_parser/parse.py,sha256=YCs_OCnoxQKsL55MjTZWXBBBsehJL8PIB9ANnC-aE44,7379
-pykubegrader/submit/submit_assignment.py,sha256=9rBB4SgRJQzu315zYamboV954ZFUgH-DNnNrNzMICFo,3404
+pykubegrader/submit/submit_assignment.py,sha256=p-v31479342q0AO3lJrd8Fwk7iJQUz183OeGeiNcXOY,3405
+pykubegrader/tokens/tokens.py,sha256=cM8CKUrwHkIUXE3ucSCsY9JDT-A8K-opmTpliJtGEWs,1404
 pykubegrader/widgets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/widgets/multiple_choice.py,sha256=NjD3-uXSnibpUQ0mO3hRp_O-rynFyl0Dz6IXE4tnCRI,2078
 pykubegrader/widgets/reading_question.py,sha256=y30_swHwzH8LrT8deWTnxctAAmR8BSxTlXAqMgUrAT4,3031
@@ -25,9 +26,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.11.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.11.dist-info/METADATA,sha256=tEO2oOi3YBk0IIhX5g4wkiHAVGPZsUXiIP0OCquLswA,2779
-PyKubeGrader-0.2.11.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-PyKubeGrader-0.2.11.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.11.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.11.dist-info/RECORD,,
+PyKubeGrader-0.2.13.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.13.dist-info/METADATA,sha256=kKG8_Pma2DrHWtCtw-FrI5rEDvW3R5mVXljRVZUY5sI,2779
+PyKubeGrader-0.2.13.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+PyKubeGrader-0.2.13.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.13.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.13.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -1,7 +1,6 @@
 ### Note
 
 
-
 import argparse
 import importlib.util
 import json
@@ -28,6 +27,7 @@ import nbformat
 from .api_notebook_builder import FastAPINotebookBuilder
 from typing import Optional
 
+
 @dataclass
 class NotebookProcessor:
     """
@@ -160,22 +160,21 @@ class NotebookProcessor:
 
         if self.check_if_file_in_folder("assignment_config.yaml"):
             self.add_assignment()
-            
+
         self.update_initialize_function()
-                
+
     def update_initialize_function(self):
-        
+
         for key, value in self.total_point_log.items():
-            
+
             assignment_tag = f"week{self.week_num}-{self.assignment_type}"
-                
+
             update_initialize_assignment(
-                    notebook_path = os.path.join(self.root_folder, key + '.ipynb'),
-                    assignment_points= value,
-                    assignment_tag = assignment_tag,
-                )
-                
-        
+                notebook_path=os.path.join(self.root_folder, key + ".ipynb"),
+                assignment_points=value,
+                assignment_tag=assignment_tag,
+            )
+
     def build_payload(self, yaml_content):
         """
         Reads YAML content for an assignment and returns Python variables.
@@ -215,15 +214,15 @@ class NotebookProcessor:
             "due_date": due_date,
             "max_score": int(self.assignment_total_points),
         }
-        
-    def build_payload_notebook(self, yaml_content,  notebook_title, total_points):
+
+    def build_payload_notebook(self, yaml_content, notebook_title, total_points):
         # Parse the YAML content
         with open(yaml_content, "r") as file:
             data = yaml.safe_load(file)
-        
+
         # Extract assignment details
         assignment = data.get("assignment", {})
-         
+
         week_num = self.week_num
         assignment_type = self.assignment_type
         due_date_str = assignment.get("due_date")
@@ -235,7 +234,7 @@ class NotebookProcessor:
                 due_date = parser.parse(due_date_str)  # Automatically handles timezones
             except ValueError as e:
                 print(f"Error parsing due_date: {e}")
-        
+
         return {
             "title": notebook_title,
             "week_number": week_num,
@@ -243,8 +242,7 @@ class NotebookProcessor:
             "due_date": due_date,
             "max_score": total_points,
         }
-        
-        
+
     def add_notebook(self, notebook_title, total_points):
         """
         Sends a POST request to add a notebook.
@@ -253,9 +251,11 @@ class NotebookProcessor:
         url = "https://engr-131-api.eastus.cloudapp.azure.com/notebook"
 
         # Build the payload
-        payload = self.build_payload_notebook(yaml_content=f"{self.root_folder}/assignment_config.yaml", 
-                                              notebook_title=notebook_title, 
-                                              total_points=total_points)
+        payload = self.build_payload_notebook(
+            yaml_content=f"{self.root_folder}/assignment_config.yaml",
+            notebook_title=notebook_title,
+            total_points=total_points,
+        )
 
         # Define HTTP Basic Authentication
         auth = (user(), password())
@@ -496,19 +496,50 @@ class NotebookProcessor:
             self.select_many_total_points
             + self.mcq_total_points
             + self.tf_total_points
-            + self.otter_total_points 
+            + self.otter_total_points
         )
-            
+
         # creates the assignment record in the database
         self.add_notebook(notebook_name, total_points)
 
         self.assignment_total_points += total_points
 
         self.total_point_log.update({notebook_name: total_points})
-        
-        student_file_path = os.path.join(self.root_folder, notebook_name + '.ipynb')
+
+        student_file_path = os.path.join(self.root_folder, notebook_name + ".ipynb")
         self.add_submission_cells(student_file_path, student_file_path)
-        
+        NotebookProcessor.remove_empty_cells(student_file_path)
+
+    @staticmethod
+    def remove_empty_cells(notebook_path, output_path=None):
+        """
+        Removes empty cells from a Jupyter Notebook and saves the updated notebook.
+
+        Parameters:
+            notebook_path (str): Path to the input Jupyter Notebook.
+            output_path (str): Path to save the updated Jupyter Notebook. If None, it overwrites the original file.
+        """
+        try:
+            # Load the notebook
+            with open(notebook_path, "r") as nb_file:
+                notebook = nbformat.read(nb_file, as_version=4)
+
+            # Filter out empty cells
+            non_empty_cells = [cell for cell in notebook.cells if cell.source.strip()]
+
+            # Update the notebook cells
+            notebook.cells = non_empty_cells
+
+            # Save the updated notebook
+            save_path = output_path if output_path else notebook_path
+            with open(save_path, "w") as nb_file:
+                nbformat.write(notebook, nb_file)
+
+            print(f"Empty cells removed. Updated notebook saved at: {save_path}")
+
+        except Exception as e:
+            print(f"An error occurred: {e}")
+
     def add_submission_cells(self, notebook_path: str, output_path: str) -> None:
         """
         Adds submission cells to the end of a Jupyter notebook.
@@ -533,12 +564,9 @@ class NotebookProcessor:
             "from pykubegrader.submit.submit_assignment import submit_assignment\n\n"
             f'submit_assignment("week{self.week_num}-{self.assignment_type}", "{os.path.basename(notebook_path).replace(".ipynb", "")}")'
         )
-        
+
         # Make the code cell non-editable and non-deletable
-        code_cell.metadata = {
-            "editable": False,
-            "deletable": False
-        }
+        code_cell.metadata = {"editable": False, "deletable": False}
 
         # Add the cells to the notebook
         notebook.cells.append(markdown_cell)
@@ -548,7 +576,6 @@ class NotebookProcessor:
         with open(output_path, "w", encoding="utf-8") as f:
             nbformat.write(notebook, f)
 
-
     def free_response_parser(
         self, temp_notebook_path, notebook_subfolder, notebook_name
     ):
@@ -783,7 +810,7 @@ class NotebookProcessor:
             return solution_path, question_path
         else:
             return None, None
-        
+
     @staticmethod
     def replace_temp_no_otter(input_file, output_file):
         # Load the notebook
@@ -793,8 +820,8 @@ class NotebookProcessor:
         # Iterate through the cells and modify `cell.source`
         for cell in notebook.cells:
             if cell.cell_type == "code":  # Only process code cells
-                if 'responses = initialize_assignment(' in cell.source:
-                    cell.source = cell.source.replace('_temp', '')
+                if "responses = initialize_assignment(" in cell.source:
+                    cell.source = cell.source.replace("_temp", "")
 
         # Save the modified notebook
         with open(output_file, "w", encoding="utf-8") as f:
@@ -823,7 +850,6 @@ class NotebookProcessor:
                 cell["source"] = [
                     line.replace("_temp.ipynb", ".ipynb") for line in cell["source"]
                 ]
-            
 
         # Write the updated notebook to the output file
         with open(output_file, "w", encoding="utf-8") as f:
@@ -1508,6 +1534,7 @@ def extract_MCQ(ipynb_file):
         print("Invalid JSON in notebook file.")
         return []
 
+
 def check_for_heading(notebook_path, search_strings):
     """
     Checks if a Jupyter notebook contains a heading cell whose source matches any of the given strings.
@@ -1547,8 +1574,6 @@ def clean_notebook(notebook_path):
                     cell.metadata["editable"] = cell.metadata.get("editable", False)
                     cell.metadata["deletable"] = cell.metadata.get("deletable", False)
                 if cell.cell_type == "code":
-                    if "grader.check(" in cell.source:
-                        continue
                     cell.metadata["tags"] = cell.metadata.get("tags", [])
                     if "skip-execution" not in cell.metadata["tags"]:
                         cell.metadata["tags"].append("skip-execution")
@@ -1953,7 +1978,8 @@ def replace_cell_source(notebook_path, cell_index, new_source):
     # Save the notebook
     with open(notebook_path, "w", encoding="utf-8") as f:
         nbformat.write(notebook, f)
-        
+
+
 def update_initialize_assignment(
     notebook_path: str,
     assignment_points: Optional[float] = None,
@@ -2001,11 +2027,11 @@ def update_initialize_assignment(
                     existing_args = match.group(1).strip()
                     # Replace with the updated line
                     if additional_variables_str:
+                        updated_line = f"responses = initialize_assignment({existing_args}, {additional_variables_str})\n"
+                    else:
                         updated_line = (
-                            f"responses = initialize_assignment({existing_args}, {additional_variables_str})\n"
+                            f"responses = initialize_assignment({existing_args})\n"
                         )
-                    else:
-                        updated_line = f"responses = initialize_assignment({existing_args})\n"
                     source_code[i] = updated_line
                     updated = True
 

pykubegrader/initialize.py

@@ -9,7 +9,7 @@ from IPython import get_ipython
 from typing import Optional
 from .telemetry import ensure_responses, log_variable, telemetry, update_responses
 
-
+#TODO: could cleanup to remove redundant imports
 def initialize_assignment(
     name: str,
     week: str,
@@ -33,6 +33,9 @@ def initialize_assignment(
     Raises:
         Exception: If the environment is unsupported or initialization fails.
     """
+    
+    if assignment_tag is None:
+        assignment_tag = f"{week}-{assignment_type}"
 
     ipython = get_ipython()
     if ipython is None:

pykubegrader/submit/submit_assignment.py

@@ -43,7 +43,7 @@ async def call_score_assignment(
     # Get credentials
     credentials = get_credentials()
     username = credentials["username"]
-    password = credentials["password"]
+    password = credentials["password"] 
 
     # Encode credentials for Basic Authentication
     auth_header = (

pykubegrader/tokens/tokens.py

@@ -0,0 +1,50 @@
+import requests
+
+try:
+    from pykubegrader.build.passwords import password, user, juptyerhub_user
+except:  # noqa: E722
+    print("Passwords not found, cannot access database")
+
+
+def build_token_payload(token: str, duration: int) -> dict:
+
+    if juptyerhub_user() is None:
+        raise ValueError("JupyterHub user not found")
+
+    # Return the extracted details as a dictionary
+    return {
+        "value": token,
+        "requester": juptyerhub_user(),
+        "duration": duration,
+    }
+
+
+# Need to do for add token as well
+def add_token(self, token, duration=20):
+    """
+    Sends a POST request to add a notebook.
+    """
+    # Define the URL
+    url = "https://engr-131-api.eastus.cloudapp.azure.com/tokens"
+
+    # Build the payload
+    payload = self.build_token_payload(token= token, duration=duration)
+
+    # Define HTTP Basic Authentication
+    auth = (user(), password())
+
+    # Define headers
+    headers = {"Content-Type": "application/json"}
+
+    # Serialize the payload with the custom JSON encoder
+    serialized_payload = json.dumps(payload, default=self.json_serial)
+
+    # Send the POST request
+    response = requests.post(url, data=serialized_payload, headers=headers, auth=auth)
+
+    # Print the response
+    print(f"Status Code: {response.status_code}")
+    try:
+        print(f"Response: {response.json()}")
+    except ValueError:
+        print(f"Response: {response.text}")