Merge remote-tracking branch 'origin/main_desktop_1' into sub_laptop_2

M02_MasterTemplete/M02_Item_Snapshot.py

@@ -28,7 +28,7 @@ from typing import Any
 from B05_Profile.B05_Profile_Structures_Repository import load_structures
 from common_util.common_util_drainage_pipes import pipe_points_path_in, read_pipe_points_file
 from common_util.common_util_json import atomic_write_json
-from common_util.common_util_summary_item import snapshot_folder_name
+from common_util.common_util_summary_item import GROUP_JOIN, snapshot_folder_name
 from M02_MasterTemplete import M02_Template_Layers as layers
 from M02_MasterTemplete.M02_Item_Source import (
     LABOR_FILE,
@@ -48,8 +48,11 @@ MANIFEST_NAME = "manifest.json"
 VALUES_FILE = "입력값.json"  # {로직키: {입력이름: {값, 확인}}}
 PICKS_FILE = "고른자재.json"  # {로직키: {호표 차례: MT키}}
 LOCAL_FILES = (VALUES_FILE, PICKS_FILE)
-#: 복사본 폴더 이름 — 구조물 id(영문 · 숫자 · `_` `-`) 또는 `pipe@측점`
-FOLDER_PATTERN = re.compile(r"^(?:pipe@\d+(?:\.\d+)?|[0-9A-Za-z][0-9A-Za-z_-]*)$")
+#: 복사본 폴더 이름 — 구조물 id(영문 · 숫자 · `_` `-`) 또는 `pipe@측점` · 옵션 그룹(PLAN 46)은
+#: 뒤에 `__{그룹 id}`
+FOLDER_PATTERN = re.compile(
+    r"^(?:pipe@\d+(?:\.\d+)?(?:__g[0-9a-z]{1,16})?|[0-9A-Za-z][0-9A-Za-z_-]*)$"
+)
 
 
 def structures_dir(project_root: str | Path) -> Path:
@@ -130,15 +133,22 @@ def write_snapshot(target: Path, item: dict[str, Any], owner_id: str, extra: dic
 
 
 def assignments(project_root: str | Path) -> dict[str, dict[str, Any]]:
-    """`{구조물 id: 항목}` — 구조물 정본 + 관 지점 정본(id = `pipe@측점`) · 지정한 것만."""
+    """`{구조물 id: 항목}` — 구조물 정본 + 관 지점 정본(id = `pipe@측점`) · 지정한 것만 ·
+    옵션 그룹(PLAN 46)에 고른 항목은 `{구조물 id}__{그룹 id}` 로 따로(복사본도 따로)."""
     found: dict[str, dict[str, Any]] = {}
     _, structures = load_structures(str(project_root))
-    for index, structure in enumerate(structures):
-        if structure.summary_item:
-            found[structure.structure_id or f"#{index}"] = structure.summary_item
-    for point in read_pipe_points_file(pipe_points_path_in(Path(project_root))):
-        if point.summary_item:
-            found[f"pipe@{round(float(point.chainage_m), 3)}"] = point.summary_item
+    owners: list[tuple[str, Any]] = [
+        (s.structure_id or f"#{index}", s) for index, s in enumerate(structures)
+    ]
+    owners += [
+        (f"pipe@{round(float(p.chainage_m), 3)}", p)
+        for p in read_pipe_points_file(pipe_points_path_in(Path(project_root)))
+    ]
+    for owner, record in owners:
+        if record.summary_item:
+            found[owner] = record.summary_item
+        for gid, item in (record.group_items or {}).items():
+            found[f"{owner}{GROUP_JOIN}{gid}"] = item
     return found
 
 

M02_MasterTemplete/M02_Table_Fill.py

@@ -110,6 +110,7 @@ def collect_items(
                 "options": _with_defaults(definition, dict(item.options or {})),
                 "summary_item": item.summary_item,
                 "복사본": item.structure_id or f"#{index}",
+                "group_items": item.group_items,
             }
         )
     for point in read_pipe_points_file(pipe_points_path_in(Path(project_root))):
@@ -126,9 +127,34 @@ def collect_items(
                 "관연장": _nearest(lengths, chainage) if type_id == "pipe" else None,
                 "summary_item": point.summary_item,
                 "복사본": f"pipe@{round(chainage, 3)}",
+                "group_items": point.group_items,
             }
         )
-    return items
+    return _with_group_items(items)
+
+
+def _with_group_items(items: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """옵션 그룹(M02 PLAN 46)마다 한 건 더 — 같은 구조물 · 옵션 · 자리에 그 그룹이 고른 항목 ·
+    복사본 `{구조물 id}__{그룹 id}`. 정의된 그룹만(미지정 그룹 = 「미지정」 알림에 셈) · 정의가 사라진
+    그룹 연결은 기록에만 남고 표에 안 들어감."""
+    from common_util.common_util_summary_item import GROUP_JOIN
+    from M02_MasterTemplete.StructOptions.M02_SO_Groups import groups_of
+
+    defined = groups_of()
+    out: list[dict[str, Any]] = []
+    for item in items:
+        links = item.pop("group_items", None) or {}
+        out.append(item)
+        for group in defined.get(item["type_id"], []):
+            out.append(
+                {
+                    **item,
+                    "summary_item": links.get(group["id"]),
+                    "복사본": f"{item['복사본']}{GROUP_JOIN}{group['id']}",
+                    "그룹": group["name"],
+                }
+            )
+    return out
 
 
 # ── 값 · 글 ───────────────────────────────────────────