Update app.py

app.py

@@ -2,10 +2,18 @@ import gradio as gr
 from genmake_engine import generate_crystal, PRODUCTS, QUALITIES
 from photo_prep import auto_enhance_to_png
 
-def run_engine(img_path, product, face_mode, bg_mode, quality, use_enhanced, fp16):
+def run_engine(img_path, product, face_mode, bg_mode, shape_mask, mask_scale, mask_x, mask_y, diorama_mode, quality, use_enhanced, fp16, detail_boost, depth_vol):
     if img_path is None:
-        return "⚠️ Error: Please upload an image.", None, None, None
-    return generate_crystal(img_path, product, face_mode, bg_mode, quality, use_enhanced, fp16)
+        return "⚠️ Error: Please upload an image.", None, None, None, None
+    
+    log, files_out, depth_png, weight_png = generate_crystal(
+        img_path, product, face_mode, bg_mode, shape_mask, 
+        mask_scale, mask_x, mask_y, diorama_mode, quality, 
+        use_enhanced, fp16, detail_boost, depth_vol
+    )
+    
+    glb_path = files_out[0]
+    return log, glb_path, glb_path, depth_png, weight_png
 
 def run_enhance(img_path):
     if img_path is None:
@@ -13,59 +21,123 @@ def run_enhance(img_path):
     orig, enh, report = auto_enhance_to_png(img_path)
     return enh, report
 
-with gr.Blocks(title="GenMake SSLE Engine") as app:
-    gr.Markdown("# 💎 GenMake Studio: Automated Subsurface Engine")
+# ==========================================
+# 🎨 CUSTOM LUXURY THEME (GOLD & BROWN)
+# ==========================================
+genmake_gold = gr.themes.Color(
+    c50="#fbf8ea", c100="#f4ebd0", c200="#ead6ad", c300="#dfbe82",
+    c400="#d4a35b", c500="#c98a3c", c600="#b36f30", c700="#955529",
+    c800="#7a4426", c900="#633821", c950="#371d0f",
+)
+
+genmake_brown = gr.themes.Color(
+    c50="#fcfbf9", c100="#f3efe9", c200="#e1d8cf", c300="#c9bbae",
+    c400="#af9c8b", c500="#96806e", c600="#7a6556", c700="#625146",
+    c800="#52453d", c900="#453a34", c950="#251f1b",
+)
+
+luxury_theme = gr.themes.Soft(
+    primary_hue=genmake_gold,
+    neutral_hue=genmake_brown,
+    font=[gr.themes.GoogleFont("Montserrat"), "ui-sans-serif", "system-ui", "sans-serif"]
+).set(
+    body_background_fill="*neutral_50",
+    body_background_fill_dark="*neutral_950",
+    button_primary_background_fill="*primary_500",
+    button_primary_background_fill_hover="*primary_400",
+    button_primary_text_color="white",
+    block_title_text_color="*primary_600",
+    block_title_text_color_dark="*primary_400",
+    slider_color="*primary_500",
+    border_color_primary="*neutral_200",
+)
+
+# ==========================================
+# APP UI BUILDER
+# ==========================================
+with gr.Blocks(title="GenMake Command Center", theme=luxury_theme) as app:
+    
+    gr.Markdown("# 💎 GenMake F2 Ultra Command Center")
+    gr.Markdown("Direct point-cloud generation for K9 crystal subsurface engraving.")
     
     with gr.Row():
-        # --- LEFT COLUMN: CONTROLS ---
-        with gr.Column():
-            img_in = gr.Image(type="filepath", label="1. Upload Customer Photo")
+        
+        # --- LEFT PANEL: THE WORKFLOW CONTROLS ---
+        with gr.Column(scale=4):
             
