Update app.py

app.py

@@ -623,97 +623,190 @@ def generate_diagram_locally(json_data: str, diagram_type: str, output_format: s
 ##############################################################################
 # ────────────────── Prompt Templates (6 Styles) ──────────────────
 EXAMPLE_PROMPTS: dict[str, str] = {
-    "Product Design": """A sleek industrial design concept for a coffee machine:
-- Curved metallic body with minimal bezel
-- Touchscreen panel for settings
-- Modern matte black finish
-- Hand-drawn concept sketch style""",
-    "Mindmap": """A handrawn colorful mind map diagram, educational style, vibrant colors, clear hierarchy, golden ratio layout.
-KNOWLEDGE
-├── ACQUISITION [Brain with Lightning ~60px]
-│   ├── READING [Open Book with Glow]
-│   ├── PRACTICE [Hands-on Tools]
-│   └── OBSERVATION [Eye with Magnifier]
-├── PROCESSING [Gear Network ~50px]
-│   ├── ANALYSIS [Graph Trending Up]
-│   └── SYNTHESIS [Puzzle Pieces]
-├── RETENTION [Memory Chip ~45px]
-│   ├── SHORT-TERM [Quick Flash]
-│   └── LONG-TERM [Solid Archive]
-└── APPLICATION
-    ├── CREATION [Artist Palette]
-    └── INNOVATION [Lightbulb Constellation]""",
-    "Mockup": """A clean hand-drawn style wireframe for a mobile banking app:
-- Title screen with logo
-- Login screen (username, password, login button)
-- Dashboard with 3 main sections (balance, transactions, quick actions)
-- Bottom navigation bar (home, transfers, profile)""",
-    "Infographic": """A sophisticated flat-style infographic for a multinational corporation's annual report:
-- Title: "Global Renewable Energy Trends 2025"
-- Subtitle: "Market Share and Growth Analysis"
-- Visual Elements:
-    - Multi-segmented bar charts comparing Solar, Wind, and Hydro energy production across regions
-    - Pie chart displaying overall energy distribution: Solar (45%), Wind (30%), Hydro (25%)
-    - Trend lines indicating year-over-year growth
-- Icons: Sleek, minimalist representations of a sun, wind turbine, and water droplet
-- Layout: Clean, grid-based design with ample white space and pastel accents for a modern corporate look
-- Annotations: Brief, impactful data callouts highlighting key performance indicators and future forecasts""",
-    "Diagram": """A detailed hand-drawn diagram illustrating an end-to-end business workflow:
-- Title: "Integrated Business Process Diagram"
-- Components:
-    - Market Analysis → Strategy Development → Product Design → Implementation → Post-Launch Review
-- Visual Elements:
-    - Directional arrows, magnifying glass, lightbulb, gear, checklist icons
-- Style: Vibrant, educational yet professional
-- Layout: Clear hierarchy, color-coded sections""",
-    "Flowchart": """A hand-drawn style flowchart, vibrant colors, minimalistic icons.
-BUSINESS WORKFLOW
-├── START [Green Button ~40px]
-│   ├── COLLECT REQUIREMENTS [Folder Icon]
-│   └── ANALYZE DATA [Chart Icon]
-├── IMPLEMENTATION [Coding Symbol ~50px]
-│   ├── FRONTEND [Browser Icon]
-│   └── BACKEND [Server Icon]
-├── TEST & INTEGRATION [Gear Icon ~45px]
-└── DEPLOY → END [Checkered Flag ~40px]"""
+
+    "Product Design": (
+        "A sleek industrial product-design sketch.\n"
+        "{nodes}"
+    ),
+    "Mindmap": (
+        "A hand-drawn colorful mind-map, educational style, clear hierarchy.\n"
+        "{nodes}"
+    ),
+    "Mockup": (
+        "A clean hand-drawn wire-frame for a mobile banking app.\n"
+        "{nodes}"
+    ),
+    "Infographic": (
+        "A flat corporate infographic – “Global Renewable Energy Trends 2025”.\n"
+        "{nodes}"
+    ),
+    "Diagram": (
+        "A hand-drawn business process diagram.\n"
+        "{nodes}"
+    ),
+    "Flowchart": (
+        "A vibrant hand-drawn flow-chart.\n"
+        "{nodes}"
+    ),
 }
 STYLE_KEYS = list(EXAMPLE_PROMPTS.keys())
 
+def create_advanced_ppt_from_content(
+    slides_data: list,
+    topic: str,
+    theme_name: str = "professional",
+    include_charts: bool = False,
+    include_ai_image: bool = False,
+    include_diagrams: bool = False,
+    include_flux_images: bool = False,
+    max_images_per_api: int = 3,
+    max_diagrams: int = 2,
+) -> str:
+    """
+    Build a fully-styled 16:9 PowerPoint file from parsed slide data.
+
+    • 슬라이드 테마/폰트/색상은 DESIGN_THEMES에서 끌어온다.  
+    • AI 이미지: 3D-API와 FLUX-API 각각 최대 `max_images_per_api` 장.  
+    • 다이어그램: detect_diagram_type_with_score() 우선순위 상위 `max_diagrams` 개.  
+    • 함수가 끝나면 임시파일(.pptx) 경로를 돌려준다.
+    """
+    if not PPTX_AVAILABLE:
+        raise ImportError("python-pptx 라이브러리가 필요합니다 (pip install python-pptx)")
+
+    prs = Presentation()
+    theme = DESIGN_THEMES.get(theme_name, DESIGN_THEMES["professional"])
+
+    # --- 슬라이드 캔버스 크기 (16:9) ---
+    prs.slide_width = Inches(10)
+    prs.slide_height = Inches(5.625)
+
+    # 내부 카운터
+    img_cnt_3d, img_cnt_flux, dia_cnt = 0, 0, 0
+
+    # ▸▸▸ 0. 다이어그램 필요 슬라이드 미리 선정
+    diagram_targets: list[tuple[int, str]] = []
+    if include_diagrams:
+        scored = []
+        for idx, s in enumerate(slides_data):
+            d_type, score = detect_diagram_type_with_score(s["title"], s["content"])
+            if d_type:
+                scored.append((idx, d_type, score))
+        scored.sort(key=lambda x: x[2], reverse=True)
+        diagram_targets = [(i, t) for i, t, _ in scored[:max_diagrams]]
+
+    # ▸▸▸ 1. 표지 슬라이드 --------------------------------------------------
+    cover = prs.slides.add_slide(prs.slide_layouts[0])
+    add_gradient_background(cover, theme["colors"]["primary"], theme["colors"]["secondary"])
+    cover.shapes.title.text = topic
+    cover.shapes.title.text_frame.paragraphs[0].font.size = Pt(36)
+    cover.shapes.title.text_frame.paragraphs[0].font.bold = True
+    if include_ai_image and (AI_IMAGE_ENABLED or FLUX_API_ENABLED):
+        p3d, pph = generate_cover_image_prompts(topic, slides_data)
+        img3d, imgph = generate_images_parallel(p3d, pph)
+        pick = img3d if img3d and img_cnt_3d < max_images_per_api else imgph
+        if pick:
+            cover.shapes.add_picture(pick, Inches(6.2), Inches(2.0), width=Inches(3.3))
+            if pick == img3d: img_cnt_3d += 1
+            else: img_cnt_flux += 1
+
+    # ▸▸▸ 2. 본문 슬라이드 ---------------------------------------------------
+    for idx, s in enumerate(slides_data):
+        layout = prs.slide_layouts[1]
+        sl = prs.slides.add_slide(layout)
+        apply_theme_to_slide(sl, theme)
+        sl.shapes.title.text = s["title"]
+
+        # 왼쪽 텍스트
+        left = sl.shapes.add_textbox(Inches(0.6), Inches(1.4), Inches(4.4), Inches(3.6))
+        tf = left.text_frame
+        tf.text = s["content"]
+        force_font_size(tf, 16, theme)
+
+        # 오른쪽 시각 요소
+        right_x, right_y = Inches(5.2), Inches(1.5)
+        visual_done = False
+
+        # 다이어그램 우선
+        if (idx, _) := next(((i, t) for i, t in diagram_targets if i == idx), None):
+            if dia_cnt < max_diagrams:
+                j = generate_diagram_json(s["title"], s["content"], _)
+                if j:
+                    p = generate_diagram_locally(j, _, "png")
+                    if p:
+                        sl.shapes.add_picture(p, right_x, right_y, width=Inches(4.0))
+                        visual_done, dia_cnt = True, dia_cnt + 1
+
+        # 이미지 (3D / FLUX)
+        if not visual_done and include_flux_images and (img_cnt_3d + img_cnt_flux) < max_images_per_api * 2:
+            p3d, pph = generate_diverse_prompt(s["title"], s["content"], idx)
+            pic = None
+            if img_cnt_3d < max_images_per_api:
+                pic = generate_ai_image_via_3d_api(p3d)
+                if pic: img_cnt_3d += 1
+            if not pic and img_cnt_flux < max_images_per_api:
+                pic = generate_flux_image_via_api(pph)
+                if pic: img_cnt_flux += 1
+            if pic:
+                sl.shapes.add_picture(pic, right_x, right_y, width=Inches(4.0))
+
+        # 차트
+        if include_charts and s.get("chart_data"):
+            create_chart_slide(sl, s["chart_data"], theme)
+
+        # 슬라이드 번호
+        num_box = sl.shapes.add_textbox(Inches(9.0), Inches(5.1), Inches(1.0), Inches(0.3))
+        num_box.text_frame.text = f"{idx+1}/{len(slides_data)}"
+        num_box.text_frame.paragraphs[0].font.size = Pt(10)
+
+    # ▸▸▸ 3. 마무리 슬라이드 -------------------------------------------------
+    thanks = prs.slides.add_slide(prs.slide_layouts[5])
+    add_gradient_background(thanks, theme["colors"]["secondary"], theme["colors"]["primary"])
+    thanks.shapes.title.text = "감사합니다"
+
+    # ▸▸▸ 4. 저장 -----------------------------------------------------------
+    tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".pptx")
+    prs.save(tmp.name)
+    return tmp.name
+
+# ------------------------------------------------------------------
+# 2) generate_flux_prompt 함수 전체  ★ 수정 완료
+# ------------------------------------------------------------------
 def generate_flux_prompt(title: str, content: str, style_key: str) -> str:
     """
-    Build a FLUX image-generation prompt for one slide, following six
-    pre-defined visual styles (Product Design, Mindmap, Mockup, Infographic,
-    Diagram, Flowchart).  `content` is the raw bullet-point block coming from
-    the slide; `style_key` picks which template to use.
+    Build a FLUX image-generation prompt for one slide, using six pre-defined
+    visual styles (Product Design, Mindmap, Mockup, Infographic, Diagram,
+    Flowchart).  `content` is the raw bullet-point block; ‘+’/‘-’/‘•’/‘●’ 등
+    모든 글머리 기호를 처리한다.
     """
