PyKubeGrader 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

pykubegrader/telemetry.py

@@ -16,8 +16,8 @@ from requests import Response
 from requests.auth import HTTPBasicAuth
 from requests.exceptions import RequestException
 
-from .graders.late_assignments import calculate_late_submission
-from .utils import api_base_url, student_pw, student_user
+from pykubegrader.graders.late_assignments import calculate_late_submission
+from pykubegrader.utils import api_base_url, student_pw, student_user
 
 #
 # Logging setup
@@ -291,26 +291,63 @@ def upload_execution_log() -> None:
     print("Execution log uploaded successfully")
 
 
-# #
-# # Qiao's work on grades
-#
+def get_all_students(user, password):
+    """
+    Fetches a list of all students from the API and returns their usernames.
+
+    Args:
+        user (str): The username for HTTP basic authentication.
+        password (str): The password for HTTP basic authentication.
+
+    Returns:
+        list: A list of usernames extracted from the students' email addresses.
+
+    Raises:
+        requests.exceptions.HTTPError: If the HTTP request returned an unsuccessful status code.
+    """
+    res = requests.get(
+        url=api_base_url.rstrip("/") + "/students",
+        auth=HTTPBasicAuth(user, password),
+    )
+    res.raise_for_status()
+    
+    # Input: List of players
+    return [student["email"].split("@")[0] for student in res.json()]
 
 
-def get_assignments_submissions():
+def get_assignments_submissions(params=None):
+    """
+    Fetches assignment submissions for a student from the grading API.
+    This function retrieves the assignment submissions for a student by making a GET request to the grading API.
+    It requires certain environment variables to be set and validates the JupyterHub username.
+    Args:
+        params (dict, optional): A dictionary of parameters to be sent in the query string. Defaults to None. If not provided, it will default to {"username": <JUPYTERHUB_USER>}.
+    Raises:
+        ValueError: If necessary environment variables (student_user, student_pw, api_base_url) are not set.
+        ValueError: If there is a mismatch between the JupyterHub username from the hostname and the environment variable.
+    Returns:
+        dict: A dictionary containing the JSON response from the API with the assignment submissions.
+    """
+
     if not student_user or not student_pw or not api_base_url:
         raise ValueError("Necessary environment variables not set")
+
     from_hostname = socket.gethostname().removeprefix("jupyter-")
     from_env = os.getenv("JUPYTERHUB_USER")
+
     if from_hostname != from_env:
         raise ValueError("Problem with JupyterHub username")
-    print(from_env)
-    params = {"username": from_env}
+
+    if not params:
+        params = {"username": from_env}
+
     # get submission information
     res = requests.get(
         url=api_base_url.rstrip("/") + "/my-grades-testing",
         params=params,
         auth=HTTPBasicAuth(student_user, student_pw),
     )
+
     return res.json()
 
 
@@ -319,7 +356,7 @@ def setup_grades_df(assignments):
 
     inds = [f"week{i + 1}" for i in range(11)] + ["Running Avg"]
     restruct_grades = {k: [0 for i in range(len(inds))] for k in assignment_types}
-    new_weekly_grades = pd.DataFrame(restruct_grades,dtype=float)
+    new_weekly_grades = pd.DataFrame(restruct_grades, dtype=float)
     new_weekly_grades["inds"] = inds
     new_weekly_grades.set_index("inds", inplace=True)
     return new_weekly_grades
@@ -329,19 +366,31 @@ def skipped_assignment_mask(assignments):
     existing_assignment_mask = setup_grades_df(assignments).astype(bool)
     for assignment in assignments:
         # existing_assignment_mask[assignment["assignment_type"]].iloc[assignment["week_number"]-1] = True
-        existing_assignment_mask.loc[f'week{assignment["week_number"]}', assignment["assignment_type"]] = True
+        existing_assignment_mask.loc[
+            f"week{assignment['week_number']}", assignment["assignment_type"]
+        ] = True
     return existing_assignment_mask.astype(bool)
 
+
 def fill_grades_df(new_weekly_grades, assignments, student_subs):
     for assignment in assignments:
         # get the assignment from all submissions
-        subs = [ sub for sub in student_subs if (sub['assignment_type']==assignment['assignment_type']) and (sub['week_number']==assignment['week_number']) ]
+        subs = [
+            sub
+            for sub in student_subs
+            if (sub["assignment_type"] == assignment["assignment_type"])
+            and (sub["week_number"] == assignment["week_number"])
+        ]
         # print(assignment, subs)
         # print(assignment)
         # print(student_subs[:5])
         if assignment["assignment_type"] == "lecture":
-            if sum([sub["raw_score"] for sub in subs]) > 0: # TODO: good way to check for completion?
-                new_weekly_grades.loc[f"week{assignment['week_number']}", "lecture"] = 1.0
+            if (
+                sum([sub["raw_score"] for sub in subs]) > 0
+            ):  # TODO: good way to check for completion?
+                new_weekly_grades.loc[f"week{assignment['week_number']}", "lecture"] = (
+                    1.0
+                )
         if assignment["assignment_type"] == "final":
             continue
         if assignment["assignment_type"] == "midterm":
