Naturalize composition frame wording
This commit is contained in:
@@ -67,6 +67,19 @@ def _couple_subject_phrase(subject: str, ages: str) -> str:
|
||||
return subject
|
||||
|
||||
|
||||
def _framed_composition_phrase(composition: str, prefix: str = "framed as") -> str:
|
||||
composition = re.sub(r"\s+composition$", "", str(composition or "").strip(), flags=re.IGNORECASE)
|
||||
composition = re.sub(
|
||||
r"\bcomposition\b",
|
||||
"frame",
|
||||
composition,
|
||||
flags=re.IGNORECASE,
|
||||
).strip(" ,")
|
||||
if not composition:
|
||||
return ""
|
||||
return f"{prefix} {composition}"
|
||||
|
||||
|
||||
def format_normal_row_result(
|
||||
request: KreaNormalRowRequest,
|
||||
deps: KreaNormalRowDependencies,
|
||||
@@ -95,7 +108,7 @@ def format_normal_row_result(
|
||||
f"with {expression}" if expression else "",
|
||||
f"in {scene}" if scene else "",
|
||||
camera_scene,
|
||||
f"framed as {composition}" if composition else "",
|
||||
_framed_composition_phrase(composition),
|
||||
camera,
|
||||
style if detail_level != "concise" else "",
|
||||
]
|
||||
@@ -118,7 +131,7 @@ def format_normal_row_result(
|
||||
f"The setting is {scene}" if scene else "",
|
||||
camera_scene,
|
||||
f"Facial expressions are {expression}" if expression else "",
|
||||
f"The image is framed as {composition}" if composition else "",
|
||||
_framed_composition_phrase(composition, "The image is framed as"),
|
||||
camera,
|
||||
style if detail_level != "concise" else "",
|
||||
]
|
||||
@@ -131,7 +144,7 @@ def format_normal_row_result(
|
||||
f"in {scene}" if scene else "",
|
||||
camera_scene,
|
||||
f"with {expression}" if expression else "",
|
||||
f"framed as {composition}" if composition else "",
|
||||
_framed_composition_phrase(composition),
|
||||
camera,
|
||||
style if detail_level != "concise" else "",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user