Merge pull request #180 from USACE-WaterManagement/cwbi-dev

Migrate dev to test

Author: jbkolze

.github/workflows/cwbi-test-push-api.yml

@@ -0,0 +1,72 @@
+name: Python Tests on PR
+
+on:
+  pull_request:
+    branches:
+      - cwbi-dev
+      - cwbi-test
+      - cwbi-prod
+    paths:
+      - "cwms_batch_events/**"
+      - "tests/**"
+      - "requirements.txt"
+      - "requirements-dev.txt"
+      - "pytest.ini"
+      - ".github/workflows/cwbi-test-push-api.yml"
+
+permissions:
+  contents: read
+
+jobs:
+  python-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+          cache: "pip"
+          cache-dependency-path: |
+            requirements.txt
+            requirements-dev.txt
+
+      - name: Install dependencies
+        run: python -m pip install -r requirements-dev.txt
+
+      - name: Run pytest
+        run: pytest --cov-report=html --cov-report=json
+
+      - name: Upload coverage HTML report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-htmlcov
+          path: htmlcov/
+
+      - name: Add coverage summary
+        if: always()
+        run: |
+          python - <<'PY'
+          import json
+          import os
+          from pathlib import Path
+
+          coverage_file = Path("coverage.json")
+          if not coverage_file.exists():
+              raise SystemExit("coverage.json was not generated")
+
+          data = json.loads(coverage_file.read_text())
+          total = data["totals"]["percent_covered_display"]
+
+          summary = Path(os.environ["GITHUB_STEP_SUMMARY"])
+          summary.write_text(
+              "## Python Coverage\n\n"
+              f"- Total coverage: `{total}%`\n"
+              "- HTML report: download the `python-htmlcov` artifact from this workflow run.\n",
+              encoding="utf-8",
+          )
+          PY

.gitignore

@@ -42,6 +42,7 @@ htmlcov/
 .nox/
 .coverage
 .coverage.*
+coverage.json
 .cache
 nosetests.xml
 coverage.xml

CONTRIBUTING.md

@@ -25,4 +25,7 @@
 ## Notes
 * Type Standardization
   * TypeScript types are generated from the API for use in the frontend using [OpenAPI TypeScript](https://openapi-ts.dev/). 
-  * If API types are updated or modified, run `npm run generate:types` to update the type definitions.
+  * If API types are updated or modified, run `npm run generate:types` to update the type definitions.
+* Python Testing
+  * Run `pytest` from the project root to execute the Python unit test suite.
+  * The suite is configured to report coverage for `cwms_batch_events` and should stay fast and free of external dependencies.

cwms_batch_events/api/routers/scripts.py

@@ -63,7 +63,7 @@ def post_script(
         return job_db.store_script(payload)
     except ValueError as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(e)
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT, detail=str(e)
         )
     except SlugError as e:
         raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=str(e))
@@ -87,7 +87,7 @@ def put_script(
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail=str(e))
     except ValueError as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=str(e)
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT, detail=str(e)
         )
 
 

cwms_batch_events/core/auth/user/dependencies.py

@@ -1,6 +1,7 @@
 from fastapi import Depends, HTTPException, Request, status
 from fastapi.security import APIKeyHeader, HTTPAuthorizationCredentials, HTTPBearer
 
+from cachetools import TTLCache
 from cwms_batch_events.core.auth.user.jwt import verify_jwt
 from cwms_batch_events.core.auth.user.models import User
 from cwms_batch_events.core.auth.user.roles import (
@@ -24,6 +25,8 @@
     description="Use format: apikey <your-api-key>",
 )
 
+user_cache: TTLCache[str, User] = TTLCache(maxsize=1024, ttl=300)
+
 
 async def get_auth_header_for_docs(
     bearer: str = Depends(bearer_scheme),
@@ -47,6 +50,10 @@ async def get_auth_credentials(
 async def get_current_user_cwms(
     credentials: HTTPAuthorizationCredentials = Depends(get_auth_credentials),
 ) -> User:
+    cache_key = f"{credentials.scheme}:{credentials.credentials}"
+    if cache_key in user_cache:
+        return user_cache[cache_key]
+
     if credentials.scheme.lower() == "bearer":
         token = credentials.credentials
         try:
@@ -71,13 +78,16 @@ async def get_current_user_cwms(
 
     allowed_offices = get_user_allowed_offices(cda_user)
     admin_offices = get_user_admin_offices(cda_user)
-    return User(
+    user = User(
         username=cda_user.user_name,
         offices=allowed_offices,
         admin_offices=admin_offices,
         roles=cda_user.roles,
     )
 
+    user_cache[cache_key] = user
+    return user
+
 
 async def get_current_user_mock() -> User:
     return User(

cwms_batch_events/core/auth/user/jwt.py

@@ -16,7 +16,7 @@
 
 ISSUER = {
     "PROD": "https://identity.sec.usace.army.mil/auth/realms/cwbi",
-    "TEST": "https://identity-test.cwbi.us/auth/realms/cwbi",
+    "TEST": "https://identity-test.cwbi.mil/auth/realms/cwbi",
 }
 
 

cwms_batch_events/lambdas/dispatch_job/dispatcher.py

@@ -100,6 +100,7 @@ def lambda_handler(event, context):
             external_job_id = dispatch_job(message)
         except ClientError:
             logger.exception("Failed to submit batch job for message: %s", message)
+            raise
 
         try:
             bind_request = BindExternalJobIdRequest(external_job_id=external_job_id)

pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+testpaths = tests
+addopts = -ra --strict-markers --cov=cwms_batch_events --cov-branch --cov-report=term-missing
+markers =
+    unit: fast isolated tests
+    integration: tests that exercise component boundaries

requirements-dev.txt

@@ -1,3 +1,5 @@
 -r requirements.txt
 pytest
-docker
+pytest-cov
+pytest-trio
+docker

requirements.txt

@@ -1,4 +1,5 @@
 boto3
+cachetools
 fastapi
 psycopg2-binary
 pydantic