diff --git a/B09_Estimation/B09_Estimation_Linked.py b/B09_Estimation/B09_Estimation_Linked.py index fc26d152c..ab5c98588 100644 --- a/B09_Estimation/B09_Estimation_Linked.py +++ b/B09_Estimation/B09_Estimation_Linked.py @@ -31,8 +31,6 @@ from M02_MasterTemplete.M02_Item_Source import LABOR_FILE, read_json #: 원가 단가 목록에 오르는 자원 표 RESOURCE_TABLES = ("LB", "EQ", "MT", "MO") -mf = item_prices.mf - def used_keys(folder: Path) -> list[str]: """사본 하나가 담은 로직을 돌릴 때 부른 자원 키 — 부른 차례 · 겹침 없음.""" diff --git a/B09_Estimation/B09_Estimation_Sangeun.py b/B09_Estimation/B09_Estimation_Sangeun.py index f4b252da2..8c3b26d16 100644 --- a/B09_Estimation/B09_Estimation_Sangeun.py +++ b/B09_Estimation/B09_Estimation_Sangeun.py @@ -62,7 +62,6 @@ from M02_MasterTemplete.M02_Item_Snapshot import ( ) from M02_MasterTemplete.M02_Item_Source import LABOR_FILE, read_json -mf = item_prices.mf PARTS = ("labor", "material", "expense") COST_PART = {"노무비": "labor", "재료비": "material", "경비": "expense"} diff --git a/M02_MasterTemplete/M02_Hopyo_Fixed.py b/M02_MasterTemplete/M02_Hopyo_Fixed.py index 42e381ebe..87b283812 100644 --- a/M02_MasterTemplete/M02_Hopyo_Fixed.py +++ b/M02_MasterTemplete/M02_Hopyo_Fixed.py @@ -45,7 +45,9 @@ def kind_of(line: dict[str, Any]) -> str: return kind -mm_plain = m01.cm.mf.mp.mm.plain +import master_base as mb # noqa: E402 — 바탕만(855-E 2-E4) + +mm_plain = mb.mp.mm.plain def _parts(money: Any) -> dict[str, Decimal]: diff --git a/M02_MasterTemplete/M02_Hopyo_Match.py b/M02_MasterTemplete/M02_Hopyo_Match.py index 1f6c8e65c..ef0716393 100644 --- a/M02_MasterTemplete/M02_Hopyo_Match.py +++ b/M02_MasterTemplete/M02_Hopyo_Match.py @@ -22,7 +22,8 @@ from M01_MasterData import M01_MasterData_Store as m01 from M01_MasterData import M01_MasterData_Store_Combo as combo_store from M02_MasterTemplete import M02_Mat_Place as place -mf = m01.cm.mf +import master_base as mf # noqa: E402 — 바탕만(855-E 2-E4 · 엔진 몸 안 읽음) · scripts 길은 `m01` 이 둠 + mp = mf.mp mm = mp.mm SEED_NAME = "일위대가조합.json" diff --git a/M02_MasterTemplete/M02_Hopyo_Sangeun.py b/M02_MasterTemplete/M02_Hopyo_Sangeun.py index 87518e106..6035e0174 100644 --- a/M02_MasterTemplete/M02_Hopyo_Sangeun.py +++ b/M02_MasterTemplete/M02_Hopyo_Sangeun.py @@ -14,7 +14,7 @@ from decimal import Decimal from pathlib import Path from typing import Any -from M01_MasterData import M01_MasterData_Store as m01 +from M01_MasterData import M01_MasterData_Store as m01 # noqa: F401 — scripts 길을 둠 from M02_MasterTemplete import M02_Hopyo_Elem as elem from M02_MasterTemplete import M02_Hopyo_Fixed as hfix from M02_MasterTemplete import M02_Labor_Doc as labor @@ -35,7 +35,9 @@ WHY = { "호표": "하위 호표 단위 다름 · 같은 하위 둘째", "%": "밑수가 다른 줄 금액 합 아님", } -mm_unit = m01.cm.mf.mp.mm.plain_unit +import master_base as mb # noqa: E402 — 바탕만(855-E 2-E4) + +mm_unit = mb.mp.mm.plain_unit def mark(key: str, no: int) -> str: diff --git a/M02_MasterTemplete/M02_Item_Prices.py b/M02_MasterTemplete/M02_Item_Prices.py index 5581e0dda..f85130025 100644 --- a/M02_MasterTemplete/M02_Item_Prices.py +++ b/M02_MasterTemplete/M02_Item_Prices.py @@ -25,7 +25,8 @@ from typing import Any from M01_MasterData import M01_MasterData_Store as m01 from M02_MasterTemplete import M02_MyMachine as mym # noqa: F401 — Item_Bundle.collect 가 씀 -mf = m01.cm.mf +import master_base as mf # noqa: E402 — 바탕만(855-E 2-E4 · 엔진 몸 안 읽음) · scripts 길은 `m01` 이 둠 + mk = m01.mk mcb = m01.mcb mm = mf.mp.mm # 품셈재료 · 자재품목 후보(`master_material`) diff --git a/M02_MasterTemplete/M02_Labor_Doc.py b/M02_MasterTemplete/M02_Labor_Doc.py index 826c55f5f..8bb2de626 100644 --- a/M02_MasterTemplete/M02_Labor_Doc.py +++ b/M02_MasterTemplete/M02_Labor_Doc.py @@ -36,7 +36,7 @@ import json from decimal import Decimal, InvalidOperation from typing import Any -from M01_MasterData import M01_MasterData_Store as m01 +from M01_MasterData import M01_MasterData_Store as m01 # noqa: F401 — scripts 길을 둠 from M01_MasterData import M01_MasterData_Store_Combo as combo_store from M02_MasterTemplete import M02_Labor_Fixed as fixed from M02_MasterTemplete import M02_Labor_Inputs as labor_inputs @@ -46,7 +46,8 @@ from M02_MasterTemplete import M02_Labor_Spec as spec from M02_MasterTemplete import M02_MasterTemplete_Store as store from M02_MasterTemplete import M02_Material_Own as own -mf = m01.cm.mf +import master_base as mf # noqa: E402 — 바탕만(855-E 2-E4 · 엔진 몸 안 읽음) · scripts 길은 `m01` 이 둠 + mm = mf.mp.mm import master_cut as mcut # noqa: E402 — 끝수(751-3 · 품셈 1-2-2) · scripts 길은 `m01` 이 둠 diff --git a/M02_MasterTemplete/M02_Labor_Fixed.py b/M02_MasterTemplete/M02_Labor_Fixed.py index e7a92e9eb..4e3b521c1 100644 --- a/M02_MasterTemplete/M02_Labor_Fixed.py +++ b/M02_MasterTemplete/M02_Labor_Fixed.py @@ -21,9 +21,9 @@ from __future__ import annotations from decimal import Decimal, InvalidOperation from typing import Any -from M01_MasterData import M01_MasterData_Store as m01 +from M01_MasterData import M01_MasterData_Store as m01 # noqa: F401 — scripts 길을 둠 -mf = m01.cm.mf +import master_base as mf # noqa: E402 — 바탕만(855-E 2-E4 · 엔진 몸 안 읽음) · scripts 길은 `m01` 이 둠 import master_cut as mcut # noqa: E402 — 끝수(751-3) · scripts 길은 `m01` 이 둠 mm = mf.mp.mm diff --git a/M02_MasterTemplete/M02_Logic_Standard.py b/M02_MasterTemplete/M02_Logic_Standard.py index 456f29962..3e53579c5 100644 --- a/M02_MasterTemplete/M02_Logic_Standard.py +++ b/M02_MasterTemplete/M02_Logic_Standard.py @@ -33,7 +33,7 @@ from M01_MasterData import M01_MasterData_Store as m01 from M02_MasterTemplete import M02_Labor_Inputs as labor_inputs from M02_MasterTemplete import M02_Template_Layers as layers -mf = m01.cm.mf +import master_base as mf # noqa: E402 — 바탕만(855-E 2-E4 · 엔진 몸 안 읽음) · scripts 길은 `m01` 이 둠 import master_doc as md # noqa: E402 — scripts 길은 `m01` 이 둠 import master_doc_calc as mc # noqa: E402 import master_doc_link as ml # noqa: E402 @@ -113,7 +113,7 @@ def _table_reps(whole: Any, ref: str, cond: str, unit: str) -> list[tuple[Any, s """표 `ref` 조건 칸 `cond` 줄마다 (값, 글) — 범위 줄은 위 끝(없으면 아래 끝 · 드는 값).""" try: table = whole.get(ref) - except m01.cm.mf.FormulaError: + except mf.FormulaError: return [] ranged = table.get("조건", {}).get(cond) == "범위" out: dict[Any, str] = {} @@ -374,7 +374,7 @@ def sheet(key: str, change: dict) -> dict: files, whole = m01.loaded() try: m01_doc.head(key) # 없는 · 로직 아닌 키 = 옛 `Master.logic` 과 같은 까닭 글 - except m01.cm.mf.FormulaError as e: + except mf.FormulaError as e: raise m01.StoreError(404, str(e)) from e doc = m01_doc.docs()[key] given, ax = _given(whole, doc, change) diff --git a/M02_MasterTemplete/M02_Machine_Hourly.py b/M02_MasterTemplete/M02_Machine_Hourly.py index 5a8c70646..40474ffea 100644 --- a/M02_MasterTemplete/M02_Machine_Hourly.py +++ b/M02_MasterTemplete/M02_Machine_Hourly.py @@ -20,14 +20,15 @@ from __future__ import annotations from typing import Any -import master_machine_crew as mcrew - from M01_MasterData import M01_MasterData_Doc as m01doc from M01_MasterData import M01_MasterData_Store as store from M02_MasterTemplete import M02_Labor_Inputs as li from M02_MasterTemplete import M02_MyMachine as mym cm = store.cm +import master_base as mb # noqa: E402 — 바탕만(855-E 2-E4) · scripts 길은 `store` 가 둠 +import master_machine_crew as mcrew # noqa: E402 + _PLAIN = { "기계", "지역", @@ -184,7 +185,7 @@ def hourly(key: str) -> dict[str, Any]: return {"ok": False, "reason": f"「{key}」 는 기계 아님"} try: row = (whole := mym.whole()).get(key) - except cm.mf.FormulaError as e: + except mb.FormulaError as e: return {"ok": False, "reason": str(e)} if mym.mine(key): return mym.hourly(row, whole) @@ -228,7 +229,7 @@ def doc_sums(row: dict, logic: dict, index: Any) -> dict | None: if not got["셈됨"]: why = got.get("까닭") or " · ".join(m["글"] for m in got["표지"]) or "셈 못 함" return {"ok": False, "reason": why, "로직": logic["키"]} - return {"ok": True, "합": {k: float(got[k]) for k in (*cm.mf.COST_ITEMS, "계")}} + return {"ok": True, "합": {k: float(got[k]) for k in (*mb.COST_ITEMS, "계")}} #: {키: (색인, 줄)} — 색인이 바뀌면 비움 · 꺼낼 때 `is` 확인(옛 색인 주소 재사용 · 옛 값 막음 · 854-1) @@ -241,7 +242,7 @@ def brief(keys: list[str]) -> list[dict[str, Any]]: 마스터를 다시 읽지 않고 색인 위에서 셈 · 색인마다 메모) · 키 · 원문번호로 찾음 · 없는 키 = 뺌.""" from M02_MasterTemplete.M02_Item_Prices import to_json - index, mf = store.loaded()[1], cm.mf + index, mf = store.loaded()[1], mb # ponytail: 통째 비움 · 기계 수(655)의 세 배 if _BRIEF_OF[0] is not index or len(_BRIEF) > 2000: _BRIEF.clear() @@ -273,7 +274,7 @@ def combo(main: str, part: str) -> tuple[str, str] | None: (GC000270 · 271) 고르기에 있을 때만 · 부착 기계 줄은 제 시간당(손료만).""" try: codes = [str(store.loaded()[1].get(k).get("원문번호") or "") for k in (main, part)] - except cm.mf.FormulaError: + except mb.FormulaError: return None rows = _rows() fits = any(