@@ -370,15 +419,17 @@ def fill_grades_df(new_weekly_grades, assignments, student_subs):
             # print(assignment['title'], grades, assignment['max_score'])
             grade = max(grades) / assignment["max_score"]
 
-        # fill out new df with max
-        new_weekly_grades.loc[
-            f"week{assignment['week_number']}", assignment["assignment_type"]
-        ] = grade
 
     # Merge different names
-    new_weekly_grades["attend"] = new_weekly_grades[["attend", "attendance"]].max(axis=1)
-    new_weekly_grades["practicequiz"] = new_weekly_grades[["practicequiz", "practice-quiz"]].max(axis=1)
-    new_weekly_grades["practicemidterm"] = new_weekly_grades[["practicemidterm", "PracticeMidterm"]].max(axis=1)
+    new_weekly_grades["attend"] = new_weekly_grades[["attend", "attendance"]].max(
+        axis=1
+    )
+    new_weekly_grades["practicequiz"] = new_weekly_grades[
+        ["practicequiz", "practice-quiz"]
+    ].max(axis=1)
+    new_weekly_grades["practicemidterm"] = new_weekly_grades[
+        ["practicemidterm", "PracticeMidterm"]
+    ].max(axis=1)
     new_weekly_grades.drop(
         ["attendance", "practice-quiz", "test", "PracticeMidterm"],
         axis=1,
@@ -386,7 +437,8 @@ def fill_grades_df(new_weekly_grades, assignments, student_subs):
         errors="ignore",
     )
 
-    return new_weekly_grades
+#     return new_weekly_grades
+
 
 def get_current_week(start_date):
     # Calculate the current week (1-based indexing)
@@ -396,11 +448,13 @@ def get_current_week(start_date):
     return days_since_start // 7 + 1
 
 
-def get_average_weighted_grade(assignments, current_week, new_weekly_grades, weights):
+def get_average_weighted_grade(assignments, new_weekly_grades, weights):
     # Get average until current week
     skip_weeks = skipped_assignment_mask(assignments)
     for col in new_weekly_grades.columns:
-        new_weekly_grades.loc["Running Avg", col] = new_weekly_grades.loc[skip_weeks[col]==True, col].mean()
+        new_weekly_grades.loc["Running Avg", col] = new_weekly_grades.loc[
+            skip_weeks[col], col
+        ].mean()
     # for col in new_weekly_grades.columns:
     #     skip_weeks = skipped_assignment_mask(assignments)
     #     skip_weeks_series = pd.Series(skip_weeks)
