PyKubeGrader 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

{PyKubeGrader-0.2.8.dist-info → PyKubeGrader-0.2.10.dist-info}/METADATA

@@ -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.dist-info → PyKubeGrader-0.2.10.dist-info}/RECORD

@@ -5,14 +5,14 @@ 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=g8yRRGmHxW_47WHpFPsH9tiuFgFrvcxBPJwjZyFMS_w,74895
+pykubegrader/build/build_folder.py,sha256=hNHfhCn2rAHUK_i-KbtZYhUbd_bYsAoPRm2vVK9gYi8,76508
 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=UHRwogSz7TpMUZSAyEbQIQut2WcC08ma2JEIEWaSUdM,2702
+pykubegrader/submit/submit_assignment.py,sha256=f8mQ96d0EpI5FNhdauGj21ybSZEzBEYsuG25a-Jel-c,3289
 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 +25,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.8.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.8.dist-info/METADATA,sha256=KDlsQ-0emWgalUlulH1-hifPtv1M7kzHulEJlcLDmtM,2778
-PyKubeGrader-0.2.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-PyKubeGrader-0.2.8.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.8.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.8.dist-info/RECORD,,
+PyKubeGrader-0.2.10.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.10.dist-info/METADATA,sha256=VlXNrYslMa8YjmEQWQ67wCuII-K0uGZXKHeEDcAkSro,2779
+PyKubeGrader-0.2.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+PyKubeGrader-0.2.10.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.10.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.10.dist-info/RECORD,,

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/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")