Compact exact Krea2 atlas prompts
This commit is contained in:
@@ -210,7 +210,8 @@ def format_insta_pair_result(request: KreaPairFormatRequest, deps: KreaPairForma
|
||||
hard_axis_values,
|
||||
hard_detail_density,
|
||||
)
|
||||
hard_output_composition = "" if _has_krea2_atlas_variant(hard) else deps.pov_composition_text(hard_composition, pov_labels)
|
||||
hard_has_atlas_variant = _has_krea2_atlas_variant(hard)
|
||||
hard_output_composition = "" if hard_has_atlas_variant else deps.pov_composition_text(hard_composition, pov_labels)
|
||||
same_soft_cast = options.get("softcore_cast") == "same_as_hardcore"
|
||||
soft_output_composition = deps.pov_composition_text(soft.get("composition"), pov_labels if same_soft_cast else [])
|
||||
soft_cast_presence = deps.softcore_cast_presence_phrase(
|
||||
@@ -243,7 +244,7 @@ def format_insta_pair_result(request: KreaPairFormatRequest, deps: KreaPairForma
|
||||
soft_labels,
|
||||
)
|
||||
hard_expression = ""
|
||||
if not deps.expression_disabled(hard):
|
||||
if not deps.expression_disabled(hard) and not hard_has_atlas_variant:
|
||||
hard_expression_source = _filter_expression_for_krea2_variant(
|
||||
hard,
|
||||
deps.clean(hard.get("character_expression_text")) or deps.clean(hard.get("expression")),
|
||||
@@ -281,7 +282,9 @@ def format_insta_pair_result(request: KreaPairFormatRequest, deps: KreaPairForma
|
||||
hard_cast_prose,
|
||||
hard_action,
|
||||
deps.pov_camera_phrase(pov_labels),
|
||||
deps.natural_label_text(
|
||||
""
|
||||
if hard_has_atlas_variant
|
||||
else deps.natural_label_text(
|
||||
deps.filter_pov_labeled_clauses(deps.natural_clothing_state(row.get("hardcore_clothing_state"), hard_action), pov_labels),
|
||||
hard_labels,
|
||||
),
|
||||
@@ -290,7 +293,7 @@ def format_insta_pair_result(request: KreaPairFormatRequest, deps: KreaPairForma
|
||||
deps.expression_phrase(hard_expression),
|
||||
deps.composition_phrase(hard_output_composition, hard_action, detail_density=hard_detail_density),
|
||||
hard_camera,
|
||||
hard_style if detail_level != "concise" else "",
|
||||
"" if hard_has_atlas_variant else hard_style if detail_level != "concise" else "",
|
||||
]
|
||||
return KreaPairPrompts(
|
||||
soft_prompt=deps.paragraph(soft_parts),
|
||||
|
||||
Reference in New Issue
Block a user