Merge branch 'main' of github.com:UW-Macrostrat/macrostrat

Author: amyfromandi

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

@@ -1,21 +1,17 @@
 import hashlib
 import json
 import mimetypes
+from functools import lru_cache
 from typing import Any
 
 import starlette.requests
 from api.database import get_async_session, get_engine
 from api.routes.security import has_access
-from fastapi import (
-    APIRouter,
-    Depends,
-    HTTPException,
-)
+from fastapi import APIRouter, Depends, HTTPException
 from minio import Minio
-from sqlalchemy import text
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
-from functools import lru_cache
+from sqlalchemy import text
 from starlette.datastructures import UploadFile as StarletteUploadFile
 
 
@@ -45,7 +41,6 @@ def get_file_settings() -> FileSettings:
         )
 
 
-
 router = APIRouter(
     prefix="/object",
     tags=["file"],
@@ -93,6 +88,7 @@ def get_storage_host_bucket() -> tuple[str, str]:
     Also ensures host has no port (hostname only) if storage_host ever includes one.
     """
     import urllib.parse
+
     settings = get_file_settings()
 
     raw_host = settings.s3_endpoint

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

@@ -358,7 +358,7 @@ async def redirect_callback(code: str, state: Optional[str] = None):
             )
 
             # validate jwt https://dev.macrostrat.org/dev/me
-            #TODO remove the groups and sub and add the user_name
+            # TODO remove the groups and sub and add the user_name
             access_token = create_access_token(
                 data={
                     "sub": user.sub,
@@ -398,7 +398,7 @@ async def redirect_callback(code: str, state: Optional[str] = None):
                 samesite=samesite,
                 secure=secure,
             )
-            #TODO remove the token type
+            # TODO remove the token type
             refresh_jwt = jwt.encode(
                 {
                     "user_id": user.id,
@@ -464,7 +464,7 @@ async def refresh_token(
         else "web_user"
     )
     # setting new access cookie
-    #TODO can remove groups, sub. add user_name.
+    # TODO can remove groups, sub. add user_name.
     access_token = create_access_token(
         data={"sub": user.sub, "role": role, "user_id": user.id, "groups": list(ids)}
     )

services/api-v3/api/settings.py

@@ -2,6 +2,7 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing import Optional
 
+
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
         env_file=".env",