Update fastapi, fastapimsal, mypy, etc

Author: Iain-S

alembic/versions/b65796c99771_squash.py

@@ -5,6 +5,7 @@
 Create Date: 2023-07-06 22:17:36.160486
 
 """
+
 import sqlalchemy as sa
 from sqlalchemy import text
 from sqlalchemy.dialects import postgresql

docs/conf.py

@@ -1,4 +1,5 @@
 """Configuration file for the Sphinx documentation builder."""
+
 import os
 from importlib import metadata
 from unittest.mock import patch

poetry.lock

@@ -10,9 +10,8 @@ alembic = "^1.7.1"
 asyncpg = "^0.27.0"
 azure-identity = "^1.16.0"
 databases = { version = "^0.6.2", extras = ["postgresql"] }
-#fastapi = "^0.110.1"
-fastapi = "^0.95.0"
-fastapimsal = { git = "https://github.com/alan-turing-institute/fastapimsal", tag = "0.4.8" }
+fastapi = "^0.110.1"
+fastapimsal = { git = "https://github.com/alan-turing-institute/fastapimsal", tag = "0.4.9" }
 Jinja2 = "^3.1.3"
 opencensus-ext-azure = "^1.1.7"
 pandas = "^1.1.3"
@@ -42,7 +41,6 @@ httpie = "3.2.1"  # upgrade once the 3.2.2 safety issue is resolved
 httpie-jwt-auth = "^0.4.0"
 ipykernel = "^6.19.4"
 isort = "^5.6.4"
-mypy = "^0.991"
 pre-commit = "^2.14.1"
 pylint = "^2.10.2"
 pylint-absolute-imports = "^1.0.1"
@@ -56,6 +54,7 @@ safety = "^3.1.0"
 sqlalchemy-stubs = "^0.3"
 pydocstyle = "^6.3.0"
 hypothesis = "^6.82.6"
+mypy = "^1.9.0"
 
 [tool.poetry.extras]
 docs = ["sphinx-rtd-theme", "sphinxcontrib-napoleon", "myst-parser"]

pyproject.toml

@@ -1,4 +1,5 @@
 """The RCTab FastAPI web app."""
+
 from rctab.main import app
 
 __all__ = ["app"]

rctab/__init__.py

@@ -1,4 +1,5 @@
 """Constants that don't change often enough to go in Settings."""
+
 from importlib import metadata
 
 ADMIN_OID = "8b8fb95c-e391-43dd-a6f9-1b03574f7c39"

rctab/constants.py

@@ -1,4 +1,5 @@
 """The SQLAlchemy models, Pydantic models and database logic."""
