Resolve ty type checking diagnostics

Author: chriscarrollsmith

routers/core/dashboard.py

@@ -1,7 +1,7 @@
 from typing import Optional, List
 from fastapi import APIRouter, Depends, Request, Response
 from fastapi.templating import Jinja2Templates
-from sqlmodel import Session, select
+from sqlmodel import Session, select, col
 from utils.core.dependencies import get_user_with_relations, get_session
 from utils.core.models import User, Organization
 from utils.app.enums import AppPermissions
@@ -48,7 +48,7 @@ async def read_dashboard(
                 session.exec(
                     select(OrganizationResource)
                     .where(OrganizationResource.organization_id == selected_org.id)
-                    .order_by(OrganizationResource.created_at.desc())  # type: ignore[union-attr]
+                    .order_by(col(OrganizationResource.created_at).desc())
                 ).all()
             )
             can_read = user.has_permission(

routers/core/user.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, Form, UploadFile, File, Request, HTTPException
 from fastapi.responses import RedirectResponse, Response
-from sqlmodel import Session, select
+from sqlmodel import Session, select, col
 from typing import Optional, List
 from fastapi.templating import Jinja2Templates
 from sqlalchemy.orm import selectinload
@@ -81,7 +81,7 @@ async def read_profile(
         session.exec(
             select(AccountEmail)
             .where(AccountEmail.account_id == user.account_id)
-            .order_by(AccountEmail.is_primary.desc())  # type: ignore[union-attr]
+            .order_by(col(AccountEmail.is_primary).desc())
         ).all()
         if user.account_id
         else []

tests/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 import os
-from typing import Generator
+from typing import Generator, cast
 from sqlmodel import create_engine, Session, select
 from fastapi.testclient import TestClient
 from dotenv import load_dotenv
@@ -576,7 +576,7 @@ def mock_email_response():
     # Ensure resend is imported
     import resend
 
-    return resend.Email(**email_data)
+    return cast(resend.Email, email_data)
 
 
 @pytest.fixture

utils/core/db.py

@@ -99,12 +99,18 @@ def get_connection_url() -> URL:
     if missing:
         raise ValueError(f"Missing environment variables: {', '.join(missing)}")
 
+    assert port is not None
+    assert database is not None
+    assert username is not None
+    assert password is not None
+    assert host is not None
+
     database_url: URL = URL.create(
         drivername="postgresql",
         username=username,
         password=password,
         host=host,
-        port=int(port),  # type: ignore[arg-type]
+        port=int(port),
         database=database,
         query={"sslmode": sslmode},
     )

utils/core/models.py

@@ -4,7 +4,7 @@
 from datetime import datetime, UTC, timedelta
 from typing import Optional, List, Union
 from pydantic import EmailStr
-from sqlmodel import SQLModel, Field, Relationship, Session, select
+from sqlmodel import SQLModel, Field, Relationship, Session, select, col
 from sqlalchemy import Column, LargeBinary, String, UniqueConstraint
 from sqlalchemy.orm import Mapped
 from exceptions.http_exceptions import DataIntegrityError
@@ -371,7 +371,7 @@ def get_active_for_org(
         cls, session: Session, organization_id: int
     ) -> list["Invitation"]:
         statement = select(cls).where(
-            cls.organization_id == organization_id, cls.used.is_(False)
+            cls.organization_id == organization_id, col(cls.used).is_(False)
         )
         results = session.exec(statement).all()
         return [inv for inv in results if not inv.is_expired()]