Add expression enable controls

caption_naturalizer.py

@@ -49,6 +49,18 @@ def _clean_text(value: Any) -> str:
     return text
 
 
+def _is_false(value: Any) -> bool:
+    if isinstance(value, bool):
+        return value is False
+    if isinstance(value, str):
+        return value.strip().lower() in ("false", "0", "no", "off")
+    return False
+
+
+def _expression_disabled(row: dict[str, Any]) -> bool:
+    return bool(row.get("expression_disabled")) or _is_false(row.get("expression_enabled", True))
+
+
 def _cap_first(text: str) -> str:
     text = _clean_text(text).strip(" ,")
     return text[:1].upper() + text[1:] if text else ""
@@ -362,7 +374,7 @@ def _single_from_row(row: dict[str, Any], detail_level: str, keep_style: bool) -
         item = _clean_clothing(_row_value(row, "clothing", ("Clothing", "Erotic outfit")))
     scene = _row_value(row, "scene_text", ("Scene", "Setting"))
     pose = _row_value(row, "pose", ("Pose",))
-    expression = _row_value(row, "expression", ("Facial expression", "Facial expressions"))
+    expression = "" if _expression_disabled(row) else _row_value(row, "expression", ("Facial expression", "Facial expressions"))
     composition = _normalize_composition(_row_value(row, "composition", ("Composition",)))
     prop = _row_value(row, "prop", ("Prop/detail",))
     style = _row_value(row, "style") if keep_style else ""
@@ -431,7 +443,9 @@ def _couple_from_row(row: dict[str, Any], detail_level: str, keep_style: bool) -
     pose = pose.replace(", affectionate and flirtatious but non-explicit", "")
     clothing = _clean_clothing(_row_value(row, "item", ITEM_LABELS) or _row_value(row, "clothing", ("Clothing",)))
     scene = _row_value(row, "scene_text", ("Scene", "Setting"))
-    expression = _row_value(row, "expression", ("Facial expressions", "Facial expression"))
+    expression = ""
+    if not _expression_disabled(row):
+        expression = _row_value(row, "character_expression_text") or _row_value(row, "expression", ("Facial expressions", "Facial expression"))
     composition = _normalize_composition(_row_value(row, "composition", ("Composition",)))
     style = _row_value(row, "style") if keep_style else ""
 
@@ -466,7 +480,9 @@ def _configured_cast_from_row(row: dict[str, Any], detail_level: str, keep_style
     role_graph = _row_value(row, "role_graph", ("Role graph",))
     item = _row_value(row, "item", ITEM_LABELS)
     scene = _row_value(row, "scene_text", ("Setting", "Scene"))
-    expression = _row_value(row, "expression", ("Facial expressions", "Facial expression"))
+    expression = ""
+    if not _expression_disabled(row):
+        expression = _row_value(row, "character_expression_text") or _row_value(row, "expression", ("Facial expressions", "Facial expression"))
     composition = _normalize_composition(_row_value(row, "composition", ("Composition",)))
     cast_descriptor_text = _row_value(row, "cast_descriptor_text", ("Characters", "Cast descriptors"))
     scene_kind = _row_value(row, "scene_kind") or "explicit adult sex scene"
@@ -504,7 +520,9 @@ def _group_or_layout_from_row(row: dict[str, Any], detail_level: str, keep_style
     age = _row_value(row, "age", ("Ages",)) or _clean_text(row.get("age_band"))
     item = _clean_clothing(_row_value(row, "item", ITEM_LABELS) or _row_value(row, "clothing", ("Clothing",)))
     scene = _row_value(row, "scene_text", ("Scene", "Setting"))
-    expression = _row_value(row, "expression", ("Facial expressions", "Facial expression"))
+    expression = ""
+    if not _expression_disabled(row):
+        expression = _row_value(row, "character_expression_text") or _row_value(row, "expression", ("Facial expressions", "Facial expression"))
     composition = _normalize_composition(_row_value(row, "composition", ("Composition",)))
     style = _row_value(row, "style") if keep_style else ""