Merge branch 'main' into develop

Author: travis-bauer

.github/workflows/ci-cd.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: ['3.11', '3.12', '3.13']
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Cache pip dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
@@ -75,7 +75,7 @@ jobs:
     needs: test
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Python
       uses: actions/setup-python@v6
@@ -98,7 +98,7 @@ jobs:
         safety check
 
     - name: Upload security scan results
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: security-reports
@@ -116,7 +116,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Log in to Container Registry
       uses: docker/login-action@v3
@@ -184,7 +184,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4
@@ -203,7 +203,7 @@ jobs:
     if: github.event_name == 'release' && github.event.action == 'published'
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
 

pyproject.toml

@@ -52,6 +52,7 @@ dev = [
     "mypy>=1.0.0",
     "bandit>=1.7.0",
     "safety>=2.3.0",
+    "isort"
 ]
 test = [
     "pytest>=7.0.0",

tests/conftest.py

@@ -6,7 +6,11 @@
 
 import pytest
 from fastapi.testclient import TestClient
-from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
+from sqlalchemy.ext.asyncio import (
+    AsyncSession,
+    async_sessionmaker,
+    create_async_engine,
+)
 from sqlalchemy.pool import StaticPool
 
 from writing_assistant.app.auth import get_user_manager
@@ -26,6 +30,31 @@
 )
 
 
+def pytest_sessionfinish(session, exitstatus):
+    """Clean up async engine after all tests complete."""
+    import asyncio
+
+    # Dispose of the async engine to close all connections and threads
+    try:
+        # Try to dispose using the current event loop if available
+        try:
+            loop = asyncio.get_event_loop()
+            if not loop.is_closed() and not loop.is_running():
+                loop.run_until_complete(test_engine.dispose())
+            else:
+                # Create a new event loop for cleanup
+                asyncio.run(test_engine.dispose())
+        except RuntimeError:
+            # No event loop exists, create one
+            asyncio.run(test_engine.dispose())
+    except Exception:
+        # Fallback: try to close the underlying sync engine
+        try:
+            test_engine.sync_engine.dispose(close=True)
+        except Exception:
+            pass
+
+
 @pytest.fixture(scope="function")
 async def async_db_session() -> AsyncGenerator[AsyncSession, None]:
     """Create a fresh database for each test."""

tests/test_main_coverage.py

@@ -116,17 +116,16 @@ def test_get_user_preferences_empty(authenticated_client):
     assert data["preferences"] == {}
 
 
-def test_get_user_preferences_with_data(authenticated_client, async_db_session, test_user):
+async def test_get_user_preferences_with_data(authenticated_client, async_db_session, test_user):
     """Test getting user preferences with saved data."""
     import json
 
     # Set preferences on user
     test_user.preferences = json.dumps({"theme": "dark", "fontSize": 14})
     async_db_session.add(test_user)
 
-    # Use sync over async to commit
-    import asyncio
-    asyncio.get_event_loop().run_until_complete(async_db_session.commit())
+    # Commit the changes
+    await async_db_session.commit()
 
     response = authenticated_client.get("/user/preferences")
     assert response.status_code == 200
@@ -413,9 +412,10 @@ def test_create_snapshot_cleanup_old(authenticated_client):
     )
 
     # Create 12 snapshots
+    import time
     for i in range(12):
         authenticated_client.post("/documents/snapshot/cleanup.json")
-        asyncio.sleep(0.01)  # Small delay to ensure different timestamps
+        time.sleep(0.01)  # Small delay to ensure different timestamps
 
     # List snapshots
     response = authenticated_client.get("/documents/snapshots/cleanup.json")