Prompt Builder: รูปร่าง/สัดส่วน -> multiselect dropdown of model-reliable body tags (Thai label, English value) + free text; _field() handles list values

app.py

@@ -166,27 +166,39 @@ def reload_registry():
     )
 
 
+def _field(v):
+    """Normalise a Prompt Builder field to a clean string. Dropdowns with
+    multiselect return a list — join those; plain Textboxes return a string."""
+    if isinstance(v, (list, tuple)):
+        return ", ".join(str(x).strip() for x in v if x and str(x).strip())
+    return str(v).strip() if v is not None else ""
+
+
 def build_prompt(subject, age, ethnicity, skin, face, body, hair, eyes, outfit, pose,
                  expression, scene, lighting, shot):
     """Assemble form fields into a prompt. Thai values are fine — the auto-translator
-    turns the whole thing into English at generate time."""
+    turns the whole thing into English at generate time. Dropdown fields already carry
+    model-friendly English tags (e.g. 'hourglass figure')."""
     parts = []
     # Framing/shot goes FIRST so "full body / head to toe" survives CLIP's 77-token cut
     # (it's the key compositional cue; if truncated, SD1.5 defaults to a portrait crop).
-    if shot and str(shot).strip():
-        parts.append(str(shot).strip())
-    who = (subject or "ผู้หญิง").strip()
-    if ethnicity and ethnicity.strip():
-        who = f"{ethnicity.strip()} {who}"
-    if age and str(age).strip():
-        who = f"{who} อายุ {str(age).strip()} ปี"
+    shot = _field(shot)
+    if shot:
+        parts.append(shot)
+    who = _field(subject) or "ผู้หญิง"
+    ethnicity, age = _field(ethnicity), _field(age)
+    if ethnicity:
+        who = f"{ethnicity} {who}"
+    if age:
+        who = f"{who} อายุ {age} ปี"
     parts.append(who)
     # Priority order for CLIP's 77-token budget: compositional anchors first
     # (location/lighting/outfit/pose), fine appearance details last (least harmful
     # if truncated). Skin texture realism is carried by the model's style_prefix anyway.
     for v in (scene, lighting, outfit, pose, expression, body, hair, skin, face, eyes):
-        if v and str(v).strip():
-            parts.append(str(v).strip())
+        s = _field(v)
+        if s:
+            parts.append(s)
     thai = ", ".join(parts)
     # Photographic suffix (NOT "masterpiece/best quality" — those art tokens push the model
     # toward an illustrated/CG look. The model's style_prefix + negative do the heavy lifting).
@@ -223,7 +235,24 @@ with gr.Blocks(css=CSS, theme=gr.themes.Soft(primary_hue="blue"),
             b_age = gr.Textbox(label="อายุ", placeholder="เช่น 25")
             b_ethnicity = gr.Textbox(label="เชื้อชาติ / สัญชาติ", placeholder="เช่น เกาหลี, ไทย")
         with gr.Row():
-            b_body = gr.Textbox(label="รูปร่าง / สัดส่วน", placeholder="เช่น ผอมสูง, ทรงนาฬิกาทราย")
+            b_body = gr.Dropdown(
+                label="รูปร่าง / สัดส่วน (เลือกได้หลายอัน · พิมพ์เองได้)",
+                choices=[
+                    ("ผอมเพรียว / slim", "slim, slender figure"),
+                    ("ตัวเล็กบอบบาง / petite", "petite, small frame"),
+                    ("ทรงนาฬิกาทราย / hourglass", "hourglass figure, narrow waist"),
+                    ("อวบอั๋นเว้าโค้ง / curvy", "curvy, voluptuous"),
+                    ("ฟิตมีกล้าม / athletic", "athletic, toned, fit body"),
+                    ("อึ๋มอกใหญ่ / busty", "busty, large breasts"),
+                    ("ท้วมอวบ / chubby", "chubby, plump"),
+                    ("สูงขายาวทรงนางแบบ / tall model", "tall, long legs, model body"),
+                    ("สะโพกผาย / wide hips", "wide hips"),
+                    ("ต้นขาหนา / thick thighs", "thick thighs"),
+                    ("เอวเล็ก / slim waist", "slim waist"),
+                    ("อกเล็ก / small breasts", "small breasts"),
+                    ("ทรงผู้ใหญ่ / mature", "mature body"),
+                ],
+                value=None, multiselect=True, allow_custom_value=True)
             b_hair = gr.Textbox(label="ทรงผม / สีผม", placeholder="เช่น ผมยาวสีดำ, ผมบลอนด์")
             b_eyes = gr.Textbox(label="สีตา", placeholder="เช่น ตาสีน้ำตาล")
         with gr.Row():