diff --git a/old_code/B09_Estimation/B09_Estimation_UnitPrice.py b/old_code/B09_Estimation/B09_Estimation_UnitPrice.py index 9c06a591..1a50e0a2 100644 --- a/old_code/B09_Estimation/B09_Estimation_UnitPrice.py +++ b/old_code/B09_Estimation/B09_Estimation_UnitPrice.py @@ -500,19 +500,23 @@ def _add_machine_layers( @lru_cache(maxsize=1) def load_basis_missing( - file_name: str = "2_공종_산림_밑수없음_2026-01-01.json", + file_name: str = "기준수량없음_산림품셈_2026-01-01.json", ) -> dict[str, str]: """B08 이 낸 **밑수 못 찾은 표** 목록 — `{표 번호: 절 이름}`. 「10㎡당」 같은 기준을 원문에서 못 찾은 표다. 1 단위당으로 단정하면 곱셈이 10배·100배 틀리므로(떼채취가 실제로 100배였다) 그 표를 쓰는 공종은 **금액을 안 만든다**. + + 2026-09-22 — old/ 스냅샷 대신 최상위 마스터로 옮김(PLAN 7-5 ⑤ · 브레인 판정). + ⚠ `root` 계산이 파일이 `old_code/` 로 옮겨진 뒤(PLAN 7-3) 한 단 부족해 있었음 — + 조용히 빈 딕셔너리를 돌려주던 것을 여기서 같이 바로잡음(3단 위가 프로젝트 뿌리). """ import json import os - root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - path = os.path.join(root, "resources", "master_data", "old", file_name) + root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + path = os.path.join(root, "resources", "master_data", file_name) if not os.path.exists(path): return {} with open(path, encoding="utf-8") as handle: diff --git a/common_util/common_util_aliases.py b/old_code/common_util/common_util_aliases.py similarity index 99% rename from common_util/common_util_aliases.py rename to old_code/common_util/common_util_aliases.py index 119d8aef..b6d3a1e1 100644 --- a/common_util/common_util_aliases.py +++ b/old_code/common_util/common_util_aliases.py @@ -22,10 +22,10 @@ from pathlib import Path from typing import Any ALIAS_FILE = ( - Path(__file__).resolve().parents[1] + Path(__file__).resolve().parents[2] / "resources" / "master_data" - / "ref" + / "old" / "공종_자원별칭_실무_2026-01-01.json" ) AXES = frozenset({"resource", "variant"}) diff --git a/common_util/common_util_work_item_key.py b/old_code/common_util/common_util_work_item_key.py similarity index 97% rename from common_util/common_util_work_item_key.py rename to old_code/common_util/common_util_work_item_key.py index d5e7e531..48a1d1a7 100644 --- a/common_util/common_util_work_item_key.py +++ b/old_code/common_util/common_util_work_item_key.py @@ -20,7 +20,7 @@ from functools import lru_cache from pathlib import Path from typing import Any, Iterable -MASTER_DIR = Path(__file__).resolve().parent.parent / "resources" / "master_data" / "old" +MASTER_DIR = Path(__file__).resolve().parent.parent.parent / "resources" / "master_data" / "old" #: 우리가 세운 공종·구조물 — 난수 코드가 곧 불변 열쇠 _STABLE_CODE = re.compile(r"^AX-(?:WK|ST)-[0-9a-f]{8}$") diff --git a/common_util/common_util_work_item_link.py b/old_code/common_util/common_util_work_item_link.py similarity index 97% rename from common_util/common_util_work_item_link.py rename to old_code/common_util/common_util_work_item_link.py index a86783e6..5c22ab86 100644 --- a/common_util/common_util_work_item_link.py +++ b/old_code/common_util/common_util_work_item_link.py @@ -19,7 +19,7 @@ from functools import lru_cache from pathlib import Path from typing import Any -FOLDER = Path(__file__).resolve().parent.parent / "resources" / "master_data" / "old" +FOLDER = Path(__file__).resolve().parent.parent.parent / "resources" / "master_data" / "old" CONFIRMED = "확정" #: 표 `policy.both_precedence` 낱말 → 그 행의 열쇠 칸 _KEY_COLUMN = {"forest": "forest_key", "construction": "const_key"} diff --git a/resources/tester/test_b08_root_removal_excavator.py b/old_code/resources/tester/test_b08_root_removal_excavator.py similarity index 100% rename from resources/tester/test_b08_root_removal_excavator.py rename to old_code/resources/tester/test_b08_root_removal_excavator.py diff --git a/resources/tester/test_b09_fuel_kind_vibrator.py b/old_code/resources/tester/test_b09_fuel_kind_vibrator.py similarity index 100% rename from resources/tester/test_b09_fuel_kind_vibrator.py rename to old_code/resources/tester/test_b09_fuel_kind_vibrator.py diff --git a/resources/master_data/ref/_열목록_화면표.csv b/resources/master_data/old/_열목록_화면표.csv similarity index 100% rename from resources/master_data/ref/_열목록_화면표.csv rename to resources/master_data/old/_열목록_화면표.csv diff --git a/resources/master_data/_원문목록.json b/resources/master_data/old/_원문목록.json similarity index 100% rename from resources/master_data/_원문목록.json rename to resources/master_data/old/_원문목록.json diff --git a/resources/master_data/ref/공종_수량연결_실무_2026-01-01.json b/resources/master_data/old/공종_수량연결_실무_2026-01-01.json similarity index 100% rename from resources/master_data/ref/공종_수량연결_실무_2026-01-01.json rename to resources/master_data/old/공종_수량연결_실무_2026-01-01.json diff --git a/resources/master_data/ref/공종_자원별칭_실무_2026-01-01.json b/resources/master_data/old/공종_자원별칭_실무_2026-01-01.json similarity index 100% rename from resources/master_data/ref/공종_자원별칭_실무_2026-01-01.json rename to resources/master_data/old/공종_자원별칭_실무_2026-01-01.json diff --git a/resources/master_data/ref/수량_구조물원단위_울진_2026-01-01.json b/resources/master_data/old/수량_구조물원단위_울진_2026-01-01.json similarity index 100% rename from resources/master_data/ref/수량_구조물원단위_울진_2026-01-01.json rename to resources/master_data/old/수량_구조물원단위_울진_2026-01-01.json diff --git a/resources/master_data/ref/수량_돌쌓기찰라이브러리_소광리_2026-01-01.json b/resources/master_data/old/수량_돌쌓기찰라이브러리_소광리_2026-01-01.json similarity index 100% rename from resources/master_data/ref/수량_돌쌓기찰라이브러리_소광리_2026-01-01.json rename to resources/master_data/old/수량_돌쌓기찰라이브러리_소광리_2026-01-01.json diff --git a/resources/master_data/ref/품셈_산림_돌종류계수_울진_2026-01-01.json b/resources/master_data/old/품셈_산림_돌종류계수_울진_2026-01-01.json similarity index 100% rename from resources/master_data/ref/품셈_산림_돌종류계수_울진_2026-01-01.json rename to resources/master_data/old/품셈_산림_돌종류계수_울진_2026-01-01.json diff --git a/resources/master_data/ref/품셈_산림_재료할증_울진_2026-01-01.json b/resources/master_data/old/품셈_산림_재료할증_울진_2026-01-01.json similarity index 100% rename from resources/master_data/ref/품셈_산림_재료할증_울진_2026-01-01.json rename to resources/master_data/old/품셈_산림_재료할증_울진_2026-01-01.json diff --git a/resources/master_data/scripts/check_master.py b/resources/master_data/scripts/check_master.py index 6f2193b2..264b402a 100644 --- a/resources/master_data/scripts/check_master.py +++ b/resources/master_data/scripts/check_master.py @@ -62,6 +62,8 @@ DIVISIONS = { _FILE = re.compile( rf"^(?:(인력|기계)|({'|'.join(mf.GROUPS)})_({'|'.join(BOOKS)})(?:_(\d\d)장_(.+))?)\.json$" ) +#: 8장 틀에 안 맞는 특수 최상위 파일(표·요소가 아닌 다른 모양) — 틀 검사에서 뺌(PLAN 7-5 ⑤). +SPECIAL_FILES = {"기준수량없음_산림품셈_2026-01-01.json"} _SOURCE = re.compile( rf"^(?:자체|(?:{'|'.join(b for b in BOOKS if b not in ('건설품셈', '자체'))})(?:\s\S.*)?|건설품셈 (?:{'|'.join(DIVISIONS)}) \S.*)$" ) @@ -253,6 +255,8 @@ def check_combo_form(name: str, data: dict) -> list[str]: def check_form(name: str, data: dict) -> list[str]: if name == mcb.FILE: return check_combo_form(name, data) + if name in SPECIAL_FILES: + return [] m = _FILE.match(name) if not m: return [ diff --git a/resources/master_data/old/2_공종_산림_밑수없음_2026-01-01.json b/resources/master_data/기준수량없음_산림품셈_2026-01-01.json similarity index 100% rename from resources/master_data/old/2_공종_산림_밑수없음_2026-01-01.json rename to resources/master_data/기준수량없음_산림품셈_2026-01-01.json