Pass actual 2D pattern pieces to 3D builder — 3D view now matches 2D patterns

app.py

@@ -5,7 +5,7 @@ import json, os, re, traceback, copy
 from typing import Dict, Optional, Tuple, List
 import gradio as gr
 from PIL import Image
-from pattern_generator import generate_pattern_from_analysis
+from pattern_generator import generate_pattern_from_analysis, get_pattern_pieces
 from garment_3d import create_3d_figure
 
 GARMENT_ANALYSIS_PROMPT = """You are a professional fashion pattern maker. Analyze this garment image and extract precise sewing pattern parameters.
@@ -90,7 +90,6 @@ def _extract_json_from_text(text):
     return None
 
 def _call_vlm(messages, timeout=180):
-    """Call a VLM model via HF Inference Providers."""
     import requests, base64
     from io import BytesIO
     hf_token = os.environ.get("HF_TOKEN", "")
@@ -153,13 +152,24 @@ def get_default_analysis(garment_type="shirt"):
     }
     return defaults.get(garment_type, defaults["shirt"])
 
-# Global state for current analysis
 _current_analysis = {"data": None}
 
 def _generate_all_outputs(analysis):
-    """Generate 2D pattern, 3D figure, and summary from analysis."""
+    """Generate 2D pattern, 3D figure (from pattern pieces), and summary."""
+    garment_type = analysis.get('garment_type', 'shirt')
+    measurements = analysis.get('measurements', {})
+    features = analysis.get('features', {})
+    params = {**measurements, **features}
+
+    # Generate 2D pattern pieces
+    pattern_pieces = get_pattern_pieces(garment_type, params)
+
+    # Generate 2D pattern image and summary
     pattern_image, summary = generate_pattern_from_analysis(analysis)
-    fig_3d = create_3d_figure(analysis)
+
+    # Generate 3D figure FROM the actual pattern pieces
+    fig_3d = create_3d_figure(analysis, pattern_pieces=pattern_pieces)
+
     display = {k: v for k, v in analysis.items() if k != '_model_used'}
     model_info = f"\n\n*AI: {analysis.get('_model_used', 'Default')}*" if analysis.get('_model_used') else ""
     desc = analysis.get('description', 'No description')
@@ -229,7 +239,6 @@ def process_manual(gt,bust,waist,hip,shoulder,bodice,sleeve,skirt,pant,neck,flar
         return None, None, f"Error: {e}", "{}", []
 
 def chat_edit(message, history):
-    """Chat-based pattern editing."""
     if not message.strip():
         return history, None, None, "Please enter an edit request.", "{}"
     current = _current_analysis.get("data")
@@ -238,9 +247,7 @@ def chat_edit(message, history):
         _current_analysis["data"] = current
     current_clean = {k: v for k, v in current.items() if k != '_model_used'}
     edit_prompt = EDIT_PROMPT_TEMPLATE.format(
-        current_json=json.dumps(current_clean, indent=2),
-        user_message=message
-    )
+        current_json=json.dumps(current_clean, indent=2), user_message=message)
     updated = None
     hf_token = os.environ.get("HF_TOKEN", "")
     if hf_token:
@@ -257,18 +264,15 @@ def chat_edit(message, history):
         elif "short sleeve" in msg_lower or "shorter sleeve" in msg_lower:
             updated['measurements']['sleeve_length'] = 25
         if "no collar" in msg_lower or "remove collar" in msg_lower:
-            updated['features']['has_collar'] = False
-            updated['features']['collar_type'] = 'none'
+            updated['features']['has_collar'] = False; updated['features']['collar_type'] = 'none'
         if "add collar" in msg_lower:
-            updated['features']['has_collar'] = True
-            updated['features']['collar_type'] = 'standard'
+            updated['features']['has_collar'] = True; updated['features']['collar_type'] = 'standard'
         if "add hood" in msg_lower or "hoodie" in msg_lower:
             updated['features']['has_hood'] = True
         if "no hood" in msg_lower or "remove hood" in msg_lower:
             updated['features']['has_hood'] = False
         if "add pocket" in msg_lower:
-            updated['features']['has_pockets'] = True
-            updated['features']['pocket_type'] = 'patch'
+            updated['features']['has_pockets'] = True; updated['features']['pocket_type'] = 'patch'
         if "no pocket" in msg_lower or "remove pocket" in msg_lower:
             updated['features']['has_pockets'] = False
         if "oversized" in msg_lower or "loose" in msg_lower:
@@ -278,14 +282,10 @@ def chat_edit(message, history):
             updated['features']['fit'] = 'fitted'
         if "flare" in msg_lower or "a-line" in msg_lower:
             updated['measurements']['flare'] = max(updated['measurements'].get('flare', 0), 8)
-        if "straight" in msg_lower:
-            updated['measurements']['flare'] = 0
-        if "mini" in msg_lower:
-            updated['measurements']['skirt_length'] = 30
-        if "midi" in msg_lower:
-            updated['measurements']['skirt_length'] = 80
-        if "maxi" in msg_lower:
-            updated['measurements']['skirt_length'] = 110
+        if "straight" in msg_lower: updated['measurements']['flare'] = 0
+        if "mini" in msg_lower: updated['measurements']['skirt_length'] = 30
+        if "midi" in msg_lower: updated['measurements']['skirt_length'] = 80
+        if "maxi" in msg_lower: updated['measurements']['skirt_length'] = 110
         updated['_model_used'] = 'Rule-based edit'
     if 'garment_type' not in updated:
         updated['garment_type'] = current.get('garment_type', 'shirt')
@@ -296,22 +296,14 @@ def chat_edit(message, history):
         p2d, p3d, summary, j = None, None, f"Error: {e}", "{}"
     ai_msg = f"Applied edit: {message}\n\n"
     changes = []
-    old_m = current.get('measurements', {})
-    new_m = updated.get('measurements', {})
-    old_f = current.get('features', {})
-    new_f = updated.get('features', {})
-    for k in set(list(old_m.keys()) + list(new_m.keys())):
-        ov, nv = old_m.get(k), new_m.get(k)
+    for k in set(list(current.get('measurements',{}).keys()) + list(updated.get('measurements',{}).keys())):
+        ov, nv = current.get('measurements',{}).get(k), updated.get('measurements',{}).get(k)
         if ov != nv and ov is not None and nv is not None:
             changes.append(f"  {k}: {ov} -> {nv}")
-    for k in set(list(old_f.keys()) + list(new_f.keys())):
-        ov, nv = old_f.get(k), new_f.get(k)
-        if ov != nv:
-            changes.append(f"  {k}: {ov} -> {nv}")
-    if changes:
-        ai_msg += "Changes:\n" + "\n".join(changes)
-    else:
-        ai_msg += "No changes detected."
+    for k in set(list(current.get('features',{}).keys()) + list(updated.get('features',{}).keys())):
+        ov, nv = current.get('features',{}).get(k), updated.get('features',{}).get(k)
+        if ov != nv: changes.append(f"  {k}: {ov} -> {nv}")
+    ai_msg += ("Changes:\n" + "\n".join(changes)) if changes else "No changes detected."
     history = history or []
     history.append((message, ai_msg))
     return history, p2d, p3d, summary, j
@@ -326,21 +318,14 @@ with gr.Blocks(title="Garment Pattern Studio") as demo:
     gr.HTML("""
     <div class="main-header">
         <h1>🧵 Garment Pattern Studio</h1>
