perf: 쿠팡·배송·경비·말레이시아·휴가 라우터 async def → def
동기 psycopg/파일 I/O 를 async def 안에서 부르면 쿼리·엑셀 파싱 동안 이벤트 루프가 멈춰 앱 전체(다른 모듈 포함) 요청이 줄줄이 대기했다. sync def 로 두면 FastAPI 가 스레드풀에서 돌린다. - await 없는 핸들러 116개는 async 키워드만 제거(AST 로 기계 변환). - 업로드: await up.read() → up.file.read() (쿠팡 매출/발주 업로드, 경비 첨부 청크 읽기). - 말레이시아 폼 핸들러 6개: request.form() 은 async 라 _request_form 의존성(인증 뒤에 실행)으로 미리 받아 넘기고 본문은 def. - Google Sheets writer: httplib2 가 스레드 안전하지 않고 같은 날짜 시트를 동시에 쓰면 섞이므로 RLock 으로 직렬화. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -107,7 +107,7 @@ def _ym(request: Request) -> tuple[int, int]:
|
||||
# 메인 — 월간 달력 + 선택일 출고 리스트
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/", response_class=HTMLResponse)
|
||||
async def index(request: Request) -> HTMLResponse:
|
||||
def index(request: Request) -> HTMLResponse:
|
||||
from app.main import build_erp_nav, render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
|
||||
@@ -332,7 +332,7 @@ def _push_to_google_sheet(store: Any, ship_date: str) -> dict[str, Any]:
|
||||
|
||||
|
||||
@router.get("/export.xlsx")
|
||||
async def export_shipments_xlsx(request: Request, date: str = "") -> Any:
|
||||
def export_shipments_xlsx(request: Request, date: str = "") -> Any:
|
||||
"""출고일 기준 출고리스트 엑셀 다운로드. 시트명 = YYYYMMDD."""
|
||||
from io import BytesIO # noqa: WPS433
|
||||
|
||||
@@ -371,7 +371,7 @@ async def export_shipments_xlsx(request: Request, date: str = "") -> Any:
|
||||
# 출고 묶음 — 등록 / 수정 / 상세
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/new")
|
||||
async def new_form(request: Request) -> RedirectResponse:
|
||||
def new_form(request: Request) -> RedirectResponse:
|
||||
"""신규 등록 폼은 없앴다. 출고 묶음은 상자 계산의 [분배 확정] 으로만 만든다.
|
||||
|
||||
예전 링크/북마크가 404 나지 않도록 상자 계산으로 보낸다.
|
||||
@@ -380,7 +380,7 @@ async def new_form(request: Request) -> RedirectResponse:
|
||||
|
||||
|
||||
@router.get("/{shipment_id:int}", response_class=HTMLResponse)
|
||||
async def detail(request: Request, shipment_id: int) -> HTMLResponse:
|
||||
def detail(request: Request, shipment_id: int) -> HTMLResponse:
|
||||
"""출고 묶음 보기 — 상자 계산 화면과 같은 3열 구성(읽기 전용).
|
||||
|
||||
수정 기능은 없앴다. 잘못 만들었으면 달력에서 삭제하고 다시 확정한다.
|
||||
@@ -431,7 +431,7 @@ async def detail(request: Request, shipment_id: int) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.get("/{shipment_id:int}/boxes.xlsx")
|
||||
async def export_box_list_xlsx(request: Request, shipment_id: int) -> Any:
|
||||
def export_box_list_xlsx(request: Request, shipment_id: int) -> Any:
|
||||
"""상자 목록(상자번호·제품명·제품코드·수량) 엑셀 다운로드."""
|
||||
from io import BytesIO # noqa: WPS433
|
||||
|
||||
@@ -480,7 +480,7 @@ def _safe_next(raw: str, fallback: str) -> str:
|
||||
|
||||
|
||||
@router.post("/{shipment_id:int}/delete")
|
||||
async def delete(
|
||||
def delete(
|
||||
request: Request,
|
||||
shipment_id: int,
|
||||
next: str = Form(""),
|
||||
@@ -505,7 +505,7 @@ async def delete(
|
||||
|
||||
|
||||
@router.post("/{shipment_id:int}/hard-delete")
|
||||
async def hard_delete(
|
||||
def hard_delete(
|
||||
request: Request,
|
||||
shipment_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -526,7 +526,7 @@ async def hard_delete(
|
||||
|
||||
|
||||
@router.post("/day-delete")
|
||||
async def day_delete(
|
||||
def day_delete(
|
||||
request: Request,
|
||||
date: str = Form(...),
|
||||
next: str = Form(""),
|
||||
@@ -595,7 +595,7 @@ def _sales_filters(request: Request) -> dict[str, str]:
|
||||
|
||||
|
||||
@router.get("/sales", response_class=HTMLResponse)
|
||||
async def sales_page(request: Request) -> HTMLResponse:
|
||||
def sales_page(request: Request) -> HTMLResponse:
|
||||
"""매출 표 — 기간·센터·발주유형·검색어로 조회, 합계 표시."""
|
||||
from app.main import build_erp_nav, render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
@@ -661,7 +661,7 @@ async def sales_page(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.post("/sales/api")
|
||||
async def sales_create(
|
||||
def sales_create(
|
||||
request: Request,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -677,7 +677,7 @@ async def sales_create(
|
||||
|
||||
|
||||
@router.post("/sales/api/{sale_id:int}")
|
||||
async def sales_update(
|
||||
def sales_update(
|
||||
request: Request,
|
||||
sale_id: int,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
@@ -696,7 +696,7 @@ async def sales_update(
|
||||
|
||||
|
||||
@router.post("/sales/api/{sale_id:int}/delete")
|
||||
async def sales_delete(
|
||||
def sales_delete(
|
||||
request: Request,
|
||||
sale_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -712,7 +712,7 @@ async def sales_delete(
|
||||
|
||||
|
||||
@router.post("/sales/upload")
|
||||
async def sales_upload(
|
||||
def sales_upload(
|
||||
request: Request,
|
||||
files: list[UploadFile] = File(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -728,7 +728,7 @@ async def sales_upload(
|
||||
weekly_saved = 0
|
||||
names: list[str] = []
|
||||
for up in files:
|
||||
data = await up.read()
|
||||
data = up.file.read() # sync def(스레드풀) — 동기 읽기
|
||||
if not data:
|
||||
continue
|
||||
try:
|
||||
@@ -757,7 +757,7 @@ async def sales_upload(
|
||||
|
||||
|
||||
@router.get("/sales/export.xlsx")
|
||||
async def sales_export_xlsx(request: Request) -> Any:
|
||||
def sales_export_xlsx(request: Request) -> Any:
|
||||
"""현재 조회 조건 그대로 엑셀 다운로드."""
|
||||
from io import BytesIO # noqa: WPS433
|
||||
|
||||
@@ -788,7 +788,7 @@ async def sales_export_xlsx(request: Request) -> Any:
|
||||
# 상자 입수량 관리
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/box-rules", response_class=HTMLResponse)
|
||||
async def box_rules_page(request: Request) -> HTMLResponse:
|
||||
def box_rules_page(request: Request) -> HTMLResponse:
|
||||
from app.main import build_erp_nav, render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
|
||||
@@ -813,7 +813,7 @@ async def box_rules_page(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.post("/box-rules")
|
||||
async def box_rule_upsert(
|
||||
def box_rule_upsert(
|
||||
request: Request,
|
||||
product_code: str = Form(...),
|
||||
units_per_box: int = Form(...),
|
||||
@@ -839,7 +839,7 @@ async def box_rule_upsert(
|
||||
|
||||
|
||||
@router.post("/box-rules/{rule_id}/delete")
|
||||
async def box_rule_delete(
|
||||
def box_rule_delete(
|
||||
request: Request,
|
||||
rule_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -859,7 +859,7 @@ async def box_rule_delete(
|
||||
# 저장하지 않는 계산 전용 화면. 규칙은 cupang_box_rules 를 그대로 사용한다.
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/box-calc", response_class=HTMLResponse)
|
||||
async def box_calc_page(request: Request) -> HTMLResponse:
|
||||
def box_calc_page(request: Request) -> HTMLResponse:
|
||||
from app.main import build_erp_nav, render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
|
||||
@@ -934,7 +934,7 @@ def _parse_po_sheet(ws: Any) -> dict[str, Any]:
|
||||
|
||||
|
||||
@router.post("/api/box-calc/upload")
|
||||
async def box_calc_upload(
|
||||
def box_calc_upload(
|
||||
request: Request,
|
||||
files: list[UploadFile] = File(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -977,7 +977,7 @@ async def box_calc_upload(
|
||||
no_rule: set[str] = set()
|
||||
|
||||
for up in files:
|
||||
raw = await up.read()
|
||||
raw = up.file.read() # sync def(스레드풀) — 동기 읽기
|
||||
name = up.filename or "(이름 없음)"
|
||||
try:
|
||||
wb = load_workbook(BytesIO(raw), data_only=True)
|
||||
@@ -1105,7 +1105,7 @@ async def box_calc_upload(
|
||||
|
||||
|
||||
@router.post("/api/box-calc")
|
||||
async def box_calc_api(
|
||||
def box_calc_api(
|
||||
request: Request,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1329,7 +1329,7 @@ def _pack_leftovers(results: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
# 설정 — 제품명 카탈로그 관리 (itemcode_db 에서 등록)
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/products", response_class=HTMLResponse)
|
||||
async def products_page(request: Request) -> HTMLResponse:
|
||||
def products_page(request: Request) -> HTMLResponse:
|
||||
from app.main import build_erp_nav, render_template # noqa: WPS433
|
||||
from app.store import is_admin # noqa: WPS433
|
||||
|
||||
@@ -1356,7 +1356,7 @@ async def products_page(request: Request) -> HTMLResponse:
|
||||
|
||||
|
||||
@router.get("/api/products/all")
|
||||
async def product_all(
|
||||
def product_all(
|
||||
request: Request, _: dict[str, Any] = Depends(_require_user)
|
||||
) -> JSONResponse:
|
||||
"""itemcode_db 전체 상품 목록(낱개+세트). 설정 화면 왼쪽 리스트 소스."""
|
||||
@@ -1374,7 +1374,7 @@ async def product_all(
|
||||
|
||||
|
||||
@router.post("/products/bulk")
|
||||
async def product_bulk(
|
||||
def product_bulk(
|
||||
request: Request,
|
||||
items: list[dict[str, Any]] = Body(..., embed=True),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1407,7 +1407,7 @@ async def product_bulk(
|
||||
|
||||
|
||||
@router.post("/products")
|
||||
async def product_upsert(
|
||||
def product_upsert(
|
||||
request: Request,
|
||||
product_code: str = Form(...),
|
||||
product_name: str = Form(...),
|
||||
@@ -1432,7 +1432,7 @@ async def product_upsert(
|
||||
|
||||
|
||||
@router.post("/products/{product_id:int}/active")
|
||||
async def product_set_active(
|
||||
def product_set_active(
|
||||
request: Request,
|
||||
product_id: int,
|
||||
active: str = Form(...),
|
||||
@@ -1451,7 +1451,7 @@ async def product_set_active(
|
||||
|
||||
|
||||
@router.post("/api/products/{product_id:int}/edit")
|
||||
async def product_edit(
|
||||
def product_edit(
|
||||
request: Request,
|
||||
product_id: int,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
@@ -1476,7 +1476,7 @@ async def product_edit(
|
||||
|
||||
|
||||
@router.post("/api/products/{product_id:int}/toggle")
|
||||
async def product_toggle_active(
|
||||
def product_toggle_active(
|
||||
request: Request,
|
||||
product_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1493,7 +1493,7 @@ async def product_toggle_active(
|
||||
|
||||
|
||||
@router.post("/products/{product_id:int}/delete")
|
||||
async def product_delete(
|
||||
def product_delete(
|
||||
request: Request,
|
||||
product_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1566,7 +1566,7 @@ def _clean_box_plan(raw: Any) -> list[dict[str, Any]]:
|
||||
|
||||
|
||||
@router.post("/api/box-calc/confirm")
|
||||
async def box_calc_confirm(
|
||||
def box_calc_confirm(
|
||||
request: Request,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1705,7 +1705,7 @@ async def box_calc_confirm(
|
||||
# 상자 계산 임시 저장 (화면 상태 스냅샷)
|
||||
# ════════════════════════════════════════════════════════════
|
||||
@router.get("/api/box-calc/drafts")
|
||||
async def box_calc_drafts_list(
|
||||
def box_calc_drafts_list(
|
||||
request: Request,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
) -> JSONResponse:
|
||||
@@ -1716,7 +1716,7 @@ async def box_calc_drafts_list(
|
||||
|
||||
|
||||
@router.get("/api/box-calc/drafts/{draft_id:int}")
|
||||
async def box_calc_draft_get(
|
||||
def box_calc_draft_get(
|
||||
request: Request,
|
||||
draft_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1731,7 +1731,7 @@ async def box_calc_draft_get(
|
||||
|
||||
|
||||
@router.post("/api/box-calc/drafts")
|
||||
async def box_calc_draft_save(
|
||||
def box_calc_draft_save(
|
||||
request: Request,
|
||||
payload: dict[str, Any] = Body(...),
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1768,7 +1768,7 @@ async def box_calc_draft_save(
|
||||
|
||||
|
||||
@router.delete("/api/box-calc/drafts/{draft_id:int}")
|
||||
async def box_calc_draft_delete(
|
||||
def box_calc_draft_delete(
|
||||
request: Request,
|
||||
draft_id: int,
|
||||
user: dict[str, Any] = Depends(_require_user),
|
||||
@@ -1784,5 +1784,5 @@ async def box_calc_draft_delete(
|
||||
|
||||
|
||||
@router.get("/health")
|
||||
async def health() -> dict[str, str]:
|
||||
def health() -> dict[str, str]:
|
||||
return {"status": "ok", "module": "cupang"}
|
||||
|
||||
Reference in New Issue
Block a user