PyKubeGrader 0.1.22__py3-none-any.whl → 0.2.0__py3-none-any.whl

{PyKubeGrader-0.1.22.dist-info → PyKubeGrader-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyKubeGrader
-Version: 0.1.22
+Version: 0.2.0
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2
@@ -24,6 +24,8 @@ Requires-Dist: requests
 Requires-Dist: ruff
 Requires-Dist: setuptools
 Requires-Dist: sphinx
+Requires-Dist: types-python-dateutil
+Requires-Dist: types-pyyaml
 Requires-Dist: types-requests
 Requires-Dist: types-setuptools
 Provides-Extra: testing

PyKubeGrader-0.2.0.dist-info/RECORD

@@ -0,0 +1,32 @@
+pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
+pykubegrader/initialize.py,sha256=t3iSdeIcndfY8LoHBVUEZfTW6sUWHyeFLirKo4GwSQE,3328
+pykubegrader/telemetry.py,sha256=jRInaDqIpdeT7F0rxLJgO38lA-SMtmLcYE8nEAGah1Q,4922
+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=nR06JHvgMio2p-95GsdqCXlfzZ6xJgAJNFPSjmg7QhI,70722
+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/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
+pykubegrader/widgets/select_many.py,sha256=l7YQ8QT5k71j36KC1f5LmKIAX2bXpvMDGc6nqIJ1PeQ,4116
+pykubegrader/widgets/student_info.py,sha256=xhQgKehk1r5e6N_hnjAIovLdPvQju6ZqQTOiPG0aevg,3568
+pykubegrader/widgets/style.py,sha256=fVBMYy_a6Yoz21avNpiORWC3f5FD-OrVpaZ3npmunvs,1656
+pykubegrader/widgets/true_false.py,sha256=D45bjRLaAcNzsSlWPgxwTXGVZPE7PER34S30V6PjEXU,2807
+pykubegrader/widgets/types_question.py,sha256=kZdRRXyFzOtYTmGdC7XWb_2oaxqg1WSuLcQn_sTj6Qc,2300
+pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+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.0.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.0.dist-info/METADATA,sha256=XEGRhBLAhcEcQVOhEkNcQi9orqofhyuNCQBwkALUJZ0,2729
+PyKubeGrader-0.2.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+PyKubeGrader-0.2.0.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.0.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.0.dist-info/RECORD,,

{PyKubeGrader-0.1.22.dist-info → PyKubeGrader-0.2.0.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 otter-folder-builder = pykubegrader.build.build_folder:main
+otter-folder-cleaner = pykubegrader.build.clean_folder:main

pykubegrader/build/__init__.py

@@ -0,0 +1 @@
+

pykubegrader/build/api_notebook_builder.py

@@ -93,7 +93,7 @@ class FastAPINotebookBuilder:
             self.replace_cell_source(cell_index, updated_cell_source)
 
     def compute_max_points_free_response(self):
-        for i, (cell_index, cell_dict) in enumerate(self.assertion_tests_dict.items()):
+        for cell_dict in self.assertion_tests_dict.values():
             # gets the question name from the first cell to not double count
             if cell_dict["is_first"]:
                 # get the max points for the question
@@ -380,7 +380,7 @@ class FastAPINotebookBuilder:
             question_groups[question].append(key)
 
         # Add 'is_first' and 'is_last' flags to all cells
-        for question, keys in question_groups.items():
+        for keys in question_groups.values():
             test_number = 1
             for i, key in enumerate(keys):
                 cells_dict[key]["is_first"] = i == 0

pykubegrader/build/build_folder.py

@@ -8,6 +8,16 @@ import shutil
 import subprocess
 import sys
 from dataclasses import dataclass, field
+from datetime import datetime
+
+import requests
+import yaml
+from dateutil import parser  # For robust datetime parsing
+
+try:
+    from pykubegrader.build.passwords import password, user
+except:  # noqa: E722
+    print("Passwords not found, cannot access database")
 
 import nbformat
 
@@ -44,8 +54,24 @@ class NotebookProcessor:
         Raises:
             OSError: If the solutions folder cannot be created due to permissions or other filesystem issues.
         """
+        if self.check_if_file_in_folder("assignment_config.yaml"):
+            # Parse the YAML content
+            with open(f"{self.root_folder}/assignment_config.yaml", "r") as file:
+                data = yaml.safe_load(file)
+                # Extract assignment details
+                assignment = data.get("assignment", {})
+                week_num = assignment.get("week")
+                self.assignment_type = assignment.get("assignment_type")
+        else:
+            self.assignment_type = self.assignment_tag.split("-")[0].lower()
+            week_num = self.assignment_tag.split("-")[-1]
+
+        self.week = f"week_{week_num}"
+
         # Define the folder to store solutions and ensure it exists
         self.solutions_folder = os.path.join(self.root_folder, "_solutions")
+        self.assignment_total_points = 0
+
         os.makedirs(
             self.solutions_folder, exist_ok=True
         )  # Create the folder if it doesn't exist
@@ -127,6 +153,84 @@ class NotebookProcessor:
                 self.total_point_log, json_file, indent=4
             )  # `indent=4` for pretty formatting
 
+        if self.check_if_file_in_folder("assignment_config.yaml"):
+            self.add_assignment()
+
+    def build_payload(self, yaml_content):
+        """
+        Reads YAML content for an assignment and returns Python variables.
+
+        Args:
+            yaml_content (str): The YAML file path to parse.
+
+        Returns:
+            dict: A dictionary containing the parsed assignment data.
+        """
+        # Parse the YAML content
+        with open(yaml_content, "r") as file:
+            data = yaml.safe_load(file)
+
+        # Extract assignment details
+        assignment = data.get("assignment", {})
+        week = assignment.get("week")
+        assignment_type = assignment.get("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}")
+
+        title = f"Week {week} - {assignment_type}"
+
+        # Return the extracted details as a dictionary
+        return {
+            "title": title,
+            "description": str(week),
+            "due_date": due_date,
+            "max_score": int(self.assignment_total_points),
+        }
+
+    def add_assignment(self):
+        """
+        Sends a POST request to add an assignment.
+        """
+        # Define the URL
+        url = "https://engr-131-api.eastus.cloudapp.azure.com/assignments"
+
+        # Build the payload
+        payload = self.build_payload(f"{self.root_folder}/assignment_config.yaml")
+
+        # 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 check_if_file_in_folder(self, file):
+        for root, _, files in os.walk(self.root_folder):
+            if file in files:
+                return True
+        return False
+
     def _print_and_log(self, message):
         """
         Logs a message and optionally prints it to the console.
@@ -215,29 +319,42 @@ class NotebookProcessor:
         else:
             self._print_and_log(f"Notebook already in destination: {new_notebook_path}")
 
-        solution_path_1, question_path = self.multiple_choice_parser(
+        solution_path_1, question_path_1 = self.multiple_choice_parser(
             temp_notebook_path, new_notebook_path
         )
-        solution_path_2, question_path = self.true_false_parser(
+        solution_path_2, question_path_2 = self.true_false_parser(
             temp_notebook_path, new_notebook_path
         )
-        solution_path_3, question_path = self.select_many_parser(
+        solution_path_3, question_path_3 = self.select_many_parser(
             temp_notebook_path, new_notebook_path
         )
 
         if any([solution_path_1, solution_path_2, solution_path_3]) is not None:
             solution_path = solution_path_1 or solution_path_2 or solution_path_3
 
+        if any([question_path_1, question_path_2, question_path_3]) is not None:
+            question_path = question_path_1 or question_path_2 or question_path_3
+
         student_notebook, self.otter_total_points = self.free_response_parser(
             temp_notebook_path, notebook_subfolder, notebook_name
         )
 
         # If Otter does not run, move the student file to the main directory
         if student_notebook is None:
+            clean_notebook(temp_notebook_path)
             path_ = shutil.copy(temp_notebook_path, self.root_folder)
+            path_2 = shutil.move(
+                question_path,
+                os.path.join(
+                    os.path.dirname(temp_notebook_path), os.path.basename(question_path)
+                ),
+            )
             self._print_and_log(
                 f"Copied and cleaned student notebook: {path_} -> {self.root_folder}"
             )
+            self._print_and_log(
+                f"Copied Questions to: {path_2} -> {os.path.join(os.path.dirname(temp_notebook_path), os.path.basename(question_path))}"
+            )
 
         # Move the solution file to the autograder folder
         if solution_path is not None:
@@ -298,6 +415,8 @@ class NotebookProcessor:
             + self.otter_total_points
         )
 
+        self.assignment_total_points += total_points
+
         self.total_point_log.update({notebook_name: total_points})
 
     def free_response_parser(
@@ -354,9 +473,9 @@ class NotebookProcessor:
                 notebook_subfolder, "dist", "student", f"{notebook_name}.ipynb"
             )
 
-            NotebookProcessor.add_initialization_code(student_notebook)
-
-            self.clean_notebook(student_notebook)
+            NotebookProcessor.add_initialization_code(
+                student_notebook, self.week, self.assignment_type
+            )
 
             NotebookProcessor.replace_temp_in_notebook(
                 student_notebook, student_notebook
@@ -367,6 +486,9 @@ class NotebookProcessor:
             NotebookProcessor.replace_temp_in_notebook(
                 autograder_notebook, autograder_notebook
             )
+
+            clean_notebook(student_notebook)
+
             shutil.copy(student_notebook, self.root_folder)
             self._print_and_log(
                 f"Copied and cleaned student notebook: {student_notebook} -> {self.root_folder}"
@@ -378,9 +500,18 @@ class NotebookProcessor:
 
             return student_notebook, out.total_points
         else:
-            NotebookProcessor.add_initialization_code(temp_notebook_path)
+            NotebookProcessor.add_initialization_code(
+                temp_notebook_path, self.week, self.assignment_type
+            )
             return None, 0
 
+    @staticmethod
+    def json_serial(obj):
+        """JSON serializer for objects not serializable by default."""
+        if isinstance(obj, datetime):
+            return obj.isoformat()
+        raise TypeError(f"Type {type(obj)} not serializable")
+
     @staticmethod
     def remove_assignment_config_cells(notebook_path):
         # Read the notebook
@@ -399,13 +530,13 @@ class NotebookProcessor:
             nbformat.write(notebook, f)
 
     @staticmethod
-    def add_initialization_code(notebook_path):
+    def add_initialization_code(notebook_path, week, assignment_type):
         # finds the first code cell
         index, cell = find_first_code_cell(notebook_path)
         cell = cell["source"]
         import_text = "from pykubegrader.initialize import initialize_assignment\n"
+        cell += f'\nresponses = initialize_assignment("{os.path.splitext(os.path.basename(notebook_path))[0]}", "{week}", "{assignment_type}" )\n'
         cell = f"{import_text}\n" + cell
-        cell += f'\nresponses = initialize_assignment("{os.path.splitext(os.path.basename(notebook_path))[0]}")\n'
         replace_cell_source(notebook_path, index, cell)
 
     def multiple_choice_parser(self, temp_notebook_path, new_notebook_path):
@@ -426,15 +557,11 @@ class NotebookProcessor:
 
             data = NotebookProcessor.merge_metadata(value, data)
 
-            for data_ in data:
-                # Generate the solution file
-                self.mcq_total_points = self.generate_solution_MCQ(
-                    data, output_file=solution_path
-                )
+            self.mcq_total_points = self.generate_solution_MCQ(
+                data, output_file=solution_path
+            )
 
-                question_path = (
-                    f"{new_notebook_path.replace(".ipynb", "")}_questions.py"
-                )
+            question_path = f"{new_notebook_path.replace(".ipynb", "")}_questions.py"
 
             generate_mcq_file(data, output_file=question_path)
 
@@ -854,13 +981,6 @@ class NotebookProcessor:
                     os.rename(old_file_path, new_file_path)
                     logging.info(f"Renamed: {old_file_path} -> {new_file_path}")
 
-    @staticmethod
-    def clean_notebook(notebook_path):
-        """
-        Cleans a Jupyter notebook to remove unwanted cells and set cell metadata.
-        """
-        clean_notebook(notebook_path)
-
 
 def extract_raw_cells(ipynb_file, heading="# BEGIN MULTIPLE CHOICE"):
     """
@@ -1572,7 +1692,7 @@ def generate_tf_file(data_dict, output_file="tf_questions.py"):
 
     # Define header lines
     header_lines = [
-        "from pykubegrader.widgets.true_false import TFQuestion, TrueFalse_style\n",
+        "from pykubegrader.widgets.true_false import TFQuestion, TFStyle\n",
         "import pykubegrader.initialize\n",
         "import panel as pn\n\n",
         "pn.extension()\n\n",
@@ -1592,7 +1712,7 @@ def generate_tf_file(data_dict, output_file="tf_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("            style=TrueFalse_style,\n")
+                    f.write("            style=TFStyle,\n")
                     f.write(
                         f"            question_number={q_value['question number']},\n"
                     )

pykubegrader/build/clean_folder.py

@@ -0,0 +1,45 @@
+import argparse
+import os
+import shutil
+import sys
+
+
+class FolderCleaner:
+    def __init__(self, root_folder: str):
+        """
+        Initializes the FolderCleaner with the root folder to clean.
+
+        Args:
+            root_folder (str): Path to the root folder to start cleaning.
+        """
+        self.root_folder = root_folder
+
+    def delete_dist_folders(self):
+        """
+        Recursively deletes all folders named 'dist' starting from the root folder.
+        """
+        for dirpath, dirnames, filenames in os.walk(self.root_folder, topdown=False):
+            if "dist" in dirnames:
+                dist_path = os.path.join(dirpath, "dist")
+                try:
+                    shutil.rmtree(dist_path)
+                    print(f"Deleted: {dist_path}")
+                except Exception as e:
+                    print(f"Failed to delete {dist_path}: {e}")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Recursively delete all folders named 'dist' starting from a specified root folder."
+    )
+    parser.add_argument(
+        "root_folder", type=str, help="Path to the root folder to process"
+    )
+
+    args = parser.parse_args()
+    cleaner = FolderCleaner(root_folder=args.root_folder)
+    cleaner.delete_dist_folders()
+
+
+if __name__ == "__main__":
+    sys.exit(main())

pykubegrader/graders/__init__.py

@@ -0,0 +1 @@
+

pykubegrader/graders/late_assignments.py

@@ -0,0 +1,45 @@
+import datetime
+
+import numpy as np
+
+
+def calculate_late_submission(
+    due: str,
+    submitted: str,
+    Q0: int = 100,
+    Q_min: int = 40,
+    k: float = 6.88e-5,
+) -> float:
+    """
+    Calculate the percentage value based on an exponential decay model
+    with respect to a due date, using datetime string inputs.
+
+    Parameters:
+    - due_date_str (str): The due date as a string in the format "%Y-%m-%d %H:%M:%S".
+    - submission_date (str): The comparison date as a string in the format "%Y-%m-%d %H:%M:%S".
+    - Q0 (float): Initial value (default is 100).
+    - Q_min (float): Minimum value (default is 40).
+    - k (float): Decay constant per minute (default is 6.88e-5).
+
+    Returns:
+    - float: The percentage value after decay, bounded between Q_min and Q0.
+    """
+
+    # Convert datetime strings to UNIX timestamps
+    due_date = datetime.datetime.strptime(due, "%Y-%m-%d %H:%M:%S")
+    submitted_date = datetime.datetime.strptime(submitted, "%Y-%m-%d %H:%M:%S")
+
+    # Calculate time difference in seconds
+    time_difference = (submitted_date - due_date).total_seconds()
+
+    # Convert time difference from seconds to minutes
+    time_in_minutes = time_difference / 60.0
+
+    # Calculate the exponential decay
+    Q: float = Q0 * np.exp(-k * time_in_minutes)
+
+    # Apply floor and ceiling conditions
+    Q = np.maximum(Q, Q_min)
+    Q = np.minimum(Q, Q0)
+
+    return Q

pykubegrader/log_parser/__init__.py

@@ -0,0 +1 @@
+

pykubegrader/log_parser/parse.ipynb

@@ -6,7 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from .parse import LogParser\n",
+    "from parse import LogParser\n",
     "\n",
     "# ----------------- Example usage -----------------\n",
     "\n",

pykubegrader/log_parser/parse.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional
+from typing import Optional
 
 
 @dataclass
@@ -9,16 +9,16 @@ class LogParser:
     Handles both assignment info and question-level details.
     """
 
-    log_lines: List[str]
+    log_lines: list[str]
     week_tag: Optional[str] = None
-    student_info: Dict[str, str] = field(default_factory=dict)
-    assignments: Dict[str, Dict] = field(default_factory=dict)
+    student_info: dict[str, str] = field(default_factory=dict)
+    assignments: dict[str, dict] = field(default_factory=dict)
 
-    def parse_logs(self):
+    def parse_logs(self) -> None:
         """
         Main method to parse logs and populate student_info and assignments.
         """
-        unique_students = set()
+        unique_students: set[str] = set()
 
         self._find_all_questions()
 
@@ -41,13 +41,13 @@ class LogParser:
             ):
                 self._process_assignment_entry(line)
 
-    def _find_all_questions(self):
+    def _find_all_questions(self) -> None:
         """
         Finds all questions in the log_lines and returns a list of them.
         """
         questions = []
         for line in self.log_lines:
-            if self.week_tag in line:
+            if self.week_tag and self.week_tag in line:
                 parts = line.split(",")
                 question_tag = parts[3].strip()
                 if question_tag not in questions:
@@ -60,7 +60,7 @@ class LogParser:
         """
         return line.startswith("Student Info")
 
-    def _process_student_info(self, line: str, unique_students: set):
+    def _process_student_info(self, line: str, unique_students: set) -> None:
         """
         Processes a line containing student information.
         Raises an error if multiple unique students are found.
@@ -83,7 +83,7 @@ class LogParser:
                 "timestamp": parts[3].strip(),
             }
 
-    def _process_assignment_header(self, line: str):
+    def _process_assignment_header(self, line: str) -> None:
         parts = line.split(",")
         assignment_tag = parts[0].strip()
         if assignment_tag.startswith("total-points"):
@@ -105,7 +105,7 @@ class LogParser:
                 self.assignments[notebook_name]["max_points"] = total_points_value
                 self.assignments[notebook_name]["latest_timestamp"] = timestamp
 
-    def _process_assignment_entry(self, line: str):
+    def _process_assignment_entry(self, line: str) -> None:
         """
         Processes a line containing an assignment entry.
         Adds it to the assignments dictionary.
@@ -141,7 +141,7 @@ class LogParser:
         if timestamp > self.assignments[assignment_tag]["latest_timestamp"]:
             self.assignments[assignment_tag]["latest_timestamp"] = timestamp
 
-    def _extract_total_points(self, parts: List[str]) -> Optional[float]:
+    def _extract_total_points(self, parts: list[str]) -> Optional[float]:
         """
         Extracts the total-points value from the parts array of a total-points line.
         """
@@ -150,17 +150,17 @@ class LogParser:
         except (ValueError, IndexError):
             return None
 
-    def calculate_total_scores(self):
+    def calculate_total_scores(self) -> None:
         """
         Calculates total scores for each assignment by summing the 'score_earned'
         of its questions, and sets 'total_points' if it was not specified.
         """
-        for assignment, data in self.assignments.items():
+        for data in self.assignments.values():
             # Sum of all question score_earned
             total_score = sum(q["score_earned"] for q in data["questions"].values())
             data["total_score"] = total_score
 
-    def get_results(self) -> Dict[str, Dict]:
+    def get_results(self) -> dict[str, dict]:
         """
         Returns the parsed results as a hierarchical dictionary with three sections:
         """

pykubegrader/telemetry.py

@@ -11,27 +11,24 @@ from IPython.core.interactiveshell import ExecutionInfo
 from requests import Response
 from requests.auth import HTTPBasicAuth
 
-# Logger for .output_code.log
+#
+# Logging setup
+#
+
+# Logger for cell execution
 logger_code = logging.getLogger("code_logger")
 logger_code.setLevel(logging.INFO)
 
 file_handler_code = logging.FileHandler(".output_code.log")
 file_handler_code.setLevel(logging.INFO)
-
-# formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-# file_handler_code.setFormatter(formatter)
-
 logger_code.addHandler(file_handler_code)
 
-# Logger for .output_reduced.log
+# Logger for question scores etc.
 logger_reduced = logging.getLogger("reduced_logger")
 logger_reduced.setLevel(logging.INFO)
 
 file_handler_reduced = logging.FileHandler(".output_reduced.log")
 file_handler_reduced.setLevel(logging.INFO)
-
-# file_handler_reduced.setFormatter(formatter)
-
 logger_reduced.addHandler(file_handler_reduced)
 
 #
@@ -55,7 +52,7 @@ def encrypt_to_b64(message: str) -> str:
     return encrypted_b64
 
 
-def ensure_responses() -> dict:
+def ensure_responses() -> dict[str, Any]:
     with open(".responses.json", "a") as _:
         pass
 
@@ -125,28 +122,34 @@ def update_responses(key: str, value) -> dict:
 #
 
 
-# If we instead call this with **responses
+# TODO: Improve error handling
 def score_question(
-    student_email: str,
-    assignment: str,
-    question: str,
-    submission: str,
     term: str = "winter_2025",
-    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
-) -> Response:
+    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com",
+) -> None:
     url = base_url + "/live-scorer"
 
-    payload = {
-        "student_email": student_email,
+    responses = ensure_responses()
+
+    payload: dict[str, Any] = {
+        "student_email": f'{responses["jhub_user"]}@drexel.edu',
         "term": term,
-        "assignment": assignment,
-        "question": question,
-        "responses": submission,
+        "week": responses["week"],
+        "assignment": responses["assignment_type"],
+        "question": f'_{responses["assignment"]}',
+        "responses": responses,
     }
 
     res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
 
-    return res
+    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,
+        )
 
 
 def submit_question(
@@ -157,7 +160,7 @@ def submit_question(
     responses: dict,
     score: dict,
     base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
-):
+) -> Response:
     url = base_url + "/submit-question"
 
     payload = {
@@ -174,7 +177,7 @@ def submit_question(
     return res
 
 
-# TODO: refine function
+# TODO: Refine
 def verify_server(
     jhub_user: Optional[str] = None,
     url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
@@ -183,43 +186,3 @@ def verify_server(
     res = requests.get(url, params=params)
     message = f"status code: {res.status_code}"
     return message
-
-
-# TODO: implement function; or maybe not?
-# At least improve other one
-def score_question_improved(
-    week: str,
-    assignment_category: str,
-    term: str = "winter_2025",
-    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com",
-) -> None:
-    url = base_url + "/live-scorer"
-
-    responses = ensure_responses()
-
-    payload: dict[str, Any] = {
-        "student_email": f'{responses["jhub_user"]}@drexel.edu',
-        "term": term,
-        "week": week,
-        "assignment": assignment_category,
-        "question": f'_{responses["assignment"]}',
-        "responses": responses,
-    }
-
-    res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
-
-    res_data = res.json()
-    # max_points, points_earned = res_data["max_points"], res_data["points_earned"]
-    # log_variable(
-    #     assignment_name=responses["assignment"],
-    #     value=f"{points_earned}, {max_points}",
-    #     info_type="score",
-    # )
-
-    # res_data is now dict[str, tuple[float, float]]
-    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,
-        )

pykubegrader/utils.py

@@ -1,5 +1,5 @@
 import random
-from typing import Tuple
+from typing import Optional, Tuple
 
 import panel as pn
 
@@ -8,7 +8,7 @@ def list_of_lists(options: list) -> bool:
     return all(isinstance(elem, list) for elem in options)
 
 
-def shuffle_options(options, seed: int):
+def shuffle_options(options: list[Optional[str]], seed: int) -> list[Optional[str]]:
     random.seed(seed)
     random.shuffle(options)
 

pykubegrader/validate.py

@@ -19,18 +19,20 @@ def validate_logfile(
     filepath: str,
     assignment_id: str,
     question_max_scores: dict[int, int],
-    free_response_questions=0,
-    username="student",
-    password="capture",
-    base_url="https://engr-131-api.eastus.cloudapp.azure.com",
+    free_response_questions: int = 0,
+    username: str = "student",
+    password: str = "capture",
+    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com",
+    key_box=None,
 ) -> None:
     login_data = {
         "username": username,
         "password": password,
     }
 
-    # Generate box from private and public keys
-    key_box = generate_keys()
+    if key_box is None:
+        # Generate box from private and public keys
+        key_box = generate_keys()
 
     decrypted_log, log_reduced = read_logfile(filepath, key_box)
 
@@ -225,7 +227,7 @@ def validate_logfile(
     submission_message(response)
 
 
-def read_logfile(filepath, key_box=None) -> tuple[list[str], list[str]]:
+def read_logfile(filepath: str, key_box=None) -> tuple[list[str], list[str]]:
     if key_box is None:
         key_box = generate_keys()
 
@@ -307,7 +309,7 @@ def get_last_entry(data: list[str], field_name: str) -> str:
     return ""
 
 
-def submission_message(response) -> None:
+def submission_message(response: requests.Response) -> None:
     if response.status_code == 200:
         print("Data successfully uploaded to the server")
         print(response.text)
@@ -326,7 +328,7 @@ def submission_message(response) -> None:
         print("results.json was not present")
 
 
-def verify_login(login_data, login_url):
+def verify_login(login_data: dict[str, str], login_url: str) -> None:
     login_response = requests.post(
         login_url, auth=HTTPBasicAuth(login_data["username"], login_data["password"])
     )

pykubegrader/widgets/__init__.py

@@ -1,19 +1 @@
-# Auto-generated __init__.py
 
-from . import (
-    multiple_choice,
-    reading_question,
-    select_many,
-    student_info,
-    true_false,
-    types_question,
-)
-
-__all__ = [
-    "select_many",
-    "multiple_choice",
-    "true_false",
-    "reading_question",
-    "student_info",
-    "types_question",
-]

pykubegrader/widgets/true_false.py

@@ -13,7 +13,7 @@ pn.extension(design="material", global_css=[drexel_colors], raw_css=[raw_css])
 #
 
 
-def TrueFalse_style(
+def TFStyle(
     descriptions: List[str],
     options: List[str] | List[List[str]],
     initial_vals: List[str],
@@ -71,7 +71,7 @@ class TFQuestion(SelectQuestion):
     def __init__(
         self,
         title="Select if the statement is True or False",
-        style=TrueFalse_style,
+        style=TFStyle,
         question_number=2,
         keys=["MC1", "MC2", "MC3", "MC4"],
         options=None,

pykubegrader/widgets_base/multi_select.py

@@ -3,7 +3,7 @@ from typing import Callable, Tuple
 
 import panel as pn
 
-from ..telemetry import ensure_responses, update_responses
+from ..telemetry import ensure_responses, score_question, update_responses
 from ..utils import shuffle_questions
 from ..widgets.style import drexel_colors, raw_css
 
@@ -104,6 +104,8 @@ class MultiSelectQuestion:
 
         self.record_responses(responses_flat)
 
+        score_question()  # Debugging; update later
+
     def record_responses(self, responses_flat: list[bool]) -> None:
         for key, value in zip(self.keys, responses_flat):
             update_responses(key, value)

pykubegrader/widgets_base/reading.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 import panel as pn
 
-from ..telemetry import ensure_responses, update_responses
+from ..telemetry import ensure_responses, score_question, update_responses
 from ..utils import shuffle_options
 
 
@@ -162,6 +162,8 @@ class ReadingPython:
             i += 1
             update_responses(f"q{self.question_number}_{i}", exec_val)
 
+        score_question()  # Debugging; update later
+
         print("Responses recorded successfully")
 
     def show(self):

pykubegrader/widgets_base/select.py

@@ -3,7 +3,7 @@ from typing import Callable, Tuple
 
 import panel as pn
 
-from ..telemetry import ensure_responses, update_responses
+from ..telemetry import ensure_responses, score_question, update_responses
 from ..utils import shuffle_questions
 from ..widgets.style import drexel_colors
 
@@ -71,6 +71,8 @@ class SelectQuestion:
         for key, value in selections.items():
             update_responses(key, value)
 
+        score_question()  # Debugging; update later
+
         # Temporarily change button text to indicate submission
         self.submit_button.name = "Responses Submitted"
         time.sleep(1)

PyKubeGrader-0.1.22.dist-info/RECORD

@@ -1,27 +0,0 @@
-pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
-pykubegrader/initialize.py,sha256=t3iSdeIcndfY8LoHBVUEZfTW6sUWHyeFLirKo4GwSQE,3328
-pykubegrader/telemetry.py,sha256=IVQISKPfJX7IJ4tCG9AOO36UlTtbVZv2rZnrv3-ZSIc,5994
-pykubegrader/utils.py,sha256=dKw6SyRYU3DWRgD3xER7wq-C9e1daWPkqr901LpcwiQ,642
-pykubegrader/validate.py,sha256=vEdNN386yFloDRcjMDrTAqfBmeCXGcDPNH_rLZScIm8,10945
-pykubegrader/build/api_notebook_builder.py,sha256=GVi6hupfQaWeFMv6Bdela3FTRHvOQYXPIcICnkaLhgA,20119
-pykubegrader/build/build_folder.py,sha256=_mVEUiPwOPARBHkucAOw2bP8XzmspfL6B4-Ic_Ey3I0,66493
-pykubegrader/log_parser/parse.ipynb,sha256=F3ZWi5_AOxEnSihY0VBz4jjqo0__GggjRgFvS0QCHTg,10611
-pykubegrader/log_parser/parse.py,sha256=aON6tWj0dFJcYR9GmzXWfmZ4_t8LU1FTq6vbWCePgRs,6987
-pykubegrader/widgets/__init__.py,sha256=s3ky3eJDa1RedFVdpKxmqv6mHBYpOSL9Z6qThSH9cbs,303
-pykubegrader/widgets/multiple_choice.py,sha256=NjD3-uXSnibpUQ0mO3hRp_O-rynFyl0Dz6IXE4tnCRI,2078
-pykubegrader/widgets/reading_question.py,sha256=y30_swHwzH8LrT8deWTnxctAAmR8BSxTlXAqMgUrAT4,3031
-pykubegrader/widgets/select_many.py,sha256=l7YQ8QT5k71j36KC1f5LmKIAX2bXpvMDGc6nqIJ1PeQ,4116
-pykubegrader/widgets/student_info.py,sha256=xhQgKehk1r5e6N_hnjAIovLdPvQju6ZqQTOiPG0aevg,3568
-pykubegrader/widgets/style.py,sha256=fVBMYy_a6Yoz21avNpiORWC3f5FD-OrVpaZ3npmunvs,1656
-pykubegrader/widgets/true_false.py,sha256=pE2FjvX6WQ-Z423N40nTWMtudtGS7LiNXZ5dERk6uWs,2823
-pykubegrader/widgets/types_question.py,sha256=kZdRRXyFzOtYTmGdC7XWb_2oaxqg1WSuLcQn_sTj6Qc,2300
-pykubegrader/widgets_base/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pykubegrader/widgets_base/multi_select.py,sha256=jzuK_1eLyhDOzR1jragLRBf_aO8IEaoixfozxBeMBs0,3975
-pykubegrader/widgets_base/reading.py,sha256=4uTLmlPzCwxVzufFhPjM7W19uMGguRb6y4eAV3x-zAc,5314
-pykubegrader/widgets_base/select.py,sha256=b5mmd-Cl1A2T2ePZ20-KLVyvP3bzvzYX36n3lMcrcFM,2456
-PyKubeGrader-0.1.22.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.1.22.dist-info/METADATA,sha256=AeAp-atdN0IzDgWASkN7M-AtvFD4j2GvCE3Q_aGfCTQ,2665
-PyKubeGrader-0.1.22.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-PyKubeGrader-0.1.22.dist-info/entry_points.txt,sha256=Kd4Bh-i3hc4qlnLU1p0nc8yPw9cC5AQGOtkk2eLGnQw,78
-PyKubeGrader-0.1.22.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.1.22.dist-info/RECORD,,