PyKubeGrader 0.2.33__py3-none-any.whl → 0.2.35__py3-none-any.whl

{PyKubeGrader-0.2.33.dist-info → PyKubeGrader-0.2.35.dist-info}/METADATA

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

{PyKubeGrader-0.2.33.dist-info → PyKubeGrader-0.2.35.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pykubegrader/__init__.py,sha256=AoAkdfIjDDZGWLlsIRENNq06L9h46kDGBIE8vRmsCfg,311
-pykubegrader/initialize.py,sha256=W-O1d9hy6BIYS28x3kcLG50WnNC4196eZwqwzVZdsgU,3902
-pykubegrader/telemetry.py,sha256=4rMEWfijv50yE2sE1PoZKJTAwLTvPMzmclS2hrj_e9g,5900
-pykubegrader/utils.py,sha256=T3GYnLnTL9VXjTZNPr00sUgMgobQYsNTGwynMyXdvHk,696
-pykubegrader/validate.py,sha256=2KLSB3wfFZbBh1NGgmrOV073paKAgrQz4AgA6LmCIj4,11076
+pykubegrader/initialize.py,sha256=Bwu1q18l18FB9lGppvt-L41D5gzr3S8t6zC0_UbrASw,3994
+pykubegrader/telemetry.py,sha256=jP_mLsn5fBAkAT8sqwEBK0oGKjsOXbtZFoujje68FqI,6288
+pykubegrader/utils.py,sha256=FrxuZ3gtTBTm5FQeH5c0bF9kFjA_AVtE5AYeFhzwKZ0,827
+pykubegrader/validate.py,sha256=OKnItGyd-L8QPKcsE0KRuwBI_IxKiJzMLJKZiA2j3II,11184
 pykubegrader/build/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/build/api_notebook_builder.py,sha256=dlcVrGgsvxnt6GlAUN3e-FrpsPNJKXSHni1fstRCBik,20311
 pykubegrader/build/build_folder.py,sha256=5jl_TAnxfd9sqWvggJr4i3E7mrEf03cmFDotVrgTZWQ,82697
@@ -13,7 +13,7 @@ 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=TOj0jRun1lWTztKA7KX9SjzIfNQqkwdnbczrFSPWB7Y,1089
+pykubegrader/tokens/tokens.py,sha256=X9f3SzrGCrAJp_BXhr6VJn5f0LxtgQ7HLPBw7zEF2BY,1198
 pykubegrader/tokens/validate_token.py,sha256=MQtgz_USvSZ9JahJ48ybjp74F5aYz64lhtvuwVc4kQw,2712
 pykubegrader/widgets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pykubegrader/widgets/multiple_choice.py,sha256=NjD3-uXSnibpUQ0mO3hRp_O-rynFyl0Dz6IXE4tnCRI,2078
@@ -27,9 +27,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=xmvN1UIXwk32v9S-JhsXwDc7axPlgpvoxSeM3II8sxY,5393
 pykubegrader/widgets_base/select.py,sha256=Fw3uFNOIWo1a3CvlzSx23bvi6bSmA3TqutuRbhD4Dp8,2525
-PyKubeGrader-0.2.33.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.33.dist-info/METADATA,sha256=HRHP59oTmYU6gTF21A3NircxAx1nwsc1p8Ecg7xPPz0,2779
-PyKubeGrader-0.2.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.2.33.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.33.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.33.dist-info/RECORD,,
+PyKubeGrader-0.2.35.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.35.dist-info/METADATA,sha256=R4xFLArrD0fLQwL8Wekm6BwI3vh3HN2to6m0NbN_cAo,2779
+PyKubeGrader-0.2.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.2.35.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.35.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.35.dist-info/RECORD,,

pykubegrader/initialize.py

@@ -6,9 +6,10 @@ from typing import Optional
 
 import panel as pn
 import requests
-from IPython import get_ipython
+from IPython.core.getipython import get_ipython
 
 from .telemetry import ensure_responses, log_variable, telemetry, update_responses
+from .utils import api_base_url
 
 
 # TODO: could cleanup to remove redundant imports
@@ -16,7 +17,6 @@ def initialize_assignment(
     name: str,
     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,
@@ -72,8 +72,10 @@ def initialize_assignment(
         pn.extension(silent=True)
 
         # Check connection to API server
+        if not api_base_url:
+            raise Exception("Environment variable for API URL not set")
         params = {"jhub_user": responses["jhub_user"]}
-        response = requests.get(url, params=params)
+        response = requests.get(api_base_url, params=params)
         if verbose:
             print(f"status code: {response.status_code}")
             data = response.json()

pykubegrader/telemetry.py

@@ -13,6 +13,8 @@ from requests import Response
 from requests.auth import HTTPBasicAuth
 from requests.exceptions import RequestException
 
+from .utils import api_base_url, student_pw, student_user
+
 #
 # Logging setup
 #
@@ -126,11 +128,11 @@ def update_responses(key: str, value) -> dict:
 #
 
 
-def score_question(
-    term: str = "winter_2025",
-    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com",
-) -> None:
-    url = base_url + "/live-scorer"
+def score_question(term: str = "winter_2025") -> None:
+    if not student_user or not student_pw or not api_base_url:
+        raise ValueError("Necessary environment variables not set")
+
+    url = api_base_url.rstrip("/") + "/live-scorer"
 
     responses = ensure_responses()
 
@@ -144,7 +146,9 @@ def score_question(
     }
 
     try:
-        res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
+        res = requests.post(
+            url, json=payload, auth=HTTPBasicAuth(student_user, student_pw)
+        )
         res.raise_for_status()
 
         res_data: dict[str, tuple[float, float]] = res.json()
@@ -170,9 +174,11 @@ def submit_question(
     question: str,
     responses: dict,
     score: dict,
-    base_url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
 ) -> Response:
-    url = base_url + "/submit-question"
+    if not student_user or not student_pw or not api_base_url:
+        raise ValueError("Necessary environment variables not set")
+
+    url = api_base_url.rstrip("/") + "/submit-question"
 
     payload = {
         "student_email": student_email,
@@ -183,33 +189,35 @@ def submit_question(
         "score": score,
     }
 
-    res = requests.post(url, json=payload, auth=HTTPBasicAuth("student", "capture"))
+    res = requests.post(url, json=payload, auth=HTTPBasicAuth(student_user, student_pw))
 
     return res
 
 
 # TODO: Refine
-def verify_server(
-    jhub_user: Optional[str] = None,
-    url: str = "https://engr-131-api.eastus.cloudapp.azure.com/",
-) -> str:
+def verify_server(jhub_user: Optional[str] = None) -> str:
+    if not api_base_url:
+        raise ValueError("Environment variable for API URL not set")
     params = {"jhub_user": jhub_user} if jhub_user else {}
-    res = requests.get(url, params=params)
+    res = requests.get(api_base_url, params=params)
     message = f"status code: {res.status_code}"
     return message
 
 
 def get_my_grades() -> dict[str, float]:
+    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 JupiterHub username")
+        raise ValueError("Problem with JupyterHub username")
 
     params = {"username": from_env}
     res = requests.get(
-        "https://engr-131-api.eastus.cloudapp.azure.com/my-grades",
+        url=api_base_url.rstrip("/") + "/my-grades",
         params=params,
-        auth=HTTPBasicAuth("student", "capture"),
+        auth=HTTPBasicAuth(student_user, student_pw),
     )
     res.raise_for_status()
 

pykubegrader/tokens/tokens.py

@@ -3,6 +3,8 @@ import os
 import requests
 from requests.auth import HTTPBasicAuth
 
+from ..utils import api_base_url
+
 
 def build_token_payload(token: str, duration: int) -> dict:
     jhub_user = os.getenv("JUPYTERHUB_USER")
@@ -21,7 +23,9 @@ def add_token(token: str, duration: int = 20) -> None:
     Sends a POST request to mint a token
     """
 
-    url = "https://engr-131-api.eastus.cloudapp.azure.com/tokens"
+    if not api_base_url:
+        raise ValueError("Environment variable for API URL not set")
+    url = api_base_url.rstrip("/") + "/tokens"
 
     payload = build_token_payload(token=token, duration=duration)
 

pykubegrader/utils.py

@@ -1,8 +1,13 @@
+import os
 import random
 from typing import Optional, Tuple
 
 import panel as pn
 
+api_base_url = os.getenv("DB_URL")
+student_user = os.getenv("user_name_student")
+student_pw = os.getenv("keys_student")
+
 
 def list_of_lists(options: list) -> bool:
     return all(isinstance(elem, list) for elem in options)

pykubegrader/validate.py

@@ -20,11 +20,14 @@ def validate_logfile(
     assignment_id: str,
     question_max_scores: dict[int, int],
     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:
+    username = os.getenv("user_name_student")
+    password = os.getenv("keys_student")
+    base_url = os.getenv("DB_URL")
+    if not username or not password or not base_url:
+        sys.exit("Necessary environment variables are not set")
+
     login_data = {
         "username": username,
         "password": password,