PyKubeGrader 0.2.26__py3-none-any.whl → 0.2.28__py3-none-any.whl

{PyKubeGrader-0.2.26.dist-info → PyKubeGrader-0.2.28.dist-info}/METADATA

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

{PyKubeGrader-0.2.26.dist-info → PyKubeGrader-0.2.28.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
 pykubegrader/initialize.py,sha256=W-O1d9hy6BIYS28x3kcLG50WnNC4196eZwqwzVZdsgU,3902
-pykubegrader/telemetry.py,sha256=h8PPrXWGFgPWCcrChJo2woqd_XIPMFfYcxgLJ0CWpH8,5360
+pykubegrader/telemetry.py,sha256=GwKcC8Y8p35L07zwTC7ijR5ux5ceb6LyC_MZp5yBbH8,5360
 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=IzzU_jh6SYSA2wtjtlhxa4t9WM8-JqWnWsV8e3UPwdo,20305
-pykubegrader/build/build_folder.py,sha256=D8zNP6tFDR0S9zFIqutcPHZGw6px3vpIwnoVsl2LbvE,82949
+pykubegrader/build/api_notebook_builder.py,sha256=dlcVrGgsvxnt6GlAUN3e-FrpsPNJKXSHni1fstRCBik,20311
+pykubegrader/build/build_folder.py,sha256=5jl_TAnxfd9sqWvggJr4i3E7mrEf03cmFDotVrgTZWQ,82697
 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
@@ -13,8 +13,8 @@ pykubegrader/log_parser/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YB
 pykubegrader/log_parser/parse.ipynb,sha256=5e-9dzUbJk2M8kPP55lVeksm86lSY5ocKfWOP2RSWH0,11921
 pykubegrader/log_parser/parse.py,sha256=dXzTEOTI6VTRNoHFDAjg6hZUhvB3kHtMb10_KW3NPrw,7641
 pykubegrader/submit/submit_assignment.py,sha256=UgJXKWw5b8-bRSFnba4iHAyXnujULHcWIask7hKx9ik,3421
-pykubegrader/tokens/tokens.py,sha256=qMUN4aCR9NB_KVfyA13pbqt0nkjDmd0_C04CI-RD1So,1260
-pykubegrader/tokens/validate_token.py,sha256=kzXZPCVyYAedSmnzekIdwAhjBY3ZCMUrqOHOKFKAssI,4123
+pykubegrader/tokens/tokens.py,sha256=TOj0jRun1lWTztKA7KX9SjzIfNQqkwdnbczrFSPWB7Y,1089
+pykubegrader/tokens/validate_token.py,sha256=SmVfnJDoWaUoiPVlPv_eHqROu5nsdpOshyxAmzozEHU,3790
 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,11 +25,11 @@ pykubegrader/widgets/true_false.py,sha256=D45bjRLaAcNzsSlWPgxwTXGVZPE7PER34S30V6
 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/reading.py,sha256=xmvN1UIXwk32v9S-JhsXwDc7axPlgpvoxSeM3II8sxY,5393
 pykubegrader/widgets_base/select.py,sha256=Fw3uFNOIWo1a3CvlzSx23bvi6bSmA3TqutuRbhD4Dp8,2525
-PyKubeGrader-0.2.26.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.26.dist-info/METADATA,sha256=PHetJ4aQEkMSYy0E6kMfn48RYDy6ZXmesTwd3pHmZfg,2779
-PyKubeGrader-0.2.26.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-PyKubeGrader-0.2.26.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.26.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.26.dist-info/RECORD,,
+PyKubeGrader-0.2.28.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.28.dist-info/METADATA,sha256=23BZ-4RHb8dLTt3xLorKdiC3zqrD1AZRSdvaJRUxkaA,2779
+PyKubeGrader-0.2.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.2.28.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.28.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.28.dist-info/RECORD,,

{PyKubeGrader-0.2.26.dist-info → PyKubeGrader-0.2.28.dist-info}/WHEEL

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

pykubegrader/build/api_notebook_builder.py

@@ -65,9 +65,6 @@ class FastAPINotebookBuilder:
             updated_cell_source.extend(
                 FastAPINotebookBuilder.construct_question_info(cell_dict)
             )
-            updated_cell_source.extend(
-                FastAPINotebookBuilder.construct_update_responses(cell_dict)
-            )
 
             updated_cell_source.extend(cell_source[last_import_line_ind + 1 :])
             updated_cell_source.extend(["\n"])
@@ -91,6 +88,10 @@ class FastAPINotebookBuilder:
                 ["os.environ['EARNED_POINTS'] = str(earned_points)\n"]
             )
 
+            updated_cell_source.extend(
+                FastAPINotebookBuilder.construct_update_responses(cell_dict)
+            )
+
             self.replace_cell_source(cell_index, updated_cell_source)
 
     def compute_max_points_free_response(self):
