diff --git a/M02_MasterTemplete/M02_San_Book.py b/M02_MasterTemplete/M02_San_Book.py index e11fe2f4c..027b518d5 100644 --- a/M02_MasterTemplete/M02_San_Book.py +++ b/M02_MasterTemplete/M02_San_Book.py @@ -152,14 +152,6 @@ def flat(s: Any) -> str: return re.sub(r"\s+", "", str(s or "")) -def _hcol(rows: list[list[Any]], word: str, start: int = 2) -> int | None: - for r in rows[start : start + 2]: - for j, v in enumerate(r): - if flat(v) == word: - return j - return None - - def _n(v: Any) -> float | None: if isinstance(v, (int, float)): return float(v) @@ -192,51 +184,3 @@ def applied_how(r: list[Any]) -> tuple[dict[str, float], str | None]: return got, None # 쓸 값이 없음 — 표지할 것 없음 why = "적용 칸 합이 안 맞음" if a["T"] else "적용 칸 비어 있음" return got, f"당초 칸 사용 — {why}" + (f" ({gap})" if gap else "") - - -def applied(r: list[Any]) -> dict[str, float]: - return applied_how(r)[0] - - -def est_prices(book: dict[str, list]) -> tuple[list[dict[str, Any]], dict[int, dict[str, Any]]]: - """→ (단가 목록 [{종류, 이름, 규격, 비목, 값}], 산근 총괄 {번: {T, L, M, S, 이름, 규격}}).""" - out: list[dict[str, Any]] = [] - lab = book.get("노임단가", []) - c = _hcol(lab, "적용단가") - for r in lab[3:]: - if c is not None and len(r) > c and r[2] and isinstance(r[c], (int, float)): - out.append( - {"종류": "노임", "이름": flat(r[2]), "규격": "", "비목": "L", "값": float(r[c])} - ) - mat = book.get("자재단가", []) - c = _hcol(mat, "적용단가") - for r in mat[4:]: - if c is not None and len(r) > c and r[2] and isinstance(r[c], (int, float)): - out.append( - { - "종류": "자재", - "이름": flat(r[2]), - "규격": flat(r[3]), - "비목": "M", - "값": float(r[c]), - } - ) - for sheet, kind in (("기계경비총괄표", "기계"), ("견적단가", "견적")): - for r in book.get(sheet, [])[3:]: - if len(r) > 28 and r[2]: - for k, v in applied(r).items(): - if isinstance(v, (int, float)) and (v or k != "T"): - one = {"종류": kind, "이름": flat(r[2]), "규격": flat(r[3])} - out.append({**one, "비목": k, "값": float(v or 0)}) - san: dict[int, dict[str, Any]] = {} - for r in book.get("단가산출총괄표", [])[3:]: - if len(r) > 28 and str(r[1]).strip().isdigit(): - n = int(str(r[1]).strip()) - got, note = applied_how(r) - san[n] = {k: float(v or 0) for k, v in got.items()} - san[n] |= {"이름": flat(r[2]), "규격": flat(r[3]), "칸": note} - for k in "TLMS": - if san[n][k] or k != "T": - one = {"종류": "산근", "이름": f"단산{n}", "규격": ""} - out.append({**one, "비목": k, "값": san[n][k]}) - return out, san diff --git a/M02_MasterTemplete/M02_San_MatPick.py b/M02_MasterTemplete/M02_San_MatPick.py index 2b03c7dbc..e5ec2794a 100644 --- a/M02_MasterTemplete/M02_San_MatPick.py +++ b/M02_MasterTemplete/M02_San_MatPick.py @@ -139,12 +139,6 @@ def chosen(item: dict) -> dict | None: return got if got and not _apart(res) else None -def item_key(res: dict) -> str | None: - """줄 품목 키 — 고름 › 엔진 이음.""" - found = res.get("재료찾기") or {} - return (found.get("고름") or {}).get("키") or found.get("키") - - def apart_note(found: dict) -> str: """별도계상 줄 설명 — 품목이 있으면 「별도계상 · 품목: 이름 규격」.""" from M02_MasterTemplete import M02_San_Link as link diff --git a/M02_MasterTemplete/M02_San_Stmate.py b/M02_MasterTemplete/M02_San_Stmate.py index 89cde2e67..b8f8c8086 100644 --- a/M02_MasterTemplete/M02_San_Stmate.py +++ b/M02_MasterTemplete/M02_San_Stmate.py @@ -182,10 +182,3 @@ def parse_line(g: str | None) -> dict[str, Any]: if refs: return {**head, **_ref_line(st, refs[0])} return {**head, **_assign_line(st)} - - -def parse_block(lines: list[dict[str, Any]]) -> list[dict[str, Any]]: - """[{행, G}] → 줄 나무 목록(행 · 원문 붙임).""" - return [ - {"행": ln.get("행"), "글": ln.get("G") or "", **parse_line(ln.get("G"))} for ln in lines - ] diff --git a/M02_MasterTemplete/M02_San_Xlsx.py b/M02_MasterTemplete/M02_San_Xlsx.py index abb69a007..56d77e2cc 100644 --- a/M02_MasterTemplete/M02_San_Xlsx.py +++ b/M02_MasterTemplete/M02_San_Xlsx.py @@ -122,7 +122,7 @@ def _table(rows: list[list[Any]], price: tuple[str, ...]) -> list[dict[str, Any] def resources(sheets: dict[str, list]) -> dict[str, list[dict[str, Any]]]: """같은 책 단가표 → {종류: [{번 · 이름 · 규격 · 단위 · 표 · 값 {T L M S}}]}(노임 · 자재 = 적용단가 · - 기계 · 견적 · 산근 = 적용 칸(합이 안 맞으면 당초 · `M02_San_Book.applied`)).""" + 기계 · 견적 · 산근 = 적용 칸(합이 안 맞으면 당초 · `M02_San_Book.applied_how`)).""" out: dict[str, list[dict[str, Any]]] = {} for kind, sheet, comp in (("노임", "노임단가", "L"), ("자재", "자재단가", "M")): rows = sheets.get(sheet) or [] diff --git a/M02_MasterTemplete/M02_Sangeun_Imported.py b/M02_MasterTemplete/M02_Sangeun_Imported.py index 61ee815a2..951f94479 100644 --- a/M02_MasterTemplete/M02_Sangeun_Imported.py +++ b/M02_MasterTemplete/M02_Sangeun_Imported.py @@ -561,7 +561,8 @@ def create( new: bool = False, use: str | None = None, ) -> dict[str, Any]: # fmt: skip """엔진 로직 줄 + 원본 → 지금 층 새 가져온 식 SK — 서버가 다시 셈해 엑셀과 맞댐(검산 · - 다르면 `같음` False 로 표지 · 막지 않음) · 같은 층 같은 내용 = 409(`ask` · 733-2).""" + 다르면 `같음` False 로 표지 · 막지 않음) · 같은 층 같은 내용 = 409(`ask` · 733-2) · + 서버 길(POST sangeun/imported)은 853-3 에서 걷음 — 시험이 가져온 식 SK 바탕으로 씀.""" return keep(new_doc(logic, source, name, unit, head), new, use) diff --git a/M02_MasterTemplete/M02_Sangeun_Router.py b/M02_MasterTemplete/M02_Sangeun_Router.py index d030ffa44..7040427e0 100644 --- a/M02_MasterTemplete/M02_Sangeun_Router.py +++ b/M02_MasterTemplete/M02_Sangeun_Router.py @@ -1,6 +1,6 @@ """M02 단가산출(SK) 셈 길(PLAN 715-1b) — `POST /api/m02/layers/{층}/sangeun/calc` · 일위대가 [+ 줄] M01 기초 = 그 층 SK 사본(811-1 · `M02_Labor_SkRow`) `…/sangeun/from-logic`(층 쓰기) · -가져온 식(793-2 · `M02_Sangeun_Imported`) `…/sangeun/imported`(만들기 · 층 쓰기) · `/price` · +가져온 식(793-2 · `M02_Sangeun_Imported`) `…/sangeun/imported/price` · `/link`(화면 캐시 문서 고침 · 저장 없음 · 층 읽기 · 기초로 바꾸기 없음 · 809-1) · 불러오기 단산 블록 → 가져온 식(793-3b · `M02_Sangeun_FromHopyo`) `…/sangeun/from-hopyo` (늘 개인 층 쓰기 · 몸 `문서` = 미리 보기에서 고친 문서) · 미리 보기 `…/from-hopyo/preview`(층 읽기 · 안 씀 · 835-1). @@ -81,31 +81,6 @@ def calc_sangeun( return _call(_root(session, layer, owner), _calc, body) -class ImportedBody(BaseModel): - 로직: dict[str, Any] - 원본: dict[str, Any] | None = None - 이름: str = "" - 단위: str = "" - 구분: str = "" - 상세구분: str = "" - 새로: bool = False - 씀: str | None = None - - -@router.post("/layers/{layer}/sangeun/imported") -def sangeun_imported( - layer: Layer, - body: ImportedBody, - owner: str | None = None, - session: Session = Depends(verify_session), -) -> dict: - """가져온 식 단가산출 만들기(793-2) — 답 = {이름, 검산, 단가기준} · 같은 내용 409.""" - folder = _root(session, layer, owner, write=True) - head = {"구분": body.구분, "상세구분": body.상세구분} - args = (body.로직, body.원본, body.이름, body.단위, head, body.새로, body.씀) - return _call(folder, _sd(imp.create), *args) - - class FromHopyoBody(BaseModel): 층: Layer 주인: str | None = None diff --git a/resources/tester/test_793_2_san_emit.py b/resources/tester/test_793_2_san_emit.py index c06984c6a..4c018f4a0 100644 --- a/resources/tester/test_793_2_san_emit.py +++ b/resources/tester/test_793_2_san_emit.py @@ -26,6 +26,12 @@ mf = importlib.import_module("master_formula") mcut = importlib.import_module("master_cut") ms = importlib.import_module("master_formula_sum") + +def _nodes(rows): + """[{행, G}] → 줄 나무(옛 `San_Stmate.parse_block` 꼴 · 지금 길 = `Doc_FromNative._emit` 이 줄마다 `parse_line`).""" + return [{"행": r.get("행"), "글": r.get("G") or "", **stm.parse_line(r.get("G"))} for r in rows] + + STMATE = { # 파일: (블록, 금액 줄, 계표시 줄, 끝전) "봉화": (62, 349, 184, "비목버림"), "동부청영월": (69, 411, 230, "합버림_큰나머지"), @@ -72,7 +78,7 @@ def _load(tag: str) -> dict: def _stmate(tag: str, blk: dict) -> tuple[list, dict]: - nodes = stm.parse_block(blk["몸"]) + nodes = _nodes(blk["몸"]) return nodes, em.stmate(blk, nodes, _load(tag)["단가"], STMATE[tag][3]) @@ -150,7 +156,7 @@ def test_link_keys_m01() -> None: """호표 줄 = 793-2 꼴(종류 · 단가 · 이음 = 1차 줄 판정 M01 키) · 덧칸 자원 · 원본.""" tag = "봉화" blk = next(b for b in _load(tag)["블록"] if b["코드"] == "D00102") - out = em.stmate(blk, stm.parse_block(blk["몸"]), _load(tag)["단가"], "비목버림", True) + out = em.stmate(blk, _nodes(blk["몸"]), _load(tag)["단가"], "비목버림", True) labor = next(x for x in out["로직"]["호표"] if x["이름"] == "보통인부") assert {k: v for k, v in labor.items() if k != "자원"} == { "이름": "보통인부", @@ -207,7 +213,7 @@ def test_stmate_grammar_sample_engine() -> None: "'뒤 인부' &L00007& * 0.01 =", ] rows = [{"행": i, "G": g} for i, g in enumerate(text)] - nodes = stm.parse_block(rows) + nodes = _nodes(rows) block = {"코드": "D00001", "이름": "견본", "꼬리": [], "몸": rows} block["머리"] = {"A": "", "B": "", "C": 0, "D": 0, "E": 0, "F": 0} out = em.stmate(block, nodes, prices, "비목버림") diff --git a/resources/tester/test_797_1a_import_flags.py b/resources/tester/test_797_1a_import_flags.py index dbed88327..82c1bebc9 100644 --- a/resources/tester/test_797_1a_import_flags.py +++ b/resources/tester/test_797_1a_import_flags.py @@ -24,6 +24,11 @@ NOTE = em.NOTE DOCS = golden.DOCS +def _nodes(rows): + """[{행, G}] → 줄 나무(옛 `San_Stmate.parse_block` 꼴 · 지금 길 = `Doc_FromNative._emit` 이 줄마다 `parse_line`).""" + return [{"행": r.get("행"), "글": r.get("G") or "", **stm.parse_line(r.get("G"))} for r in rows] + + def notes(out: dict) -> list[str]: return [m for m in out["원본"]["표지"] if NOTE in m] @@ -60,7 +65,7 @@ def test_applied_or_first_column_is_flagged() -> None: ) nothing = book.applied_how(_row((None,) * 4, (0, 0, 0, 0))) assert nothing[1] is None # 쓸 값이 없는 줄 - assert book.applied(_row((100, 40, 30, 30), (90, 40, 30, 20)))["T"] == 100 + assert book.applied_how(_row((100, 40, 30, 30), (90, 40, 30, 20)))[0]["T"] == 100 def test_first_column_note_reaches_block_flags() -> None: @@ -88,7 +93,7 @@ def _stmate_out(meta: dict) -> dict: rows = [{"행": 0, "G": "'보통인부' &L00007& * 1 :=A01"}] block = {"코드": "D00001", "이름": "견본", "꼬리": [], "몸": rows} block["머리"] = {"A": "", "B": "", "C": 0, "D": 0, "E": 0, "F": 0} - return em.stmate(block, stm.parse_block(rows), prices, "비목버림") + return em.stmate(block, _nodes(rows), prices, "비목버림") def test_adjust_ratio_and_bid_rate_are_flagged() -> None: diff --git a/resources/tester/test_827_3_material_pick.py b/resources/tester/test_827_3_material_pick.py index 43e2ce09a..a33662718 100644 --- a/resources/tester/test_827_3_material_pick.py +++ b/resources/tester/test_827_3_material_pick.py @@ -173,7 +173,6 @@ def test_apart_item_zero(world) -> None: var = _var(conv, e["기호"]) assert e["별도계상"] and var["연결"]["갈래"] == "숫자" assert f"별도계상 · 품목: {gov['이름']} {gov['규격']} · 셈은 프로젝트에서" in var["설명"] - assert mp.item_key(mine["자원"]) == gov["키"] assert skpath.read(got["이름"])["셈"] == skpath.read(plain["이름"])["셈"] # 이미 만든(고름 전) SK 에 물음 예 = 품목 설명만 · 단가 0 그대로 money = skpath.read(plain["이름"])["셈"]