debugging deletion

Author: CrysR

src/webapp/database.py

@@ -243,8 +243,18 @@ class AccountHistoryTable(Base):
 association_table = Table(
     "file_batch_association_table",
     Base.metadata,
-    Column("file_val", Uuid(as_uuid=True), ForeignKey("file.id", ondelete="CASCADE"), primary_key=True),
-    Column("batch_val", Uuid(as_uuid=True), ForeignKey("batch.id", ondelete="CASCADE"), primary_key=True),
+    Column(
+        "file_val",
+        Uuid(as_uuid=True),
+        ForeignKey("file.id", ondelete="CASCADE"),
+        primary_key=True,
+    ),
+    Column(
+        "batch_val",
+        Uuid(as_uuid=True),
+        ForeignKey("batch.id", ondelete="CASCADE"),
+        primary_key=True,
+    ),
 )
 
 

src/webapp/gcsutil.py

@@ -114,8 +114,12 @@ def generate_download_signed_url(self, bucket_name: str, blob_name: str) -> str:
     def delete_bucket(self, bucket_name: str) -> None:
         storage_client = storage.Client()
         # Delete the GCS bucket.  Force=True handles non-empty buckets.
+        print("[debugging_crystal]: in delete_bucket()1")
+
         bucket = storage_client.get_bucket(bucket_name)
+        print("[debugging_crystal]: in delete_bucket()2:" + str(bucket))
         bucket.delete(force=True)
+        print("[debugging_crystal]: in delete_bucket()3")
 
     def create_bucket(self, bucket_name: str) -> None:
         """

src/webapp/routers/institutions.py

@@ -270,10 +270,12 @@ def delete_inst(
     )
     local_session.get().commit()
     # Delete GCS bucket
+    print("[debugging_crystal]: deleting bucket")
     bucket_name = get_external_bucket_name(inst_id)
+    print("[debugging_crystal]: deleting bucket" + bucket_name)
     try:
         storage_control.delete_bucket(bucket_name)
-    except ValueError as e:
+    except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="Storage bucket deletion failed:" + str(e),

src/webapp/routers/models.py

@@ -556,7 +556,7 @@ def trigger_inference_run(
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="Databricks run_pdp_inference error. "+str(e),
+            detail="Databricks run_pdp_inference error. " + str(e),
         )
     triggered_timestamp = datetime.now()
     job = JobTable(