From c88ba7890a24d362f0eee7391b9a9867ab533404 Mon Sep 17 00:00:00 2001 From: umsangdon Date: Wed, 18 Nov 2026 04:32:15 +0900 Subject: [PATCH] =?UTF-8?q?refactor(855-E=202-E1):=20M01=20=EC=98=9B=20?= =?UTF-8?q?=EC=85=88=20=EA=B8=B8=20/calc=20=C2=B7=20/text=20=EA=B1=B7?= =?UTF-8?q?=EC=9D=8C(M02=20=EA=B0=90=EC=8B=BC=20=EA=B8=B8=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 길 넷 걷음: POST /api/m01/calc · /text · /api/m02/logic-lib/calc · /text — 화면 부름 0(9c7807297 에 runCalc · runText 걷음) · 다른 서버 모듈 · B08 · B09 부름 0 · /openapi.json 480 → 476(이 넷만 빠짐) - 본체 걷음: Store.calc · text · _swap · DRAFT · Store_Sheet.py(옛 /text 계산서 덧칸) · Router.CalcBody · _pct - 남김: Store.mtx(B09 Sangeun_Text · M02 Logic_Settle 가 씀) · Store._logic_files(M02 Item_Source · Logic_Standard) - 시험: 옛 엔진(B09 · M02 가 아직 씀)을 이 길 꼴로 보던 시험 11 파일은 새 도우미 helper_855_old_engine_routes(같은 몸 · 시험 전용 · 2-E4 에서 엔진과 같이 지움)를 앱에 붙임 · M01 시험 계산 길만 보던 test_149_4 한 시험 · test_717_1 M02 /calc 시험 지움 - 관련 1,158(1,105 + 다시 돈 실패 파일 151) 통과 · 빌더 --check 같음 · typecheck 0 Co-Authored-By: Claude Opus 5.5 --- M01_MasterData/M01_MasterData_Router.py | 40 ------ M01_MasterData/M01_MasterData_Store.py | 58 +-------- M01_MasterData/M01_MasterData_Store_Sheet.py | 27 ---- M02_MasterTemplete/M02_Logic_Lib_Read.py | 13 +- .../tester/helper_855_old_engine_routes.py | 115 ++++++++++++++++++ resources/tester/test_149_4_pct_extra.py | 10 +- resources/tester/test_714_1_sheet_line.py | 2 +- resources/tester/test_717_1_logic_lib.py | 20 --- resources/tester/test_751_3_money_cut.py | 5 +- resources/tester/test_794_1_m01_sheet.py | 2 + .../tester/test_822_2_machine_hourly_all.py | 3 +- resources/tester/test_m01_api.py | 2 + resources/tester/test_m01_auto.py | 2 + resources/tester/test_m01_copy.py | 2 + resources/tester/test_m01_make.py | 2 + resources/tester/test_m01_pick.py | 2 + resources/tester/test_m01_text.py | 14 ++- 17 files changed, 146 insertions(+), 173 deletions(-) delete mode 100644 M01_MasterData/M01_MasterData_Store_Sheet.py create mode 100644 resources/tester/helper_855_old_engine_routes.py diff --git a/M01_MasterData/M01_MasterData_Router.py b/M01_MasterData/M01_MasterData_Router.py index f90545143..5569ffbc4 100644 --- a/M01_MasterData/M01_MasterData_Router.py +++ b/M01_MasterData/M01_MasterData_Router.py @@ -21,7 +21,6 @@ from M01_MasterData import M01_MasterData_Store as store from M01_MasterData import M01_MasterData_Store_List as store_list from M01_MasterData import M01_MasterData_RateSheet as rate_sheet from M01_MasterData import M01_MasterData_Store_Make as make -from M01_MasterData import M01_MasterData_Store_Sheet as sheet import master_basis as mbs # noqa: E402 (`store` 가 scripts 를 길에 둠) @@ -31,16 +30,6 @@ if "pytest" not in sys.modules: # 시험은 사본 폴더를 써서 정본을 store.warm() # 서버가 뜰 때 뒤에서 마스터를 한 번 읽어 둠 — 첫 목록을 기다리지 않게 -class CalcBody(BaseModel): - key: str - inputs: dict[str, Any] = {} - row: dict[str, Any] | None = None # 저장 전 고친 로직 줄(없으면 저장된 파일로) - file: str | None = None # 새 로직이면 더할 로직 파일 - 고름: dict[ - str, str - ] = {} # {호표 줄 차례(0부터): 자재 키} — 그 줄만 이 품목으로 셈 · 저장 안 함 - - class Change(BaseModel): op: Literal["edit", "add", "delete"] key: str | None = None @@ -257,35 +246,6 @@ def post_machine_formula(row: dict[str, Any]) -> dict: return _call(machine.formula, row) -@router.post("/calc") -def post_calc(body: CalcBody) -> dict: - with store.cm.mf.mp.choosing(body.고름): - got = _call(store.calc, body.key, body.inputs, body.row, body.file) - return _pct(got, body) - - -def _pct(got: dict, body: CalcBody) -> dict: - """% 덧줄 표기(149-4) — 줄에 율 · 규격 덧칸(M02 일위대가 하위 행과 같은 도우미 · 금액 그대로).""" - if not got.get("lines"): - return got - from M02_MasterTemplete import M02_Labor_Doc as labor_doc # M02 가 M01 을 부름 — 늦게 - - whole = store.loaded()[1] - try: - logic = body.row or whole.logic(body.key) - except store.cm.mf.FormulaError: - return got - lines = labor_doc.pct_extras(whole, logic, got["lines"], got.get("middle") or {}) - return {**got, "lines": _num(lines)} # 율 Decimal(4.0) 이 글자 「4.0」 으로 나가지 않게 - - -@router.post("/text") -def post_text(body: CalcBody) -> dict: - """읽는 식 줄 — 몸은 `/calc` 와 같음.""" - with store.cm.mf.mp.choosing(body.고름): - return _call(sheet.text, body.key, body.inputs, body.row, body.file) # 줄 덧칸(714-1) - - @router.post("/save") def post_save(body: SaveBody) -> dict: """로직 정본 줄 고침 = 개정 확인 · 새 줄(키 없음)은 자체 GX — {files, added, warnings}.""" diff --git a/M01_MasterData/M01_MasterData_Store.py b/M01_MasterData/M01_MasterData_Store.py index 0324711a8..50faeb6d0 100644 --- a/M01_MasterData/M01_MasterData_Store.py +++ b/M01_MasterData/M01_MasterData_Store.py @@ -23,7 +23,7 @@ import master_auto as mau # noqa: E402 import master_combo as mcb # noqa: E402,F401 (`_Store_Combo` 가 `store.mcb` 로 씀) import master_copy as mcp # noqa: E402,F401 (`_Store_Make` 가 `store.mcp` 로 씀) import master_keys as mk # noqa: E402 -import master_text as mtx # noqa: E402 +import master_text as mtx # noqa: E402,F401 (B09 `Sangeun_Text` · M02 `Logic_Settle` 가 `store.mtx` 로 씀) from M01_MasterData import M01_MasterData_Store_Cache as cache # noqa: E402 from M01_MasterData.M01_MasterData_Store_Find import hit as _hit # noqa: E402 @@ -32,7 +32,6 @@ from M01_MasterData.M01_MasterData_Store_Shape import dump # noqa: E402,F401 _COPY = os.environ.get("AISLO_MASTER_DIR") # 화면 저장 시험 사본 폴더(정함 13) · 없으면 정본 FOLDER: Path = Path(_COPY).resolve() if _COPY else cm.MASTER # 시험은 사본 폴더로 바꿈 -DRAFT = "_초안.json" # 저장 안 한 새 로직을 얹는 메모리 자리 — 파일로 쓰지 않음 _CHAPTER = re.compile(r"_(\d\d)장_(.+)\.json$") # 「_03장_토공사.json」 # ponytail: 저장은 한 번에 하나(프로세스 안 잠금) · 서버를 여럿 띄우면 파일 잠금으로 _LOCK = threading.Lock() @@ -344,7 +343,7 @@ def table(file: str, key: str) -> dict: def _logic_files(files: dict[str, dict]): - """로직 파일 줄(옛 엔진 시험 셈 `_swap` 몫 · L3 에서 걷음).""" + """로직 파일 줄 — M02 `Item_Source` · `Logic_Standard` 가 씀(로직 JSON 은 L3 에서 걷음).""" for name, data in files.items(): if data.get("그룹") == "로직": yield name, data @@ -540,46 +539,6 @@ def materials(sub: str, detail: str, spec: str, region: str, unit: str, limit: i } -# ── 시험 계산 ────────────────────────────────────────────────────────── -def _swap(files: dict, key: str, row: dict, file: str | None) -> str: - """저장 전 시험 — 메모리 사본에서 그 로직을 고친 줄로 바꿈(없으면 `file` 에 더함) · 돌려받는 것 = 계산할 키.""" - row = _dec(row) - for name, data in _logic_files(files): - items = data.get("줄") or [] - for i, old in enumerate(items): - if str(old.get("키")) == key: - items[i] = {**row, "키": key} - return key - if file is None: # 저장 안 한 새 초안 — 메모리에만 얹고 셈(만들기 모달의 시험 계산) - file = DRAFT - files[file] = {"그룹": "로직", "원문": "자체", "줄": []} - if file not in files or files[file].get("그룹") != "로직": - raise StoreError(404, f"없는 로직 파일 「{file}」") - new = mk.table_id("로직", files[file].get("원문")) + "999999" # 아직 번호 안 받은 새 로직 - files[file].setdefault("줄", []).append({**row, "키": new}) - return new - - -def calc(key: str, inputs: dict, row: dict | None = None, file: str | None = None): - given = {k: _dec(v) for k, v in inputs.items()} - files = cm.load(folder=FOLDER) - if row is not None: - key = _swap(files, str(row.get("키") or key), row, file) - try: - given = cm.mf.fill_empty(cm.mf.Master(files).logic(key), given) - result = cm.calc(files, key, given) - except (cm.mf.FormulaError, ArithmeticError, KeyError, TypeError, ValueError) as e: - return {"ok": False, "reason": str(e) or type(e).__name__} - if "결과" in result: - return {"ok": True, "result": result["결과"], "middle": result["중간"]} - return { - "ok": True, - "lines": result["줄"], - "sums": {k: result[k] for k in cm.mf.BUNDLE}, - "middle": result["중간"], - } - - def auto(key: str) -> dict: """견본 입력 — 마스터 보기용 자동값(`master_auto`) · 프로젝트 기본값 아님 · 저장 안 함.""" whole = loaded()[1] @@ -589,19 +548,6 @@ def auto(key: str) -> dict: raise StoreError(404, str(e)) from e -def text(key: str, inputs: dict, row: dict | None = None, file: str | None = None): - """사람이 읽는 식 줄 — 비목 묶음마다 「이름 : 단가 * 수량식 = 금액」 과 소계(`master_text`).""" - given = {k: _dec(v) for k, v in inputs.items()} - files = cm.load(folder=FOLDER) - if row is not None: - key = _swap(files, str(row.get("키") or key), row, file) - try: - given = cm.mf.fill_empty(cm.mf.Master(files).logic(key), given) - return mtx.lines(files, key, given) - except (cm.mf.FormulaError, ArithmeticError, KeyError, TypeError, ValueError) as e: - return {"ok": False, "reason": str(e) or type(e).__name__} - - # ── 저장 ────────────────────────────────────────────────────────────── def _dec(v): """화면이 보낸 수 → Decimal(파일을 읽은 모양과 같게).""" diff --git a/M01_MasterData/M01_MasterData_Store_Sheet.py b/M01_MasterData/M01_MasterData_Store_Sheet.py deleted file mode 100644 index 57181e401..000000000 --- a/M01_MasterData/M01_MasterData_Store_Sheet.py +++ /dev/null @@ -1,27 +0,0 @@ -"""M01 `/text` 계산서 줄 덧칸(PLAN 714-1) — `store.text` 답에 줄마다 쓰는 입력 · 묶음 · 기준단위 · -환산 근거(`master_sheet_line.annotate` — M02 `/logic-lib/sheet` 와 한 벌) · 서버 단독(③) · 저장 안 함. -`M01_MasterData_Store.py` 는 700 줄 근처라 여기서 감쌈.""" - -from __future__ import annotations - -from M01_MasterData import M01_MasterData_Store as store - -mf = store.cm.mf -import master_sheet_line as msl # noqa: E402 — `store` 가 scripts 를 길에 둔 뒤 - - -def text(key: str, inputs: dict, row: dict | None = None, file: str | None = None) -> dict: - got = store.text(key, inputs, row, file) - if not isinstance(got, dict) or not got.get("ok"): - return got - given = {k: store._dec(v) for k, v in inputs.items()} - try: - if row is None: - files, whole = store.loaded() - else: # 저장 전 시험 — `store.text` 와 같은 메모리 사본 - files = store.cm.load(folder=store.FOLDER) - key = store._swap(files, str(row.get("키") or key), row, file) - whole = mf.Master(files) - return msl.annotate(files, key, mf.fill_empty(whole.logic(key), given), got) - except (mf.FormulaError, ArithmeticError, KeyError, TypeError, ValueError): - return got diff --git a/M02_MasterTemplete/M02_Logic_Lib_Read.py b/M02_MasterTemplete/M02_Logic_Lib_Read.py index 9df0562b8..5b97416e3 100644 --- a/M02_MasterTemplete/M02_Logic_Lib_Read.py +++ b/M02_MasterTemplete/M02_Logic_Lib_Read.py @@ -2,7 +2,7 @@ M01 상세 부품(`M01_MasterData_UI_Logic_Api.ts` · `Api_Fetch.ts` · `Logic_Note.ts`)이 길 앞머리만 `/m02/logic-lib` 로 바꿔 부름 — 길 · 몸 · 답 = M01 `/api/m01/…` 와 같음(M01 길 함수를 부름). -쓰기 없음 — `/calc` · `/text` 의 `row`(저장 안 한 고친 줄)는 메모리 사본에서만 셈(`Store._swap`). +쓰기 없음 · 옛 셈 길 `/calc` · `/text` 는 855 2-E1 에 걷음(화면 부름 0). `/logics` · `/subs` · `/logic` · 원문은 `M02_MasterTemplete_Router_Combos.py` 에 있음. """ @@ -58,17 +58,6 @@ def get_table(file: str, key: str) -> dict: return m01.get_table(file, key) -@router.post("/calc") -def post_calc(body: m01.CalcBody) -> dict: - """M01 `/calc` 와 같음 — `row` = 저장 안 한 고친 줄(셈만 · 쓰기 없음).""" - return m01.post_calc(body) - - -@router.post("/text") -def post_text(body: m01.CalcBody) -> dict: - return m01.post_text(body) - - @router.get("/machine-hourly") def get_machine_hourly(key: str) -> dict: """기계(EQ) 한 시간 값 노 · 재 · 경(736-3 · [항목 추가] 기계 고정 줄 단가).""" diff --git a/resources/tester/helper_855_old_engine_routes.py b/resources/tester/helper_855_old_engine_routes.py new file mode 100644 index 000000000..b1acbf4a4 --- /dev/null +++ b/resources/tester/helper_855_old_engine_routes.py @@ -0,0 +1,115 @@ +"""855 2-E1 — 서버에서 걷은 M01 옛 셈 길(`POST /api/m01/calc` · `/text`)의 몸 — 시험 전용. + +옛 엔진(`master_formula` · `master_text` · `master_sheet_line`)은 B09 · M02 가 아직 씀 → +그 엔진을 이 길 꼴로 보던 시험(test_m01_text · test_m01_api · test_m01_copy · test_794_1 · test_714_1)이 +앱에 `router` 를 붙여 그대로 셈. 2-E4(엔진 지움)에서 같이 지움. +""" + +from __future__ import annotations + +from typing import Any + +from fastapi import APIRouter +from pydantic import BaseModel + +from M01_MasterData import M01_MasterData_Router as m01 +from M01_MasterData import M01_MasterData_Store as store + +import master_sheet_line as msl # noqa: E402 — `store` 가 scripts 를 길에 둔 뒤 + +cm, mf = store.cm, store.cm.mf +DRAFT = "_초안.json" +router = APIRouter(prefix="/api/m01") + + +class CalcBody(BaseModel): + key: str + inputs: dict[str, Any] = {} + row: dict[str, Any] | None = None + file: str | None = None + 고름: dict[str, str] = {} + + +def _swap(files: dict, key: str, row: dict, file: str | None) -> str: + """저장 전 시험 — 메모리 사본에서 그 로직을 고친 줄로 바꿈(없으면 `file` 에 더함).""" + row = store._dec(row) + for data in files.values(): + if data.get("그룹") != "로직": + continue + items = data.get("줄") or [] + for i, old in enumerate(items): + if str(old.get("키")) == key: + items[i] = {**row, "키": key} + return key + if file is None: + file = DRAFT + files[file] = {"그룹": "로직", "원문": "자체", "줄": []} + if file not in files or files[file].get("그룹") != "로직": + raise store.StoreError(404, f"없는 로직 파일 「{file}」") + new = store.mk.table_id("로직", files[file].get("원문")) + "999999" + files[file].setdefault("줄", []).append({**row, "키": new}) + return new + + +def _files(key: str, row: dict | None, file: str | None) -> tuple[dict, str]: + files = cm.load(folder=store.FOLDER) + if row is not None: + key = _swap(files, str(row.get("키") or key), row, file) + return files, key + + +_FAIL = (mf.FormulaError, ArithmeticError, KeyError, TypeError, ValueError) + + +def calc(key: str, inputs: dict, row: dict | None = None, file: str | None = None) -> dict: + given = {k: store._dec(v) for k, v in inputs.items()} + files, key = _files(key, row, file) + try: + given = mf.fill_empty(mf.Master(files).logic(key), given) + result = cm.calc(files, key, given) + except _FAIL as e: + return {"ok": False, "reason": str(e) or type(e).__name__} + if "결과" in result: + return {"ok": True, "result": result["결과"], "middle": result["중간"]} + sums = {k: result[k] for k in mf.BUNDLE} + return {"ok": True, "lines": result["줄"], "sums": sums, "middle": result["중간"]} + + +def text(key: str, inputs: dict, row: dict | None = None, file: str | None = None) -> dict: + """읽는 식 줄(`master_text`) + 계산서 줄 덧칸(`master_sheet_line.annotate` · 714-1).""" + given = {k: store._dec(v) for k, v in inputs.items()} + files, key = _files(key, row, file) + try: + given = mf.fill_empty(mf.Master(files).logic(key), given) + got = store.mtx.lines(files, key, given) + except _FAIL as e: + return {"ok": False, "reason": str(e) or type(e).__name__} + if not isinstance(got, dict) or not got.get("ok"): + return got + try: + return msl.annotate(files, key, given, got) + except _FAIL: + return got + + +@router.post("/calc") +def post_calc(body: CalcBody) -> dict: + with mf.mp.choosing(body.고름): + got = m01._call(calc, body.key, body.inputs, body.row, body.file) + if not got.get("lines"): + return got + from M02_MasterTemplete import M02_Labor_Doc as labor_doc # % 덧줄 표기(149-4) + + whole = store.loaded()[1] + try: + logic = body.row or whole.logic(body.key) + except mf.FormulaError: + return got + lines = labor_doc.pct_extras(whole, logic, got["lines"], got.get("middle") or {}) + return {**got, "lines": m01._num(lines)} + + +@router.post("/text") +def post_text(body: CalcBody) -> dict: + with mf.mp.choosing(body.고름): + return m01._call(text, body.key, body.inputs, body.row, body.file) diff --git a/resources/tester/test_149_4_pct_extra.py b/resources/tester/test_149_4_pct_extra.py index b89d99fc2..775e38518 100644 --- a/resources/tester/test_149_4_pct_extra.py +++ b/resources/tester/test_149_4_pct_extra.py @@ -2,13 +2,12 @@ - M02 `run_line` → 큰돌쌓기 찰쌓기 제잡비 설치 9 · 안 함 3 · 「노무비의 %」 - 인력 줄 합 밑수 = 「인건비의 %」 · 호표 줄 밑수 = 「그 줄 이름의 %」 · 금액 식(기계손료) = 덧칸 없음 -- M01 시험계산(`post_calc`) 도 같은 도우미 · 화면 두 곳은 `pctView` 한 벌 +- M01 시험계산 길(`post_calc`)은 855 2-E1 에 걷음 · 화면은 `pctView` 한 벌 """ from decimal import Decimal from pathlib import Path -from M01_MasterData import M01_MasterData_Router as m01_router from M01_MasterData import M01_MasterData_Store as m01 from M02_MasterTemplete import M02_Labor_Doc as labor @@ -42,10 +41,3 @@ def test_인건비_호표줄_밑수_금액식은_덧칸_없음(): assert "율" not in mach and "규격" not in mach mat = _extra("GC000267", name="잡재료비") assert mat["규격"] == "재료비의 %" - - -def test_M01_시험계산도_율_규격(): - given = {"물빼기파이프": "설치", "직경": "60", "지역": "전국평균", "보정작업": "해당 없음"} - got = m01_router.post_calc(m01_router.CalcBody(key="GF000227", inputs=given)) - extra = [x for x in got["lines"] if x["이름"] == "제잡비"][0] - assert extra["율"] == 9 and extra["규격"] == "노무비의 %" diff --git a/resources/tester/test_714_1_sheet_line.py b/resources/tester/test_714_1_sheet_line.py index 61cbf574f..6289b6bc5 100644 --- a/resources/tester/test_714_1_sheet_line.py +++ b/resources/tester/test_714_1_sheet_line.py @@ -10,7 +10,7 @@ ROOT = Path(__file__).resolve().parents[2] sys.path.insert(0, str(ROOT)) from M01_MasterData import M01_MasterData_Store as store # noqa: E402 -from M01_MasterData import M01_MasterData_Store_Sheet as sheet # noqa: E402 +import helper_855_old_engine_routes as sheet # noqa: E402 — 옛 `/text` 몸(855 2-E1 · 시험 전용) msl = sheet.msl diff --git a/resources/tester/test_717_1_logic_lib.py b/resources/tester/test_717_1_logic_lib.py index 906de3605..459b9ca4f 100644 --- a/resources/tester/test_717_1_logic_lib.py +++ b/resources/tester/test_717_1_logic_lib.py @@ -15,7 +15,6 @@ from fastapi import Depends, FastAPI from fastapi.testclient import TestClient from common_util.common_util_auth import verify_session -from M01_MasterData import M01_MasterData_Router as m01_router from M01_MasterData import M01_MasterData_Store as store from M02_MasterTemplete import M02_Logic_Lib_Read as lib @@ -70,22 +69,3 @@ def test_요소_표_밖_파일은_막음(user: TestClient) -> None: assert user.get(f"{BASE}/rows", params={"file": logic_file}).status_code == 403 assert user.get(f"{BASE}/table", params={"file": "기계.json", "key": "x"}).status_code == 403 assert user.get(f"{BASE}/rows", params={"file": "재료_../x.json"}).status_code == 404 - - -def test_저장_안_한_줄_셈_쓰기_없음(user: TestClient) -> None: - before = _prints() - saved = user.post(f"{BASE}/calc", json={"key": KEY, "inputs": {}}).json() - row = m01_router._num( - store.logic(KEY)["logic"] - ) # 화면이 받는 꼴(M01 /logic = _num · 794-2b 「개정」 수 칸) - same = user.post(f"{BASE}/calc", json={"key": KEY, "inputs": {}, "row": row}).json() - line = row["호표"][0] - row2 = {**row, "호표": [{**line, "수량": f"({line['수량']}) * 2"}, *row["호표"][1:]]} - double = user.post(f"{BASE}/calc", json={"key": KEY, "inputs": {}, "row": row2}).json() - text = user.post(f"{BASE}/text", json={"key": KEY, "inputs": {}, "row": row2}).json() - assert saved["ok"] and same["sums"] == saved["sums"] - # 751-3 — 줄 0.1 원 · 소계 1 원 버림이라 두 배는 1 원 안 - assert double["sums"]["노무비"] == pytest.approx(saved["sums"]["노무비"] * 2, abs=2) - assert text["ok"] and text["계"] == pytest.approx(double["sums"]["계"], rel=1e-6) - assert store.logic(KEY)["logic"]["호표"][0]["수량"] == line["수량"] # 정본 그대로 - assert _prints() == before diff --git a/resources/tester/test_751_3_money_cut.py b/resources/tester/test_751_3_money_cut.py index 1c6f49e6e..b77dee3dc 100644 --- a/resources/tester/test_751_3_money_cut.py +++ b/resources/tester/test_751_3_money_cut.py @@ -8,6 +8,7 @@ from decimal import Decimal from B09_Estimation import B09_Estimation_Sangeun as sg from M01_MasterData import M01_MasterData_Store as m01 +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 몸(855 2-E1 · 시험 전용) from M02_MasterTemplete import M02_Labor_Doc as labor from M02_MasterTemplete import M02_Sangeun_Calc as calc from M02_MasterTemplete import M02_Sangeun_Doc as sd @@ -73,8 +74,8 @@ def test_화면_넷_같은_값_SK_시험계산_읽는식(): ) sk = calc.run(doc, whole)["기준"] auto = {k: v for k, v in (m01.auto(KEY)["값"] or {}).items() if v is not None} - m1 = m01.calc(KEY, auto) - text = m01.text(KEY, auto) + m1 = old_engine.calc(KEY, auto) + text = old_engine.text(KEY, auto) assert float(sk["계"]) == m1["sums"]["계"] == float(text["계"]) assert {g["비목"]: float(g["소계"]) for g in text["groups"]} == {k: float(sk[k]) for k in COSTS} line = next(x for g in text["groups"] for x in g["줄"] if x["이름"].startswith("형틀")) diff --git a/resources/tester/test_794_1_m01_sheet.py b/resources/tester/test_794_1_m01_sheet.py index 506239703..17fb32aed 100644 --- a/resources/tester/test_794_1_m01_sheet.py +++ b/resources/tester/test_794_1_m01_sheet.py @@ -19,6 +19,7 @@ from fastapi.testclient import TestClient from common_util.common_util_auth import require_system_admin, verify_session from M01_MasterData import M01_MasterData_Router as m01_router from M01_MasterData import M01_MasterData_Store as store +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) REAL = store.FOLDER KEY = "GC000211" # 합판거푸집 설치 및 해체 @@ -48,6 +49,7 @@ def folder(tmp_path: Path, monkeypatch) -> Path: def client(folder: Path) -> TestClient: app = FastAPI() app.include_router(m01_router.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_822_2_machine_hourly_all.py b/resources/tester/test_822_2_machine_hourly_all.py index 46037133c..b4cf22cc1 100644 --- a/resources/tester/test_822_2_machine_hourly_all.py +++ b/resources/tester/test_822_2_machine_hourly_all.py @@ -23,6 +23,7 @@ from fastapi.testclient import TestClient from common_util import common_util_auth as auth from M01_MasterData import M01_MasterData_Router as router_module from M01_MasterData import M01_MasterData_Store as m01 +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 몸(855 2-E1 · 시험 전용) from M02_MasterTemplete import M02_Labor_Ref as refs from M02_MasterTemplete import M02_Machine_Hourly as mh from M02_MasterTemplete import M02_MasterTemplete_Store as store @@ -215,7 +216,7 @@ def test_power_line_jumbo_drill(): h["경비"], h["계"], ) - home = m01.calc(POWER_CREW, {"기계": "5805-0002", "전력 계약종별": "주택용 저압"}) + home = old_engine.calc(POWER_CREW, {"기계": "5805-0002", "전력 계약종별": "주택용 저압"}) assert home["ok"] and float(home["sums"]["재료비"]) > h["재료비"] # 120 원/kWh > 114.4 diff --git a/resources/tester/test_m01_api.py b/resources/tester/test_m01_api.py index b08113d5e..682ef3c23 100644 --- a/resources/tester/test_m01_api.py +++ b/resources/tester/test_m01_api.py @@ -17,6 +17,7 @@ from fastapi.testclient import TestClient from M01_MasterData import M01_MasterData_Router as router_module from M01_MasterData import M01_MasterData_Store as store +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) REAL = store.FOLDER LABOR = "인력.json" @@ -51,6 +52,7 @@ def client(tmp_path: Path, monkeypatch) -> TestClient: monkeypatch.setattr(store._docs().ml, "FOLDER", tmp_path / "수식문서") app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_m01_auto.py b/resources/tester/test_m01_auto.py index 7b4f1611b..aece281a2 100644 --- a/resources/tester/test_m01_auto.py +++ b/resources/tester/test_m01_auto.py @@ -13,12 +13,14 @@ from fastapi import FastAPI from fastapi.testclient import TestClient from M01_MasterData import M01_MasterData_Router as router_module +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) @pytest.fixture(scope="module") def client() -> TestClient: app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_m01_copy.py b/resources/tester/test_m01_copy.py index 4729f3a42..fd3f0e380 100644 --- a/resources/tester/test_m01_copy.py +++ b/resources/tester/test_m01_copy.py @@ -24,6 +24,7 @@ from M01_MasterData import M01_MasterData_Store as store sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/scripts")) import master_copy as mcp # noqa: E402 +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) REAL = store.FOLDER STACK = "GF000219" # 13-4-1 메쌓기(인력) — 같은 표를 같은 인자로 두 번(별칭 하나로 합침) @@ -41,6 +42,7 @@ def client(tmp_path: Path, monkeypatch) -> TestClient: monkeypatch.setattr(store._docs().ml, "FOLDER", tmp_path / "수식문서") app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_m01_make.py b/resources/tester/test_m01_make.py index 1544b66cb..65c3ee71b 100644 --- a/resources/tester/test_m01_make.py +++ b/resources/tester/test_m01_make.py @@ -16,6 +16,7 @@ from fastapi.testclient import TestClient from M01_MasterData import M01_MasterData_Doc as doc_store from M01_MasterData import M01_MasterData_Router as router_module from M01_MasterData import M01_MasterData_Store as store +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) from M01_MasterData import M01_MasterData_Store_Make as make REAL = store.FOLDER @@ -37,6 +38,7 @@ def client(tmp_path: Path, monkeypatch) -> TestClient: doc_store._memo.clear() app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_m01_pick.py b/resources/tester/test_m01_pick.py index 5b7186b46..74655cb9e 100644 --- a/resources/tester/test_m01_pick.py +++ b/resources/tester/test_m01_pick.py @@ -13,6 +13,7 @@ from fastapi.testclient import TestClient from M01_MasterData import M01_MasterData_Router as router_module from M01_MasterData import M01_MasterData_Store as store +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) mf = store.cm.mf mp = mf.mp @@ -22,6 +23,7 @@ mp = mf.mp def client() -> TestClient: app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) diff --git a/resources/tester/test_m01_text.py b/resources/tester/test_m01_text.py index ad5832f56..cf081d99f 100644 --- a/resources/tester/test_m01_text.py +++ b/resources/tester/test_m01_text.py @@ -23,6 +23,7 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "master_data/script import master_text as mt # noqa: E402 from helper_test_all import spread # noqa: E402 +import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 길 몸(855 2-E1 · 시험 전용) REAL = store.FOLDER STACK = "GF000219" # 13-4-1 메쌓기(인력) — 증가율이 걸린 줄 @@ -40,6 +41,7 @@ def client(tmp_path: Path, monkeypatch) -> TestClient: monkeypatch.setattr(store, "FOLDER", tmp_path) app = FastAPI() app.include_router(router_module.router) + app.include_router(old_engine.router) return TestClient(app) @@ -499,7 +501,7 @@ def test_값_식_작은_수는_유효숫자로_보인_수끼리_곱해도_금액 def _text_of(key: str, **given) -> list[dict]: auto = {k: v for k, v in (store.auto(key).get("값") or {}).items() if v is not None} - return _all_lines(store.text(key, {**auto, **given})) + return _all_lines(old_engine.text(key, {**auto, **given})) def test_빈_줄을_부른_덧줄_값_조각은_None_대신_그_줄_이름() -> None: @@ -523,12 +525,12 @@ def test_수량_식_안_로직_조각은_그_로직_이름() -> None: def test_표에_없는_입력_조합은_그_줄만_비우고_글은_그대로() -> None: """/calc 와 같은 빈 줄 규칙 — 풀리지 않는 중간값은 /text 도 멈추지 않음.""" - got = store.text("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) + got = old_engine.text("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) lines = _all_lines(got) blank = [x for x in lines if x["금액"] is None] assert blank and all(x["이름글"] and x["조각"] for x in blank) assert len(blank) < len(lines) or got["계"] is not None - calc = store.calc("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) + calc = old_engine.calc("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) assert got["계"] == calc["sums"]["계"] @@ -541,7 +543,9 @@ def test_재료_줄_요소조각은_잡힌_품목_이름과_MT_참조() -> None: assert piece["글"].startswith("어닐링철선(결속선)") assert piece["참조"] == {"테이블": "MT", "키": "MT000209"} auto = {k: v for k, v in store.auto("GF000159")["값"].items() if v is not None} - assert store.text("GF000159", auto)["계"] == store.calc("GF000159", auto)["sums"]["계"] + assert ( + old_engine.text("GF000159", auto)["계"] == old_engine.calc("GF000159", auto)["sums"]["계"] + ) def test_고름으로_바꾼_재료_줄_요소조각은_고른_품목() -> None: @@ -552,5 +556,5 @@ def test_고름으로_바꾼_재료_줄_요소조각은_고른_품목() -> None: items = cm.master().logic("GF000159")["호표"] at = next(i for i, h in enumerate(items) if h.get("이름") == "결속선 0.9㎜") with mp.choosing({at: "MT000174"}): - got = _all_lines(store.text("GF000159", auto)) + got = _all_lines(old_engine.text("GF000159", auto)) assert _mat_piece(got, "결속선 0.9㎜")["참조"]["키"] == "MT000174"