-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
issue #221: break azure storage conn string into individual fields
- Loading branch information
Showing
8 changed files
with
223 additions
and
297 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,152 +1,4 @@ | ||
| from http import HTTPStatus | ||
| from typing import Annotated | ||
| from uuid import UUID | ||
| from app.config import Settings, create_app, lifespan | ||
| from app.routes import router | ||
|
|
||
| from fastapi import Depends, Form, HTTPException, Request, UploadFile | ||
| from fastapi.responses import JSONResponse, RedirectResponse | ||
| from pipeline import GPT, OCR | ||
| from psycopg_pool import ConnectionPool | ||
|
|
||
| from app.config import Settings, create_app | ||
| from app.controllers.data_extraction import extract_data | ||
| from app.controllers.inspections import ( | ||
| create_inspection, | ||
| delete_inspection, | ||
| read_all_inspections, | ||
| read_inspection, | ||
| update_inspection, | ||
| ) | ||
| from app.controllers.users import sign_up | ||
| from app.dependencies import ( | ||
| authenticate_user, | ||
| fetch_user, | ||
| get_connection_pool, | ||
| get_gpt, | ||
| get_ocr, | ||
| get_settings, | ||
| validate_files, | ||
| ) | ||
| from app.exceptions import InspectionNotFoundError, UserConflictError, log_error | ||
| from app.models.inspections import ( | ||
| DeletedInspection, | ||
| Inspection, | ||
| InspectionData, | ||
| InspectionUpdate, | ||
| ) | ||
| from app.models.label_data import LabelData | ||
| from app.models.monitoring import HealthStatus | ||
| from app.models.users import User | ||
| from app.sanitization import custom_secure_filename | ||
|
|
||
| app = create_app(get_settings()) | ||
|
|
||
|
|
||
| @app.exception_handler(Exception) | ||
| async def global_exception_handler(_: Request, e: Exception): | ||
| log_error(e) | ||
| return JSONResponse(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, content=str(e)) | ||
|
|
||
|
|
||
| @app.get("/", tags=["Home"]) | ||
| async def home(): | ||
| return RedirectResponse(url=app.docs_url) | ||
|
|
||
|
|
||
| @app.get("/health", tags=["Monitoring"], response_model=HealthStatus) | ||
| async def health_check(): | ||
| return HealthStatus() | ||
|
|
||
|
|
||
| @app.post("/analyze", response_model=LabelData, tags=["Pipeline"]) | ||
| async def analyze_document( | ||
| ocr: Annotated[OCR, Depends(get_ocr)], | ||
| gpt: Annotated[GPT, Depends(get_gpt)], | ||
| settings: Annotated[Settings, Depends(get_settings)], | ||
| files: Annotated[list[UploadFile], Depends(validate_files)], | ||
| ): | ||
| file_dict = {custom_secure_filename(f.filename): f.file for f in files} | ||
| return extract_data(file_dict, ocr, gpt, settings.upload_folder) | ||
|
|
||
|
|
||
| @app.post("/signup", tags=["Users"], status_code=201, response_model=User) | ||
| async def signup( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: Annotated[User, Depends(authenticate_user)], | ||
| settings: Annotated[Settings, Depends(get_settings)], | ||
| ): | ||
| try: | ||
| return await sign_up(cp, user, settings.fertiscan_storage_url) | ||
| except UserConflictError: | ||
| raise HTTPException(status_code=HTTPStatus.CONFLICT, detail="User exists!") | ||
|
|
||
|
|
||
| @app.post("/login", tags=["Users"], status_code=200, response_model=User) | ||
| async def login(user: User = Depends(fetch_user)): | ||
| return user | ||
|
|
||
|
|
||
| @app.get("/inspections", tags=["Inspections"], response_model=list[InspectionData]) | ||
| async def get_inspections( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: User = Depends(fetch_user), | ||
| ): | ||
| return await read_all_inspections(cp, user) | ||
|
|
||
|
|
||
| @app.get("/inspections/{id}", tags=["Inspections"], response_model=Inspection) | ||
| async def get_inspection( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: Annotated[User, Depends(fetch_user)], | ||
| id: UUID, | ||
| ): | ||
| try: | ||
| return await read_inspection(cp, user, id) | ||
| except InspectionNotFoundError: | ||
| raise HTTPException( | ||
| status_code=HTTPStatus.NOT_FOUND, detail="Inspection not found" | ||
| ) | ||
|
|
||
|
|
||
| @app.post("/inspections", tags=["Inspections"], response_model=Inspection) | ||
| async def post_inspection( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: Annotated[User, Depends(fetch_user)], | ||
| settings: Annotated[Settings, Depends(get_settings)], | ||
| label_data: Annotated[LabelData, Form(...)], | ||
| files: Annotated[list[UploadFile], Depends(validate_files)], | ||
| ): | ||
| # Note: later on, we might handle label images as their own domain | ||
| label_images = [await f.read() for f in files] | ||
| conn_string = settings.fertiscan_storage_url | ||
| return await create_inspection(cp, user, label_data, label_images, conn_string) | ||
|
|
||
|
|
||
| @app.put("/inspections/{id}", tags=["Inspections"], response_model=Inspection) | ||
| async def put_inspection( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: Annotated[User, Depends(fetch_user)], | ||
| id: UUID, | ||
| inspection: InspectionUpdate, | ||
| ): | ||
| try: | ||
| return await update_inspection(cp, user, id, inspection) | ||
| except InspectionNotFoundError: | ||
| raise HTTPException( | ||
| status_code=HTTPStatus.NOT_FOUND, detail="Inspection not found" | ||
| ) | ||
|
|
||
|
|
||
| @app.delete("/inspections/{id}", tags=["Inspections"], response_model=DeletedInspection) | ||
| async def delete_inspection_( | ||
| cp: Annotated[ConnectionPool, Depends(get_connection_pool)], | ||
| user: Annotated[User, Depends(fetch_user)], | ||
| settings: Annotated[Settings, Depends(get_settings)], | ||
| id: UUID, | ||
| ): | ||
| try: | ||
| conn_string = settings.fertiscan_storage_url | ||
| return await delete_inspection(cp, user, id, conn_string) | ||
| except InspectionNotFoundError: | ||
| raise HTTPException( | ||
| status_code=HTTPStatus.NOT_FOUND, detail="Inspection not found" | ||
| ) | ||
| app = create_app(Settings(), router, lifespan) |
Oops, something went wrong.