-        <p style="font-size: 1.1em; color: #555;">
-            Analyze garments, edit with chat, preview in 3D
-        </p>
+        <p style="font-size: 1.1em; color: #555;">Analyze garments, edit with chat, preview in 3D</p>
     </div>
     <div class="info-box">
         <b>Powered by:</b> Qwen 3.5 &middot; Gemma 4 &middot; Kimi K2.5 via
-        <a href="https://huggingface.co/docs/inference-providers" target="_blank">HF Inference Providers</a>
-        &nbsp;|&nbsp;
-        <b>Research:</b>
-        <a href="https://arxiv.org/abs/2412.17811">ChatGarment</a> &
-        <a href="https://arxiv.org/abs/2602.20700">NGL-Prompter</a>
-    </div>
-    """)
+        <a href="https://huggingface.co/docs/inference-providers">HF Inference Providers</a>
+        &nbsp;|&nbsp; <b>3D view is built from the actual 2D pattern pieces</b>
+    </div>""")
 
-    # === Tab 1: From Image ===
     with gr.Tab("From Image"):
         with gr.Row():
             with gr.Column(scale=1):
@@ -349,16 +334,12 @@ with gr.Blocks(title="Garment Pattern Studio") as demo:
                 analyze_btn = gr.Button("Analyze & Generate", variant="primary", size="lg")
             with gr.Column(scale=2):
                 with gr.Row():
