PyKubeGrader 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

{PyKubeGrader-0.2.1.dist-info → PyKubeGrader-0.2.3.dist-info}/METADATA

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

{PyKubeGrader-0.2.1.dist-info → PyKubeGrader-0.2.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
-pykubegrader/initialize.py,sha256=t3iSdeIcndfY8LoHBVUEZfTW6sUWHyeFLirKo4GwSQE,3328
-pykubegrader/telemetry.py,sha256=jRInaDqIpdeT7F0rxLJgO38lA-SMtmLcYE8nEAGah1Q,4922
+pykubegrader/initialize.py,sha256=lQ80bB4LHDLJXFFl820_mNTFXvXpLT-rEAViBBsEPn0,3568
+pykubegrader/telemetry.py,sha256=bgBWt9B3zqbfV2xWKDZKg41ZEBaF6X43O74do1fRylM,5325
 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=e27Ni64qpgmzg4Yu94nQieyK3IflZUQ0BvEOzwMGKMU,70729
+pykubegrader/build/build_folder.py,sha256=MyQ7ncPwiuTZ9PD7Q7al1n1bog4cugH1ew5DEC2NqNM,71700
 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=kPTo9gqhDineT7yT56P9xrQP1OKTf6Ro-iR4xlJ-or8,10610
-pykubegrader/log_parser/parse.py,sha256=uw8lxWVh0FTaWi-bVmpMBbqwTXIHlJtB9gPc1qKvm4I,7040
+pykubegrader/log_parser/parse.ipynb,sha256=GnEgUmowdN2bZSwwWgxqi43QXaP-syPD2SnHvOGq1vU,11674
+pykubegrader/log_parser/parse.py,sha256=YCs_OCnoxQKsL55MjTZWXBBBsehJL8PIB9ANnC-aE44,7379
 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
@@ -24,9 +24,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.1.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.1.dist-info/METADATA,sha256=tY6eIv1slUtGb-qLeuoxkXxPc55sAjxqGG_f9MFf5Oo,2729
-PyKubeGrader-0.2.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-PyKubeGrader-0.2.1.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.1.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.1.dist-info/RECORD,,
+PyKubeGrader-0.2.3.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.3.dist-info/METADATA,sha256=W63VPeqive20qAS1GAsEGYRiOpMsP028h5u76CfEOdw,2729
+PyKubeGrader-0.2.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+PyKubeGrader-0.2.3.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.3.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.3.dist-info/RECORD,,

pykubegrader/build/build_folder.py

@@ -190,6 +190,8 @@ class NotebookProcessor:
         return {
             "title": title,
             "description": str(week),
+            "week_number": week,
+            "assignment_type": assignment_type,
             "due_date": due_date,
             "max_score": int(self.assignment_total_points),
         }
@@ -503,6 +505,9 @@ class NotebookProcessor:
             NotebookProcessor.add_initialization_code(
                 temp_notebook_path, self.week, self.assignment_type
             )
+            NotebookProcessor.replace_temp_no_otter(
+                temp_notebook_path, temp_notebook_path
+            )
             return None, 0
 
     @staticmethod
@@ -650,6 +655,22 @@ class NotebookProcessor:
             return solution_path, question_path
         else:
             return None, None
+        
+    @staticmethod
+    def replace_temp_no_otter(input_file, output_file):
+        # Load the notebook
+        with open(input_file, "r", encoding="utf-8") as f:
+            notebook = nbformat.read(f, as_version=4)
+
+        # Iterate through the cells and modify `cell.source`
+        for cell in notebook.cells:
+            if cell.cell_type == "code":  # Only process code cells
+                if 'responses = initialize_assignment(' in cell.source:
+                    cell.source = cell.source.replace('_temp', '')
+
+        # Save the modified notebook
+        with open(output_file, "w", encoding="utf-8") as f:
+            nbformat.write(notebook, f)
 
     @staticmethod
     def replace_temp_in_notebook(input_file, output_file):
@@ -674,6 +695,7 @@ class NotebookProcessor:
                 cell["source"] = [
                     line.replace("_temp.ipynb", ".ipynb") for line in cell["source"]
                 ]
+            
 
         # Write the updated notebook to the output file
         with open(output_file, "w", encoding="utf-8") as f:
@@ -1398,6 +1420,8 @@ def clean_notebook(notebook_path):
                     cell.metadata["editable"] = cell.metadata.get("editable", False)
                     cell.metadata["deletable"] = cell.metadata.get("deletable", False)
                 if cell.cell_type == "code":
+                    if "grader.check(" in cell.source:
+                        continue
                     cell.metadata["tags"] = cell.metadata.get("tags", [])
                     if "skip-execution" not in cell.metadata["tags"]:
                         cell.metadata["tags"].append("skip-execution")
@@ -1563,7 +1587,7 @@ def generate_mcq_file(data_dict, output_file="mc_questions.py"):
                     )
                     f.write("    def __init__(self):\n")
                     f.write("        super().__init__(\n")