+
 from rctab.crud import accounting_models, models, schema
 
 __all__ = [

rctab/crud/__init__.py

@@ -1,4 +1,5 @@
 """SQLAlchemy models for the accounting schema."""
+
 from databases import Database
 from sqlalchemy import (
     Boolean,

rctab/crud/accounting_models.py

@@ -1,4 +1,5 @@
 """User authentication with Active Directory."""
+
 from typing import Dict, Optional
 
 import fastapimsal

rctab/crud/auth.py

@@ -1,4 +1,5 @@
 """SQLAlchemy models for the default schema."""
+
 from typing import List, Mapping, Sequence, Tuple
 
 import asyncpg

rctab/crud/models.py

@@ -1,4 +1,5 @@
 """Pydantic models for the RCTab API."""
+
 import datetime
 from enum import Enum
 from typing import Dict, List, Optional, Tuple

rctab/crud/schema.py

@@ -1,4 +1,5 @@
 """Database utilities and helper functions."""
+
 from typing import List
 from uuid import UUID
 

rctab/crud/utils.py

@@ -1,4 +1,5 @@
 """Used as an entrypoint when debugging from an IDE."""
+
 import uvicorn
 
 from rctab.main import app

rctab/debug.py

@@ -1,4 +1,5 @@
 """Utilities for logging to a central log workspace."""
+
 import logging
 from typing import Optional
 

rctab/logutils.py

@@ -1,4 +1,5 @@
 """The entrypoint of the FastAPI application."""
+
 import logging
 from pathlib import Path
 from typing import Any, Callable, Dict, Final

rctab/main.py

@@ -1,4 +1,5 @@
 """The accounting routes."""
+
 from rctab.routers.accounting import (
     allocations,
     approvals,

rctab/routers/accounting/__init__.py

@@ -1,4 +1,5 @@
 """Mark subscriptions as "abolished" if they have been inactive for >90 days."""
+
 import logging
 from datetime import datetime, timedelta
 from typing import List, Optional

rctab/routers/accounting/abolishment.py

@@ -1,4 +1,5 @@
 """Allocate some approved budget to a subscription."""
+
 from typing import Any, List
 
 from fastapi import Depends, HTTPException

rctab/routers/accounting/allocations.py

@@ -1,4 +1,5 @@
 """Set and fetch approvals for subscriptions."""
+
 import datetime
 from datetime import timedelta
 from typing import Any, List, Optional

rctab/routers/accounting/approvals.py

@@ -1,4 +1,5 @@
 """Charge subscriptions' spending to a cost centre."""
+
 from datetime import date, timedelta
 from typing import Any, Dict, List, Optional
 from uuid import UUID

rctab/routers/accounting/cost_recovery.py

@@ -1,4 +1,5 @@
 """Calculate and disseminate the desired states of subscriptions."""
+
 import datetime
 import logging
 from typing import Dict, List, Optional

rctab/routers/accounting/desired_states.py

@@ -1,4 +1,5 @@
 """Deciding who to charge for a subscription's spending."""
+
 import calendar
 import datetime
 from typing import Any, List

rctab/routers/accounting/finances.py

@@ -1,4 +1,5 @@
 """Routes that determine whether a subscription is permanently on."""
+
 from typing import Any
 from uuid import UUID
 

rctab/routers/accounting/persistence.py

@@ -1,4 +1,5 @@
 """Miscellaneous queries for the accounting schema."""
+
 import datetime
 import uuid
 from typing import List, Optional, Union

rctab/routers/accounting/routes.py

@@ -1,4 +1,5 @@
 """Tools for sending email notifications to users."""
+
 import logging
 from contextlib import AbstractAsyncContextManager
 from datetime import date, datetime, timedelta, timezone

rctab/routers/accounting/send_emails.py

@@ -1,4 +1,5 @@
 """Receive data from the status function app."""
+
 from typing import Dict
 from uuid import UUID
 

rctab/routers/accounting/status.py

@@ -1,4 +1,5 @@
 """Create and fetch subscriptions."""
+
 from typing import Any, List, Optional
 from uuid import UUID
 

rctab/routers/accounting/subscription.py

@@ -1,4 +1,5 @@
 """Background tasks that run daily."""
+
 import logging
 from datetime import datetime
 from typing import List, Optional

rctab/routers/accounting/summary_emails.py

@@ -1,4 +1,5 @@
 """Set and get usage data."""
+
 import calendar
 import datetime
 import logging

rctab/routers/accounting/usage.py

@@ -1,4 +1,5 @@
 """The user-facing web pages."""
+
 import datetime
 import logging
 from pathlib import Path

rctab/routers/frontend.py

@@ -1,4 +1,5 @@
 """Global app configuration."""
+
 from functools import lru_cache
 from typing import Any, List, Optional
 from uuid import UUID

rctab/settings.py

@@ -8,6 +8,7 @@
 for the task to run on schedule:
 `celery -A rctab.tasks beat --loglevel=info`
 """
+
 import asyncio
 import logging
 from typing import Any, Final

rctab/tasks.py

@@ -1,4 +1,5 @@
 """Utility functions for the RCTab API."""
+
 import functools
 import logging
 from contextlib import contextmanager