Merge pull request #187 from datakind/develop

feat: custom job add feature

Author: Mesh-ach

src/webapp/main.py

@@ -1,15 +1,15 @@
 """Main file for the SST API."""
 
 import logging
-from typing import Any, Annotated
+from typing import Any, Annotated, Optional, cast
 from datetime import timedelta
 import secrets
 from fastapi import FastAPI, Depends, HTTPException, status, Security
 from fastapi.responses import FileResponse
 from pydantic import BaseModel
 from sqlalchemy.future import select
 from sqlalchemy import update
-from .routers import models, users, data, institutions
+from .routers import models, users, data, institutions, front_end_tables
 from .database import (
     setup_db,
     db_engine,
@@ -58,6 +58,7 @@
 app.include_router(models.router)
 app.include_router(users.router)
 app.include_router(data.router)
+app.include_router(front_end_tables.router)
 
 
 class SelfInfo(BaseModel):
@@ -95,7 +96,9 @@ def read_root() -> Any:
 @app.post("/token-from-api-key")
 async def access_token_from_api_key(
     sql_session: Annotated[Session, Depends(get_session)],
-    api_key_enduser_tuple: str = Security(get_api_key),
+    api_key_enduser_tuple: tuple[str, Optional[str], Optional[str]] = Security(
+        get_api_key
+    ),
 ) -> Token:
     """Generate a token from an API key."""
     local_session.set(sql_session)
@@ -110,10 +113,11 @@ async def access_token_from_api_key(
         )
 
     access_token_expires = timedelta(
-        minutes=int(env_vars["ACCESS_TOKEN_EXPIRE_MINUTES"])
+        minutes=int(cast(str, env_vars["ACCESS_TOKEN_EXPIRE_MINUTES"]))
     )
     access_token = create_access_token(
-        data={"sub": user.email}, expires_delta=access_token_expires
+        data={"sub": user.email},  # type: ignore
+        expires_delta=access_token_expires,  # type: ignore
     )
     return Token(access_token=access_token, token_type="bearer")
 
@@ -122,7 +126,7 @@ async def access_token_from_api_key(
 async def read_cross_inst_users(
     current_user: Annotated[BaseUser, Depends(get_current_active_user)],
     sql_session: Annotated[Session, Depends(get_session)],
-):
+) -> Any:
     """Get users that don't have institution specifications.
     (datakinders or people who haven't set their institution yet)."""
     if not current_user.is_datakinder():
@@ -140,7 +144,7 @@ async def read_cross_inst_users(
         )
         .all()
     )
-    res = []
+    res: list = []
     if not query_result or len(query_result) == 0:
         return res
 
@@ -186,7 +190,7 @@ async def set_datakinders(
         .all()
     )
 
-    res = []
+    res: list = []
     if not query_result:
         return res
     for elem in query_result:
@@ -251,7 +255,7 @@ async def generate_api_key(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="Database write of the API key duplicate entries.",
         )
-    return {
+    return {  # type: ignore
         "access_type": query_result[0][0].access_type,
         "key": generated_key_value,
         "inst_id": (