-                    with gr.Column():
-                        out_pattern_2d = gr.Image(label="2D Sewing Pattern", height=400)
-                    with gr.Column():
-                        out_3d = gr.Plot(label="3D Garment Preview")
+                    with gr.Column(): out_pattern_2d = gr.Image(label="2D Sewing Pattern", height=400)
+                    with gr.Column(): out_3d = gr.Plot(label="3D Garment Preview")
                 out_summary = gr.Markdown(label="Pattern Summary")
-                with gr.Accordion("Raw JSON", open=False):
-                    out_json = gr.Code(language="json", label="Analysis")
+                with gr.Accordion("Raw JSON", open=False): out_json = gr.Code(language="json", label="Analysis")
         analyze_btn.click(process_image, inputs=[input_image, garment_override], outputs=[out_pattern_2d, out_3d, out_summary, out_json])
 
-    # === Tab 2: From Text ===
     with gr.Tab("From Text"):
         with gr.Row():
             with gr.Column(scale=1):
@@ -374,16 +355,12 @@ with gr.Blocks(title="Garment Pattern Studio") as demo:
                 ], inputs=text_input)
             with gr.Column(scale=2):
                 with gr.Row():
-                    with gr.Column():
-                        txt_pattern_2d = gr.Image(label="2D Pattern", height=400)
-                    with gr.Column():
-                        txt_3d = gr.Plot(label="3D Preview")
+                    with gr.Column(): txt_pattern_2d = gr.Image(label="2D Pattern", height=400)
+                    with gr.Column(): txt_3d = gr.Plot(label="3D Preview")
                 txt_summary = gr.Markdown()
-                with gr.Accordion("Raw JSON", open=False):
-                    txt_json = gr.Code(language="json")
+                with gr.Accordion("Raw JSON", open=False): txt_json = gr.Code(language="json")
         text_btn.click(process_text, inputs=[text_input], outputs=[txt_pattern_2d, txt_3d, txt_summary, txt_json])
 
-    # === Tab 3: Manual Parameters ===
     with gr.Tab("Manual Parameters"):
         with gr.Row():
             with gr.Column(scale=1):
@@ -417,18 +394,14 @@ with gr.Blocks(title="Garment Pattern Studio") as demo:
                 manual_btn = gr.Button("Generate Pattern", variant="primary", size="lg")
             with gr.Column(scale=2):
                 with gr.Row():
-                    with gr.Column():
-                        man_pattern_2d = gr.Image(label="2D Pattern", height=400)
-                    with gr.Column():
-                        man_3d = gr.Plot(label="3D Preview")
+                    with gr.Column(): man_pattern_2d = gr.Image(label="2D Pattern", height=400)
+                    with gr.Column(): man_3d = gr.Plot(label="3D Preview")
                 man_summary = gr.Markdown()
-                with gr.Accordion("Raw JSON", open=False):
-                    man_json = gr.Code(language="json")
+                with gr.Accordion("Raw JSON", open=False): man_json = gr.Code(language="json")
         manual_btn.click(process_manual, inputs=[m_type,m_bust,m_waist,m_hip,m_shoulder,m_bodice,m_sleeve,m_skirt,m_pant,m_neck,m_flare,m_collar,m_ctype,m_cuffs,m_pockets,m_hood,m_fit], outputs=[man_pattern_2d, man_3d, man_summary, man_json])
 
