유형 B 파이프라인 연결: block_assembler type B 조립 + zone 기반 전환 시작
- block_assembler: _assemble_slide_html_type_b 추가 (filled/after용 HTML 생성) - fit_verifier: redistribute()가 ROLE_ZONE_MAP 대신 containers zone 사용 - renderer: render_slide_from_html()에 zone 기반 높이 탐색 추가 - pipeline: 팝업 HTML CSS를 콘텐츠 유형별(table/list/text) 분기 - run_from_stage1b: MDX 파일 하드코딩 제거 + layout_template 전달 추가 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -367,7 +367,15 @@ def assemble_slide_html(ctx: "PipelineContext", title_text: str = "") -> str:
|
||||
"""전체 슬라이드를 조립하여 HTML 반환.
|
||||
|
||||
filled, assembled, stage_2 모두 이 함수를 호출.
|
||||
layout_template에 따라 유형 A/B 분기.
|
||||
"""
|
||||
if ctx.analysis.layout_template == "B":
|
||||
return _assemble_slide_html_type_b(ctx, title_text)
|
||||
return _assemble_slide_html_type_a(ctx, title_text)
|
||||
|
||||
|
||||
def _assemble_slide_html_type_a(ctx: "PipelineContext", title_text: str = "") -> str:
|
||||
"""유형 A 전체 슬라이드 조립 (기존 코드 그대로)."""
|
||||
from src.fit_verifier import _load_design_tokens
|
||||
tokens = _load_design_tokens()
|
||||
pad = tokens["spacing_page"]
|
||||
@@ -443,3 +451,378 @@ body{{background:#e5e5e5;padding:10px;font-family:'Pretendard Variable','Noto Sa
|
||||
{role_htmls.get("결론", "")}</div>
|
||||
|
||||
</div></body></html>"""
|
||||
|
||||
|
||||
def _assemble_slide_html_type_b(ctx: "PipelineContext", title_text: str = "") -> str:
|
||||
"""유형 B 전체 슬라이드 조립: 상단(top+이미지) + 하단 2분할 + 결론.
|
||||
|
||||
assemble_stage2._assemble_type_b의 로직을 PipelineContext 기반으로 통합.
|
||||
filled/after 파이프라인에서 호출되어 Selenium 측정 가능한 HTML 생성.
|
||||
"""
|
||||
from src.fit_verifier import _load_design_tokens
|
||||
tokens = _load_design_tokens()
|
||||
pad = tokens["spacing_page"]
|
||||
header_h = tokens.get("header_height", 66)
|
||||
gap_block = tokens["spacing_block"]
|
||||
gap_small = tokens["spacing_small"]
|
||||
slide_w = tokens.get("slide_width", 1280)
|
||||
slide_h = tokens.get("slide_height", 720)
|
||||
inner_w = slide_w - pad * 2
|
||||
|
||||
ps = ctx.page_structure.roles
|
||||
enh = ctx.enhancement_result or {}
|
||||
bold_kw = enh.get("bold_keywords", {}) if isinstance(enh.get("bold_keywords"), dict) else {}
|
||||
font_h = ctx.font_hierarchy
|
||||
font_size = font_h.core
|
||||
title = title_text or ctx.analysis.title or ""
|
||||
core_message = ctx.analysis.core_message or ""
|
||||
slide_images = ctx.slide_images or []
|
||||
norm_sections = ctx.normalized.sections or []
|
||||
|
||||
# ── zone별 역할 분류 ──
|
||||
top_role = None
|
||||
bottom_left_role = None
|
||||
bottom_right_role = None
|
||||
footer_role = None
|
||||
|
||||
for role_name, info in ps.items():
|
||||
if not isinstance(info, dict):
|
||||
continue
|
||||
zone = info.get("zone", "")
|
||||
if zone == "top":
|
||||
top_role = (role_name, info)
|
||||
elif zone == "bottom_left":
|
||||
bottom_left_role = (role_name, info)
|
||||
elif zone == "bottom_right":
|
||||
bottom_right_role = (role_name, info)
|
||||
elif zone == "footer":
|
||||
footer_role = (role_name, info)
|
||||
|
||||
# ── 좌표 계산 (containers에서 동적으로) ──
|
||||
footer_ci = ctx.containers.get(footer_role[0]) if footer_role else None
|
||||
footer_h_px = footer_ci.height_px if footer_ci else 53
|
||||
ft_top = slide_h - pad - footer_h_px
|
||||
|
||||
top_ci = ctx.containers.get(top_role[0]) if top_role else None
|
||||
top_h = top_ci.height_px if top_ci else 200
|
||||
top_top = pad + header_h + gap_block
|
||||
|
||||
# 이미지: block_constraints 또는 slide_images에서 판단
|
||||
img_constraints = top_ci.block_constraints if top_ci else {}
|
||||
img_w = img_constraints.get("img_width_px", 0)
|
||||
has_image = img_constraints.get("has_image", False)
|
||||
# block_constraints에 has_image가 없어도 slide_images에 b64가 있으면 사용
|
||||
if not has_image and slide_images:
|
||||
has_image = any(img.get("b64") for img in slide_images)
|
||||
if has_image and img_w <= 0:
|
||||
# 이미지 폭: top_h * ratio, 최대 45%
|
||||
first_img = next((img for img in slide_images if img.get("b64")), None)
|
||||
if first_img:
|
||||
img_ratio = first_img.get("ratio", 1)
|
||||
img_w = min(int(top_h * img_ratio), int(inner_w * 0.45))
|
||||
|
||||
img_h = 0
|
||||
img_html = ""
|
||||
if has_image and slide_images:
|
||||
for img in slide_images:
|
||||
b64 = img.get("b64", "")
|
||||
if b64:
|
||||
img_ratio = img.get("ratio", 1)
|
||||
img_h = int(img_w / img_ratio) if img_ratio > 0 else top_h
|
||||
img_html = f'<img src="data:image/png;base64,{b64}" style="width:100%;height:100%;object-fit:contain;" />'
|
||||
break
|
||||
|
||||
# 하단
|
||||
bottom_top = top_top + top_h + gap_small
|
||||
|
||||
# V'-4: 결론 바로 위까지 채움
|
||||
fit = ctx.fit_result or {}
|
||||
redist = fit.get("redistribution", {})
|
||||
column_bottom = ft_top - gap_block
|
||||
bottom_h = column_bottom - bottom_top
|
||||
bottom_col_w = (inner_w - gap_block) // 2
|
||||
|
||||
# ── 유틸 ──
|
||||
def _bold(text: str, role: str) -> str:
|
||||
for kw in bold_kw.get(role, []):
|
||||
if kw in text:
|
||||
text = text.replace(kw, f"<strong>{kw}</strong>")
|
||||
return text
|
||||
|
||||
# ── 상단 조립: normalized.sections에서 직접 가져오기 ──
|
||||
top_html = ""
|
||||
if top_role:
|
||||
rn = top_role[0]
|
||||
topic_title_from_section = ""
|
||||
top_contents = []
|
||||
for s in norm_sections:
|
||||
if s.get("level") == 3:
|
||||
break # level=3(소목차) 나오면 상단 끝
|
||||
if not topic_title_from_section and s.get("title"):
|
||||
topic_title_from_section = s["title"]
|
||||
content = s.get("content", "")
|
||||
if content:
|
||||
if s.get("title") and s["title"] != topic_title_from_section:
|
||||
top_contents.append(f"### {s['title']}")
|
||||
top_contents.append(content)
|
||||
all_text = "\n".join(top_contents)
|
||||
all_text_clean = re.sub(r'\*\*(.+?)\*\*', r'<strong>\1</strong>', all_text)
|
||||
|
||||
# 팝업 분리
|
||||
popup_titles = []
|
||||
content_lines = []
|
||||
for line in all_text_clean.split("\n"):
|
||||
stripped = line.strip()
|
||||
if not stripped:
|
||||
continue
|
||||
popup_match = re.search(r'\[팝업:\s*([^\]]+)\]', stripped)
|
||||
if popup_match:
|
||||
popup_titles.append(popup_match.group(1))
|
||||
continue
|
||||
if re.search(r'\[이미지:', stripped):
|
||||
continue
|
||||
content_lines.append(stripped)
|
||||
|
||||
popup_html = _popup_links_html(popup_titles, font_size)
|
||||
|
||||
# 소제목(###) + 불릿을 카드형으로 분리
|
||||
sections = []
|
||||
current_section = ("", [])
|
||||
for line in content_lines:
|
||||
if line.startswith("### ") or line.startswith("###"):
|
||||
if current_section[0] or current_section[1]:
|
||||
sections.append(current_section)
|
||||
current_section = (line.lstrip("# ").strip(), [])
|
||||
else:
|
||||
clean = line.lstrip("• ")
|
||||
if clean.startswith("출처:"):
|
||||
continue
|
||||
current_section[1].append(_bold(clean, rn))
|
||||
if current_section[0] or current_section[1]:
|
||||
sections.append(current_section)
|
||||
|
||||
# 카드형 HTML
|
||||
_card_colors = [
|
||||
("linear-gradient(135deg, #1a365d, #2d3748)", "#e2e8f0"),
|
||||
("linear-gradient(135deg, #1e3a2f, #2d4a3e)", "#e2e8f0"),
|
||||
("linear-gradient(135deg, #3b1f2b, #4a2d3b)", "#e2e8f0"),
|
||||
("linear-gradient(135deg, #2d2b55, #3d3b65)", "#e2e8f0"),
|
||||
]
|
||||
card_pad = int(font_size * 0.6)
|
||||
card_gap = max(3, int(font_size * 0.4))
|
||||
indent_body = int(font_size * 1.2)
|
||||
|
||||
bullets = ""
|
||||
if len(sections) > 1 and sections[0][0]:
|
||||
for ci, (sec_title, sec_items) in enumerate(sections):
|
||||
bg, text_color = _card_colors[ci % len(_card_colors)]
|
||||
items_html = "".join(
|
||||
f'<div style="padding-left:{indent_body}px;margin-bottom:1px;">'
|
||||
f'<span style="color:{text_color};font-size:{font_size-1}px;line-height:1.5;">• {item}</span></div>'
|
||||
for item in sec_items
|
||||
)
|
||||
if sec_title:
|
||||
bullets += (
|
||||
f'<div style="background:{bg};border-radius:{int(font_size*0.4)}px;'
|
||||
f'padding:{card_pad}px {int(card_pad*1.5)}px;margin-bottom:{card_gap}px;">'
|
||||
f'<div style="font-size:{font_size}px;font-weight:700;color:#fbbf24;'
|
||||
f'margin-bottom:{int(font_size*0.3)}px;">{_bold(sec_title, rn)}</div>'
|
||||
f'{items_html}</div>\n'
|
||||
)
|
||||
else:
|
||||
bullets += items_html
|
||||
else:
|
||||
for _, sec_items in sections:
|
||||
for item in sec_items:
|
||||
bullets += (
|
||||
f'<div style="padding-left:{indent_body}px;margin-bottom:1px;">'
|
||||
f'<span style="font-size:{font_size}px;">• {item}</span></div>\n'
|
||||
)
|
||||
|
||||
# 이미지 캡션
|
||||
img_caption = ""
|
||||
norm_images = ctx.normalized.images or []
|
||||
if norm_images:
|
||||
img_caption = norm_images[0].get("alt", "")
|
||||
if not img_caption:
|
||||
for line in all_text.split("\n"):
|
||||
stripped = line.strip().lstrip("• ")
|
||||
if stripped.startswith("출처:"):
|
||||
img_caption = re.sub(r'^출처:\s*', '', stripped)
|
||||
break
|
||||
caption_html = f'<div style="font-size:{font_size-2}px;color:#94a3b8;text-align:center;margin-top:2px;">{img_caption}</div>' if img_caption else ""
|
||||
|
||||
# 이미지 블록
|
||||
img_block = ""
|
||||
if has_image and img_html:
|
||||
img_block = (
|
||||
f'<div style="width:{img_w}px;flex-shrink:0;">'
|
||||
f'<div style="height:{img_h}px;border-radius:6px;overflow:hidden;">{img_html}</div>'
|
||||
f'{caption_html}</div>'
|
||||
)
|
||||
|
||||
topic_title = _bold(topic_title_from_section or rn, rn)
|
||||
|
||||
top_html = (
|
||||
f'<div style="position:relative;height:100%;padding:{gap_small}px;box-sizing:border-box;'
|
||||
f'display:flex;flex-direction:column;justify-content:space-between;">'
|
||||
f'{popup_html}'
|
||||
f'<div style="font-weight:700;font-size:{font_size+1}px;color:#1a365d;margin-bottom:4px;">{topic_title}</div>'
|
||||
f'<div style="display:flex;gap:{max(6, int(font_size*0.8))}px;align-items:flex-start;flex:1;">'
|
||||
f'<div style="flex:1;font-size:{font_size}px;line-height:1.55;color:#333;">{bullets}</div>'
|
||||
f'{img_block}</div></div>'
|
||||
)
|
||||
|
||||
# ── 하단: normalized.sections에서 직접 매핑 ──
|
||||
bottom_title = ""
|
||||
sub_sections_from_norm = []
|
||||
found_level3 = False
|
||||
for s in norm_sections:
|
||||
if s.get("level") == 3:
|
||||
found_level3 = True
|
||||
sub_sections_from_norm.append((s.get("title", ""), s.get("content", "")))
|
||||
# 하단 대목차: level=3 바로 앞의 level=2
|
||||
for s in norm_sections:
|
||||
if s.get("level") == 2:
|
||||
idx = norm_sections.index(s)
|
||||
if idx + 1 < len(norm_sections) and norm_sections[idx + 1].get("level") == 3:
|
||||
bottom_title = s.get("title", "")
|
||||
break
|
||||
|
||||
bl_indent = int(font_size * 1.2)
|
||||
|
||||
# 하단 좌측
|
||||
bl_html = ""
|
||||
if sub_sections_from_norm and bottom_left_role:
|
||||
rn = bottom_left_role[0]
|
||||
sub_title, sub_content = sub_sections_from_norm[0]
|
||||
sub_content = re.sub(r'\*\*(.+?)\*\*', r'<strong>\1</strong>', sub_content)
|
||||
|
||||
bul = ""
|
||||
for line in sub_content.split("\n"):
|
||||
stripped = line.strip()
|
||||
if not stripped:
|
||||
continue
|
||||
clean = stripped.lstrip("- ").lstrip("• ")
|
||||
clean = _bold(clean, rn)
|
||||
bul += f'<div style="padding-left:{bl_indent}px;font-size:{font_size}px;margin-bottom:2px;">• {clean}</div>\n'
|
||||
|
||||
bl_html = (
|
||||
f'<div style="height:100%;padding:{gap_small}px;box-sizing:border-box;">'
|
||||
f'<div style="font-weight:700;font-size:{font_size+1}px;color:#1a365d;margin-bottom:4px;">{_bold(sub_title, rn)}</div>'
|
||||
f'<div style="line-height:1.55;color:#333;">{bul}</div></div>'
|
||||
)
|
||||
|
||||
# 하단 우측 + 표 요약
|
||||
br_html = ""
|
||||
if bottom_right_role and len(sub_sections_from_norm) > 1:
|
||||
rn = bottom_right_role[0]
|
||||
sub_title_br, sub_content_br = sub_sections_from_norm[1]
|
||||
sub_content_br = re.sub(r'\*\*(.+?)\*\*', r'<strong>\1</strong>', sub_content_br)
|
||||
|
||||
# 팝업 링크
|
||||
popup_link_title = f"{sub_title_br} 바로가기"
|
||||
popup_html_br = (
|
||||
f'<div style="position:absolute;top:4px;right:8px;text-align:right;z-index:1;">'
|
||||
f'<span style="color:#2563eb;font-size:{font_size-2}px;cursor:pointer;">[{popup_link_title} →]</span></div>'
|
||||
)
|
||||
|
||||
# 불릿
|
||||
table_summaries = enh.get("table_summaries", {})
|
||||
bul = ""
|
||||
if not table_summaries:
|
||||
for line in sub_content_br.split("\n"):
|
||||
clean = line.strip().lstrip("- ").lstrip("• ")
|
||||
if clean:
|
||||
clean = _bold(clean, rn)
|
||||
bul += f'<div style="padding-left:{bl_indent}px;font-size:{font_size}px;margin-bottom:2px;">• {clean}</div>\n'
|
||||
|
||||
# 표 요약 HTML
|
||||
table_html_br = ""
|
||||
for ts_key, ts_data in table_summaries.items():
|
||||
fmt = ts_data.get("format", "text")
|
||||
if fmt == "table":
|
||||
cols = ts_data.get("columns", [])
|
||||
data = ts_data.get("data", [])
|
||||
col_count = len(cols)
|
||||
if col_count > 0 and data:
|
||||
header_cells = "".join(
|
||||
f'<div style="padding:{int(font_size*0.3)}px {int(font_size*0.5)}px;font-size:{font_size-2}px;font-weight:700;color:#fff;text-align:center;">{c}</div>'
|
||||
for c in cols
|
||||
)
|
||||
rows_html = ""
|
||||
for ri, row in enumerate(data):
|
||||
bg = "#f8fafc" if ri % 2 == 0 else "#fff"
|
||||
cells = ""
|
||||
for ci_idx, cell in enumerate(row):
|
||||
c_color = "#1e40af" if ci_idx == 0 else "#475569"
|
||||
c_weight = "600" if ci_idx == 0 else "400"
|
||||
cells += f'<div style="padding:{int(font_size*0.2)}px {int(font_size*0.4)}px;font-size:{font_size-2}px;color:{c_color};font-weight:{c_weight};">{_bold(str(cell), rn)}</div>'
|
||||
rows_html += f'<div style="display:grid;grid-template-columns:repeat({col_count},1fr);border-top:1px solid #e2e8f0;background:{bg};">{cells}</div>\n'
|
||||
table_html_br = (
|
||||
f'<div style="margin-top:{int(font_size*0.5)}px;border:1px solid #e2e8f0;border-radius:{int(font_size*0.4)}px;overflow:hidden;">'
|
||||
f'<div style="display:grid;grid-template-columns:repeat({col_count},1fr);background:linear-gradient(135deg,#0d47a1,#1565c0);">{header_cells}</div>'
|
||||
f'{rows_html}</div>'
|
||||
)
|
||||
elif fmt == "bullets":
|
||||
items = ts_data.get("items", [])
|
||||
table_html_br = "".join(
|
||||
f'<div style="padding-left:{int(font_size*1.2)}px;font-size:{font_size-1}px;margin-bottom:1px;">• {_bold(str(item), rn)}</div>'
|
||||
for item in items
|
||||
)
|
||||
elif fmt == "text":
|
||||
table_html_br = f'<div style="font-size:{font_size-1}px;color:#475569;margin-top:{int(font_size*0.5)}px;">{_bold(str(ts_data.get("summary", "")), rn)}</div>'
|
||||
|
||||
br_html = (
|
||||
f'<div style="position:relative;height:100%;padding:{gap_small}px;box-sizing:border-box;'
|
||||
f'display:flex;flex-direction:column;">'
|
||||
f'{popup_html_br}'
|
||||
f'<div style="font-weight:700;font-size:{font_size+1}px;color:#1a365d;margin-bottom:4px;">{_bold(sub_title_br, rn)}</div>'
|
||||
f'<div style="font-size:{font_size}px;line-height:1.55;color:#333;flex:1;">{bul}</div>'
|
||||
f'{table_html_br}</div>'
|
||||
)
|
||||
|
||||
# ── 결론 ──
|
||||
footer_html = ""
|
||||
if footer_role:
|
||||
rn = footer_role[0]
|
||||
footer_html = (
|
||||
f'<div class="block-banner-grad" style="background:linear-gradient(135deg,#006aff 0%,#00aaff 100%);'
|
||||
f'border-radius:8px;padding:{int(font_size*1.2)}px;text-align:center;color:#fff;height:100%;'
|
||||
f'display:flex;align-items:center;justify-content:center;">'
|
||||
f'<div style="font-size:{font_h.key_msg}px;font-weight:700;">{_bold(core_message, rn)}</div></div>'
|
||||
)
|
||||
|
||||
# ── HTML 조립 ──
|
||||
_color_palette = ["#2563eb", "#16a34a", "#d97706", "#7c3aed"]
|
||||
|
||||
return f"""<!DOCTYPE html><html><head><meta charset="UTF-8">
|
||||
<style>
|
||||
*{{margin:0;padding:0;box-sizing:border-box;}}
|
||||
body{{background:#e5e5e5;padding:10px;font-family:'Pretendard Variable','Noto Sans KR',sans-serif;word-break:keep-all;}}
|
||||
.bl{{display:flex;gap:0;margin-bottom:2px;}}.bl-m{{flex-shrink:0;width:1em;text-align:left;}}.bl-t{{flex:1;word-break:keep-all;}}
|
||||
</style></head><body>
|
||||
<div class="slide" style="width:{slide_w}px;height:{slide_h}px;background:white;position:relative;border:1px solid #ccc;">
|
||||
|
||||
<div style="position:absolute;left:{pad}px;top:{pad}px;width:{inner_w}px;height:{header_h}px;background:#f8fafc;border-bottom:3px solid #2563eb;display:flex;align-items:center;padding:0 20px;font-size:{tokens.get('font_title', 22)}px;font-weight:900;color:#1e293b;">{title}</div>
|
||||
|
||||
<div class="area-top" style="position:absolute;left:{pad}px;top:{top_top}px;width:{inner_w}px;height:{top_h}px;border:2px solid {_color_palette[0]};border-radius:6px;overflow:hidden;">
|
||||
<span style="position:absolute;top:2px;left:4px;font-size:7px;color:{_color_palette[0]};opacity:0.5;">상단 ({inner_w}x{top_h}px)</span>
|
||||
{top_html}</div>
|
||||
|
||||
<div class="area-bottom" style="position:absolute;left:{pad}px;top:{bottom_top}px;width:{inner_w}px;height:{bottom_h}px;">
|
||||
<div style="font-weight:700;font-size:{font_size+1}px;color:#1a365d;margin-bottom:4px;">{_bold(bottom_title, "")}</div>
|
||||
<div style="display:flex;gap:{gap_block}px;height:calc(100% - {int(font_size*1.5 + 4)}px);">
|
||||
<div class="area-bottom-left" style="flex:1;border:2px solid {_color_palette[1]};border-radius:6px;overflow:hidden;">
|
||||
<span style="position:absolute;top:2px;left:4px;font-size:7px;color:{_color_palette[1]};opacity:0.5;">하단좌 ({bottom_col_w}px)</span>
|
||||
{bl_html}</div>
|
||||
<div class="area-bottom-right" style="flex:1;border:2px solid {_color_palette[2]};border-radius:6px;overflow:hidden;">
|
||||
<span style="position:absolute;top:2px;left:4px;font-size:7px;color:{_color_palette[2]};opacity:0.5;">하단우 ({bottom_col_w}px)</span>
|
||||
{br_html}</div>
|
||||
</div></div>
|
||||
|
||||
<div class="area-footer" style="position:absolute;left:{pad}px;top:{ft_top}px;width:{inner_w}px;height:{footer_h_px}px;border-radius:8px;overflow:hidden;">
|
||||
<span style="position:absolute;top:2px;left:4px;font-size:7px;color:{_color_palette[3]};opacity:0.5;">결론 ({inner_w}x{footer_h_px}px)</span>
|
||||
{footer_html}</div>
|
||||
|
||||
</div></body></html>"""
|
||||
|
||||
Reference in New Issue
Block a user