PyKubeGrader 0.2.8__tar.gz → 0.2.10__tar.gz

{pykubegrader-0.2.8/src/PyKubeGrader.egg-info → pykubegrader-0.2.10}/PKG-INFO

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

{pykubegrader-0.2.8 → pykubegrader-0.2.10/src/PyKubeGrader.egg-info}/PKG-INFO

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

{pykubegrader-0.2.8 → pykubegrader-0.2.10}/src/pykubegrader/build/build_folder.py

@@ -434,12 +434,55 @@ class NotebookProcessor:
             self.select_many_total_points
             + self.mcq_total_points
             + self.tf_total_points
-            + self.otter_total_points
+            + self.otter_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')
+        self.add_submission_cells(student_file_path, student_file_path)
+        
+    def add_submission_cells(self, notebook_path: str, output_path: str) -> None:
+        """
+        Adds submission cells to the end of a Jupyter notebook.
+
+        Args:
+            notebook_path (str): Path to the input notebook.
+            output_path (str): Path to save the modified notebook.
+        """
+        # Load the notebook
+        with open(notebook_path, "r", encoding="utf-8") as f:
+            notebook = nbformat.read(f, as_version=4)
+
+        # Define the Markdown cell
+        markdown_cell = nbformat.v4.new_markdown_cell(
+            "## Submitting Assignment\n\n"
+            "Please run the following block of code using `shift + enter` to submit your assignment, "
+            "you should see your score."
+        )
+
+        # Define the Code cell
+        code_cell = nbformat.v4.new_code_cell(
+            "from pykubegrader.submit.submit_assignment import submit_assignment\n\n"
+            f'submit_assignment("week{self.week_num}-{self.assignment_type}")'
+        )
+        
+        # Make the code cell non-editable and non-deletable
+        code_cell.metadata = {
+            "editable": False,
+            "deletable": False
+        }
+
+        # Add the cells to the notebook
+        notebook.cells.append(markdown_cell)
+        notebook.cells.append(code_cell)
+
+        # Save the modified notebook
+        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

{pykubegrader-0.2.8 → pykubegrader-0.2.10}/src/pykubegrader/submit/submit_assignment.py

@@ -1,9 +1,10 @@
 import os
 import httpx
 import asyncio
-
 import nest_asyncio
+import base64
 
+# Apply nest_asyncio for environments like Jupyter
 nest_asyncio.apply()
 
 
@@ -37,10 +38,15 @@ async def call_score_assignment(
     base_url = os.getenv("DB_URL")
     if not base_url:
         raise ValueError("Environment variable 'DB_URL' is not set.")
-    url = f"{base_url}score-assignment"
+    url = f"{base_url}score-assignment?assignment_title={assignment_title}"
 
     # Get credentials
     credentials = get_credentials()
+    username = credentials["username"]
+    password = credentials["password"]
+
+    # Encode credentials for Basic Authentication
+    auth_header = f"Basic {base64.b64encode(f'{username}:{password}'.encode()).decode()}"
 
     # Send the POST request
     async with httpx.AsyncClient() as client:
@@ -48,8 +54,8 @@ async def call_score_assignment(
             with open(file_path, "rb") as file:
                 response = await client.post(
                     url,
-                    data={"cred": credentials, "assignment_title": assignment_title},
-                    files={"log_file": file},
+                    headers={"Authorization": auth_header},  # Add Authorization header
+                    files={"log_file": file},  # Upload log file
                 )
 
                 # Handle the response
@@ -64,7 +70,6 @@ async def call_score_assignment(
             raise RuntimeError(f"An unexpected error occurred: {e}")
 
 
-# Importable function
 def submit_assignment(
     assignment_title: str, file_path: str = ".output_reduced.log"
 ) -> None:
@@ -75,10 +80,20 @@ def submit_assignment(
         assignment_title (str): Title of the assignment.
         file_path (str): Path to the log file to upload.
     """
-    response = asyncio.run(call_score_assignment(assignment_title, file_path))
+    # Get the current event loop or create one
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+    # Run the async function in the event loop
+    response = loop.run_until_complete(
+        call_score_assignment(assignment_title, file_path)
+    )
     print("Server Response:", response.get("message", "No message in response"))
 
 
 # Example usage (remove this section if only the function needs to be importable):
 if __name__ == "__main__":
-    submit_assignment("Week 1 Assignment", "path/to/your/log_file.txt")
+    submit_assignment("week1-readings", "path/to/your/log_file.txt")