Merge remote-tracking branch 'origin/dev' into sub_laptop_1

This commit is contained in:
2026-11-15 13:58:57 +09:00
29 changed files with 2045 additions and 20 deletions
+20 -2
View File
@@ -26,6 +26,9 @@ from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_MyMachine_Draft as draft
from M02_MasterTemplete import M02_Sangeun_Copy as skc
from M02_MasterTemplete import M02_Sangeun_Doc as sd
from M02_MasterTemplete import M02_Sk_AutoRenew as renew
import master_doc_cover as mcv # noqa: E402 — 기계 덮음(836-1 · scripts 길 = dc)
MAX = 2_000_000 # 문서 글 크기(바이트) 상한
JOBS = (skc.PRICE, skc.REGEN)
@@ -78,7 +81,7 @@ def answer(copy: dict, sk: dict) -> dict[str, Any]:
"""{문서, 부름, 끊음, 셈, 사본 표지, 연결 기록} — 글 · 수는 JSON 꼴 · 가져온 식 표지 = 단가기준."""
got = dsk.run(sk, copy)
head = {k: copy.get(k) for k in ("시점", "단가시점")}
mark = {**head, "따로": bool(copy.get("따로"))}
mark = {**head, "따로": bool(copy.get("따로")), "자동": renew.on()} # 836-2 M01 자동 따라옴
mark |= (
{"단가기준": dim.basis_of(sk)}
if dim.is_imported(sk)
@@ -98,7 +101,9 @@ def answer(copy: dict, sk: dict) -> dict[str, Any]:
def read(key: str) -> dict[str, Any]:
"""읽기 — {문서, 부름, 끊음, 셈, 사본, 판}."""
got = _file(key)
return {**answer(current(got["문서"]), got["문서"]), "판": got["판"]}
out = {**answer(current(got["문서"]), got["문서"]), "판": got["판"]}
out["사본"]["갱신"] = renew.notes(got["문서"]) # 836-2 열 때 알림(지울 고침)
return out
def read_memory(sk: Any) -> dict[str, Any]:
@@ -148,10 +153,23 @@ def edited(copy: dict, body: dict, key: str, sk: dict | None = None) -> dict:
*dc.calls(out["문서"]),
*(c for d in out.get("끊음", {}).values() for c in dc.calls(d)),
]
try: # 기계 덮음(836-1) — 몸 검사 · 원본과 같은 칸 · 안 부르는 기계 뺌(가져온 식 = 검사만)
if dim.is_imported(sk):
got = mcv.clean(out["문서"].get(mcv.COVER))
rest = {k: v for k, v in out["문서"].items() if k != mcv.COVER}
out["문서"] = {**rest, mcv.COVER: got} if got else rest
except ValueError as e:
raise _bad(str(e)) from e
if not dim.is_imported(sk):
out["부름"] = dc.closure(dc.over(out), calls, copy.get("부름"))
try:
out["문서"] = mcv.prune_doc(out["문서"], dc.ml.Links(dc.over(out), dc.docs_of(out)))
except ValueError as e:
raise _bad(str(e)) from e
out = gap.fill(out) # 셈이 읽은 줄 가운데 사본 없는 것 = 지금 값으로 박음(822-1)
out = draft.renew(out) # 기계 창 초안으로 만든 · 고친 내 기계 = 새 값(827-1)
if not copy.get("따로"): # 고침 판정 원본(836-2) = 따로가 되기 전 문서
out[renew.FIRST] = copy["문서"]
out["따로"] = True
return out