-    # 1) Extract clean bullet points (max 8)
+    # 1) clean bullet points (max 8)
     bullets = [
-        re.sub(r'^[\-\•\●]\s*', '', line).strip()
+        re.sub(r'^[\+\-\•\●]\s*', '', line).strip()
         for line in content.splitlines()
-        if line.strip().startswith(('-', '•', '●'))
+        if line.lstrip().startswith(('+', '-', '•', '●'))
     ][:8]
 
-    # Build node / list representation for templates that need it
     if bullets:
-        node_block = '\n'.join([f"- {b}" for b in bullets])
-        tree_block = '\n'.join([f"├── {b}" if i < len(bullets) - 1 else f"└── {b}"
-                                for i, b in enumerate(bullets)])
+        nodes_block = '\n'.join(f"- {b}" for b in bullets)
+        tree_block = '\n'.join(
+            f"{'├──' if i < len(bullets)-1 else '└──'} {b}"
+            for i, b in enumerate(bullets)
+        )
     else:
-        node_block = "- No explicit bullet points provided -"
-        tree_block = node_block
+        nodes_block = "- (no explicit bullet points) -"
+        tree_block = nodes_block
 
-    # 2) Select template
-    tpl = EXAMPLE_PROMPTS.get(style_key, EXAMPLE_PROMPTS["Diagram"])
+    # 2) choose template & inject nodes
+    template = EXAMPLE_PROMPTS.get(style_key, EXAMPLE_PROMPTS["Diagram"])
+    prompt_body = template.format(nodes=nodes_block, tree=tree_block)
 
-    # 3) Inject dynamic parts
-    prompt_body = tpl.format(title=title, nodes=node_block if "{nodes}" in tpl else tree_block)
+    # 3) stylistic tail (≤120 words total)
+    tail = (
+        "Corporate palette, white background, hand-drawn line style, "
+        "clean composition, high-resolution vector."
+    )
 
-    # 4) Final stylistic tail – ensure English, ≤120 words
-    style_tail = "Corporate palette, white background, high-resolution vector, clean composition."
+    return f"{prompt_body}\n\n{tail}".strip()
 
-    # 5) Return full prompt (no markdown / commentary)
-    full_prompt = f"{prompt_body}\n\n{style_tail}"
-    return full_prompt.strip()
 
 
 def generate_flux_image_via_api(prompt: str) -> Optional[str]: