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

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

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

{PyKubeGrader-0.2.10.dist-info → PyKubeGrader-0.2.12.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=hNHfhCn2rAHUK_i-KbtZYhUbd_bYsAoPRm2vVK9gYi8,76508
+pykubegrader/build/build_folder.py,sha256=Ahec6o48wHYpsLViUWi5qIHTirZQg9PJk3N4ABiZD-w,78871
 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=f8mQ96d0EpI5FNhdauGj21ybSZEzBEYsuG25a-Jel-c,3289
+pykubegrader/submit/submit_assignment.py,sha256=p-v31479342q0AO3lJrd8Fwk7iJQUz183OeGeiNcXOY,3405
 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.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-0.2.12.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.12.dist-info/METADATA,sha256=DH3IMdYk9nFa_JwDfNdMSZRbr_vZy5jx7OvX8Rjy_FY,2779
+PyKubeGrader-0.2.12.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+PyKubeGrader-0.2.12.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.12.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.12.dist-info/RECORD,,

{PyKubeGrader-0.2.10.dist-info → PyKubeGrader-0.2.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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):
         """
@@ -436,6 +498,9 @@ class NotebookProcessor:
             + self.tf_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
 
@@ -466,7 +531,7 @@ class NotebookProcessor:
         # 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}")'
+            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

pykubegrader/submit/submit_assignment.py

@@ -22,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.
@@ -38,15 +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?assignment_title={assignment_title}"
+    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"]
+    password = credentials["password"] 
 
     # Encode credentials for Basic Authentication
-    auth_header = f"Basic {base64.b64encode(f'{username}:{password}'.encode()).decode()}"
+    auth_header = (
+        f"Basic {base64.b64encode(f'{username}:{password}'.encode()).decode()}"
+    )
 
     # Send the POST request
     async with httpx.AsyncClient() as client:
@@ -71,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.
@@ -89,7 +93,7 @@ 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"))