PyKubeGrader 0.2.5__tar.gz → 0.2.7__tar.gz

{pykubegrader-0.2.5/src/PyKubeGrader.egg-info → pykubegrader-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyKubeGrader
-Version: 0.2.5
+Version: 0.2.7
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2
@@ -28,6 +28,7 @@ Requires-Dist: types-python-dateutil
 Requires-Dist: types-pyyaml
 Requires-Dist: types-requests
 Requires-Dist: types-setuptools
+Requires-Dist: httpx
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/setup.cfg

@@ -38,6 +38,7 @@ install_requires =
 	types-pyyaml
 	types-requests
 	types-setuptools
+	httpx
 
 [options.packages.find]
 where = src

{pykubegrader-0.2.5 → pykubegrader-0.2.7/src/PyKubeGrader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyKubeGrader
-Version: 0.2.5
+Version: 0.2.7
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2
@@ -28,6 +28,7 @@ Requires-Dist: types-python-dateutil
 Requires-Dist: types-pyyaml
 Requires-Dist: types-requests
 Requires-Dist: types-setuptools
+Requires-Dist: httpx
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/src/PyKubeGrader.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ src/pykubegrader/graders/late_assignments.py
 src/pykubegrader/log_parser/__init__.py
 src/pykubegrader/log_parser/parse.ipynb
 src/pykubegrader/log_parser/parse.py
+src/pykubegrader/submit/submit_assignment.py
 src/pykubegrader/widgets/__init__.py
 src/pykubegrader/widgets/multiple_choice.py
 src/pykubegrader/widgets/reading_question.py

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/src/PyKubeGrader.egg-info/requires.txt

@@ -13,6 +13,7 @@ types-python-dateutil
 types-pyyaml
 types-requests
 types-setuptools
+httpx
 
 [:python_version < "3.8"]
 importlib-metadata

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/src/pykubegrader/build/build_folder.py

@@ -1,3 +1,7 @@
+### Note
+
+
+
 import argparse
 import importlib.util
 import json
@@ -22,7 +26,7 @@ except:  # noqa: E722
 import nbformat
 
 from .api_notebook_builder import FastAPINotebookBuilder
-
+from typing import Optional
 
 @dataclass
 class NotebookProcessor:
@@ -66,6 +70,7 @@ class NotebookProcessor:
             self.assignment_type = self.assignment_tag.split("-")[0].lower()
             week_num = self.assignment_tag.split("-")[-1]
 
+        self.week_num = week_num
         self.week = f"week_{week_num}"
 
         # Define the folder to store solutions and ensure it exists
@@ -155,7 +160,22 @@ 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,
+                )
+                
+        
     def build_payload(self, yaml_content):
         """
         Reads YAML content for an assignment and returns Python variables.
@@ -1380,7 +1400,6 @@ 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.
@@ -1826,6 +1845,69 @@ 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,
+    assignment_tag: Optional[str] = None,
+) -> None:
+    """
+    Search for a specific line in a Jupyter Notebook and update it with additional input variables.
+
+    Args:
+        notebook_path (str): The path to the Jupyter Notebook file (.ipynb).
+        assignment_points (Optional[float]): The assignment points variable to add (default is None).
+        assignment_tag (Optional[str]): The assignment tag variable to add (default is None).
+
+    Returns:
+        None
+    """
+    # Load the notebook content
+    with open(notebook_path, "r", encoding="utf-8") as file:
+        notebook_data = json.load(file)
+
+    # Pattern to match the specific initialize_assignment line
+    pattern = re.compile(r"responses\s*=\s*initialize_assignment\((.*?)\)")
+
+    # Collect additional variables
+    additional_variables = []
+    if assignment_points is not None:
+        additional_variables.append(f"assignment_points = {assignment_points}")
+    if assignment_tag is not None:
+        additional_variables.append(f"assignment_tag = '{assignment_tag}'")
+
+    # Join additional variables into a string
+    additional_variables_str = ", ".join(additional_variables)
+
+    # Flag to check if any replacements were made
+    updated = False
+
+    # Iterate through notebook cells
+    for cell in notebook_data.get("cells", []):
+        if cell.get("cell_type") == "code":  # Only modify code cells
+            source_code = cell.get("source", [])
+            for i, line in enumerate(source_code):
+                match = pattern.search(line)
+                if match:
+                    # Extract existing arguments
+                    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})\n"
+                    source_code[i] = updated_line
+                    updated = True
+
+    # If updated, save the notebook
+    if updated:
+        with open(notebook_path, "w", encoding="utf-8") as file:
+            json.dump(notebook_data, file, indent=2)
+        print(f"Notebook '{notebook_path}' has been updated.")
+    else:
+        print(f"No matching lines found in '{notebook_path}'.")
 
 
 def main():

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/src/pykubegrader/initialize.py

@@ -6,16 +6,18 @@ from pathlib import Path
 import panel as pn
 import requests
 from IPython import get_ipython
-
+from typing import Optional
 from .telemetry import ensure_responses, log_variable, telemetry, update_responses
 
 
 def initialize_assignment(
     name: str,
-    week: int,
+    week: str,
     assignment_type: str,
     url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
     verbose: bool = False,
+    assignment_points: Optional[float] = None,
+    assignment_tag: Optional[str] = None,
 ) -> dict:
     """
     Initialize an assignment in a Jupyter environment.
@@ -75,6 +77,8 @@ def initialize_assignment(
     except Exception as e:
         raise Exception(f"Failed to initialize assignment: {e}")
 
+    log_variable("total-points", f"{assignment_tag}, {name}", assignment_points)
+
     print("Assignment successfully initialized")
     if verbose:
         print(f"Assignment: {name}")

{pykubegrader-0.2.5 → pykubegrader-0.2.7}/src/pykubegrader/log_parser/parse.ipynb

@@ -1,5 +1,22 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Get the public/private keypair for decryption\n",
+    "key_box = get_keybox()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -134,7 +151,7 @@
     "parser = LogParser(log_lines=log_lines, week_tag=\"week1-readings\")\n",
     "parser.parse_logs()\n",
     "parser.calculate_total_scores()\n",
-    "results = parser.get_results()\n",
+    "results = parser.get_results() \n",
     "\n",
     "results"
    ]
@@ -182,6 +199,15 @@
    "outputs": [],
    "source": []
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "type(results[\"student_information\"][\"timestamp\"])"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -190,16 +216,23 @@
    "source": [
     "student_email = results[\"student_information\"][\"username\"]\n",
     "time_stamp = results[\"student_information\"][\"timestamp\"]\n",
-    "assignments_graded = results[\"assignment_information\"].keys()\n",
+    "\n",
     "week_num = results[\"week_num\"]\n",
     "assignment_type = results['assignment_type']\n",
     "\n",
-    "\n",
+    "assignments_graded = results[\"assignment_information\"].keys()\n",
     "total_score = 0\n",
     "for assignment in assignments_graded:\n",
-    "    max_points = results[\"assignment_information\"][assignment][\"max_points\"]\n",
-    "    total_score = results[\"assignment_information\"][assignment][\"total_score\"]\n",
-    "\n"
+    "    total_score += results[\"assignment_information\"][assignment][\"total_score\"]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "total_score"
    ]
   },
   {
@@ -217,7 +250,9 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": []
+   "source": [
+    "student_email"
+   ]
   },
   {
    "cell_type": "code",

pykubegrader-0.2.7/src/pykubegrader/submit/submit_assignment.py

@@ -0,0 +1,80 @@
+import os
+import httpx
+import asyncio
+
+
+def get_credentials():
+    """
+    Fetch the username and password from environment variables.
+    """
+    username = os.getenv("user_name_student")
+    password = os.getenv("keys_student")
+    if not username or not password:
+        raise ValueError(
+            "Environment variables 'user_name_student' or 'keys_student' are not set."
+        )
+    return {"username": username, "password": password}
+
+
+async def call_score_assignment(
+    assignment_title: str, file_path: str = ".output_reduced.log"
+) -> dict:
+    """
+    Submit an assignment to the scoring endpoint.
+
+    Args:
+        assignment_title (str): Title of the assignment.
+        file_path (str): Path to the log file to upload.
+
+    Returns:
+        dict: JSON response from the server.
+    """
+    # Fetch the endpoint URL from environment variables
+    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"
+
+    # Get credentials
+    credentials = get_credentials()
+
+    # Send the POST request
+    async with httpx.AsyncClient() as client:
+        try:
+            with open(file_path, "rb") as file:
+                response = await client.post(
+                    url,
+                    data={"cred": credentials, "assignment_title": assignment_title},
+                    files={"log_file": file},
+                )
+
+                # Handle the response
+                response.raise_for_status()  # Raise an exception for HTTP errors
+                response_data = response.json()
+                return response_data
+        except FileNotFoundError:
+            raise FileNotFoundError(f"The file {file_path} does not exist.")
+        except httpx.RequestError as e:
+            raise RuntimeError(f"An error occurred while requesting {url}: {e}")
+        except Exception as e:
+            raise RuntimeError(f"An unexpected error occurred: {e}")
+
+
+# Importable function
+def submit_assignment(
+    assignment_title: str, file_path: str = ".output_reduced.log"
+) -> None:
+    """
+    Synchronous wrapper for the `call_score_assignment` function.
+
+    Args:
+        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))
+    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")