Minor fixes to appeas type checker

Author: chriscarrollsmith

pyproject.toml

@@ -13,14 +13,14 @@ dependencies = [
     "pyjwt<3.0.0,>=2.10.1",
     "jinja2<4.0.0,>=3.1.4",
     "uvicorn<1.0.0,>=0.32.0",
-    "psycopg2<3.0.0,>=2.9.10",
     "pydantic[email]<3.0.0,>=2.9.2",
     "python-multipart<1.0.0,>=0.0.17",
     "python-dotenv<2.0.0,>=1.0.1",
     "resend<3.0.0,>=2.4.0",
     "bcrypt<5.0.0,>=4.2.0",
     "fastapi<1.0.0,>=0.115.5",
     "pillow>=11.0.0",
+    "psycopg2-binary>=2.9.10",
 ]
 
 [dependency-groups]
@@ -31,5 +31,5 @@ dev = [
     "notebook<8.0.0,>=7.2.2",
     "pytest<9.0.0,>=8.3.3",
     "sqlalchemy-schemadisplay<3.0,>=2.0",
-    "mypy>=1.15.0",
+    "mypy>=1.18.2",
 ]

routers/core/account.py

@@ -375,15 +375,19 @@ async def login(
 
         # Process the invitation
         try:
-            logger.info(f"Processing invitation {invitation.id} for user {account.user.id} during login.")
-            process_invitation(invitation, account.user, session)
-            session.commit()
-            # Set redirect to the organization page
-            redirect_url = org_router.url_path_for("read_organization", org_id=invitation.organization_id)
-            logger.info(f"Redirecting user {account.user.id} to organization {invitation.organization_id} after accepting invitation {invitation.id}.")
+            if account.user and account.user.id:
+                logger.info(f"Processing invitation {invitation.id} for user {account.user.id} during login.")
+                process_invitation(invitation, account.user, session)
+                session.commit()
+                # Set redirect to the organization page
+                redirect_url = org_router.url_path_for("read_organization", org_id=invitation.organization_id)
+                logger.info(f"Redirecting user {account.user.id} to organization {invitation.organization_id} after accepting invitation {invitation.id}.")
+            else:
+                logger.error("User has no ID during invitation processing.")
+                raise DataIntegrityError(resource="User ID")
         except Exception as e:
              logger.error(
-                 f"Error processing invitation {invitation.id} for user {account.user.id} during login: {e}",
+                 "Error processing invitation during login: {e}",
                  exc_info=True
              )
              session.rollback()

tests/conftest.py

@@ -45,7 +45,7 @@ def env_vars(monkeypatch):
 
 
 @pytest.fixture
-def engine(env_vars) -> Engine:
+def engine(env_vars):
     """
     Create a new SQLModel engine for the test database.
     Use PostgreSQL for testing to match production environment.
@@ -136,13 +136,13 @@ def test_organization(session: Session) -> Organization:
     session.add(organization)
     session.flush()
 
-    if organization.id is None:
+    if organization.id:
+        # Use the utility function to create default roles and assign permissions
+        # This function handles the commit internally
+        create_default_roles(session, organization.id, check_first=False)
+    else:
         pytest.fail("Failed to get organization ID after flush")
 
-    # Use the utility function to create default roles and assign permissions
-    # This function handles the commit internally
-    create_default_roles(session, organization.id, check_first=False)
-
     return organization