-                    f.write(f"            title=f'{q_value['question_text']}',\n")
+                    f.write(f'            title=f"{q_value['question_text']}",\n')
                     f.write("            style=MCQ,\n")
                     f.write(
                         f"            question_number={q_value['question number']},\n"

pykubegrader/initialize.py

@@ -1,3 +1,4 @@
+import hashlib
 import os
 import shutil
 from pathlib import Path
@@ -46,7 +47,7 @@ def initialize_assignment(
         raise Exception("Setup unsuccessful. Are you on JupyterHub?")
 
     try:
-        seed = hash(jhub_user) % 1000
+        seed = username_to_seed(jhub_user) % 1000
         update_responses(key="seed", value=seed)
         update_responses(key="week", value=week)
         update_responses(key="assignment_type", value=assignment_type)
@@ -111,3 +112,10 @@ def move_dotfiles():
             shutil.copy2(source_file, target_file)
         except Exception as e:
             raise Exception(f"Failed to copy {source_file} to {target_file}: {e}")
+
+
+def username_to_seed(username: str, mod: int = 1000) -> int:
+    hash_object = hashlib.sha256(username.encode())
+    hash_hex = hash_object.hexdigest()
+    hash_int = int(hash_hex, 16)
+    return hash_int % mod

pykubegrader/log_parser/parse.ipynb

@@ -182,6 +182,43 @@
    "outputs": [],
    "source": []
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "student_email = results[\"student_information\"][\"username\"]\n",
+    "time_stamp = results[\"student_information\"][\"timestamp\"]\n",
+    "assignments_graded = results[\"assignment_information\"].keys()\n",
+    "week_num = results[\"week_num\"]\n",
+    "assignment_type = results['assignment_type']\n",
+    "\n",
+    "\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"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def extract_score_from_dict(results):\n",
+    "    student_email = results[\"student_information\"][\"username\"]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,

pykubegrader/log_parser/parse.py

@@ -166,6 +166,15 @@ class LogParser:
         """
         return {
             "student_information": self.student_info,
+            "week": self.week_tag,
+            "week_num": (
+                int(self.week_tag.split("-")[0].strip().replace("week", ""))
+                if self.week_tag
+                else None
+            ),
+            "assignment_type": (
+                self.week_tag.split("-")[1].strip() if self.week_tag else None
+            ),
             "assignment_information": {
                 assignment: {
                     "latest_timestamp": data["latest_timestamp"],

pykubegrader/telemetry.py

@@ -10,6 +10,7 @@ import requests
 from IPython.core.interactiveshell import ExecutionInfo
 from requests import Response
 from requests.auth import HTTPBasicAuth
+from requests.exceptions import RequestException
 
 #
 # Logging setup
@@ -122,7 +123,6 @@ def update_responses(key: str, value) -> dict:
 #
 
 
-# TODO: Improve error handling
 def score_question(
     term: str = "winter_2025",
     base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com",
@@ -140,16 +140,24 @@ def score_question(
         "responses": responses,
     }
 
-    res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
-
-    res_data: dict[str, tuple[float, float]] = res.json()
-
-    for question, (points_earned, max_points) in res_data.items():
-        log_variable(
-            assignment_name=responses["assignment"],
-            value=f"{points_earned}, {max_points}",
-            info_type=question,
-        )
+    try:
+        res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
+        res.raise_for_status()
+
+        res_data: dict[str, tuple[float, float]] = res.json()
+
+        for question, (points_earned, max_points) in res_data.items():
+            log_variable(
+                assignment_name=responses["assignment"],
+                value=f"{points_earned}, {max_points}",
+                info_type=question,
+            )
+    except RequestException as e:
+        raise RuntimeError("Failed to access question-scoring endpoint") from e
+    except ValueError as e:
+        raise ValueError("Failed to parse question-scoring JSON response") from e
+    except Exception as e:
+        raise RuntimeError("Failed to score question") from e
 
 
 def submit_question(