Format code and sort imports

Author: amyfromandi

services/api-v3/api/database.py

@@ -6,8 +6,10 @@
 # On the bottom you will find the methods that do not use this method
 #
 import datetime
+import json
 from os import environ
-from typing import Literal, Type, Any
+from typing import Any, Literal, Type
+
 import api.schemas as schemas
 from api.query_parser import QueryParser
 from dotenv import load_dotenv
@@ -20,7 +22,7 @@
     async_sessionmaker,
     create_async_engine,
 )
-import json
+
 from macrostrat.database import Database
 
 load_dotenv()
@@ -344,7 +346,6 @@ async def patch_sources_sub_table_set_columns_equal(
         return result
 
 
-
 def _row_to_dict(row: Any) -> dict[str, Any]:
     d = dict(row)
     if "source" in d and isinstance(d["source"], str):
@@ -421,11 +422,14 @@ async def storage_object_find_existing_id(
       AND deleted_on IS NULL
     """
 
-    res = await session.execute(text(sql), {
-        "host": host,
-        "bucket": bucket,
-        "key": key,
-    })
+    res = await session.execute(
+        text(sql),
+        {
+            "host": host,
+            "bucket": bucket,
+            "key": key,
+        },
+    )
     return res.scalar_one_or_none()
 
 
@@ -448,14 +452,17 @@ async def storage_object_insert(
       id, scheme, host, bucket, key, sha256_hash, mime_type, source, created_on, updated_on
     """
 
-    res = await session.execute(text(sql), {
-        "host": host,
-        "bucket": bucket,
-        "key": key,
-        "source": source,
-        "sha256": sha256,
-        "mime_type": mime_type,
-    })
+    res = await session.execute(
+        text(sql),
+        {
+            "host": host,
+            "bucket": bucket,
+            "key": key,
+            "source": source,
+            "sha256": sha256,
+            "mime_type": mime_type,
+        },
+    )
 
     row = res.mappings().first()
     return _row_to_dict(row) if row else None
@@ -481,12 +488,15 @@ async def storage_object_patch(
       id, scheme, host, bucket, key, sha256_hash, mime_type, source, created_on, updated_on
     """
 
-    res = await session.execute(text(sql), {
-        "id": id,
-        "key": key,
-        "mime_type": mime_type,
-        "source": source,
-    })
+    res = await session.execute(
+        text(sql),
+        {
+            "id": id,
+            "key": key,
+            "mime_type": mime_type,
+            "source": source,
+        },
+    )
 
     row = res.mappings().first()
     return _row_to_dict(row) if row else None
@@ -516,4 +526,3 @@ async def storage_object_hard_delete(session: AsyncSession, *, id: int):
 
     res = await session.execute(text(sql), {"id": id})
     return res.scalar_one_or_none()
-

services/api-v3/api/routes/object.py

@@ -6,12 +6,7 @@
 import os
 from typing import Any
 
-from minio import Minio
-from starlette.datastructures import UploadFile as StarletteUploadFile
-
 import starlette.requests
-from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
-
 from api.database import (
     get_async_session,
     get_engine,
@@ -24,6 +19,9 @@
     storage_object_soft_delete,
 )
 from api.routes.security import has_access
+from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
+from minio import Minio
+from starlette.datastructures import UploadFile as StarletteUploadFile
 
 router = APIRouter(
     prefix="/object",
@@ -37,7 +35,9 @@ def guess_mime_type(filename: str) -> str:
     return mime or "application/octet-stream"
 
 
-def sha256_of_uploadfile(upload: StarletteUploadFile, chunk_size: int = 1024 * 1024) -> str:
+def sha256_of_uploadfile(
+    upload: StarletteUploadFile, chunk_size: int = 1024 * 1024
+) -> str:
     """
     Compute sha256 while reading the upload stream.
     IMPORTANT: resets file pointer back to 0 afterwards so MinIO upload works.
@@ -70,7 +70,9 @@ def get_storage_host_bucket() -> tuple[str, str]:
     import urllib.parse
 
     raw_host = os.environ["storage_host"]
-    parsed = urllib.parse.urlparse(raw_host if "://" in raw_host else f"https://{raw_host}")
+    parsed = urllib.parse.urlparse(
+        raw_host if "://" in raw_host else f"https://{raw_host}"
+    )
     host = parsed.hostname or raw_host.split(":")[0]
     bucket = os.environ["maps_bucket_name"]
     return host, bucket
@@ -107,7 +109,9 @@ async def get_object(id: int):
     async with async_session() as session:
         row = await storage_object_get_by_id(session, id=id)
         if row is None:
-            raise HTTPException(status_code=404, detail=f"Object with id ({id}) not found")
+            raise HTTPException(
+                status_code=404, detail=f"Object with id ({id}) not found"
+            )
         return row
 
 
@@ -124,15 +128,19 @@ async def create_object(
     - Uses DB to prevent duplicates (same host/bucket/key).
     """
     if not user_has_access:
-        raise HTTPException(status_code=403, detail="User does not have access to create object")
+        raise HTTPException(
+            status_code=403, detail="User does not have access to create object"
+        )
 
     if "multipart/form-data" not in (request.headers.get("content-type") or ""):
         raise HTTPException(status_code=400, detail="Expected multipart/form-data")
 
     form = await request.form()
     uploads = form.getlist("object")
     if not uploads:
-        raise HTTPException(status_code=400, detail="No files provided under field name 'object'")
+        raise HTTPException(
+            status_code=400, detail="No files provided under field name 'object'"
+        )
 
     host, bucket = get_storage_host_bucket()
     minio_client = get_minio_client()
@@ -171,7 +179,9 @@ async def create_object(
                     metadata={"sha256": sha256},
                 )
             except Exception as e:
-                raise HTTPException(status_code=500, detail=f"Failed to upload to S3: {e}")
+                raise HTTPException(
+                    status_code=500, detail=f"Failed to upload to S3: {e}"
+                )
 
             row = await storage_object_insert(
                 session,
@@ -183,7 +193,9 @@ async def create_object(
                 source=json.dumps({}),
             )
             if row is None:
-                raise HTTPException(status_code=500, detail="Failed to insert storage.object record")
+                raise HTTPException(
+                    status_code=500, detail="Failed to insert storage.object record"
+                )
 
             created.append(row)
 
@@ -203,7 +215,9 @@ async def patch_object(
     Supported keys: key, mime_type, source
     """
     if not user_has_access:
-        raise HTTPException(status_code=403, detail="User does not have access to update object")
+        raise HTTPException(
+            status_code=403, detail="User does not have access to update object"
+        )
 
     key = body.get("key")
     mime_type = body.get("mime_type")
@@ -223,7 +237,9 @@ async def patch_object(
             source=source,
         )
         if row is None:
-            raise HTTPException(status_code=404, detail=f"Object with id ({id}) not found")
+            raise HTTPException(
+                status_code=404, detail=f"Object with id ({id}) not found"
+            )
 
         await session.commit()
         return row
@@ -241,7 +257,9 @@ async def delete_object(
     - hard=False: soft delete (sets deleted_on) and keeps object in MinIO
     """
     if not user_has_access:
-        raise HTTPException(status_code=403, detail="User does not have access to delete object")
+        raise HTTPException(
+            status_code=403, detail="User does not have access to delete object"
+        )
 
     minio_client = get_minio_client()
 
@@ -251,7 +269,9 @@ async def delete_object(
     async with async_session() as session:
         obj = await storage_object_get_by_id(session, id=id)
         if obj is None:
-            raise HTTPException(status_code=404, detail=f"Object with id ({id}) not found")
+            raise HTTPException(
+                status_code=404, detail=f"Object with id ({id}) not found"
+            )
 
         object_key = obj.get("key")
         object_bucket = obj.get("bucket")
@@ -268,14 +288,18 @@ async def delete_object(
 
             deleted_id = await storage_object_hard_delete(session, id=id)
             if deleted_id is None:
-                raise HTTPException(status_code=500, detail="Failed to delete DB record")
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete DB record"
+                )
 
             await session.commit()
             return {"status": "deleted", "id": id, "hard": True}
 
         row = await storage_object_soft_delete(session, id=id)
         if row is None:
-            raise HTTPException(status_code=500, detail="Failed to soft-delete DB record")
+            raise HTTPException(
+                status_code=500, detail="Failed to soft-delete DB record"
+            )
 
         await session.commit()
         return {"status": "deleted", "hard": False, "object": row}