@@ -142,7 +143,7 @@ class FastAPINotebookBuilder:
 
         for logging_variable in logging_variables:
             update_responses.append(
-                f"responses = update_responses(question_id, {logging_variable})\n"
+                f"responses = update_responses(question_id, str({logging_variable}))\n"
             )
 
         return update_responses
@@ -189,7 +190,7 @@ class FastAPINotebookBuilder:
         question_id = cell_dict["question"] + "-" + str(cell_dict["test_number"])
 
         question_info.append(f'question_id = "{question_id}"' + "\n")
-        question_info.append(f'max_score = {cell_dict["points"]}\n')
+        question_info.append(f"max_score = {cell_dict['points']}\n")
         question_info.append("score = 0\n")
 
         return question_info

pykubegrader/build/build_folder.py

@@ -791,7 +791,7 @@ class NotebookProcessor:
                 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)
 
@@ -831,7 +831,7 @@ class NotebookProcessor:
                 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_tf_file(data, output_file=question_path)
 
@@ -869,7 +869,7 @@ class NotebookProcessor:
                 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_select_many_file(data, output_file=question_path)
 
@@ -1809,9 +1809,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"Question{q_value['question number']}: {q_value['title']}",\n'
-                    )
+                    f.write(f'            title=f"{q_value["title"]}",\n')
                     f.write("            style=MCQ,\n")
                     f.write(
                         f"            question_number={q_value['question number']},\n"
@@ -1882,9 +1880,7 @@ def generate_select_many_file(data_dict, output_file="select_many_questions.py")
                     )
                     f.write("    def __init__(self):\n")
                     f.write("        super().__init__(\n")
