PyKubeGrader 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

{PyKubeGrader-0.2.18.dist-info → PyKubeGrader-0.2.20.dist-info}/METADATA

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

{PyKubeGrader-0.2.18.dist-info → PyKubeGrader-0.2.20.dist-info}/RECORD

@@ -14,7 +14,7 @@ pykubegrader/log_parser/parse.ipynb,sha256=H1CUuqiUSE-tiZV1IS7VG6HAEvoopGd6i_5QM
 pykubegrader/log_parser/parse.py,sha256=YCs_OCnoxQKsL55MjTZWXBBBsehJL8PIB9ANnC-aE44,7379
 pykubegrader/submit/submit_assignment.py,sha256=p-v31479342q0AO3lJrd8Fwk7iJQUz183OeGeiNcXOY,3405
 pykubegrader/tokens/tokens.py,sha256=DorNwdrA5N5apB3LQjVGa2ABN5C1upkgglecaLHobr0,1260
-pykubegrader/tokens/validate_token.py,sha256=qbAKE8Vtz3trD99Yb3RnC7gr23CRqaNMFiESqFmWDlY,2037
+pykubegrader/tokens/validate_token.py,sha256=zsELkJg1ll_3dWF1auuFVqh3N84vTZ8RIfk71edL360,3836
 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
@@ -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=_vjUPynqmJe_R4vf-7hVhGnQR726S9GL6qT8bflBXBM,5383
 pykubegrader/widgets_base/select.py,sha256=Fw3uFNOIWo1a3CvlzSx23bvi6bSmA3TqutuRbhD4Dp8,2525
-PyKubeGrader-0.2.18.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.18.dist-info/METADATA,sha256=m7tPzuZwXFkUeK19vPiztdP6MYcuFPbVzgT18AYOVAw,2779
-PyKubeGrader-0.2.18.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-PyKubeGrader-0.2.18.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.18.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.18.dist-info/RECORD,,
+PyKubeGrader-0.2.20.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.20.dist-info/METADATA,sha256=ukDi7JVBIA2MSzOVLFkd2zqqgI_c7k-GQNLqCM3VflE,2779
+PyKubeGrader-0.2.20.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+PyKubeGrader-0.2.20.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.20.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.20.dist-info/RECORD,,

pykubegrader/tokens/validate_token.py

@@ -1,5 +1,12 @@
-import requests
 import os
+import base64
+import httpx
+import asyncio
+import nest_asyncio
+
+# Apply nest_asyncio for environments like Jupyter
+nest_asyncio.apply()
+
 
 class TokenValidationError(Exception):
     """
@@ -16,9 +23,25 @@ class TokenValidationError(Exception):
         super().__init__(message)
 
 
-def validate_token(token = None):
+def get_credentials():
     """
-    Validate a token by making a GET request to the validation endpoint.
+    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."
+        )
+    return {"username": username, "password": password}
+
+
+async def async_validate_token(token: str) -> None:
+    """
+    Asynchronously validate a token by making a GET request to the validation endpoint.
 
     Args:
         token (str): The token to validate.
@@ -29,34 +52,69 @@ def validate_token(token = None):
     Returns:
         None: If the token is valid, the function will pass silently.
     """
-    endpoint = f"https://engr-131-api.eastus.cloudapp.azure.com/validate-token/{token}"
+    # Fetch the endpoint URL
+    base_url = os.getenv("DB_URL")
+    if not base_url:
+        raise ValueError("Environment variable 'DB_URL' is not set.")
+    endpoint = f"{base_url}validate-token/{token}"
 
-    if token is not None:
-        os.environ["TOKEN"] = token
+    # Get credentials
+    credentials = get_credentials()
+    username = credentials["username"]
+    password = credentials["password"]
 
-    if token is None:
-        token = os.getenv("TOKEN", None)
-        
-    if token is None:
-        raise TokenValidationError("No token provided")
+    # Encode credentials for Basic Authentication
+    auth_header = (
+        f"Basic {base64.b64encode(f'{username}:{password}'.encode()).decode()}"
+    )
 
-    try:
-        response = requests.get(endpoint, 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
-            raise TokenValidationError(response.json().get("detail", "Token not found"))
-        else:
-            # Handle unexpected status codes
-            raise TokenValidationError(
-                f"Unexpected response code: {response.status_code}"
+    # Make the GET request
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.get(
+                endpoint, headers={"Authorization": auth_header}, timeout=10
             )
-    except requests.RequestException as e:
-        # Raise an exception for connection errors or timeout
-        raise TokenValidationError(f"Request failed: {e}")
+
+            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}"
+                )
+        except httpx.RequestError as e:
+            raise TokenValidationError(f"Request failed: {e}")
+        except Exception as e:
+            raise TokenValidationError(f"An unexpected error occurred: {e}")
+
+
+def validate_token(token: str) -> None:
+    """
+    Synchronous wrapper for the `async_validate_token` function.
+
+    Args:
+        token (str): The token to validate.
+
+    Raises:
+        TokenValidationError: If the token is invalid or if there is an error in the validation process.
+
+    Returns:
+        None: If the token is valid, the function will pass silently.
+    """
+    # Get the current event loop or create one
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+    # Run the async function in the event loop
+    loop.run_until_complete(async_validate_token(token))
 
 
 # Example usage