Add separate pair camera configs
This commit is contained in:
+9
-3
@@ -1760,6 +1760,7 @@ def build_qwen_camera_config_json(
|
||||
priority: str = "locked",
|
||||
camera_detail: str = "compact",
|
||||
include_degrees: bool = False,
|
||||
suppress_phone_visibility: bool = True,
|
||||
) -> str:
|
||||
info_values = _qwen_camera_info_values(camera_info)
|
||||
if prefer_camera_info and info_values is not None:
|
||||
@@ -1779,7 +1780,7 @@ def build_qwen_camera_config_json(
|
||||
subject_focus=subject_focus,
|
||||
lens=lens,
|
||||
orientation=orientation,
|
||||
phone_visibility=phone_visibility,
|
||||
phone_visibility="auto" if not _is_false(suppress_phone_visibility) else phone_visibility,
|
||||
priority=priority,
|
||||
camera_detail=camera_detail,
|
||||
include_degrees=include_degrees,
|
||||
@@ -4669,6 +4670,8 @@ def build_insta_of_pair(
|
||||
options_json: str | dict[str, Any] | None = None,
|
||||
filter_config: str | dict[str, Any] | None = None,
|
||||
camera_config: str | dict[str, Any] | None = None,
|
||||
softcore_camera_config: str | dict[str, Any] | None = None,
|
||||
hardcore_camera_config: str | dict[str, Any] | None = None,
|
||||
character_profile: str | dict[str, Any] | None = "",
|
||||
character_cast: str | dict[str, Any] | list[Any] | None = "",
|
||||
extra_positive: str = "",
|
||||
@@ -4844,10 +4847,13 @@ def build_insta_of_pair(
|
||||
soft_level = INSTA_OF_SOFT_LEVELS[options["softcore_level"]]
|
||||
hard_level = INSTA_OF_HARDCORE_LEVELS[options["hardcore_level"]]
|
||||
hard_camera_mode = options["hardcore_camera_mode"]
|
||||
soft_camera_source = softcore_camera_config or camera_config
|
||||
hard_camera_source = hardcore_camera_config or camera_config
|
||||
if hard_camera_mode == "same_as_softcore":
|
||||
hard_camera_mode = options["softcore_camera_mode"]
|
||||
soft_camera_config = _camera_config_with_mode(camera_config, options["softcore_camera_mode"])
|
||||
hard_camera_config = _camera_config_with_mode(camera_config, hard_camera_mode)
|
||||
hard_camera_source = soft_camera_source
|
||||
soft_camera_config = _camera_config_with_mode(soft_camera_source, options["softcore_camera_mode"])
|
||||
hard_camera_config = _camera_config_with_mode(hard_camera_source, hard_camera_mode)
|
||||
soft_camera_config = _insta_camera_config_with_detail(soft_camera_config, options["camera_detail"])
|
||||
hard_camera_config = _insta_camera_config_with_detail(hard_camera_config, options["camera_detail"])
|
||||
soft_camera_directive, soft_camera_config = _camera_directive(soft_camera_config)
|
||||
|
||||
Reference in New Issue
Block a user