From 64b20ea8735f9594ea4b159c32528bc9dfed5ba7 Mon Sep 17 00:00:00 2001 From: umsangdon Date: Wed, 18 Nov 2026 04:36:52 +0900 Subject: [PATCH] =?UTF-8?q?refactor(855-E=202-E1):=20M01=20=EC=98=9B=20?= =?UTF-8?q?=EC=9E=90=EB=8F=99=EA=B0=92=20=EA=B8=B8=20/logic/auto=20?= =?UTF-8?q?=EA=B1=B7=EC=9D=8C(M02=20=EA=B0=90=EC=8B=BC=20=EA=B8=B8=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 길 둘 걷음: GET /api/m01/logic/auto · /api/m02/logic-lib/logic/auto — 화면 부름 0(9c7807297 에 fetchAuto 걷음) · 서버 모듈 · B08 · B09 부름 0 · /openapi.json 476 → 474 - 본체 Store.auto 걷음 · 남김 = Store.mau(M02 Sangeun_Calc · Labor_Doc · Labor_Inputs · B09 Sangeun 이 옛 자동값 모듈을 바로 씀 · L2 ⓑ · B9 걸음 몫) - 시험: 옛 자동값을 보던 test_m01_auto · _text · _pick · test_714_1 · test_751_3 은 helper_855_old_engine_routes.auto(같은 몸) · test_717_1 M02 /logic/auto 줄 걷음 · 걸린 시험 78 통과 Co-Authored-By: Claude Opus 5.5 --- M01_MasterData/M01_MasterData_Router.py | 6 ------ M01_MasterData/M01_MasterData_Store.py | 11 +--------- M02_MasterTemplete/M02_Logic_Lib_Read.py | 5 ----- .../tester/helper_855_old_engine_routes.py | 16 ++++++++++++++- resources/tester/test_714_1_sheet_line.py | 3 +-- resources/tester/test_717_1_logic_lib.py | 1 - resources/tester/test_751_3_money_cut.py | 2 +- resources/tester/test_m01_pick.py | 9 ++++++--- resources/tester/test_m01_text.py | 20 ++++++++++--------- 9 files changed, 35 insertions(+), 38 deletions(-) diff --git a/M01_MasterData/M01_MasterData_Router.py b/M01_MasterData/M01_MasterData_Router.py index 5569ffbc4..13e79738b 100644 --- a/M01_MasterData/M01_MasterData_Router.py +++ b/M01_MasterData/M01_MasterData_Router.py @@ -175,12 +175,6 @@ def get_logic_source(src: str) -> dict: return _call(make.source, src) -@router.get("/logic/auto") -def get_logic_auto(key: str) -> dict: - """견본 입력 — 마스터 보기용 자동값(프로젝트 기본값 아님).""" - return _call(store.auto, key) - - @router.get("/elements") def get_elements(group: str, q: str = "", limit: int = 50) -> dict: return _call(store.elements, group, q, limit) diff --git a/M01_MasterData/M01_MasterData_Store.py b/M01_MasterData/M01_MasterData_Store.py index 50faeb6d0..3cb80e821 100644 --- a/M01_MasterData/M01_MasterData_Store.py +++ b/M01_MasterData/M01_MasterData_Store.py @@ -19,7 +19,7 @@ SCRIPTS = Path(__file__).resolve().parents[1] / "resources/master_data/scripts" sys.path.insert(0, str(SCRIPTS)) import check_master as cm # noqa: E402 -import master_auto as mau # noqa: E402 +import master_auto as mau # noqa: E402,F401 (M02 `Sangeun_Calc` · `Labor_Doc` · `Labor_Inputs` · B09 `Sangeun` 가 `store.mau` 로 씀) 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 @@ -539,15 +539,6 @@ def materials(sub: str, detail: str, spec: str, region: str, unit: str, limit: i } -def auto(key: str) -> dict: - """견본 입력 — 마스터 보기용 자동값(`master_auto`) · 프로젝트 기본값 아님 · 저장 안 함.""" - whole = loaded()[1] - try: - return {"값": mau.values(whole, whole.logic(key))} - except cm.mf.FormulaError as e: - raise StoreError(404, str(e)) from e - - # ── 저장 ────────────────────────────────────────────────────────────── def _dec(v): """화면이 보낸 수 → Decimal(파일을 읽은 모양과 같게).""" diff --git a/M02_MasterTemplete/M02_Logic_Lib_Read.py b/M02_MasterTemplete/M02_Logic_Lib_Read.py index 5b97416e3..dcd0e4a56 100644 --- a/M02_MasterTemplete/M02_Logic_Lib_Read.py +++ b/M02_MasterTemplete/M02_Logic_Lib_Read.py @@ -21,11 +21,6 @@ ROW_FILES = ("인력", "재료", "기계") TABLE_FILES = ("소요량_", "계수_") -@router.get("/logic/auto") -def get_auto(key: str) -> dict: - return m01.get_logic_auto(key) - - @router.get("/elements") def get_elements(group: str, q: str = "", limit: int = 50) -> dict: return m01.get_elements(group, q, min(limit, 200)) diff --git a/resources/tester/helper_855_old_engine_routes.py b/resources/tester/helper_855_old_engine_routes.py index b1acbf4a4..6d06f3ca3 100644 --- a/resources/tester/helper_855_old_engine_routes.py +++ b/resources/tester/helper_855_old_engine_routes.py @@ -1,4 +1,4 @@ -"""855 2-E1 — 서버에서 걷은 M01 옛 셈 길(`POST /api/m01/calc` · `/text`)의 몸 — 시험 전용. +"""855 2-E1 — 서버에서 걷은 M01 옛 셈 길(`POST /api/m01/calc` · `/text` · `GET /logic/auto`)의 몸 — 시험 전용. 옛 엔진(`master_formula` · `master_text` · `master_sheet_line`)은 B09 · M02 가 아직 씀 → 그 엔진을 이 길 꼴로 보던 시험(test_m01_text · test_m01_api · test_m01_copy · test_794_1 · test_714_1)이 @@ -92,6 +92,20 @@ def text(key: str, inputs: dict, row: dict | None = None, file: str | None = Non return got +def auto(key: str) -> dict: + """견본 입력 — 옛 자동값(`master_auto`) · 없는 로직 = 404.""" + whole = store.loaded()[1] + try: + return {"값": store.mau.values(whole, whole.logic(key))} + except mf.FormulaError as e: + raise store.StoreError(404, str(e)) from e + + +@router.get("/logic/auto") +def get_logic_auto(key: str) -> dict: + return m01._call(auto, key) + + @router.post("/calc") def post_calc(body: CalcBody) -> dict: with mf.mp.choosing(body.고름): diff --git a/resources/tester/test_714_1_sheet_line.py b/resources/tester/test_714_1_sheet_line.py index 6289b6bc5..66b6195d3 100644 --- a/resources/tester/test_714_1_sheet_line.py +++ b/resources/tester/test_714_1_sheet_line.py @@ -9,14 +9,13 @@ from pathlib import Path ROOT = Path(__file__).resolve().parents[2] sys.path.insert(0, str(ROOT)) -from M01_MasterData import M01_MasterData_Store as store # noqa: E402 import helper_855_old_engine_routes as sheet # noqa: E402 — 옛 `/text` 몸(855 2-E1 · 시험 전용) msl = sheet.msl def _text(key: str) -> dict: - auto = {k: v for k, v in store.auto(key)["값"].items() if v is not None} + auto = {k: v for k, v in sheet.auto(key)["값"].items() if v is not None} return sheet.text(key, auto) diff --git a/resources/tester/test_717_1_logic_lib.py b/resources/tester/test_717_1_logic_lib.py index 459b9ca4f..9fd7ca67b 100644 --- a/resources/tester/test_717_1_logic_lib.py +++ b/resources/tester/test_717_1_logic_lib.py @@ -54,7 +54,6 @@ def _prints() -> dict[str, str]: def test_일반_계정_읽기(user: TestClient) -> None: - assert user.get(f"{BASE}/logic/auto", params={"key": KEY}).status_code == 200 assert user.get(f"{BASE}/elements", params={"group": "인력", "q": "LB000002"}).json()["items"] assert user.get(f"{BASE}/pick", params={"kind": "price", "q": "시멘트"}).status_code == 200 assert user.get(f"{BASE}/rows", params={"file": "기계.json", "size": 3}).json()["rows"] diff --git a/resources/tester/test_751_3_money_cut.py b/resources/tester/test_751_3_money_cut.py index b77dee3dc..8d9ac1536 100644 --- a/resources/tester/test_751_3_money_cut.py +++ b/resources/tester/test_751_3_money_cut.py @@ -73,7 +73,7 @@ def test_화면_넷_같은_값_SK_시험계산_읽는식(): {"키": "SK-000000", "이름": "끝수", "단위": "㎡", "바탕": {"로직": KEY}}, None, whole ) sk = calc.run(doc, whole)["기준"] - auto = {k: v for k, v in (m01.auto(KEY)["값"] or {}).items() if v is not None} + auto = {k: v for k, v in (old_engine.auto(KEY)["값"] or {}).items() if v is not None} m1 = old_engine.calc(KEY, auto) text = old_engine.text(KEY, auto) assert float(sk["계"]) == m1["sums"]["계"] == float(text["계"]) diff --git a/resources/tester/test_m01_pick.py b/resources/tester/test_m01_pick.py index 74655cb9e..a62503736 100644 --- a/resources/tester/test_m01_pick.py +++ b/resources/tester/test_m01_pick.py @@ -93,7 +93,10 @@ def test_검색어_후보가_없으면_그_줄만_비움(client) -> None: def test_기계_입력은_목록_밖_원문번호도_받음(client) -> None: key = "GC000267" - inputs = {**store.auto(key)["값"], "기계": "0101-0007"} # 고르기 목록 밖 · 기계 마스터엔 있음 + inputs = { + **old_engine.auto(key)["값"], + "기계": "0101-0007", + } # 고르기 목록 밖 · 기계 마스터엔 있음 got = client.post("/api/m01/calc", json={"key": key, "inputs": inputs}).json() assert got["ok"] is True, got bad = client.post("/api/m01/calc", json={"key": key, "inputs": {**inputs, "기계": "9999-9999"}}) @@ -120,7 +123,7 @@ def test_기계_입력은_EQ_키도_원문번호로_풀어_받음(client) -> Non key = "GC000267" number = "0101-0007" # 고르기 목록 밖 eq = next(k for k, r in store.loaded()[1].index["EQ"].items() if r.get("원문번호") == number) - base = {**store.auto(key)["값"]} + base = {**old_engine.auto(key)["값"]} by_number = client.post( "/api/m01/calc", json={"key": key, "inputs": {**base, "기계": number}} ).json() @@ -133,7 +136,7 @@ def test_기계_입력은_EQ_키도_원문번호로_풀어_받음(client) -> Non def test_재료_줄마다_품목_칸(client) -> None: key = "GF000160" - body = {"key": key, "inputs": {k: str(v) for k, v in store.auto(key)["값"].items()}} + body = {"key": key, "inputs": {k: str(v) for k, v in old_engine.auto(key)["값"].items()}} lines = client.post("/api/m01/calc", json=body).json()["lines"] idx = next( i for i, x in enumerate(lines) if x.get("품목", {}).get("이름", "").startswith("합판(내수)") diff --git a/resources/tester/test_m01_text.py b/resources/tester/test_m01_text.py index cf081d99f..f16852931 100644 --- a/resources/tester/test_m01_text.py +++ b/resources/tester/test_m01_text.py @@ -418,7 +418,7 @@ def test_자동값으로_모든_로직을_돌려도_멈추지_않는다() -> Non stops = [] keys = [k for rows in master.index.values() for k in rows] for key in spread([k for k in keys if mt.mf.mk.GROUP_OF.get(k[:2]) == "로직"], 400): - given = {n: store._dec(v) for n, v in store.auto(key)["값"].items()} + given = {n: store._dec(v) for n, v in old_engine.auto(key)["값"].items()} # 고르기가 빈 입력 = 내 기계 · 불러오기 전용 식(M01 정본 기계가 안 씀) — 자동값 고를 것이 없음 if any(i.get("고르기") == [] for i in master.logic(key).get("입력", [])): continue @@ -431,7 +431,7 @@ def test_자동값으로_모든_로직을_돌려도_멈추지_않는다() -> Non def test_빈_줄은_빈_글이고_소계는_빈_줄_빼고_더한다(client: TestClient) -> None: key = "GC000027" - given = {n: str(v) for n, v in store.auto(key)["값"].items()} + given = {n: str(v) for n, v in old_engine.auto(key)["값"].items()} got = client.post("/api/m01/text", json={"key": key, "inputs": given}).json() calc = client.post("/api/m01/calc", json={"key": key, "inputs": given}).json() assert got["ok"] is True @@ -444,7 +444,7 @@ def test_곱_뒤_덧셈_묶음은_괄호로_이름_식_값_식_모두() -> None: """GC000467 촌락지대가 — 노임 * (아홉 항 합) · 첫 항에만 곱하는 것처럼 읽히지 않게.""" files = store.cm.load(folder=REAL) row = store.cm.master(REAL).logic("GC000467") - given = {n: store._dec(v) for n, v in store.auto("GC000467")["값"].items()} + given = {n: store._dec(v) for n, v in old_engine.auto("GC000467")["값"].items()} got = mt.lines(files, "GC000467", given) one = _all_lines(got)[0] assert one["글"].startswith("295,138 * (1 + 1 + 0.5") and " = 3,984,363" in one["글"] @@ -459,7 +459,7 @@ def test_곱_뒤_덧셈_묶음은_괄호로_이름_식_값_식_모두() -> None: def test_이름글_번호_별칭은_별칭표로_되돌려진다() -> None: """이름글 속 별칭(가1~가9)은 별칭표 이름 그대로여야 식으로 되돌려짐(찾은 줄 이름 X).""" files = store.cm.load(folder=REAL) - given = {n: store._dec(v) for n, v in store.auto("GC000467")["값"].items()} + given = {n: store._dec(v) for n, v in old_engine.auto("GC000467")["값"].items()} got = mt.lines(files, "GC000467", given) left = _all_lines(got)[0]["이름글"].split(" = ")[0].split(" * ", 1)[1].strip("()") raw_of = {m["이름"]: m["원문"] for m in got["별칭"]} @@ -500,7 +500,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} + auto = {k: v for k, v in (old_engine.auto(key).get("값") or {}).items() if v is not None} return _all_lines(old_engine.text(key, {**auto, **given})) @@ -525,12 +525,14 @@ def test_수량_식_안_로직_조각은_그_로직_이름() -> None: def test_표에_없는_입력_조합은_그_줄만_비우고_글은_그대로() -> None: """/calc 와 같은 빈 줄 규칙 — 풀리지 않는 중간값은 /text 도 멈추지 않음.""" - got = old_engine.text("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) + got = old_engine.text("GC001000", {**old_engine.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 = old_engine.calc("GC001000", {**store.auto("GC001000")["값"], "시공구분": "기계시공"}) + calc = old_engine.calc( + "GC001000", {**old_engine.auto("GC001000")["값"], "시공구분": "기계시공"} + ) assert got["계"] == calc["sums"]["계"] @@ -542,7 +544,7 @@ def test_재료_줄_요소조각은_잡힌_품목_이름과_MT_참조() -> None: piece = _mat_piece(_text_of("GF000159"), "결속선 0.9㎜") assert piece["글"].startswith("어닐링철선(결속선)") assert piece["참조"] == {"테이블": "MT", "키": "MT000209"} - auto = {k: v for k, v in store.auto("GF000159")["값"].items() if v is not None} + auto = {k: v for k, v in old_engine.auto("GF000159")["값"].items() if v is not None} assert ( old_engine.text("GF000159", auto)["계"] == old_engine.calc("GF000159", auto)["sums"]["계"] ) @@ -552,7 +554,7 @@ def test_고름으로_바꾼_재료_줄_요소조각은_고른_품목() -> None: import check_master as cm import master_pick as mp - auto = {k: v for k, v in store.auto("GF000159")["값"].items() if v is not None} + auto = {k: v for k, v in old_engine.auto("GF000159")["값"].items() if v is not 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"}):