From 50a26220ec62d28f79e9868dc405f58990917c25 Mon Sep 17 00:00:00 2001 From: Jacob Filik Date: Thu, 20 Jun 2024 14:13:12 +0000 Subject: [PATCH] missed lint --- xas-standards-api/src/xas_standards_api/auth.py | 1 + xas-standards-api/src/xas_standards_api/models/models.py | 3 ++- .../src/xas_standards_api/models/response_models.py | 7 +++---- xas-standards-api/src/xas_standards_api/routers/admin.py | 2 +- xas-standards-api/src/xas_standards_api/routers/open.py | 5 +++-- .../src/xas_standards_api/routers/protected.py | 4 +++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/xas-standards-api/src/xas_standards_api/auth.py b/xas-standards-api/src/xas_standards_api/auth.py index 112dc86..7c15564 100644 --- a/xas-standards-api/src/xas_standards_api/auth.py +++ b/xas-standards-api/src/xas_standards_api/auth.py @@ -19,6 +19,7 @@ print("RUNNING IN DEV MODE") dev = True + async def get_current_user( auth: HTTPAuthorizationCredentials = Depends(get_bearer_token), ): diff --git a/xas-standards-api/src/xas_standards_api/models/models.py b/xas-standards-api/src/xas_standards_api/models/models.py index d774291..2af0f80 100644 --- a/xas-standards-api/src/xas_standards_api/models/models.py +++ b/xas-standards-api/src/xas_standards_api/models/models.py @@ -16,6 +16,7 @@ class LicenceType(enum.Enum): cc_0 = "cc_0" logged_in_only = "logged_in_only" + class PersonInput(SQLModel): identifier: str = Field(index=True, unique=True) @@ -25,7 +26,6 @@ class Person(PersonInput, table=True): admin: bool = False - class Element(SQLModel, table=True): __tablename__: str = "element" @@ -127,6 +127,7 @@ class XASStandard(XASStandardInput, table=True): } ) + class XASStandardAdminReviewInput(SQLModel): reviewer_comments: Optional[str] = None review_status: ReviewStatus diff --git a/xas-standards-api/src/xas_standards_api/models/response_models.py b/xas-standards-api/src/xas_standards_api/models/response_models.py index 47b071c..a7c8ab8 100644 --- a/xas-standards-api/src/xas_standards_api/models/response_models.py +++ b/xas-standards-api/src/xas_standards_api/models/response_models.py @@ -11,12 +11,14 @@ class FacilityResponse(SQLModel): city: str country: str + class BeamlineResponse(SQLModel): id: int name: str notes: str facility: FacilityResponse + class XASStandardResponse(XASStandardInput): id: int | None element: Element @@ -28,12 +30,9 @@ class XASStandardResponse(XASStandardInput): class AdminXASStandardResponse(XASStandardResponse): submitter: Person + class MetadataResponse(SQLModel): beamlines: List[BeamlineResponse] elements: List[Element] edges: List[Edge] licences: List[str] - - - - diff --git a/xas-standards-api/src/xas_standards_api/routers/admin.py b/xas-standards-api/src/xas_standards_api/routers/admin.py index f27b6ba..eb57d11 100644 --- a/xas-standards-api/src/xas_standards_api/routers/admin.py +++ b/xas-standards-api/src/xas_standards_api/routers/admin.py @@ -22,4 +22,4 @@ def read_standards_admin( user_id: str = Depends(get_current_user), ) -> CursorPage[AdminXASStandardResponse]: - return get_standards_admin(session,user_id) + return get_standards_admin(session, user_id) diff --git a/xas-standards-api/src/xas_standards_api/routers/open.py b/xas-standards-api/src/xas_standards_api/routers/open.py index 65abcbd..48747b9 100644 --- a/xas-standards-api/src/xas_standards_api/routers/open.py +++ b/xas-standards-api/src/xas_standards_api/routers/open.py @@ -13,6 +13,7 @@ router = APIRouter() + @router.get("/api/standards/{id}") async def read_standard( id: int, session: Session = Depends(get_session) @@ -31,7 +32,8 @@ def read_standards( element: str | None = None, ) -> CursorPage[XASStandardResponse]: - return read_standards_page(session,element) + return read_standards_page(session, element) + @router.get("/api/data/{id}") async def read_data( @@ -42,4 +44,3 @@ async def read_data( return get_file(session, id) return get_data(session, id) - diff --git a/xas-standards-api/src/xas_standards_api/routers/protected.py b/xas-standards-api/src/xas_standards_api/routers/protected.py index 935eb79..15deb0f 100644 --- a/xas-standards-api/src/xas_standards_api/routers/protected.py +++ b/xas-standards-api/src/xas_standards_api/routers/protected.py @@ -21,12 +21,13 @@ router = APIRouter() + @router.get("/api/user") async def check( session: Session = Depends(get_session), user_id: str = Depends(get_current_user) ): - return get_user(session,user_id) + return get_user(session, user_id) @router.post("/api/standards") @@ -71,6 +72,7 @@ def add_standard_file( return add_new_standard(session, xdi_file, form_input, additional_files) + @router.patch("/api/standards") def submit_review( review: XASStandardAdminReviewInput,