Upgrade fastapi to 0.114.1

app/models.py

@@ -127,7 +127,7 @@ async def stats(db, query):
                 ]
             )
 
-        select = sqlalchemy.select(measurements_stats)
+        select = sqlalchemy.select(*measurements_stats)
         select = select.group_by(
             measurements.c.sensor,
             measurements.c.source,
@@ -166,8 +166,9 @@ async def create_new_key(db: Database, provider: str) -> str:
     @staticmethod
     async def get_providers(db: Database) -> List[Tuple[str, int]]:
         query = sqlalchemy.select(
-            [providers.c.provider, sqlalchemy.func.count(providers.c.provider)]
-        ).group_by(providers.c.provider)
+            providers.c.provider, sqlalchemy.func.count(providers.c.provider)
+        )
+        query = query.group_by(providers.c.provider)
         query = query.order_by(sqlalchemy.asc(providers.c.provider))
         return await db.fetch_all(query)
 
@@ -187,14 +188,14 @@ async def revoke_all_keys(db: Database, provider: str) -> bool:
 
     @staticmethod
     async def get_all_keys(db: Database) -> Set[str]:
-        query = sqlalchemy.select([providers.c.api_key_hash])
+        query = sqlalchemy.select(providers.c.api_key_hash)
         query = query.order_by(sqlalchemy.asc(providers.c.provider))
         keys = await db.fetch_all(query)
         return {k[0] for k in keys}
 
     @staticmethod
     async def get_provider_for_key(db: Database, api_key_hash: str) -> Union[str, None]:
-        query = sqlalchemy.select([providers.c.id, providers.c.api_key_hash])
+        query = sqlalchemy.select(providers.c.id, providers.c.api_key_hash)
         query = query.where(providers.c.api_key_hash == api_key_hash)
         provider = await db.fetch_one(query)
         return provider[0] if provider else None

app/service.py

@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from contextlib import asynccontextmanager
 from fastapi import FastAPI, Depends
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.security.api_key import APIKey
@@ -35,13 +36,10 @@
 )
 
 
-@app.on_event("startup")
-async def startup():
+@asynccontextmanager
+async def lifespan(app: FastAPI):
     await db.connect()
-
-
-@app.on_event("shutdown")
-async def shutdown():
+    yield
     await db.disconnect()
 
 

requirements.txt

@@ -1,4 +1,4 @@
-fastapi==0.94.1
+fastapi==0.114.1
 httpx==0.23.3
 uvicorn==0.21.0
 gunicorn==20.1.0
@@ -9,8 +9,8 @@ black==23.1.0
 aiosqlite==0.18.0
 databases==0.7.0
 SQLAlchemy==1.4.46
-asyncpg==0.27.0
-psycopg2-binary==2.9.5
+asyncpg==0.29.0
+psycopg2-binary==2.9.9
 alembic==1.10.2
 geopy==2.3.0
 pytest-dependency==0.5.1

tests/service.py

@@ -322,7 +322,7 @@ def test_delete_provider(client):
 @pytest.mark.dependency(depends=["test_delete_provider"])
 def test_empty_measurements(client):
     query = {
-        "start": "1984-04-24T00:00:00",
+        "start": "2984-04-24T00:00:00",
     }
 
     response = client.get(f"/api/v1/measurements?{urlencode(query)}")