@@ -414,8 +468,8 @@ def get_average_weighted_grade(assignments, current_week, new_weekly_grades, wei
         grade = new_weekly_grades.get(k, pd.Series([0])).iloc[-1]
         total += grade * v
         avg_grades_dict[k] = grade
-    avg_grades_dict['Total'] = total  # excluded midterm and final
-    
+    avg_grades_dict["Total"] = total  # excluded midterm and final
+
     return avg_grades_dict
 
 
@@ -425,7 +479,7 @@ def get_my_grades_testing(start_date="2025-01-06", verbose=True):
     reshapes columns into reading, lecture, practicequiz, quiz, lab, attendance, homework, exam, final.
     fills in 0 for missing assignments
     calculate running average of each category"""
-    
+
     # set up new df format
     weights = {
         "homework": 0.15,
@@ -439,71 +493,21 @@ def get_my_grades_testing(start_date="2025-01-06", verbose=True):
     }
 
     assignments, student_subs = get_assignments_submissions()
-    
+
     new_grades_df = setup_grades_df(assignments)
 
     new_weekly_grades = fill_grades_df(new_grades_df, assignments, student_subs)
 
-    current_week = get_current_week(start_date)
-    
-    avg_grades_dict = get_average_weighted_grade(assignments, current_week, new_weekly_grades, weights)
-    
+    # current_week = get_current_week(start_date)
+
+    avg_grades_dict = get_average_weighted_grade(
+        assignments, new_weekly_grades, weights
+    )
+
     if verbose:
         max_key_length = max(len(k) for k in weights.keys())
         for k, v in avg_grades_dict.items():
-            print(f'{k:<{max_key_length}}:\t {v:.2f}')
+            print(f"{k:<{max_key_length}}:\t {v:.2f}")
 
     return new_weekly_grades  # get rid of test and running avg columns
-def get_all_students(admin_user, admin_pw):
-    res = requests.get(
-        url=api_base_url.rstrip("/") + "/students",
-        auth=HTTPBasicAuth(admin_user, admin_pw),
-    )
-    res.raise_for_status()
-
-    # Input: List of players
-    return [student['email'].split('@')[0] for student in res.json()]
-
-
-# def all_student_grades_testing(admin_user, admin_pw, start_date="2025-01-06"):
-#     """takes in json.
-#     reshapes columns into reading, lecture, practicequiz, quiz, lab, attendance, homework, exam, final.
-#     fills in 0 for missing assignments
-#     calculate running average of each category"""
-
-#     # set up new df format
-#     weights = {
-#         "homework": 0.15,
-#         "lab": 0.15,
-#         "lecture": 0.15,
-#         "quiz": 0.15,
-#         "readings": 0.15,
-#         # 'midterm':0.15, 'final':0.2
-#         "labattendance": 0.05,
-#         "practicequiz": 0.05,
-#     }
-
-#     student_usernames = get_student_usernames(admin_user, admin_pw)
-    
-#     assignments, student_subs = get_assignments_submissions(admin_user, admin_pw)
-
-#     new_grades_df = setup_grades_df(assignments)
-
-#     new_weekly_grades = fill_grades_df(new_grades_df, assignments, student_subs)
-
-#     current_week = get_current_week(start_date)
-
-#     # Get average until current week
-#     new_weekly_grades.iloc[-1] = new_weekly_grades.iloc[: current_week - 1].mean()
-
-#     # make new dataframe with the midterm, final, and running average
-#     max_key_length = max(len(k) for k in weights.keys())
-#     total = 0
-#     for k, v in weights.items():
-#         grade = new_weekly_grades.get(k, pd.Series([0])).iloc[-1]
-#         total += grade * v
-#         print(f"{k:<{max_key_length}}:\t {grade:.2f}")
-#     print(f"\nTotal: {total}")  # exclude midterm and final
 
-#     return new_weekly_grades  # get rid of test and running avg columns
-    

pykubegrader/tokens/generator.py

@@ -0,0 +1,75 @@
+import sys
+
+import panel as pn
+import requests
+from panel.pane import Markdown
+from panel.widgets import Button, Select, TextInput
+from requests.auth import HTTPBasicAuth
+
+from ..utils import api_base_url, student_pw, student_user
+
+pn.extension()
+
+
+class TokenGenerator:
+    def __init__(self) -> None:
+        if not student_user or not student_pw:
+            raise RuntimeError("API credentials not found in environment variables")
+
+        self.username = student_user
+        self.password = student_pw
+
+        self.students: list[str] = self.fetch_options("students", key="email")
+        self.assignments: list[str] = self.fetch_options("assignments", key="title")
+
+        # Empty lists are falsy
+        if not self.students or not self.assignments:
+            raise RuntimeError("No students found, or no assignments")
+
+        self.stud_select = Select(name="Student email", options=self.students)
+        self.assn_select = Select(name="Assignment name", options=self.assignments)
+        self.token_input = TextInput(name="Desired token value")
+        self.submit_btn = Button(name="Submit", button_type="primary")
+        self.status_msg = Markdown("")
+
+        self.submit_btn.on_click(self.request_token)
+
+    def fetch_options(self, endpoint: str, key: str) -> list[str]:
+        try:
+            response = requests.get(
+                url=f"{api_base_url}/{endpoint}",
+                auth=HTTPBasicAuth(self.username, self.password),
+            )
+            response.raise_for_status()
+            return sorted([item[key] for item in response.json()])
+        except requests.exceptions.RequestException as e:
+            print(f"Error fetching {endpoint}: {e}", file=sys.stderr)
+            return []
+
+    def request_token(self, _) -> None:
+        payload = {
+            "student_id": self.stud_select.value,
+            "assignment": self.assn_select.value,
+            "value": self.token_input.value,
+        }
+
+        try:
+            response = requests.post(
+                url=f"{api_base_url}/tokens",
+                auth=HTTPBasicAuth(self.username, self.password),
+                json=payload,
+            )
+            response.raise_for_status()
+            self.status_msg.object = "✅ Token generated successfully!"
+        except requests.exceptions.RequestException as e:
+            self.status_msg.object = f"❌ Submission failed: {e}"
+
+    def show(self) -> pn.Column:
+        return pn.Column(
+            "# Generate Scoped Token",
+            self.stud_select,
+            self.assn_select,
+            self.token_input,
+            self.submit_btn,
+            self.status_msg,
+        )

pykubegrader/tokens/token_panel.py

@@ -1,7 +1,8 @@
+import os
+
 import panel as pn
 import requests
 from requests.auth import HTTPBasicAuth
-import os
 
 from ..utils import api_base_url
 
@@ -23,7 +24,6 @@ def get_jhub_user():
 
 
 def get_students():
-
     # Make the request
     response = requests.get(
         f"{api_base_url}students",

pykubegrader/tokens/tokens.py

@@ -7,7 +7,6 @@ from ..utils import api_base_url
 
 
 def build_token_payload(token: str, duration: int, **kwargs) -> dict:
-
     student_id = kwargs.get("student_id", None)
     assignment = kwargs.get("assignment", None)
 

pykubegrader/widgets_base/multi_select.py

@@ -1,8 +1,8 @@
 import time
 from typing import Callable, Optional, Tuple
 
-import panel as pn
 import numpy as np
+import panel as pn
 
 from ..telemetry import ensure_responses, score_question, update_responses
 from ..utils import shuffle_options, shuffle_questions

pykubegrader/widgets_base/select.py

@@ -1,8 +1,8 @@
 import time
 from typing import Callable, Optional, Tuple
 
-import panel as pn
 import numpy as np
+import panel as pn
 
 from ..telemetry import ensure_responses, score_question, update_responses
 from ..utils import shuffle_options, shuffle_questions