-                    f.write(
-                        f'            title=f"Question{q_value['question number']}: {q_value['title']}",\n'
-                    )
+                    f.write(f'            title=f"{q_value["title"]}",\n')
                     f.write("            style=MultiSelect,\n")
                     f.write(
                         f"            question_number={q_value['question number']},\n"
@@ -1961,9 +1957,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"Question{q_value['question number']}: {q_value['title']}",\n'
-                    )
+                    f.write(f'            title=f"{q_value["title"]}",\n')
                     f.write("            style=TFStyle,\n")
                     f.write(
                         f"            question_number={q_value['question number']},\n"

pykubegrader/telemetry.py

@@ -134,11 +134,11 @@ def score_question(
     responses = ensure_responses()
 
     payload: dict[str, Any] = {
-        "student_email": f'{responses["jhub_user"]}@drexel.edu',
+        "student_email": f"{responses['jhub_user']}@drexel.edu",
         "term": term,
         "week": responses["week"],
         "assignment": responses["assignment_type"],
-        "question": f'_{responses["assignment"]}',
+        "question": f"_{responses['assignment']}",
         "responses": responses,
     }
 

pykubegrader/tokens/tokens.py

@@ -1,46 +1,41 @@
-import json
 import os
 
 import requests
+from requests.auth import HTTPBasicAuth
 
 
 def build_token_payload(token: str, duration: int) -> dict:
-    if os.getenv("JUPYTERHUB_USER", None) is None:
+    jhub_user = os.getenv("JUPYTERHUB_USER")
+    if jhub_user is None:
         raise ValueError("JupyterHub user not found")
 
-    # Return the extracted details as a dictionary
     return {
         "value": token,
-        "requester": os.getenv("JUPYTERHUB_USER", None),
         "duration": duration,
+        "requester": jhub_user,
     }
 
 
-# Need to do for add token as well
-def add_token(token, duration=20):
+def add_token(token: str, duration: int = 20) -> None:
     """
-    Sends a POST request to add a notebook.
+    Sends a POST request to mint a token
     """
-    # Define the URL
+
     url = "https://engr-131-api.eastus.cloudapp.azure.com/tokens"
 
-    # Build the payload
     payload = build_token_payload(token=token, duration=duration)
 
-    # Define HTTP Basic Authentication
-    auth = ("user", "password")
+    # Dummy credentials for HTTP Basic Auth
+    auth = HTTPBasicAuth("user", "password")
 
-    # Define headers
-    headers = {"Content-Type": "application/json"}
+    # Add a custom header, for potential use in authorization
+    headers = {"x-jhub-user": payload["requester"]}
 
-    # Serialize the payload with the custom JSON encoder
-    serialized_payload = json.dumps(payload)
+    response = requests.post(url=url, json=payload, headers=headers, auth=auth)
 
-    # Send the POST request
-    response = requests.post(url, data=serialized_payload, headers=headers, auth=auth)
+    # Print response
+    print(f"Status code: {response.status_code}")
 
-    # Print the response
-    print(f"Status Code: {response.status_code}")
     try:
         print(f"Response: {response.json()}")
     except ValueError:

pykubegrader/tokens/validate_token.py

@@ -1,5 +1,4 @@
 import asyncio
-import base64
 import os
 from typing import Optional
 
@@ -15,29 +14,33 @@ class TokenValidationError(Exception):
     Custom exception raised when the token validation fails.
     """
 
-    def __init__(self, message=None):
+    def __init__(self, message: Optional[str] = None):
         """
         Initialize the exception with an optional message.
 
         Args:
             message (str, optional): The error message to display. Defaults to None.
         """
+
         super().__init__(message)
 
 
-def get_credentials():
+def get_credentials() -> dict[str, str]:
     """
     Fetch the username and password from environment variables.
 
     Returns:
         dict: A dictionary containing 'username' and 'password'.
     """
+
     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."
+            "Environment variable 'user_name_student' or 'keys_student' not set"
         )
+
     return {"username": username, "password": password}
 
 
@@ -55,19 +58,22 @@ async def async_validate_token(token: Optional[str] = None) -> None:
         None: If the token is valid, the function will pass silently.
     """
 
+    # First, check if token is provided as an argument
     if token is not None:
         os.environ["TOKEN"] = token
 
+    # Next, check if token is available in environment variables
     if token is None:
         token = os.getenv("TOKEN", None)
 
+    # Otherwise, raise an error
     if token is None:
         raise TokenValidationError("No token provided")
 
     # Fetch the endpoint URL
     base_url = os.getenv("DB_URL")
     if not base_url:
-        raise ValueError("Environment variable 'DB_URL' is not set.")
+        raise ValueError("Environment variable 'DB_URL' not set")
     endpoint = f"{base_url}validate-token/{token}"
 
     # Get credentials
@@ -75,30 +81,17 @@ async def async_validate_token(token: Optional[str] = None) -> None:
     username = credentials["username"]
     password = credentials["password"]
 
-    # Encode credentials for Basic Authentication
-    auth_header = (
-        f"Basic {base64.b64encode(f'{username}:{password}'.encode()).decode()}"
-    )
+    basic_auth = httpx.BasicAuth(username=username, password=password)
 
-    # Make the GET request
+    # Make GET request
     async with httpx.AsyncClient() as client:
         try:
-            response = await client.get(
-                endpoint, headers={"Authorization": auth_header}, timeout=10
-            )
-
-            if response.status_code == 200:
-                # If the response is 200, the token is valid
-                return  # Pass silently
-            elif response.status_code == 404:
-                # If the response is 404, the token is invalid
-                detail = response.json().get("detail", "Token not found")
-                raise TokenValidationError(detail)
-            else:
-                # Handle unexpected status codes
-                raise TokenValidationError(
-                    f"Unexpected response code: {response.status_code}"
-                )
+            response = await client.get(url=endpoint, auth=basic_auth, timeout=10)
+            response.raise_for_status()
+            return
+        except httpx.HTTPStatusError as e:
+            detail = e.response.json().get("detail", e.response.text)
+            raise TokenValidationError(detail)
         except httpx.RequestError as e:
             raise TokenValidationError(f"Request failed: {e}")
         except Exception as e:
@@ -133,8 +126,9 @@ def validate_token(token: Optional[str] = None) -> None:
 # Example usage
 if __name__ == "__main__":
     token = "test"
+
     try:
         validate_token(token)
-        print("Token is valid.")
+        print("Token is valid")
     except TokenValidationError as e:
         print(f"Token validation failed: {e}")

pykubegrader/widgets_base/reading.py

@@ -23,7 +23,7 @@ class ReadingPython:
 
         # Dynamically assign attributes based on keys, with default values from responses
         for num in range(len(options["lines_to_comment"]) + options["n_rows"]):
-            key = f"q{question_number}_{num+1}"
+            key = f"q{question_number}_{num + 1}"
 
             # Dynamically assign the value from the responses file for persistence
             if num < len(options["lines_to_comment"]):
@@ -57,7 +57,7 @@ class ReadingPython:
             line: pn.widgets.Select(
                 options=shuffle_options(options["comments_options"], seed),
                 name=f"Line {line}:",
-                value=getattr(self, f"q{question_number}_{i_comments+1}"),
+                value=getattr(self, f"q{question_number}_{i_comments + 1}"),
                 width=600,
             )
             for i_comments, line in enumerate(options["lines_to_comment"])
@@ -97,13 +97,13 @@ class ReadingPython:
         # Function to create a row with dropdowns
         def create_row(step: int) -> pn.Row:
             widgets_list = [
-                pn.pane.HTML(f"Step {step+1}", width=150)
+                pn.pane.HTML(f"Step {step + 1}", width=150)
                 if i == 0
                 else pn.widgets.Select(
                     options=dropdown_options[i - 1],
                     value=getattr(
                         self,
-                        f'q{question_number}_{len(options["lines_to_comment"])+step+1}',
+                        f"q{question_number}_{len(options['lines_to_comment']) + step + 1}",
                     )[i - 1],
                     width=150,
                 )