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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyKubeGrader
-Version: 0.2.28
+Version: 0.2.30
 Summary: Add a short description here!
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: jagar2
@@ -12,10 +12,12 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
+Requires-Dist: httpx
 Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: ipython
 Requires-Dist: mypy
 Requires-Dist: nbformat
+Requires-Dist: nest_asyncio
 Requires-Dist: numpy
 Requires-Dist: panel
 Requires-Dist: pynacl
@@ -28,8 +30,6 @@ Requires-Dist: types-python-dateutil
 Requires-Dist: types-pyyaml
 Requires-Dist: types-requests
 Requires-Dist: types-setuptools
-Requires-Dist: httpx
-Requires-Dist: nest_asyncio
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"

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

@@ -14,7 +14,7 @@ pykubegrader/log_parser/parse.ipynb,sha256=5e-9dzUbJk2M8kPP55lVeksm86lSY5ocKfWOP
 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/validate_token.py,sha256=SmVfnJDoWaUoiPVlPv_eHqROu5nsdpOshyxAmzozEHU,3790
+pykubegrader/tokens/validate_token.py,sha256=ShCNP-BpatS3-jdIkNsGVlhAqFHukpj0URqJuCMNHQk,2643
 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=xmvN1UIXwk32v9S-JhsXwDc7axPlgpvoxSeM3II8sxY,5393
 pykubegrader/widgets_base/select.py,sha256=Fw3uFNOIWo1a3CvlzSx23bvi6bSmA3TqutuRbhD4Dp8,2525
-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.30.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.30.dist-info/METADATA,sha256=ocvUZSqFJk6PAgCy300HAFyJrKDGOZqh0gAWjB7vsLg,2779
+PyKubeGrader-0.2.30.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.2.30.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.30.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.30.dist-info/RECORD,,

pykubegrader/tokens/validate_token.py

@@ -1,12 +1,9 @@
-import asyncio
 import os
+import sys
 from typing import Optional
 
-import httpx
-import nest_asyncio  # type: ignore
-
-# Apply nest_asyncio for environments like Jupyter
-nest_asyncio.apply()
+import requests
+from requests.auth import HTTPBasicAuth
 
 
 class TokenValidationError(Exception):
@@ -44,83 +41,46 @@ def get_credentials() -> dict[str, str]:
     return {"username": username, "password": password}
 
 
-async def async_validate_token(token: Optional[str] = None) -> None:
-    """
-    Asynchronously validate a token by making a GET request to the validation endpoint.
-
-    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.
-    """
-
-    # 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")
+def validate_token(token: Optional[str] = None) -> None:
+    if token:
+        os.environ["TOKEN"] = token  # If token passed, set env var
+    else:
+        token = os.getenv("TOKEN")  # Otherwise try to get from env
+        if not token:
+            print("Error: No token provided", file=sys.stderr)
+            return
 
-    # Fetch the endpoint URL
+    # Get endpoint URL
     base_url = os.getenv("DB_URL")
     if not base_url:
-        raise ValueError("Environment variable 'DB_URL' not set")
-    endpoint = f"{base_url}validate-token/{token}"
+        print("Error: Environment variable 'DB_URL' not set", file=sys.stderr)
+        return
+    endpoint = f"{base_url.rstrip('/')}/validate-token/{token}"
 
     # Get credentials
-    credentials = get_credentials()
+    try:
+        credentials = get_credentials()
+    except ValueError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return
+
     username = credentials["username"]
     password = credentials["password"]
+    basic_auth = HTTPBasicAuth(username, password)
 
-    basic_auth = httpx.BasicAuth(username=username, password=password)
-
-    # Make GET request
-    async with httpx.AsyncClient() as client:
-        try:
-            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:
-            raise TokenValidationError(f"An unexpected error occurred: {e}")
-
-
-def validate_token(token: Optional[str] = None) -> 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))
+        response = requests.get(url=endpoint, auth=basic_auth, timeout=10)
+        response.raise_for_status()
+
+        detail = response.json().get("detail", response.text)
+        print(detail)
+    except requests.exceptions.HTTPError as e:
+        detail = e.response.json().get("detail", e.response.text)
+        print(f"Error: {detail}", file=sys.stderr)
+    except requests.exceptions.RequestException as e:
+        print(f"Error: Request failed: {e}", file=sys.stderr)
+    except Exception as e:
+        print(f"Unexpected error: {e}", file=sys.stderr)
 
 
 # Example usage