PyKubeGrader 0.2.27__py3-none-any.whl → 0.2.29__py3-none-any.whl

{PyKubeGrader-0.2.27.dist-info → PyKubeGrader-0.2.29.dist-info}/METADATA

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

{PyKubeGrader-0.2.27.dist-info → PyKubeGrader-0.2.29.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=c_fqE3j_4wrlXWYHnBt4X4g622BKdbWzPT9mg_xArxA,4152
+pykubegrader/tokens/validate_token.py,sha256=CwoVo_KFEYspbH6pbb3jb7QKHaiOQQVOEFFWXV18Gvg,5287
 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.27.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
-PyKubeGrader-0.2.27.dist-info/METADATA,sha256=O9OtbiAIstnf_CFiulp51aCAWlaX_rQe90LrOMudw4o,2779
-PyKubeGrader-0.2.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-PyKubeGrader-0.2.27.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
-PyKubeGrader-0.2.27.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
-PyKubeGrader-0.2.27.dist-info/RECORD,,
+PyKubeGrader-0.2.29.dist-info/LICENSE.txt,sha256=YTp-Ewc8Kems8PJEE27KnBPFnZSxoWvSg7nnknzPyYw,1546
+PyKubeGrader-0.2.29.dist-info/METADATA,sha256=7Te1ql0k3BNp9JaX-fQjxGKEMBLMfXrlGUj9gBdSHaw,2779
+PyKubeGrader-0.2.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+PyKubeGrader-0.2.29.dist-info/entry_points.txt,sha256=UPMdTT46fQwTYJWtrUwIWIbXbwyOPfNQgBFRa0frWzw,138
+PyKubeGrader-0.2.29.dist-info/top_level.txt,sha256=e550Klfze6higFxER1V62fnGOcIgiKRbsrl9CC4UdtQ,13
+PyKubeGrader-0.2.29.dist-info/RECORD,,

pykubegrader/tokens/validate_token.py

@@ -1,9 +1,12 @@
 import asyncio
 import os
+import sys
 from typing import Optional
 
 import httpx
 import nest_asyncio  # type: ignore
+import requests
+from requests.auth import HTTPBasicAuth
 
 # Apply nest_asyncio for environments like Jupyter
 nest_asyncio.apply()
@@ -87,26 +90,18 @@ async def async_validate_token(token: Optional[str] = None) -> None:
     async with httpx.AsyncClient() as client:
         try:
             response = await client.get(url=endpoint, auth=basic_auth, 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.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:
+def validate_token_wrapper(token: Optional[str] = None) -> None:
     """
     Synchronous wrapper for the `async_validate_token` function.
 
@@ -131,6 +126,48 @@ def validate_token(token: Optional[str] = None) -> None:
     loop.run_until_complete(async_validate_token(token))
 
 
+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
+
+    # Get endpoint URL
+    base_url = os.getenv("DB_URL")
+    if not base_url:
+        print("Error: Environment variable 'DB_URL' not set", file=sys.stderr)
+        return
+    endpoint = f"{base_url.rstrip('/')}/validate-token/{token}"
+
+    # 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)
+
+    try:
+        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
 if __name__ == "__main__":
     token = "test"