-            with gr.Row():
-                btn_enhance = gr.Button("✨ Preview Studio Enhancement")
-            
-            enh_out = gr.Image(type="filepath", label="Enhancement Preview")
-            
-            # DYNAMIC SKU LOADER: Pulls directly from the PRODUCTS dictionary
-            product_in = gr.Dropdown(
-                choices=list(PRODUCTS.keys()), 
-                value="block_50x50x80_portrait", 
-                label="2. Select Crystal Blank (SKU)"
-            )
-            
-            with gr.Row():
-                face_mode_in = gr.Dropdown(choices=["single", "couple", "group"], value="single", label="Face Limit")
-                bg_mode_in = gr.Dropdown(choices=["remove", "off"], value="remove", label="Background Mode")
-                quality_in = gr.Dropdown(choices=list(QUALITIES.keys()), value="balanced", label="Laser Density")
+            with gr.Group():
+                gr.Markdown("### 1. Photo Ingestion")
+                img_in = gr.Image(type="filepath", label="Customer Photo", height=250)
+                
+                with gr.Row():
+                    use_enh_in = gr.Checkbox(value=True, label="Auto-Enhance (SSLE)")
+                    btn_enhance = gr.Button("✨ Test Enhancement", size="sm")
+
+            with gr.Group():
+                gr.Markdown("### 2. Geometry & Shape")
+                product_in = gr.Dropdown(choices=list(PRODUCTS.keys()), value="block_50x50x80_portrait", label="Target SKU")
+                
+                with gr.Row():
+                    shape_mask_in = gr.Dropdown(choices=["None", "Round", "Square", "Heart", "Star"], value="None", label="Shape Mask")
+                    diorama_in = gr.Checkbox(value=True, label="Diorama Box Effect")
+                
+                with gr.Accordion("📐 Framing Offsets", open=False):
+                    mask_scale_in = gr.Slider(minimum=0.2, maximum=2.0, value=1.0, step=0.05, label="Mask Size (Scale)")
+                    mask_x_in = gr.Slider(minimum=-50, maximum=50, value=0, step=1, label="Left/Right Offset (%)")
+                    mask_y_in = gr.Slider(minimum=-50, maximum=50, value=0, step=1, label="Up/Down Offset (%)")
+
+            with gr.Group():
+                gr.Markdown("### 3. Laser Tuning")
+                with gr.Row():
+                    detail_boost_in = gr.Slider(minimum=0.0, maximum=1.0, value=0.25, step=0.05, label="Face Sharpness")
+                    depth_vol_in = gr.Slider(minimum=0.1, maximum=0.9, value=0.65, step=0.05, label="3D Volume Depth")
+                
+                with gr.Accordion("⚙️ Advanced Engine Variables", open=False):
+                    with gr.Row():
+                        quality_in = gr.Dropdown(choices=list(QUALITIES.keys()), value="balanced", label="Point Density")
+                        face_mode_in = gr.Dropdown(choices=["single", "couple", "group"], value="single", label="Subject Type")
+                    with gr.Row():
+                        bg_mode_in = gr.Dropdown(choices=["remove", "off"], value="remove", label="Background Mode")
+                        fp16_in = gr.Checkbox(value=True, label="GPU Acceleration")
+
+            btn_gen = gr.Button("🔥 GENERATE PRODUCTION FILE", variant="primary", size="lg")
             
-            with gr.Row():
-                use_enh_in = gr.Checkbox(value=True, label="Apply Auto-Enhance")
-                fp16_in = gr.Checkbox(value=True, label="Use Fast GPU (FP16)")
+        # --- RIGHT PANEL: VISUAL DASHBOARD ---
+        with gr.Column(scale=5):
             
-            btn_gen = gr.Button("🔥 GENERATE .GLB READY FOR f2 ultra uv", variant="primary")
+            gr.Markdown("### 👁️ Inspection Dashboard")
             
-        # --- RIGHT COLUMN: ENGINE OUTPUT ---
-        with gr.Column():
-            log_out = gr.Textbox(label="Engine Log", lines=4)
-            file_out = gr.File(label="Downloadable Assets (Import to xTool XCS)")
+            with gr.Tabs():
+                with gr.TabItem("1. 3D Model Verification"):
+                    model_out = gr.Model3D(label="Interactive 3D Preview", clear_color=[0, 0, 0, 0], height=400)
+                    file_out = gr.File(label="Download for xTool Creative Space")
+                    
+                with gr.TabItem("2. Diagnostics (2D)"):
+                    with gr.Row():
+                        depth_out = gr.Image(type="filepath", label="Depth Map", interactive=False)
+                        weight_out = gr.Image(type="filepath", label="Thermal Importance Map", interactive=False)
+                        
+                with gr.TabItem("3. Enhancement Check"):
+                    enh_out = gr.Image(type="filepath", label="SSLE Output", interactive=False)
             
-            with gr.Row():
-                depth_out = gr.Image(type="filepath", label="Depth Map Preview")
-                weight_out = gr.Image(type="filepath", label="Thermal Density Preview")
+            gr.Markdown("### 📋 Status Log")
+            log_out = gr.Textbox(label="Engine Console", lines=3, interactive=False, show_label=False)
 
-    # Wire up the buttons
-    btn_enhance.click(
-        fn=run_enhance, 
-        inputs=[img_in], 
-        outputs=[enh_out, log_out]
-    )
+    # --- WIRING & LOGIC ---
+    btn_enhance.click(fn=run_enhance, inputs=[img_in], outputs=[enh_out, log_out])
     
     btn_gen.click(
         fn=run_engine, 
-        inputs=[img_in, product_in, face_mode_in, bg_mode_in, quality_in, use_enh_in, fp16_in], 
-        outputs=[log_out, file_out, depth_out, weight_out]
+        inputs=[
+            img_in, product_in, face_mode_in, bg_mode_in, shape_mask_in, 
+            mask_scale_in, mask_x_in, mask_y_in, diorama_in, quality_in, 
+            use_enh_in, fp16_in, detail_boost_in, depth_vol_in
+        ], 
+        outputs=[log_out, file_out, model_out, depth_out, weight_out]
     )
 
 if __name__ == "__main__":
-    # delete_cache=(60, 60) tells the server to wipe temp files every 60 seconds
-    app.launch()
+    try:
+        app.launch(delete_cache=(60, 60))
+    except TypeError:
+        app.launch()