Merge branch 'main' of github.com:CSSS/csss-site-backend into fix_132_nominee-fk-conflict

Author: kathryntanardy

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.3.0
+  rev: v6.0.0
   hooks:
     - id: check-yaml
     - id: end-of-file-fixer
     - id: trailing-whitespace
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version
-  rev: v0.4.4
+  rev: v0.15.12
   hooks:
     # Run linter
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     # Run formatter
     - id: ruff-format

README.md

@@ -20,22 +20,22 @@ If you're planning to read through the source code, please check out this projec
 4. Install developer dependencies
 ```bash
 # Install main dependencies
-pip install .        # or: uv pip install .
+pip install .        # or: uv sync
 
 # Install with dev dependencies
-pip install ".[dev]" # or: uv pip install ".[dev]"
+pip install ".[dev]" # or: uv sync --extra dev
 
 # Install with test dependencies
-pip install ".[test]" # or: uv pip install ".[test]"
+pip install ".[test]" # or: uv sync --extra test
 
 # Install with all dependencies
-pip install ".[dev, test]" # or: uv pip install ".[dev, test]"
+pip install ".[dev, test]" # or: uv sync --all-extras
 ```
 
 5. Follow the database setup instructions on the [wiki](https://github.com/CSSS/csss-site-backend/wiki/1.-Local-Setup#database-setup). The recommended way is to do it through Docker, but both should work.
 6. You will need to set the following environment variables
 ```bash
-export DB_PORT=5444 # The port your database is listening at
+export DB_PORT=5444 # If you're using Docker
 export LOCAL=true # Should be true if you're running this locally
 ```
 

pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "ruff==0.15.12", # linting and formatter
+    "pre-commit"
 ]
 
 test = [

src/auth/urls.py

@@ -54,8 +54,8 @@ async def login_user(
     service_url = body.service
     service = urllib.parse.quote(service_url)
     service_validate_url = f"https://cas.sfu.ca/cas/serviceValidate?service={service}&ticket={body.ticket}"
-    async with httpx.AsyncClient() as client:
-        response = await client.get(service_validate_url)
+    client = request.app.state.http_client
+    response = await client.get(service_validate_url)
     cas_response = xmltodict.parse(response.text)
 
     if "cas:authenticationFailure" in cas_response["cas:serviceResponse"]:

src/database.py

@@ -1,18 +1,14 @@
 import asyncio
 import contextlib
 import os
-from collections.abc import AsyncIterator
+from collections.abc import AsyncGenerator
 from typing import Annotated, Any
 
 import asyncpg
 import httpx
-import sqlalchemy
 from fastapi import Depends, FastAPI
 from sqlalchemy import MetaData
-from sqlalchemy.ext.asyncio import (
-    AsyncConnection,
-    AsyncSession,
-)
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncSession, async_sessionmaker, create_async_engine
 from sqlalchemy.orm import DeclarativeBase
 
 convention = {
@@ -31,8 +27,8 @@ class Base(DeclarativeBase):
 # from: https://medium.com/@tclaitken/setting-up-a-fastapi-app-with-async-sqlalchemy-2-0-pydantic-v2-e6c540be4308
 class DatabaseSessionManager:
     def __init__(self, db_url: str, engine_kwargs: dict[str, Any], check_db=True):
-        self._engine = sqlalchemy.ext.asyncio.create_async_engine(db_url, **engine_kwargs)
-        self._sessionmaker = sqlalchemy.ext.asyncio.async_sessionmaker(autocommit=False, bind=self._engine)
+        self._engine = create_async_engine(db_url, **engine_kwargs)
+        self._sessionmaker = async_sessionmaker(autocommit=False, bind=self._engine)
 
         if check_db:
             # check if the database exists by making a test connection
@@ -63,7 +59,7 @@ async def close(self):
         self._sessionmaker = None
 
     @contextlib.asynccontextmanager
-    async def connect(self) -> AsyncIterator[AsyncConnection]:
+    async def connect(self) -> AsyncGenerator[AsyncConnection]:
         if self._engine is None:
             raise Exception("DatabaseSessionManager is not initialized")
 
@@ -75,7 +71,7 @@ async def connect(self) -> AsyncIterator[AsyncConnection]:
                 raise
 
     @contextlib.asynccontextmanager
-    async def session(self) -> AsyncIterator[AsyncSession]:
+    async def session(self) -> AsyncGenerator[AsyncSession]:
         if self._sessionmaker is None:
             raise Exception("DatabaseSessionManager is not initialized")