-    # === Tab 4: Chat & Edit ===
     with gr.Tab("Chat & Edit"):
-        gr.Markdown("### Edit your pattern with natural language\nFirst generate a pattern (from Image/Text/Manual tabs), then edit it here. Each edit updates both 2D and 3D views.")
+        gr.Markdown("### Edit your pattern with natural language\nFirst generate a pattern, then edit here. Both 2D and 3D update together.")
         with gr.Row():
             with gr.Column(scale=1):
                 chatbot = gr.Chatbot(label="Pattern Editor", height=400)
@@ -438,39 +411,21 @@ with gr.Blocks(title="Garment Pattern Studio") as demo:
                     chat_clear = gr.Button("Clear Chat")
             with gr.Column(scale=2):
                 with gr.Row():
-                    with gr.Column():
-                        chat_pattern_2d = gr.Image(label="Updated 2D Pattern", height=400)
-                    with gr.Column():
-                        chat_3d = gr.Plot(label="Updated 3D Preview")
+                    with gr.Column(): chat_pattern_2d = gr.Image(label="Updated 2D Pattern", height=400)
+                    with gr.Column(): chat_3d = gr.Plot(label="Updated 3D Preview")
                 chat_summary = gr.Markdown()
-                with gr.Accordion("Updated JSON", open=False):
-                    chat_json = gr.Code(language="json")
-
-        def clear_chat():
-            return [], None, None, "", "{}"
-
+                with gr.Accordion("Updated JSON", open=False): chat_json = gr.Code(language="json")
+        def clear_chat(): return [], None, None, "", "{}"
         chat_send.click(chat_edit, inputs=[chat_input, chatbot], outputs=[chatbot, chat_pattern_2d, chat_3d, chat_summary, chat_json])
         chat_input.submit(chat_edit, inputs=[chat_input, chatbot], outputs=[chatbot, chat_pattern_2d, chat_3d, chat_summary, chat_json])
         chat_clear.click(clear_chat, outputs=[chatbot, chat_pattern_2d, chat_3d, chat_summary, chat_json])
 
-    # References
-    gr.HTML("""
-    <div class="ref-box" style="margin-top: 20px;">
-        <h4>Research References</h4>
-        <ul>
-            <li><b>ChatGarment</b> (Bian et al., 2024) -- VLM + multi-turn dialogue for garment editing
-                [<a href="https://arxiv.org/abs/2412.17811">Paper</a>]
-                [<a href="https://github.com/biansy000/ChatGarment">Code</a>]
-                [<a href="https://huggingface.co/datasets/sy000/ChatGarmentDataset">Dataset</a>]</li>
-            <li><b>NGL-Prompter</b> (2025) -- Training-free VLM pattern estimation
-                [<a href="https://arxiv.org/abs/2602.20700">Paper</a>]</li>
-            <li><b>SewFormer</b> (Liu et al., 2023) -- Two-level Transformer pattern reconstruction
-                [<a href="https://arxiv.org/abs/2311.04218">Paper</a>]</li>
-            <li><b>GarmentDiffusion</b> (2025) -- DiT-based multimodal pattern generation
-                [<a href="https://arxiv.org/abs/2504.21476">Paper</a>]</li>
-        </ul>
-    </div>
-    """)
+    gr.HTML("""<div class="ref-box" style="margin-top: 20px;"><h4>Research References</h4><ul>
+        <li><b>ChatGarment</b> (2024) [<a href="https://arxiv.org/abs/2412.17811">Paper</a>] [<a href="https://huggingface.co/datasets/sy000/ChatGarmentDataset">Dataset</a>]</li>
+        <li><b>NGL-Prompter</b> (2025) [<a href="https://arxiv.org/abs/2602.20700">Paper</a>]</li>
+        <li><b>SewFormer</b> (2023) [<a href="https://arxiv.org/abs/2311.04218">Paper</a>]</li>
+        <li><b>GarmentDiffusion</b> (2025) [<a href="https://arxiv.org/abs/2504.21476">Paper</a>]</li>
+    </ul></div>""")
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860, css=CSS, theme=gr.themes.Soft())