PyKubeGrader 0.2.24__tar.gz → 0.2.26__tar.gz

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/.github/workflows/main.yml

@@ -2,20 +2,22 @@ name: CI/CD
 
 on:
   push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+    branches: [main]
+  # Comment out until we have real tests
+  # pull_request:
+  #   branches: [main]
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: self-hosted
+
     permissions:
       contents: write
+
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - name: Check out repository
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -59,6 +61,22 @@ jobs:
           python -m pip install --upgrade twine
           twine upload dist/*
 
+      - name: Trigger JupyterHub image rebuild
+        if: |
+          contains(github.event.head_commit.message, '#patch') ||
+          contains(github.event.head_commit.message, '#minor') ||
+          contains(github.event.head_commit.message, '#major')
+        env:
+          JHUB_TOKEN: ${{ secrets.JHUB_REBUILD_TOKEN }}
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $JHUB_TOKEN" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/theodore-s-beers/engr-131-jhub/actions/workflows/docker.yml/dispatches \
+            -d '{"ref":"main"}'
+
       - name: Deploy to GitHub Pages
         env:
           HOME: "${{ github.workspace }}/../" # Because self-hosted runner is root

{pykubegrader-0.2.24/src/PyKubeGrader.egg-info → pykubegrader-0.2.26}/PKG-INFO

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

{pykubegrader-0.2.24 → pykubegrader-0.2.26/src/PyKubeGrader.egg-info}/PKG-INFO

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

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/build/build_folder.py

@@ -22,13 +22,11 @@ try:
 except:  # noqa: E722
     print("Passwords not found, cannot access database")
 
-import nbformat
-
-from .api_notebook_builder import FastAPINotebookBuilder
 from typing import Optional
 
+import nbformat
 
-import os
+from .api_notebook_builder import FastAPINotebookBuilder
 
 os.environ["JUPYTERHUB_USER"] = "jca92"
 os.environ["TOKEN"] = "token"
@@ -180,9 +178,7 @@ class NotebookProcessor:
         self.update_initialize_function()
 
     def update_initialize_function(self):
-
         for key, value in self.total_point_log.items():
-
             assignment_tag = f"week{self.week_num}-{self.assignment_type}"
 
             update_initialize_assignment(
@@ -724,6 +720,7 @@ class NotebookProcessor:
         with open(notebook_path, "w", encoding="utf-8") as f:
             nbformat.write(notebook, f)
 
+    @staticmethod
     def add_validate_token_cell(notebook_path: str, require_key: bool) -> None:
         """
         Adds a new code cell at the top of a Jupyter notebook if require_key is True.

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/initialize.py

@@ -2,14 +2,16 @@ import hashlib
 import os
 import shutil
 from pathlib import Path
+from typing import Optional
 
 import panel as pn
 import requests
 from IPython import get_ipython
-from typing import Optional
+
 from .telemetry import ensure_responses, log_variable, telemetry, update_responses
 
-#TODO: could cleanup to remove redundant imports
+
+# TODO: could cleanup to remove redundant imports
 def initialize_assignment(
     name: str,
     week: str,
@@ -33,7 +35,7 @@ def initialize_assignment(
     Raises:
         Exception: If the environment is unsupported or initialization fails.
     """
-    
+
     if assignment_tag is None:
         assignment_tag = f"{week}-{assignment_type}"
 

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/log_parser/parse.ipynb

@@ -6,17 +6,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "# ruff: noqa\n",
+    "\n",
     "# Get the public/private keypair for decryption\n",
     "key_box = get_keybox()"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -151,7 +146,7 @@
     "parser = LogParser(log_lines=log_lines, week_tag=\"week1-readings\")\n",
     "parser.parse_logs()\n",
     "parser.calculate_total_scores()\n",
-    "results = parser.get_results() \n",
+    "results = parser.get_results()\n",
     "\n",
     "results"
    ]
@@ -192,13 +187,6 @@
     "results"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -218,7 +206,7 @@
     "time_stamp = results[\"student_information\"][\"timestamp\"]\n",
     "\n",
     "week_num = results[\"week_num\"]\n",
-    "assignment_type = results['assignment_type']\n",
+    "assignment_type = results[\"assignment_type\"]\n",
     "\n",
     "assignments_graded = results[\"assignment_information\"].keys()\n",
     "total_score = 0\n",
@@ -253,13 +241,6 @@
    "source": [
     "student_email"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/log_parser/parse.py

@@ -1,5 +1,14 @@
 from dataclasses import dataclass, field
-from typing import Optional
+from typing import Any, Optional, TypedDict
+
+
+class LogParserResults(TypedDict):
+    student_information: dict[str, str]
+    week: Optional[str]
+    week_num: Optional[int]
+    assignment_type: Optional[str]
+    assignment_information: dict[str, Any]
+    assignment_scores: dict[str, Any]
 
 
 @dataclass
@@ -160,7 +169,7 @@ class LogParser:
             total_score = sum(q["score_earned"] for q in data["questions"].values())
             data["total_score"] = total_score
 
-    def get_results(self) -> dict[str, dict]:
+    def get_results(self) -> LogParserResults:
         """
         Returns the parsed results as a hierarchical dictionary with three sections:
         """

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/submit/submit_assignment.py

@@ -1,8 +1,9 @@
-import os
-import httpx
 import asyncio
-import nest_asyncio
 import base64
+import os
+
+import httpx
+import nest_asyncio  # type: ignore
 
 # Apply nest_asyncio for environments like Jupyter
 nest_asyncio.apply()
@@ -43,7 +44,7 @@ async def call_score_assignment(
     # Get credentials
     credentials = get_credentials()
     username = credentials["username"]
-    password = credentials["password"] 
+    password = credentials["password"]
 
     # Encode credentials for Basic Authentication
     auth_header = (

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/tokens/validate_token.py

@@ -1,8 +1,10 @@
-import os
+import asyncio
 import base64
+import os
+from typing import Optional
+
 import httpx
-import asyncio
-import nest_asyncio
+import nest_asyncio  # type: ignore
 
 # Apply nest_asyncio for environments like Jupyter
 nest_asyncio.apply()
@@ -39,7 +41,7 @@ def get_credentials():
     return {"username": username, "password": password}
 
 
-async def async_validate_token(token: str = None) -> None:
+async def async_validate_token(token: Optional[str] = None) -> None:
     """
     Asynchronously validate a token by making a GET request to the validation endpoint.
 
@@ -103,7 +105,7 @@ async def async_validate_token(token: str = None) -> None:
             raise TokenValidationError(f"An unexpected error occurred: {e}")
 
 
-def validate_token(token: str = None) -> None:
+def validate_token(token: Optional[str] = None) -> None:
     """
     Synchronous wrapper for the `async_validate_token` function.
 

{pykubegrader-0.2.24 → pykubegrader-0.2.26}/src/pykubegrader/tokens/tokens.py

@@ -1,10 +1,10 @@
-import requests
-import os
 import json
+import os
 
+import requests
 
-def build_token_payload(token: str, duration: int) -> dict:
 
+def build_token_payload(token: str, duration: int) -> dict:
     if os.getenv("JUPYTERHUB_USER", None) is None:
         raise ValueError("JupyterHub user not found")