update delete endpoint

Author: CrysR

src/webapp/routers/institutions.py

@@ -9,7 +9,7 @@
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
 from sqlalchemy.future import select
-from sqlalchemy import and_
+from sqlalchemy import and_, delete
 from google.cloud import storage
 from google.cloud.storage import Client
 
@@ -25,6 +25,7 @@
     SchemaType,
     PDP_SCHEMA_GROUP,
     UsState,
+    get_external_bucket_name,
 )
 
 from ..gcsutil import StorageControl
@@ -254,12 +255,24 @@ def delete_inst(
         )
 
     local_session.set(sql_session)
+    query_result = (
+        local_session.get()
+        .execute(select(InstTable).where(InstTable.id == str_to_uuid(inst_id)))
+        .all()
+    )
+    if len(query_result) != 1:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail="Unexpected number of institutions found. Expected 1 got "
+            + str(len(query_result)),
+        )
+    inst_name = query_result[0][0].name
     local_session.get().execute(
         delete(InstTable).where(InstTable.id == str_to_uuid(inst_id))
     )
     local_session.get().commit()
     # Delete GCS bucket
-    bucket_name = get_external_bucket_name_from_uuid(query_result[0][0].id)
+    bucket_name = get_external_bucket_name(inst_id)
     try:
         storage_control.delete_bucket(bucket_name)
     except ValueError as e:
@@ -269,7 +282,7 @@ def delete_inst(
         )
     # Delete all databricks managed pieces.
     try:
-        databricks_control.delete_inst(query_result[0][0].name)
+        databricks_control.delete_inst(inst_name)
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,

src/webapp/routers/models.py

@@ -320,6 +320,7 @@ def read_inst_model_outputs(
     """Returns top-level info around all executions of a given model.
 
     Only visible to users of that institution or Datakinder access types.
+    Returns a list of runs in order of most recent to least recent based on triggering time.
 
     Args:
         current_user: the user making the request.
@@ -351,22 +352,26 @@ def read_inst_model_outputs(
         )
     update_db_from_bucket(inst_id, local_session.get(), storage_control)
     local_session.get().commit()
-    res = []
-    for elem in query_result[0][0].jobs or []:
-        # if not elem.output_filename:
+    if not query_result[0][0].jobs:
+        return []
+    result = query_result[0][0].jobs
+    result.sort(key=lambda x: x.triggered_at, reverse=True)
+    ret_val = []
+    for elem in result:
+        # This will show incomplete runs as well.
         # TODO make a query to databricks to retrieve status.
-        res.append(
+        ret_val.append(
             {
-                "inst_id": uuid_to_str(query_result[0][0].inst_id),
-                "m_name": query_result[0][0].name,
+                "inst_id": uuid_to_str(elem.inst_id),
+                "m_name": elem.name,
                 "run_id": elem.id,
                 "created_by": uuid_to_str(elem.created_by),
                 "triggered_at": elem.triggered_at,
                 "batch_name": elem.batch_name,
                 "output_filename": elem.output_filename,
             }
         )
-    return res
+    return ret_val
 
 
 @router.get(

src/webapp/routers/models_test.py

@@ -323,7 +323,7 @@ def test_trigger_inference_run(client: TestClient):
     assert response.status_code == 400
     assert (
         response.text
-        == '{"detail":"The files in this batch don\'t conform to the Schema configs allowed by this batch."}'
+        == '{"detail":"The files in this batch don\'t conform to the schema configs allowed by this model."}'
     )
 
     response = client.post(

src/webapp/utilities.py

@@ -16,6 +16,7 @@
 from datetime import datetime, timedelta, timezone
 from sqlalchemy.future import select
 from urllib.parse import unquote
+from sqlalchemy import and_
 
 from .authn import (
     verify_password,
@@ -297,7 +298,7 @@ def authenticate_api_key(api_key_enduser_tuple: str, sess: Session) -> BaseUser:
                 if inst:
                     # If there's an institution set, ensure the user is part of the institution
                     user_query = select(AccountTable).where(
-                        _and(
+                        and_(
                             AccountTable.email == enduser,
                             AccountTable.inst_id == uuid_to_str(inst),
                         )