PyKubeGrader 0.2.9__tar.gz → 0.2.11__tar.gz

{pykubegrader-0.2.9/src/PyKubeGrader.egg-info → pykubegrader-0.2.11}/PKG-INFO

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

{pykubegrader-0.2.9 → pykubegrader-0.2.11/src/PyKubeGrader.egg-info}/PKG-INFO

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

{pykubegrader-0.2.9 → pykubegrader-0.2.11}/src/pykubegrader/build/build_folder.py

@@ -215,6 +215,68 @@ class NotebookProcessor:
             "due_date": due_date,
             "max_score": int(self.assignment_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")
+
+        # Convert due_date to a datetime object if available
+        due_date = None
+        if due_date_str:
+            try:
+                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,
+            "assignment_type": assignment_type,
+            "due_date": due_date,
+            "max_score": total_points,
+        }
+        
+        
+    def add_notebook(self, notebook_title, total_points):
+        """
+        Sends a POST request to add a notebook.
+        """
+        # Define the URL
+        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)
+
+        # 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}")
 
     def add_assignment(self):
         """
@@ -434,12 +496,58 @@ 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')
+        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}", "{os.path.basename(notebook_path).replace(".ipynb", "")}")'
+        )
+        
+        # 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.9 → pykubegrader-0.2.11}/src/pykubegrader/submit/submit_assignment.py

@@ -2,6 +2,7 @@ import os
 import httpx
 import asyncio
 import nest_asyncio
+import base64
 
 # Apply nest_asyncio for environments like Jupyter
 nest_asyncio.apply()
@@ -21,7 +22,7 @@ def get_credentials():
 
 
 async def call_score_assignment(
-    assignment_title: str, file_path: str = ".output_reduced.log"
+    assignment_title: str, notebook_title: str, file_path: str = ".output_reduced.log"
 ) -> dict:
     """
     Submit an assignment to the scoring endpoint.
@@ -37,10 +38,17 @@ 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}&notebook_title={notebook_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 +56,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
@@ -65,7 +73,9 @@ async def call_score_assignment(
 
 
 def submit_assignment(
-    assignment_title: str, file_path: str = ".output_reduced.log"
+    assignment_title: str,
+    notebook_title: str,
+    file_path: str = ".output_reduced.log",
 ) -> None:
     """
     Synchronous wrapper for the `call_score_assignment` function.
@@ -83,11 +93,11 @@ def submit_assignment(
 
     # Run the async function in the event loop
     response = loop.run_until_complete(
-        call_score_assignment(assignment_title, file_path)
+        call_score_assignment(assignment_title, notebook_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")